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

ASoC: Updates for v4.10

There's been a few bits of framework work this time around and quite a
lot of cleanups and improvements to existing code:

 - Support for stereo DAPM controls from Chen-yu Tsai.
 - Some initial work on the of-graph sound card from Morimoto-san, the
   main bulk of this is currently in binding review.
 - Lots of Renesas cleanups from Morimoto-san and sunxi work from
   Chen-yu Tsai.
 - regmap conversions of the remaining AC'97 drivers from Lars-Peter
   Clausen.
 - A new version of the topology ABI from Mengdong Lin.
 - New drivers for Cirrus Logic CS42L42, Qualcomm MSM8916-WCD, and Realtek
   RT5665.

1236 files changed, 32483 insertions, 9455 deletions

diff --git a/CREDITS b/CREDITS
index 837367624e45..d7ebdfbc4d4f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -9,7 +9,7 @@
                         Linus
 ----------
 
-M: Matt Mackal
+N: Matt Mackal
 E: mpm@selenic.com
 D: SLOB slab allocator
 
@@ -1910,7 +1910,7 @@ S: Ra'annana, Israel
 
 N: Andi Kleen
 E: andi@firstfloor.org
-U: http://www.halobates.de
+W: http://www.halobates.de
 D: network, x86, NUMA, various hacks
 S: Schwalbenstr. 96
 S: 85551 Ottobrunn
@@ -2089,8 +2089,8 @@ D: ST Microelectronics SPEAr13xx PCI host bridge driver
 D: Synopsys Designware PCI host bridge driver
 
 N: Gabor Kuti
-M: seasons@falcon.sch.bme.hu
-M: seasons@makosteszta.sote.hu
+E: seasons@falcon.sch.bme.hu
+E: seasons@makosteszta.sote.hu
 D: Original author of software suspend
 
 N: Jaroslav Kysela
diff --git a/Documentation/ABI/testing/sysfs-devices-system-ibm-rtl b/Documentation/ABI/testing/sysfs-devices-system-ibm-rtl
index b82deeaec314..470def06ab0a 100644
--- a/Documentation/ABI/testing/sysfs-devices-system-ibm-rtl
+++ b/Documentation/ABI/testing/sysfs-devices-system-ibm-rtl
@@ -1,4 +1,4 @@
-What:           state
+What:           /sys/devices/system/ibm_rtl/state
 Date:           Sep 2010
 KernelVersion:  2.6.37
 Contact:        Vernon Mauery <vernux@us.ibm.com>
@@ -10,7 +10,7 @@ Description:    The state file allows a means by which to change in and
 Users:          The ibm-prtm userspace daemon uses this interface.
 
 
-What:           version
+What:           /sys/devices/system/ibm_rtl/version
 Date:           Sep 2010
 KernelVersion:  2.6.37
 Contact:        Vernon Mauery <vernux@us.ibm.com>
diff --git a/Documentation/ABI/testing/sysfs-platform-sst-atom b/Documentation/ABI/testing/sysfs-platform-sst-atom
new file mode 100644
index 000000000000..0d07c0395660
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-platform-sst-atom
@@ -0,0 +1,17 @@
+What:           /sys/devices/platform/8086%x:00/firmware_version
+Date:           November 2016
+KernelVersion:  4.10
+Contact:        "Sebastien Guiriec" <sebastien.guiriec@intel.com>
+Description:
+                LPE Firmware version for SST driver on all atom
+                plaforms (BYT/CHT/Merrifield/BSW).
+                If the FW has never been loaded it will display:
+                        "FW not yet loaded"
+                If FW has been loaded it will display:
+                        "v01.aa.bb.cc"
+                aa: Major version is reflecting SoC version:
+                        0d: BYT FW
+                        0b: BSW FW
+                        07: Merrifield FW
+                bb: Minor version
+                cc: Build version
diff --git a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt
index fbbacd958240..6f28969af9dc 100644
--- a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt
+++ b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt
@@ -6,7 +6,7 @@ perform in-band IPMI communication with their host.
 
 Required properties:
 
-- compatible : should be "aspeed,ast2400-bt-bmc"
+- compatible : should be "aspeed,ast2400-ibt-bmc"
 - reg: physical address and size of the registers
 
 Optional properties:
@@ -17,7 +17,7 @@ Optional properties:
 Example:
 
         ibt@1e789140 {
-                compatible = "aspeed,ast2400-bt-bmc";
+                compatible = "aspeed,ast2400-ibt-bmc";
                 reg = <0x1e789140 0x18>;
                 interrupts = <8>;
         };
diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
index 4e00e859e885..bfa461aaac99 100644
--- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
@@ -43,6 +43,9 @@ Optional properties:
   reset signal present internally in some host controller IC designs.
   See Documentation/devicetree/bindings/reset/reset.txt for details.
 
+* reset-names: request name for using "resets" property. Must be "reset".
+        (It will be used together with "resets" property.)
+
 * clocks: from common clock binding: handle to biu and ciu clocks for the
   bus interface unit clock and the card interface unit clock.
 
@@ -103,6 +106,8 @@ board specific portions as listed below.
                 interrupts = <0 75 0>;
                 #address-cells = <1>;
                 #size-cells = <0>;
+                resets = <&rst 20>;
+                reset-names = "reset";
         };
 
 [board specific internal DMA resources]
diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt
index e1d76812419c..05150957ecfd 100644
--- a/Documentation/devicetree/bindings/net/ethernet.txt
+++ b/Documentation/devicetree/bindings/net/ethernet.txt
@@ -9,10 +9,26 @@ The following properties are common to the Ethernet controllers:
 - max-speed: number, specifies maximum speed in Mbit/s supported by the device;
 - max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than
   the maximum frame size (there's contradiction in ePAPR).
-- phy-mode: string, operation mode of the PHY interface; supported values are
-  "mii", "gmii", "sgmii", "qsgmii", "tbi", "rev-mii", "rmii", "rgmii", "rgmii-id",
-  "rgmii-rxid", "rgmii-txid", "rtbi", "smii", "xgmii", "trgmii"; this is now a
-  de-facto standard property;
+- phy-mode: string, operation mode of the PHY interface. This is now a de-facto
+  standard property; supported values are:
+  * "mii"
+  * "gmii"
+  * "sgmii"
+  * "qsgmii"
+  * "tbi"
+  * "rev-mii"
+  * "rmii"
+  * "rgmii" (RX and TX delays are added by the MAC when required)
+  * "rgmii-id" (RGMII with internal RX and TX delays provided by the PHY, the
+     MAC should not add the RX or TX delays in this case)
+  * "rgmii-rxid" (RGMII with internal RX delay provided by the PHY, the MAC
+     should not add an RX delay in this case)
+  * "rgmii-txid" (RGMII with internal TX delay provided by the PHY, the MAC
+     should not add an TX delay in this case)
+  * "rtbi"
+  * "smii"
+  * "xgmii"
+  * "trgmii"
 - phy-connection-type: the same as "phy-mode" property but described in ePAPR;
 - phy-handle: phandle, specifies a reference to a node representing a PHY
   device; this property is described in ePAPR and so preferred;
diff --git a/Documentation/devicetree/bindings/pci/rockchip-pcie.txt b/Documentation/devicetree/bindings/pci/rockchip-pcie.txt
index ba67b39939c1..71aeda1ca055 100644
--- a/Documentation/devicetree/bindings/pci/rockchip-pcie.txt
+++ b/Documentation/devicetree/bindings/pci/rockchip-pcie.txt
@@ -26,13 +26,16 @@ Required properties:
         - "sys"
         - "legacy"
         - "client"
-- resets: Must contain five entries for each entry in reset-names.
+- resets: Must contain seven entries for each entry in reset-names.
            See ../reset/reset.txt for details.
 - reset-names: Must include the following names
         - "core"
         - "mgmt"
         - "mgmt-sticky"
         - "pipe"
+        - "pm"
+        - "aclk"
+        - "pclk"
 - pinctrl-names : The pin control state names
 - pinctrl-0: The "default" pinctrl state
 - #interrupt-cells: specifies the number of cells needed to encode an
@@ -86,8 +89,10 @@ pcie0: pcie@f8000000 {
         reg = <0x0 0xf8000000 0x0 0x2000000>, <0x0 0xfd000000 0x0 0x1000000>;
         reg-names = "axi-base", "apb-base";
         resets = <&cru SRST_PCIE_CORE>, <&cru SRST_PCIE_MGMT>,
-                 <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>;
-        reset-names = "core", "mgmt", "mgmt-sticky", "pipe";
+                 <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE> ,
+                 <&cru SRST_PCIE_PM>, <&cru SRST_P_PCIE>, <&cru SRST_A_PCIE>;
+        reset-names = "core", "mgmt", "mgmt-sticky", "pipe",
+                      "pm", "pclk", "aclk";
         phys = <&pcie_phy>;
         phy-names = "pcie-phy";
         pinctrl-names = "default";
diff --git a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
index f9753c416974..b24583aa34c3 100644
--- a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
@@ -14,11 +14,6 @@ Required properies:
  - #size-cells  : The value of this property must be 1
  - ranges       : defines mapping between pin controller node (parent) to
    gpio-bank node (children).
- - interrupt-parent: phandle of the interrupt parent to which the external
-   GPIO interrupts are forwarded to.
- - st,syscfg: Should be phandle/offset pair. The phandle to the syscon node
-   which includes IRQ mux selection register, and the offset of the IRQ mux
-   selection register.
  - pins-are-numbered: Specify the subnodes are using numbered pinmux to
    specify pins.
 
@@ -37,6 +32,11 @@ Required properties:
 
 Optional properties:
  - reset:         : Reference to the reset controller
+ - interrupt-parent: phandle of the interrupt parent to which the external
+   GPIO interrupts are forwarded to.
+ - st,syscfg: Should be phandle/offset pair. The phandle to the syscon node
+   which includes IRQ mux selection register, and the offset of the IRQ mux
+   selection register.
 
 Example:
 #include <dt-bindings/pinctrl/stm32f429-pinfunc.h>
diff --git a/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt b/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt
new file mode 100644
index 000000000000..5b9b38f578bb
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt
@@ -0,0 +1,88 @@
+Devicetree bindings for the Axentia TSE-850 audio complex
+
+Required properties:
+  - compatible: "axentia,tse850-pcm5142"
+  - axentia,ssc-controller: The phandle of the atmel SSC controller used as
+    cpu dai.
+  - axentia,audio-codec: The phandle of the PCM5142 codec.
+  - axentia,add-gpios: gpio specifier that controls the mixer.
+  - axentia,loop1-gpios: gpio specifier that controls loop relays on channel 1.
+  - axentia,loop2-gpios: gpio specifier that controls loop relays on channel 2.
+  - axentia,ana-supply: Regulator that supplies the output amplifier. Must
+    support voltages in the 2V - 20V range, in 1V steps.
+
+The schematics explaining the gpios are as follows:
+
+               loop1 relays
+   IN1 +---o  +------------+  o---+ OUT1
+            \                /
+             +              +
+             |   /          |
+             +--o  +--.     |
+             |  add   |     |
+             |        V     |
+             |      .---.   |
+   DAC +----------->|Sum|---+
+             |      '---'   |
+             |              |
+             +              +
+
+   IN2 +---o--+------------+--o---+ OUT2
+               loop2 relays
+
+The 'loop1' gpio pin controlls two relays, which are either in loop position,
+meaning that input and output are directly connected, or they are in mixer
+position, meaning that the signal is passed through the 'Sum' mixer. Similarly
+for 'loop2'.
+
+In the above, the 'loop1' relays are inactive, thus feeding IN1 to the mixer
+(if 'add' is active) and feeding the mixer output to OUT1. The 'loop2' relays
+are active, short-cutting the TSE-850 from channel 2. IN1, IN2, OUT1 and OUT2
+are TSE-850 connectors and DAC is the PCB name of the (filtered) output from
+the PCM5142 codec.
+
+Example:
+
+        &i2c {
+                codec: pcm5142@4c {
+                        compatible = "ti,pcm5142";
+
+                        reg = <0x4c>;
+
+                        AVDD-supply = <&reg_3v3>;
+                        DVDD-supply = <&reg_3v3>;
+                        CPVDD-supply = <&reg_3v3>;
+
+                        clocks = <&sck>;
+
+                        pll-in = <3>;
+                        pll-out = <6>;
+                };
+        };
+
+        ana: ana-reg {
+                compatible = "pwm-regulator";
+
+                regulator-name = "ANA";
+
+                pwms = <&pwm0 2 1000 PWM_POLARITY_INVERTED>;
+                pwm-dutycycle-unit = <1000>;
+                pwm-dutycycle-range = <100 1000>;
+
+                regulator-min-microvolt = <2000000>;
+                regulator-max-microvolt = <20000000>;
+                regulator-ramp-delay = <1000>;
+        };
+
+        sound {
+                compatible = "axentia,tse850-pcm5142";
+
+                axentia,ssc-controller = <&ssc0>;
+                axentia,audio-codec = <&codec>;
+
+                axentia,add-gpios = <&pioA 8 GPIO_ACTIVE_LOW>;
+                axentia,loop1-gpios = <&pioA 10 GPIO_ACTIVE_LOW>;
+                axentia,loop2-gpios = <&pioA 11 GPIO_ACTIVE_LOW>;
+
+                axentia,ana-supply = <&ana>;
+        };
diff --git a/Documentation/devicetree/bindings/sound/cs35l34.txt b/Documentation/devicetree/bindings/sound/cs35l34.txt
new file mode 100644
index 000000000000..b218ead2e68e
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/cs35l34.txt
@@ -0,0 +1,64 @@
+CS35L34 Speaker Amplifier
+
+Required properties:
+
+  - compatible : "cirrus,cs35l34"
+
+  - reg : the I2C address of the device for I2C.
+
+  - VA-supply, VP-supply : power supplies for the device,
+    as covered in
+    Documentation/devicetree/bindings/regulator/regulator.txt.
+
+  - cirrus,boost-vtge-millivolt : Boost Voltage Value.  Configures the boost
+    converter's output voltage in mV. The range is from VP to 8V with
+    increments of 100mV.
+
+  - cirrus,boost-nanohenry: Inductor value for boost converter. The value is
+    in nH and they can be values of 1000nH, 1100nH, 1200nH, 1500nH, and 2200nH.
+
+Optional properties:
+
+  - reset-gpios: GPIO used to reset the amplifier.
+
+  - interrupt-parent : Specifies the phandle of the interrupt controller to
+    which the IRQs from CS35L34 are delivered to.
+  - interrupts : IRQ line info CS35L34.
+    (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
+    for further information relating to interrupt properties)
+
+  - cirrus,boost-peak-milliamp : Boost converter peak current limit in mA. The
+    range starts at 1200mA and goes to a maximum of 3840mA with increments of
+    80mA. The default value is 2480mA.
+
+  - cirrus,i2s-sdinloc : ADSP SDIN I2S channel location. Indicates whether the
+    received mono data is in the left or right portion of the I2S frame
+    according to the AD0 pin or directly via this configuration.
+    0x0 (Default) = Selected by AD0 input (if AD0 = LOW, use left channel),
+    0x2 = Left,
+    0x1 = Selected by the inversion of the AD0 input (if AD0 = LOW, use right
+    channel),
+    0x3 = Right.
+
+  - cirrus,gain-zc-disable: Boolean property. If set, the gain change will take
+    effect without waiting for a zero cross.
+
+  - cirrus,tdm-rising-edge: Boolean property. If set, data is on the rising edge of
+    SCLK. Otherwise, data is on the falling edge of SCLK.
+
+
+Example:
+
+cs35l34: cs35l34@40 {
+        compatible = "cirrus,cs35l34";
+        reg = <0x40>;
+
+        interrupt-parent = <&gpio8>;
+        interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
+
+        reset-gpios = <&gpio 10 0>;
+
+        cirrus,boost-vtge-milltvolt = <8000>; /* 8V */
+        cirrus,boost-ind-nanohenry = <1000>; /* 1uH */
+        cirrus,boost-peak-milliamp = <3000>; /* 3A */
+};
diff --git a/Documentation/devicetree/bindings/sound/cs42l42.txt b/Documentation/devicetree/bindings/sound/cs42l42.txt
new file mode 100644
index 000000000000..9a2c5e2423d5
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/cs42l42.txt
@@ -0,0 +1,110 @@
+CS42L42 audio CODEC
+
+Required properties:
+
+  - compatible : "cirrus,cs42l42"
+
+  - reg : the I2C address of the device for I2C.
+
+  - VP-supply, VCP-supply, VD_FILT-supply, VL-supply, VA-supply :
+  power supplies for the device, as covered in
+  Documentation/devicetree/bindings/regulator/regulator.txt.
+
+Optional properties:
+
+  - reset-gpios : a GPIO spec for the reset pin. If specified, it will be
+  deasserted before communication to the codec starts.
+
+  - interrupt-parent : Specifies the phandle of the interrupt controller to
+  which the IRQs from CS42L42 are delivered to.
+
+  - interrupts : IRQ line info CS42L42.
+  (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
+  for further information relating to interrupt properties)
+
+  - cirrus,ts-inv : Boolean property. For jacks that invert the tip sense
+  polarity. Normal jacks will short tip sense pin to HS1 when headphones are
+  plugged in and leave tip sense floating when not plugged in. Inverting jacks
+  short tip sense when unplugged and float when plugged in.
+
+  0 = (Default) Non-inverted
+  1 = Inverted
+
+  - cirrus,ts-dbnc-rise : Debounce the rising edge of TIP_SENSE_PLUG. With no
+  debounce, the tip sense pin might be noisy on a plug event.
+
+  0 - 0ms,
+  1 - 125ms,
+  2 - 250ms,
+  3 - 500ms,
+  4 - 750ms,
+  5 - (Default) 1s,
+  6 - 1.25s,
+  7 - 1.5s,
+
+  - cirrus,ts-dbnc-fall : Debounce the falling edge of TIP_SENSE_UNPLUG.
+  With no debounce, the tip sense pin might be noisy on an unplug event.
+
+  0 - 0ms,
+  1 - 125ms,
+  2 - 250ms,
+  3 - 500ms,
+  4 - 750ms,
+  5 - (Default) 1s,
+  6 - 1.25s,
+  7 - 1.5s,
+
+  - cirrus,btn-det-init-dbnce : This sets how long the driver sleeps after
+  enabling button detection interrupts. After auto-detection and before
+  servicing button interrupts, the HS bias needs time to settle. If you
+  don't wait, there is possibility for erroneous button interrupt.
+
+  0ms - 200ms,
+  Default = 100ms
+
+  - cirrus,btn-det-event-dbnce : This sets how long the driver delays after
+  receiving a button press interrupt. With level detect interrupts, you want
+  to wait a small amount of time to make sure the button press is making a
+  clean connection with the bias resistors.
+
+  0ms - 20ms,
+  Default = 10ms
+
+  - cirrus,bias-lvls : For a level-detect headset button scheme, each button
+  will bias the mic pin to a certain voltage. To determine which button was
+  pressed, the driver will compare this biased voltage to sequential,
+  decreasing voltages and will stop when a comparator is tripped,
+  indicating a comparator voltage < bias voltage. This value represents a
+  percentage of the internally generated HS bias voltage. For different
+  hardware setups, a designer might want to tweak this. This is an array of
+  descending values for the comparator voltage.
+
+  Array of 4 values
+  Each 0-63
+  < x1 x2 x3 x4 >
+  Default = < 15 8 4 1>
+
+
+Example:
+
+cs42l42: cs42l42@48 {
+        compatible = "cirrus,cs42l42";
+        reg = <0x48>;
+        VA-supply = <&dummy_vreg>;
+        VP-supply = <&dummy_vreg>;
+        VCP-supply = <&dummy_vreg>;
+        VD_FILT-supply = <&dummy_vreg>;
+        VL-supply = <&dummy_vreg>;
+
+        reset-gpios = <&axi_gpio_0 1 0>;
+        interrupt-parent = <&gpio0>;
+        interrupts = <55 8>
+
+        cirrus,ts-inv = <0x00>;
+        cirrus,ts-dbnc-rise = <0x05>;
+        cirrus,ts-dbnc-fall = <0x00>;
+        cirrus,btn-det-init-dbnce = <100>;
+        cirrus,btn-det-event-dbnce = <10>;
+        cirrus,bias-lvls = <0x0F 0x08 0x04 0x01>;
+        cirrus,hs-bias-ramp-rate = <0x02>;
+};
\ No newline at end of file
diff --git a/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt b/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt
index 55b53e1fd72c..e0b6165c9cfc 100644
--- a/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt
+++ b/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt
@@ -43,7 +43,7 @@ mcbsp0: mcbsp@1d10000 {
                 <0x00310000 0x1000>;
         reg-names = "mpu", "dat";
         interrupts = <97 98>;
-        interrupts-names = "rx", "tx";
+        interrupt-names = "rx", "tx";
         dmas = <&edma0 3 1
                 &edma0 2 1>;
         dma-names = "tx", "rx";
diff --git a/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt b/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
index fd40c852d7c7..462b04e8209f 100644
--- a/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
+++ b/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
@@ -12,7 +12,7 @@ Required properties:
 
 Optional properties:
 - ti,dmic: phandle for the OMAP dmic node if the machine have it connected
-- ti,jack_detection: Need to be present if the board capable to detect jack
+- ti,jack-detection: Need to be present if the board capable to detect jack
   insertion, removal.
 
 Available audio endpoints for the audio-routing table:
diff --git a/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt b/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
index d9d8635ff94c..6a4aadc4ce06 100644
--- a/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
+++ b/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
@@ -44,8 +44,7 @@ Required dai-link subnodes:
 Required CPU/CODEC subnodes properties:
 
 -link-name              : Name of the dai link.
--sound-dai              : phandle and port of CPU/CODEC
--capture-dai            : phandle and port of CPU/CODEC
+-sound-dai              : phandle/s and port of CPU/CODEC
 
 Example:
 
@@ -73,7 +72,7 @@ sound: sound {
                         sound-dai = <&lpass MI2S_PRIMARY>;
                 };
                 codec {
-                        sound-dai = <&wcd_codec 0>;
+                        sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
                 };
         };
 
diff --git a/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt
new file mode 100644
index 000000000000..ccb401cfef9d
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt
@@ -0,0 +1,85 @@
+msm8916 analog audio CODEC
+
+Bindings for codec Analog IP which is integrated in pmic pm8916,
+
+## Bindings for codec core on pmic:
+
+Required properties
+ - compatible = "qcom,pm8916-wcd-analog-codec";
+ - reg: represents the slave base address provided to the peripheral.
+ - interrupt-parent : The parent interrupt controller.
+ - interrupts: List of interrupts in given SPMI peripheral.
+ - interrupt-names: Names specified to above list of interrupts in same
+                    order. List of supported interrupt names are:
+  "cdc_spk_cnp_int" - Speaker click and pop interrupt.
+  "cdc_spk_clip_int" - Speaker clip interrupt.
+  "cdc_spk_ocp_int" - Speaker over current protect interrupt.
+  "mbhc_ins_rem_det1" - jack insert removal detect interrupt 1.
+  "mbhc_but_rel_det" - button release interrupt.
+  "mbhc_but_press_det" - button press event
+  "mbhc_ins_rem_det" - jack insert removal detect interrupt.
+  "mbhc_switch_int"     - multi button headset interrupt.
+  "cdc_ear_ocp_int" - Earphone over current protect interrupt.
+  "cdc_hphr_ocp_int" - Headphone R over current protect interrupt.
+  "cdc_hphl_ocp_det" - Headphone L over current protect interrupt.
+  "cdc_ear_cnp_int" - earphone cnp interrupt.
+  "cdc_hphr_cnp_int" - hphr click and pop interrupt.
+  "cdc_hphl_cnp_int" - hphl click and pop interrupt.
+
+ - clocks: Handle to mclk.
+ - clock-names: should be "mclk"
+ - vdd-cdc-io-supply: phandle to VDD_CDC_IO regulator DT node.
+ - vdd-cdc-tx-rx-cx-supply: phandle to VDD_CDC_TX/RX/CX regulator DT node.
+ - vdd-micbias-supply: phandle of VDD_MICBIAS supply's regulator DT node.
+
+Optional Properties:
+- qcom,micbias1-ext-cap: boolean, present if micbias1 has external capacitor
+                         connected.
+- qcom,micbias2-ext-cap: boolean, present if micbias2 has external capacitor
+                         connected.
+
+Example:
+
+spmi_bus {
+        ...
+        audio-codec@f000{
+                compatible = "qcom,pm8916-wcd-analog-codec";
+                reg = <0xf000 0x200>;
+                reg-names = "pmic-codec-core";
+                clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
+                clock-names = "mclk";
+                interrupt-parent = <&spmi_bus>;
+                interrupts = <0x1 0xf0 0x0 IRQ_TYPE_NONE>,
+                             <0x1 0xf0 0x1 IRQ_TYPE_NONE>,
+                             <0x1 0xf0 0x2 IRQ_TYPE_NONE>,
+                             <0x1 0xf0 0x3 IRQ_TYPE_NONE>,
+                             <0x1 0xf0 0x4 IRQ_TYPE_NONE>,
+                             <0x1 0xf0 0x5 IRQ_TYPE_NONE>,
+                             <0x1 0xf0 0x6 IRQ_TYPE_NONE>,
+                             <0x1 0xf0 0x7 IRQ_TYPE_NONE>,
+                             <0x1 0xf1 0x0 IRQ_TYPE_NONE>,
+                             <0x1 0xf1 0x1 IRQ_TYPE_NONE>,
+                             <0x1 0xf1 0x2 IRQ_TYPE_NONE>,
+                             <0x1 0xf1 0x3 IRQ_TYPE_NONE>,
+                             <0x1 0xf1 0x4 IRQ_TYPE_NONE>,
+                             <0x1 0xf1 0x5 IRQ_TYPE_NONE>;
+                interrupt-names = "cdc_spk_cnp_int",
+                                  "cdc_spk_clip_int",
+                                  "cdc_spk_ocp_int",
+                                  "mbhc_ins_rem_det1",
+                                  "mbhc_but_rel_det",
+                                  "mbhc_but_press_det",
+                                  "mbhc_ins_rem_det",
+                                  "mbhc_switch_int",
+                                  "cdc_ear_ocp_int",
+                                  "cdc_hphr_ocp_int",
+                                  "cdc_hphl_ocp_det",
+                                  "cdc_ear_cnp_int",
+                                  "cdc_hphr_cnp_int",
+                                  "cdc_hphl_cnp_int";
+                       VDD-CDC-IO-supply = <&pm8916_l5>;
+                       VDD-CDC-TX-RX-CX-supply = <&pm8916_l5>;
+                       VDD-MICBIAS-supply = <&pm8916_l13>;
+                       #sound-dai-cells = <1>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital.txt b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital.txt
new file mode 100644
index 000000000000..1c8e4cb25176
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital.txt
@@ -0,0 +1,20 @@
+msm8916 digital audio CODEC
+
+## Bindings for codec core in lpass:
+
+Required properties
+ - compatible = "qcom,msm8916-wcd-digital-codec";
+ - reg: address space for lpass codec.
+ - clocks: Handle to mclk and ahbclk
+ - clock-names: should be "mclk", "ahbix-clk".
+
+Example:
+
+audio-codec@771c000{
+        compatible = "qcom,msm8916-wcd-digital-codec";
+        reg = <0x0771c000 0x400>;
+        clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>,
+                 <&gcc GCC_CODEC_DIGCODEC_CLK>;
+        clock-names = "ahbix-clk", "mclk";
+        #sound-dai-cells = <1>;
+};
diff --git a/Documentation/devicetree/bindings/sound/rt5514.txt b/Documentation/devicetree/bindings/sound/rt5514.txt
index 9cabfc18cb57..929ca6756b02 100644
--- a/Documentation/devicetree/bindings/sound/rt5514.txt
+++ b/Documentation/devicetree/bindings/sound/rt5514.txt
@@ -13,6 +13,9 @@ Optional properties:
 - clocks: The phandle of the master clock to the CODEC
 - clock-names: Should be "mclk"
 
+- realtek,dmic-init-delay-ms
+  Set the DMIC initial delay (ms) to wait it ready.
+
 Pins on the device (for linking into audio routes) for RT5514:
 
   * DMIC1L
diff --git a/Documentation/devicetree/bindings/sound/rt5663.txt b/Documentation/devicetree/bindings/sound/rt5663.txt
index 7d3c974c6e2e..70eaeaed2b18 100644
--- a/Documentation/devicetree/bindings/sound/rt5663.txt
+++ b/Documentation/devicetree/bindings/sound/rt5663.txt
@@ -1,10 +1,10 @@
-RT5663/RT5668 audio CODEC
+RT5663 audio CODEC
 
 This device supports I2C only.
 
 Required properties:
 
-- compatible : One of "realtek,rt5663" or "realtek,rt5668".
+- compatible : "realtek,rt5663".
 
 - reg : The I2C address of the device.
 
@@ -12,7 +12,7 @@ Required properties:
 
 Optional properties:
 
-Pins on the device (for linking into audio routes) for RT5663/RT5668:
+Pins on the device (for linking into audio routes) for RT5663:
 
   * IN1P
   * IN1N
diff --git a/Documentation/devicetree/bindings/sound/rt5665.txt b/Documentation/devicetree/bindings/sound/rt5665.txt
new file mode 100755
index 000000000000..419c89219681
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/rt5665.txt
@@ -0,0 +1,68 @@
+RT5665/RT5666/RT5668 audio CODEC
+
+This device supports I2C only.
+
+Required properties:
+
+- compatible : One of "realtek,rt5665", "realtek,rt5666" or "realtek,rt5668".
+
+- reg : The I2C address of the device.
+
+- interrupts : The CODEC's interrupt output.
+
+Optional properties:
+
+- realtek,in1-differential
+- realtek,in2-differential
+- realtek,in3-differential
+- realtek,in4-differential
+  Boolean. Indicate MIC1/2/3/4 input are differential, rather than single-ended.
+
+- realtek,dmic1-data-pin
+  0: dmic1 is not used
+  1: using GPIO4 pin as dmic1 data pin
+  2: using IN2N pin as dmic2 data pin
+
+- realtek,dmic2-data-pin
+  0: dmic2 is not used
+  1: using GPIO5 pin as dmic2 data pin
+  2: using IN2P pin as dmic2 data pin
+
+- realtek,jd-src
+  0: No JD is used
+  1: using JD1 as JD source
+
+- realtek,ldo1-en-gpios : The GPIO that controls the CODEC's LDO1_EN pin.
+
+Pins on the device (for linking into audio routes) for RT5659/RT5658:
+
+  * DMIC L1
+  * DMIC R1
+  * DMIC L2
+  * DMIC R2
+  * IN1P
+  * IN1N
+  * IN2P
+  * IN2N
+  * IN3P
+  * IN3N
+  * IN4P
+  * IN4N
+  * HPOL
+  * HPOR
+  * LOUTL
+  * LOUTR
+  * MONOOUT
+  * PDML
+  * PDMR
+
+Example:
+
+rt5659 {
+        compatible = "realtek,rt5665";
+        reg = <0x1b>;
+        interrupt-parent = <&gpio>;
+        interrupts = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_HIGH>;
+        realtek,ldo1-en-gpios =
+                <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_HIGH>;
+};
diff --git a/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt b/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt
new file mode 100644
index 000000000000..94442e5673b3
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt
@@ -0,0 +1,38 @@
+Samsung Exynos5433 TM2(E) audio complex with WM5110 codec
+
+Required properties:
+
+ - compatible            : "samsung,tm2-audio"
+ - model                 : the user-visible name of this sound complex
+ - audio-codec           : the phandle of the wm5110 audio codec node,
+                           as described in ../mfd/arizona.txt
+ - i2s-controller        : the phandle of the I2S controller
+ - audio-amplifier       : the phandle of the MAX98504 amplifier
+ - samsung,audio-routing : a list of the connections between audio components;
+                           each entry is a pair of strings, the first being the
+                           connection's sink, the second being the connection's
+                           source; valid names for sources and sinks are the
+                           WM5110's and MAX98504's pins and the jacks on the
+                           board: HP, SPK, Main Mic, Sub Mic, Third Mic,
+                           Headset Mic
+ - mic-bias-gpios        : GPIO pin that enables the Main Mic bias regulator
+
+
+Example:
+
+sound {
+        compatible = "samsung,tm2-audio";
+        audio-codec = <&wm5110>;
+        i2s-controller = <&i2s0>;
+        audio-amplifier = <&max98504>;
+        mic-bias-gpios = <&gpr3 2 0>;
+        model = "wm5110";
+        samsung,audio-routing =
+                "HP", "HPOUT1L",
+                "HP", "HPOUT1R",
+                "SPK", "SPKOUT",
+                "SPKOUT", "HPOUT2L",
+                "SPKOUT", "HPOUT2R",
+                "Main Mic", "MICBIAS2",
+                "IN1R", "Main Mic";
+};
diff --git a/Documentation/devicetree/bindings/sound/sun4i-codec.txt b/Documentation/devicetree/bindings/sound/sun4i-codec.txt
index 0dce690f78f5..3033bd8aab0f 100644
--- a/Documentation/devicetree/bindings/sound/sun4i-codec.txt
+++ b/Documentation/devicetree/bindings/sound/sun4i-codec.txt
@@ -1,8 +1,12 @@
 * Allwinner A10 Codec
 
 Required properties:
-- compatible: must be either "allwinner,sun4i-a10-codec" or
-  "allwinner,sun7i-a20-codec"
+- compatible: must be one of the following compatibles:
+                - "allwinner,sun4i-a10-codec"
+                - "allwinner,sun6i-a31-codec"
+                - "allwinner,sun7i-a20-codec"
+                - "allwinner,sun8i-a23-codec"
+                - "allwinner,sun8i-h3-codec"
 - reg: must contain the registers location and length
 - interrupts: must contain the codec interrupt
 - dmas: DMA channels for tx and rx dma. See the DMA client binding,
@@ -17,6 +21,43 @@ Required properties:
 Optional properties:
 - allwinner,pa-gpios: gpio to enable external amplifier
 
+Required properties for the following compatibles:
+                - "allwinner,sun6i-a31-codec"
+                - "allwinner,sun8i-a23-codec"
+                - "allwinner,sun8i-h3-codec"
+- resets: phandle to the reset control for this device
+- allwinner,audio-routing: A list of the connections between audio components.
+                           Each entry is a pair of strings, the first being the
+                           connection's sink, the second being the connection's
+                           source. Valid names include:
+
+                           Audio pins on the SoC:
+                           "HP"
+                           "HPCOM"
+                           "LINEIN"
+                           "LINEOUT"    (not on sun8i-a23)
+                           "MIC1"
+                           "MIC2"
+                           "MIC3"       (sun6i-a31 only)
+
+                           Microphone biases from the SoC:
+                           "HBIAS"
+                           "MBIAS"
+
+                           Board connectors:
+                           "Headphone"
+                           "Headset Mic"
+                           "Line In"
+                           "Line Out"
+                           "Mic"
+                           "Speaker"
+
+Required properties for the following compatibles:
+                - "allwinner,sun8i-a23-codec"
+                - "allwinner,sun8i-h3-codec"
+- allwinner,codec-analog-controls: A phandle to the codec analog controls
+                                   block in the PRCM.
+
 Example:
 codec: codec@01c22c00 {
         #sound-dai-cells = <0>;
@@ -28,3 +69,23 @@ codec: codec@01c22c00 {
         dmas = <&dma 0 19>, <&dma 0 19>;
         dma-names = "rx", "tx";
 };
+
+codec: codec@01c22c00 {
+        #sound-dai-cells = <0>;
+        compatible = "allwinner,sun6i-a31-codec";
+        reg = <0x01c22c00 0x98>;
+        interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&ccu CLK_APB1_CODEC>, <&ccu CLK_CODEC>;
+        clock-names = "apb", "codec";
+        resets = <&ccu RST_APB1_CODEC>;
+        dmas = <&dma 15>, <&dma 15>;
+        dma-names = "rx", "tx";
+        allwinner,audio-routing =
+                "Headphone", "HP",
+                "Speaker", "LINEOUT",
+                "LINEIN", "Line In",
+                "MIC1", "MBIAS",
+                "MIC1", "Mic",
+                "MIC2", "HBIAS",
+                "MIC2", "Headset Mic";
+};
diff --git a/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt b/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt
new file mode 100644
index 000000000000..779b735781ba
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt
@@ -0,0 +1,16 @@
+* Allwinner Codec Analog Controls
+
+Required properties:
+- compatible: must be one of the following compatibles:
+                - "allwinner,sun8i-a23-codec-analog"
+                - "allwinner,sun8i-h3-codec-analog"
+
+Required properties if not a sub-node of the PRCM node:
+- reg: must contain the registers location and length
+
+Example:
+prcm: prcm@01f01400 {
+        codec_analog: codec-analog {
+                compatible = "allwinner,sun8i-a23-codec-analog";
+        };
+};
diff --git a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
index 9340d2ddcc54..6fbba562eaa7 100644
--- a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
+++ b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
@@ -12,6 +12,7 @@ Required properties:
     "ti,tlv320aic3120" - TLV320AIC3120 (mono speaker amp, MiniDSP)
     "ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP)
     "ti,tlv320dac3100" - TLV320DAC3100 (no ADC, mono speaker amp, no MiniDSP)
+    "ti,tlv320dac3101" - TLV320DAC3101 (no ADC, stereo speaker amp, no MiniDSP)
 
 - reg - <int> -  I2C slave address
 - HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,
diff --git a/Documentation/devicetree/bindings/sound/wm8580.txt b/Documentation/devicetree/bindings/sound/wm8580.txt
index 7d9821f348da..78fce9b14954 100644
--- a/Documentation/devicetree/bindings/sound/wm8580.txt
+++ b/Documentation/devicetree/bindings/sound/wm8580.txt
@@ -1,10 +1,10 @@
-WM8580 audio CODEC
+WM8580 and WM8581 audio CODEC
 
 This device supports I2C only.
 
 Required properties:
 
-  - compatible : "wlf,wm8580"
+  - compatible : "wlf,wm8580", "wlf,wm8581"
 
   - reg : the I2C address of the device.
 
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 14cdc101d165..1b5f15653b1b 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -447,7 +447,6 @@ prototypes:
         int (*flush) (struct file *);
         int (*release) (struct inode *, struct file *);
         int (*fsync) (struct file *, loff_t start, loff_t end, int datasync);
-        int (*aio_fsync) (struct kiocb *, int datasync);
         int (*fasync) (int, struct file *, int);
         int (*lock) (struct file *, int, struct file_lock *);
         ssize_t (*readv) (struct file *, const struct iovec *, unsigned long,
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index d619c8d71966..b5039a00caaf 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -828,7 +828,6 @@ struct file_operations {
         int (*flush) (struct file *, fl_owner_t id);
         int (*release) (struct inode *, struct file *);
         int (*fsync) (struct file *, loff_t, loff_t, int datasync);
-        int (*aio_fsync) (struct kiocb *, int datasync);
         int (*fasync) (int, struct file *, int);
         int (*lock) (struct file *, int, struct file_lock *);
         ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
diff --git a/Documentation/i2c/i2c-topology b/Documentation/i2c/i2c-topology
index e0aefeece551..1a014fede0b7 100644
--- a/Documentation/i2c/i2c-topology
+++ b/Documentation/i2c/i2c-topology
@@ -326,7 +326,7 @@ Two parent-locked sibling muxes
 
 This is a good topology.
 
-                                   .--------.
+                                    .--------.
                    .----------.  .--| dev D1 |
                    |  parent- |--'  '--------'
                 .--|  locked  |     .--------.
@@ -350,7 +350,7 @@ Mux-locked and parent-locked sibling muxes
 
 This is a good topology.
 
-                                   .--------.
+                                    .--------.
                    .----------.  .--| dev D1 |
                    |   mux-   |--'  '--------'
                 .--|  locked  |     .--------.
diff --git a/Documentation/networking/dsa/dsa.txt b/Documentation/networking/dsa/dsa.txt
index 6d6c07cf1a9a..63912ef34606 100644
--- a/Documentation/networking/dsa/dsa.txt
+++ b/Documentation/networking/dsa/dsa.txt
@@ -67,13 +67,14 @@ Note that DSA does not currently create network interfaces for the "cpu" and
 Switch tagging protocols
 ------------------------
 
-DSA currently supports 4 different tagging protocols, and a tag-less mode as
+DSA currently supports 5 different tagging protocols, and a tag-less mode as
 well. The different protocols are implemented in:
 
 net/dsa/tag_trailer.c: Marvell's 4 trailer tag mode (legacy)
 net/dsa/tag_dsa.c: Marvell's original DSA tag
 net/dsa/tag_edsa.c: Marvell's enhanced DSA tag
 net/dsa/tag_brcm.c: Broadcom's 4 bytes tag
+net/dsa/tag_qca.c: Qualcomm's 2 bytes tag
 
 The exact format of the tag protocol is vendor specific, but in general, they
 all contain something which:
diff --git a/Documentation/networking/nf_conntrack-sysctl.txt b/Documentation/networking/nf_conntrack-sysctl.txt
index 399e4e866a9c..433b6724797a 100644
--- a/Documentation/networking/nf_conntrack-sysctl.txt
+++ b/Documentation/networking/nf_conntrack-sysctl.txt
@@ -62,10 +62,13 @@ nf_conntrack_generic_timeout - INTEGER (seconds)
         protocols.
 
 nf_conntrack_helper - BOOLEAN
-        0 - disabled
-        not 0 - enabled (default)
+        0 - disabled (default)
+        not 0 - enabled
 
         Enable automatic conntrack helper assignment.
+        If disabled it is required to set up iptables rules to assign
+        helpers to connections.  See the CT target description in the
+        iptables-extensions(8) man page for further information.
 
 nf_conntrack_icmp_timeout - INTEGER (seconds)
         default 30
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index 739db9ab16b2..6bbceb9a3a19 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -777,6 +777,17 @@ Gets the current timestamp of kvmclock as seen by the current guest. In
 conjunction with KVM_SET_CLOCK, it is used to ensure monotonicity on scenarios
 such as migration.
 
+When KVM_CAP_ADJUST_CLOCK is passed to KVM_CHECK_EXTENSION, it returns the
+set of bits that KVM can return in struct kvm_clock_data's flag member.
+
+The only flag defined now is KVM_CLOCK_TSC_STABLE.  If set, the returned
+value is the exact kvmclock value seen by all VCPUs at the instant
+when KVM_GET_CLOCK was called.  If clear, the returned value is simply
+CLOCK_MONOTONIC plus a constant offset; the offset can be modified
+with KVM_SET_CLOCK.  KVM will try to make all VCPUs follow this clock,
+but the exact value read by each VCPU could differ, because the host
+TSC is not stable.
+
 struct kvm_clock_data {
         __u64 clock;  /* kvmclock current value */
         __u32 flags;
diff --git a/MAINTAINERS b/MAINTAINERS
index 411e3b87b8c2..e90590a4cbe2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -77,6 +77,7 @@ Descriptions of section entries:
         Q: Patchwork web based patch tracking system site
         T: SCM tree type and location.
            Type is one of: git, hg, quilt, stgit, topgit
+        B: Bug tracking system location.
         S: Status, one of the following:
            Supported:   Someone is actually paid to look after this.
            Maintained:  Someone actually looks after it.
@@ -281,6 +282,7 @@ L:	linux-acpi@vger.kernel.org
 W:      https://01.org/linux-acpi
 Q:      https://patchwork.kernel.org/project/linux-acpi/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+B:      https://bugzilla.kernel.org
 S:      Supported
 F:      drivers/acpi/
 F:      drivers/pnp/pnpacpi/
@@ -304,6 +306,8 @@ W:	https://acpica.org/
 W:      https://github.com/acpica/acpica/
 Q:      https://patchwork.kernel.org/project/linux-acpi/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+B:      https://bugzilla.kernel.org
+B:      https://bugs.acpica.org
 S:      Supported
 F:      drivers/acpi/acpica/
 F:      include/acpi/
@@ -313,6 +317,7 @@ ACPI FAN DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
 W:      https://01.org/linux-acpi
+B:      https://bugzilla.kernel.org
 S:      Supported
 F:      drivers/acpi/fan.c
 
@@ -328,6 +333,7 @@ ACPI THERMAL DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
 W:      https://01.org/linux-acpi
+B:      https://bugzilla.kernel.org
 S:      Supported
 F:      drivers/acpi/*thermal*
 
@@ -335,6 +341,7 @@ ACPI VIDEO DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
 W:      https://01.org/linux-acpi
+B:      https://bugzilla.kernel.org
 S:      Supported
 F:      drivers/acpi/acpi_video.c
 
@@ -2318,6 +2325,13 @@ F:	include/uapi/linux/ax25.h
 F:      include/net/ax25.h
 F:      net/ax25/
 
+AXENTIA ASOC DRIVERS
+M:      Peter Rosin <peda@axentia.se>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:      Maintained
+F:      Documentation/devicetree/bindings/sound/axentia,*
+F:      sound/soc/atmel/tse850-pcm5142.c
+
 AZ6007 DVB DRIVER
 M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
 M:      Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -5663,6 +5677,7 @@ HIBERNATION (aka Software Suspend, aka swsusp)
 M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:      Pavel Machek <pavel@ucw.cz>
 L:      linux-pm@vger.kernel.org
+B:      https://bugzilla.kernel.org
 S:      Supported
 F:      arch/x86/power/
 F:      drivers/base/power/
@@ -7084,6 +7099,7 @@ F:	drivers/scsi/53c700*
 LED SUBSYSTEM
 M:      Richard Purdie <rpurdie@rpsys.net>
 M:      Jacek Anaszewski <j.anaszewski@samsung.com>
+M:      Pavel Machek <pavel@ucw.cz>
 L:      linux-leds@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
 S:      Maintained
@@ -8057,6 +8073,7 @@ F:	drivers/infiniband/hw/mlx4/
 F:      include/linux/mlx4/
 
 MELLANOX MLX5 core VPI driver
+M:      Saeed Mahameed <saeedm@mellanox.com>
 M:      Matan Barak <matanb@mellanox.com>
 M:      Leon Romanovsky <leonro@mellanox.com>
 L:      netdev@vger.kernel.org
@@ -9247,11 +9264,12 @@ S:	Maintained
 F:      drivers/pci/host/*layerscape*
 
 PCI DRIVER FOR IMX6
-M:      Richard Zhu <Richard.Zhu@freescale.com>
+M:      Richard Zhu <hongxing.zhu@nxp.com>
 M:      Lucas Stach <l.stach@pengutronix.de>
 L:      linux-pci@vger.kernel.org
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
+F:      Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
 F:      drivers/pci/host/*imx6*
 
 PCI DRIVER FOR TI KEYSTONE
@@ -9310,17 +9328,11 @@ F:	drivers/pci/host/pci-exynos.c
 
 PCI DRIVER FOR SYNOPSIS DESIGNWARE
 M:      Jingoo Han <jingoohan1@gmail.com>
-M:      Pratyush Anand <pratyush.anand@gmail.com>
-L:      linux-pci@vger.kernel.org
-S:      Maintained
-F:      drivers/pci/host/*designware*
-
-PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE
-M:      Jose Abreu <Jose.Abreu@synopsys.com>
+M:      Joao Pinto <Joao.Pinto@synopsys.com>
 L:      linux-pci@vger.kernel.org
 S:      Maintained
 F:      Documentation/devicetree/bindings/pci/designware-pcie.txt
-F:      drivers/pci/host/pcie-designware-plat.c
+F:      drivers/pci/host/*designware*
 
 PCI DRIVER FOR GENERIC OF HOSTS
 M:      Will Deacon <will.deacon@arm.com>
@@ -9335,7 +9347,7 @@ PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
 M:      Keith Busch <keith.busch@intel.com>
 L:      linux-pci@vger.kernel.org
 S:      Supported
-F:      arch/x86/pci/vmd.c
+F:      drivers/pci/host/vmd.c
 
 PCIE DRIVER FOR ST SPEAR13XX
 M:      Pratyush Anand <pratyush.anand@gmail.com>
@@ -9622,6 +9634,7 @@ POWER MANAGEMENT CORE
 M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 L:      linux-pm@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+B:      https://bugzilla.kernel.org
 S:      Supported
 F:      drivers/base/power/
 F:      include/linux/pm.h
@@ -11611,6 +11624,7 @@ M:	"Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:      Len Brown <len.brown@intel.com>
 M:      Pavel Machek <pavel@ucw.cz>
 L:      linux-pm@vger.kernel.org
+B:      https://bugzilla.kernel.org
 S:      Supported
 F:      Documentation/power/
 F:      arch/x86/kernel/acpi/
diff --git a/Makefile b/Makefile
index f97f786de58d..b1037774e8e8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 4
 PATCHLEVEL = 9
 SUBLEVEL = 0
-EXTRAVERSION = -rc4
-NAME = Psychotic Stoned Sheep
+EXTRAVERSION =
+NAME = Roaring Lionus
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
@@ -370,7 +370,7 @@ LDFLAGS_MODULE  =
 CFLAGS_KERNEL   =
 AFLAGS_KERNEL   =
 LDFLAGS_vmlinux =
-CFLAGS_GCOV     = -fprofile-arcs -ftest-coverage -fno-tree-loop-im
+CFLAGS_GCOV     = -fprofile-arcs -ftest-coverage -fno-tree-loop-im -Wno-maybe-uninitialized
 CFLAGS_KCOV     := $(call cc-option,-fsanitize-coverage=trace-pc,)
 
 
@@ -399,11 +399,12 @@ KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
                    -fno-strict-aliasing -fno-common \
                    -Werror-implicit-function-declaration \
                    -Wno-format-security \
-                   -std=gnu89
+                   -std=gnu89 $(call cc-option,-fno-PIE)
+
 
 KBUILD_AFLAGS_KERNEL :=
 KBUILD_CFLAGS_KERNEL :=
-KBUILD_AFLAGS   := -D__ASSEMBLY__
+KBUILD_AFLAGS   := -D__ASSEMBLY__ $(call cc-option,-fno-PIE)
 KBUILD_AFLAGS_MODULE  := -DMODULE
 KBUILD_CFLAGS_MODULE  := -DMODULE
 KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
@@ -606,6 +607,13 @@ else
 include/config/auto.conf: ;
 endif # $(dot-config)
 
+# For the kernel to actually contain only the needed exported symbols,
+# we have to build modules as well to determine what those symbols are.
+# (this can be evaluated only once include/config/auto.conf has been included)
+ifdef CONFIG_TRIM_UNUSED_KSYMS
+  KBUILD_MODULES := 1
+endif
+
 # The all: target is the default when no target is given on the
 # command line.
 # This allow a user to issue only 'make' to build a kernel including modules
@@ -620,7 +628,6 @@ ARCH_CFLAGS :=
 include arch/$(SRCARCH)/Makefile
 
 KBUILD_CFLAGS   += $(call cc-option,-fno-delete-null-pointer-checks,)
-KBUILD_CFLAGS   += $(call cc-disable-warning,maybe-uninitialized,)
 KBUILD_CFLAGS   += $(call cc-disable-warning,frame-address,)
 
 ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
@@ -629,15 +636,18 @@ KBUILD_CFLAGS	+= $(call cc-option,-fdata-sections,)
 endif
 
 ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
-KBUILD_CFLAGS   += -Os
+KBUILD_CFLAGS   += -Os $(call cc-disable-warning,maybe-uninitialized,)
 else
 ifdef CONFIG_PROFILE_ALL_BRANCHES
-KBUILD_CFLAGS   += -O2
+KBUILD_CFLAGS   += -O2 $(call cc-disable-warning,maybe-uninitialized,)
 else
 KBUILD_CFLAGS   += -O2
 endif
 endif
 
+KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \
+                        $(call cc-disable-warning,maybe-uninitialized,))
+
 # Tell gcc to never replace conditional load with a non-conditional one
 KBUILD_CFLAGS   += $(call cc-option,--param=allow-store-data-races=0)
 
@@ -941,7 +951,7 @@ ifdef CONFIG_GDB_SCRIPTS
 endif
 ifdef CONFIG_TRIM_UNUSED_KSYMS
         $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
-          "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile vmlinux_prereq"
+          "$(MAKE) -f $(srctree)/Makefile vmlinux"
 endif
 
 # standalone target for easier testing
@@ -1016,8 +1026,6 @@ prepare2: prepare3 prepare-compiler-check outputmakefile asm-generic
 prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
                    include/config/auto.conf
         $(cmd_crmodverdir)
-        $(Q)test -e include/generated/autoksyms.h || \
-            touch   include/generated/autoksyms.h
 
 archprepare: archheaders archscripts prepare1 scripts_basic
 
diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index 864adad52280..19cce226d1a8 100644
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -50,6 +50,9 @@ atleast_gcc44 :=  $(call cc-ifversion, -ge, 0404, y)
 
 cflags-$(atleast_gcc44)                 += -fsection-anchors
 
+cflags-$(CONFIG_ARC_HAS_LLSC)           += -mlock
+cflags-$(CONFIG_ARC_HAS_SWAPE)          += -mswape
+
 ifdef CONFIG_ISA_ARCV2
 
 ifndef CONFIG_ARC_HAS_LL64
@@ -68,7 +71,9 @@ cflags-$(CONFIG_ARC_DW2_UNWIND)		+= -fasynchronous-unwind-tables $(cfi)
 ifndef CONFIG_CC_OPTIMIZE_FOR_SIZE
 # Generic build system uses -O2, we want -O3
 # Note: No need to add to cflags-y as that happens anyways
-ARCH_CFLAGS += -O3
+#
+# Disable the false maybe-uninitialized warings gcc spits out at -O3
+ARCH_CFLAGS += -O3 $(call cc-disable-warning,maybe-uninitialized,)
 endif
 
 # small data is default for elf32 tool-chain. If not usable, disable it
diff --git a/arch/arc/boot/dts/axc001.dtsi b/arch/arc/boot/dts/axc001.dtsi
index 6ae2c476ad82..53ce226f77a5 100644
--- a/arch/arc/boot/dts/axc001.dtsi
+++ b/arch/arc/boot/dts/axc001.dtsi
@@ -71,7 +71,7 @@
                         reg-io-width = <4>;
                 };
 
-                arcpmu0: pmu {
+                arcpct0: pct {
                         compatible = "snps,arc700-pct";
                 };
         };
diff --git a/arch/arc/boot/dts/nsim_700.dts b/arch/arc/boot/dts/nsim_700.dts
index ce0ccd20b5bf..5ee96b067c08 100644
--- a/arch/arc/boot/dts/nsim_700.dts
+++ b/arch/arc/boot/dts/nsim_700.dts
@@ -69,7 +69,7 @@
                         };
                 };
 
-                arcpmu0: pmu {
+                arcpct0: pct {
                         compatible = "snps,arc700-pct";
                 };
         };
diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts
index bcf603142a33..3c391ba565ed 100644
--- a/arch/arc/boot/dts/nsimosci.dts
+++ b/arch/arc/boot/dts/nsimosci.dts
@@ -83,5 +83,9 @@
                         reg = <0xf0003000 0x44>;
                         interrupts = <7>;
                 };
+
+                arcpct0: pct {
+                        compatible = "snps,arc700-pct";
+                };
         };
 };
diff --git a/arch/arc/configs/nsim_700_defconfig b/arch/arc/configs/nsim_700_defconfig
index 7314f538847b..b0066a749d4c 100644
--- a/arch/arc/configs/nsim_700_defconfig
+++ b/arch/arc/configs/nsim_700_defconfig
@@ -14,6 +14,7 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_KPROBES=y
diff --git a/arch/arc/configs/nsim_hs_defconfig b/arch/arc/configs/nsim_hs_defconfig
index 65ab9fbf83f2..ebe9ebb92933 100644
--- a/arch/arc/configs/nsim_hs_defconfig
+++ b/arch/arc/configs/nsim_hs_defconfig
@@ -14,6 +14,7 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_KPROBES=y
diff --git a/arch/arc/configs/nsim_hs_smp_defconfig b/arch/arc/configs/nsim_hs_smp_defconfig
index 3b3990cddbe1..4bde43278be6 100644
--- a/arch/arc/configs/nsim_hs_smp_defconfig
+++ b/arch/arc/configs/nsim_hs_smp_defconfig
@@ -12,6 +12,7 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/"
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_KPROBES=y
diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig
index 98cf20933bbb..f6fb3d26557e 100644
--- a/arch/arc/configs/nsimosci_defconfig
+++ b/arch/arc/configs/nsimosci_defconfig
@@ -14,6 +14,7 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_KPROBES=y
diff --git a/arch/arc/configs/nsimosci_hs_defconfig b/arch/arc/configs/nsimosci_hs_defconfig
index ddf8b96d494e..b9f0fe00044b 100644
--- a/arch/arc/configs/nsimosci_hs_defconfig
+++ b/arch/arc/configs/nsimosci_hs_defconfig
@@ -14,6 +14,7 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/"
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_KPROBES=y
diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig
index ceb90745326e..6da71ba253a9 100644
--- a/arch/arc/configs/nsimosci_hs_smp_defconfig
+++ b/arch/arc/configs/nsimosci_hs_smp_defconfig
@@ -10,6 +10,7 @@ CONFIG_IKCONFIG_PROC=y
 # CONFIG_PID_NS is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/"
+CONFIG_PERF_EVENTS=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_KPROBES=y
 CONFIG_MODULES=y
@@ -34,7 +35,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
@@ -72,7 +72,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_HWMON is not set
 CONFIG_DRM=y
 CONFIG_DRM_ARCPGU=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 # CONFIG_HID is not set
 # CONFIG_USB_SUPPORT is not set
diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h
index 7f3f9f63708c..1bd24ec3e350 100644
--- a/arch/arc/include/asm/arcregs.h
+++ b/arch/arc/include/asm/arcregs.h
@@ -43,12 +43,14 @@
 #define STATUS_AE_BIT           5       /* Exception active */
 #define STATUS_DE_BIT           6       /* PC is in delay slot */
 #define STATUS_U_BIT            7       /* User/Kernel mode */
+#define STATUS_Z_BIT            11
 #define STATUS_L_BIT            12      /* Loop inhibit */
 
 /* These masks correspond to the status word(STATUS_32) bits */
 #define STATUS_AE_MASK          (1<<STATUS_AE_BIT)
 #define STATUS_DE_MASK          (1<<STATUS_DE_BIT)
 #define STATUS_U_MASK           (1<<STATUS_U_BIT)
+#define STATUS_Z_MASK           (1<<STATUS_Z_BIT)
 #define STATUS_L_MASK           (1<<STATUS_L_BIT)
 
 /*
diff --git a/arch/arc/include/asm/delay.h b/arch/arc/include/asm/delay.h
index 08e7e2a16ac1..a36e8601114d 100644
--- a/arch/arc/include/asm/delay.h
+++ b/arch/arc/include/asm/delay.h
@@ -22,10 +22,11 @@
 static inline void __delay(unsigned long loops)
 {
         __asm__ __volatile__(
-        "       lp  1f  \n"
-        "       nop     \n"
-        "1:             \n"
-        : "+l"(loops));
+        "       mov lp_count, %0        \n"
+        "       lp  1f                  \n"
+        "       nop                     \n"
+        "1:                             \n"
+        : : "r"(loops));
 }
 
 extern void __bad_udelay(void);
diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h
index 89eeb3720051..e94ca72b974e 100644
--- a/arch/arc/include/asm/pgtable.h
+++ b/arch/arc/include/asm/pgtable.h
@@ -280,7 +280,7 @@ static inline void pmd_set(pmd_t *pmdp, pte_t *ptep)
 
 #define pte_page(pte)           pfn_to_page(pte_pfn(pte))
 #define mk_pte(page, prot)      pfn_pte(page_to_pfn(page), prot)
-#define pfn_pte(pfn, prot)      __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
+#define pfn_pte(pfn, prot)      __pte(__pfn_to_phys(pfn) | pgprot_val(prot))
 
 /* Don't use virt_to_pfn for macros below: could cause truncations for PAE40*/
 #define pte_pfn(pte)            (pte_val(pte) >> PAGE_SHIFT)
diff --git a/arch/arc/include/asm/smp.h b/arch/arc/include/asm/smp.h
index 89fdd1b0a76e..0861007d9ef3 100644
--- a/arch/arc/include/asm/smp.h
+++ b/arch/arc/include/asm/smp.h
@@ -37,9 +37,9 @@ extern const char *arc_platform_smp_cpuinfo(void);
  * API expected BY platform smp code (FROM arch smp code)
  *
  * smp_ipi_irq_setup:
- *      Takes @cpu and @irq to which the arch-common ISR is hooked up
+ *      Takes @cpu and @hwirq to which the arch-common ISR is hooked up
  */
-extern int smp_ipi_irq_setup(int cpu, int irq);
+extern int smp_ipi_irq_setup(int cpu, irq_hw_number_t hwirq);
 
 /*
  * struct plat_smp_ops  - SMP callbacks provided by platform to ARC SMP
diff --git a/arch/arc/kernel/devtree.c b/arch/arc/kernel/devtree.c
index f1e07c2344f8..3b67f538f142 100644
--- a/arch/arc/kernel/devtree.c
+++ b/arch/arc/kernel/devtree.c
@@ -31,6 +31,8 @@ static void __init arc_set_early_base_baud(unsigned long dt_root)
                 arc_base_baud = 166666666;      /* Fixed 166.6MHz clk (TB10x) */
         else if (of_flat_dt_is_compatible(dt_root, "snps,arc-sdp"))
                 arc_base_baud = 33333333;       /* Fixed 33MHz clk (AXS10x) */
+        else if (of_flat_dt_is_compatible(dt_root, "ezchip,arc-nps"))
+                arc_base_baud = 800000000;      /* Fixed 800MHz clk (NPS) */
         else
                 arc_base_baud = 50000000;       /* Fixed default 50MHz */
 }
diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c
index c424d5abc318..f39142acc89e 100644
--- a/arch/arc/kernel/mcip.c
+++ b/arch/arc/kernel/mcip.c
@@ -181,6 +181,8 @@ idu_irq_set_affinity(struct irq_data *data, const struct cpumask *cpumask,
 {
         unsigned long flags;
         cpumask_t online;
+        unsigned int destination_bits;
+        unsigned int distribution_mode;
 
         /* errout if no online cpu per @cpumask */
         if (!cpumask_and(&online, cpumask, cpu_online_mask))
@@ -188,8 +190,15 @@ idu_irq_set_affinity(struct irq_data *data, const struct cpumask *cpumask,
 
         raw_spin_lock_irqsave(&mcip_lock, flags);
 
-        idu_set_dest(data->hwirq, cpumask_bits(&online)[0]);
-        idu_set_mode(data->hwirq, IDU_M_TRIG_LEVEL, IDU_M_DISTRI_RR);
+        destination_bits = cpumask_bits(&online)[0];
+        idu_set_dest(data->hwirq, destination_bits);
+
+        if (ffs(destination_bits) == fls(destination_bits))
+                distribution_mode = IDU_M_DISTRI_DEST;
+        else
+                distribution_mode = IDU_M_DISTRI_RR;
+
+        idu_set_mode(data->hwirq, IDU_M_TRIG_LEVEL, distribution_mode);
 
         raw_spin_unlock_irqrestore(&mcip_lock, flags);
 
@@ -207,16 +216,15 @@ static struct irq_chip idu_irq_chip = {
 
 };
 
-static int idu_first_irq;
+static irq_hw_number_t idu_first_hwirq;
 
 static void idu_cascade_isr(struct irq_desc *desc)
 {
-        struct irq_domain *domain = irq_desc_get_handler_data(desc);
-        unsigned int core_irq = irq_desc_get_irq(desc);
-        unsigned int idu_irq;
+        struct irq_domain *idu_domain = irq_desc_get_handler_data(desc);
+        irq_hw_number_t core_hwirq = irqd_to_hwirq(irq_desc_get_irq_data(desc));
+        irq_hw_number_t idu_hwirq = core_hwirq - idu_first_hwirq;
 
-        idu_irq = core_irq - idu_first_irq;
-        generic_handle_irq(irq_find_mapping(domain, idu_irq));
+        generic_handle_irq(irq_find_mapping(idu_domain, idu_hwirq));
 }
 
 static int idu_irq_map(struct irq_domain *d, unsigned int virq, irq_hw_number_t hwirq)
@@ -282,7 +290,7 @@ idu_of_init(struct device_node *intc, struct device_node *parent)
         struct irq_domain *domain;
         /* Read IDU BCR to confirm nr_irqs */
         int nr_irqs = of_irq_count(intc);
-        int i, irq;
+        int i, virq;
         struct mcip_bcr mp;
 
         READ_BCR(ARC_REG_MCIP_BCR, mp);
@@ -303,11 +311,11 @@ idu_of_init(struct device_node *intc, struct device_node *parent)
                  * however we need it to get the parent virq and set IDU handler
                  * as first level isr
                  */
-                irq = irq_of_parse_and_map(intc, i);
+                virq = irq_of_parse_and_map(intc, i);
                 if (!i)
-                        idu_first_irq = irq;
+                        idu_first_hwirq = irqd_to_hwirq(irq_get_irq_data(virq));
 
-                irq_set_chained_handler_and_data(irq, idu_cascade_isr, domain);
+                irq_set_chained_handler_and_data(virq, idu_cascade_isr, domain);
         }
 
         __mcip_cmd(CMD_IDU_ENABLE, 0);
diff --git a/arch/arc/kernel/process.c b/arch/arc/kernel/process.c
index 59aa43cb146e..a41a79a4f4fe 100644
--- a/arch/arc/kernel/process.c
+++ b/arch/arc/kernel/process.c
@@ -43,8 +43,8 @@ SYSCALL_DEFINE0(arc_gettls)
 
 SYSCALL_DEFINE3(arc_usr_cmpxchg, int *, uaddr, int, expected, int, new)
 {
-        int uval;
-        int ret;
+        struct pt_regs *regs = current_pt_regs();
+        int uval = -EFAULT;
 
         /*
          * This is only for old cores lacking LLOCK/SCOND, which by defintion
@@ -54,24 +54,26 @@ SYSCALL_DEFINE3(arc_usr_cmpxchg, int *, uaddr, int, expected, int, new)
          */
         WARN_ON_ONCE(IS_ENABLED(CONFIG_SMP));
 
+        /* Z indicates to userspace if operation succeded */
+        regs->status32 &= ~STATUS_Z_MASK;
+
         if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
                 return -EFAULT;
 
         preempt_disable();
 
-        ret = __get_user(uval, uaddr);
-        if (ret)
+        if (__get_user(uval, uaddr))
                 goto done;
 
-        if (uval != expected)
-                ret = -EAGAIN;
-        else
-                ret = __put_user(new, uaddr);
+        if (uval == expected) {
+                if (!__put_user(new, uaddr))
+                        regs->status32 |= STATUS_Z_MASK;
+        }
 
 done:
         preempt_enable();
 
-        return ret;
+        return uval;
 }
 
 void arch_cpu_idle(void)
diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c
index f183cc648851..88674d972c9d 100644
--- a/arch/arc/kernel/smp.c
+++ b/arch/arc/kernel/smp.c
@@ -22,6 +22,7 @@
 #include <linux/atomic.h>
 #include <linux/cpumask.h>
 #include <linux/reboot.h>
+#include <linux/irqdomain.h>
 #include <asm/processor.h>
 #include <asm/setup.h>
 #include <asm/mach_desc.h>
@@ -67,11 +68,13 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         int i;
 
         /*
-         * Initialise the present map, which describes the set of CPUs
-         * actually populated at the present time.
+         * if platform didn't set the present map already, do it now
+         * boot cpu is set to present already by init/main.c
          */
-        for (i = 0; i < max_cpus; i++)
-                set_cpu_present(i, true);
+        if (num_present_cpus() <= 1) {
+                for (i = 0; i < max_cpus; i++)
+                        set_cpu_present(i, true);
+        }
 }
 
 void __init smp_cpus_done(unsigned int max_cpus)
@@ -351,20 +354,24 @@ irqreturn_t do_IPI(int irq, void *dev_id)
  */
 static DEFINE_PER_CPU(int, ipi_dev);
 
-int smp_ipi_irq_setup(int cpu, int irq)
+int smp_ipi_irq_setup(int cpu, irq_hw_number_t hwirq)
 {
         int *dev = per_cpu_ptr(&ipi_dev, cpu);
+        unsigned int virq = irq_find_mapping(NULL, hwirq);
+
+        if (!virq)
+                panic("Cannot find virq for root domain and hwirq=%lu", hwirq);
 
         /* Boot cpu calls request, all call enable */
         if (!cpu) {
                 int rc;
 
-                rc = request_percpu_irq(irq, do_IPI, "IPI Interrupt", dev);
+                rc = request_percpu_irq(virq, do_IPI, "IPI Interrupt", dev);
                 if (rc)
-                        panic("Percpu IRQ request failed for %d\n", irq);
+                        panic("Percpu IRQ request failed for %u\n", virq);
         }
 
-        enable_percpu_irq(irq, 0);
+        enable_percpu_irq(virq, 0);
 
         return 0;
 }
diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c
index f927b8dc6edd..c10390d1ddb6 100644
--- a/arch/arc/kernel/time.c
+++ b/arch/arc/kernel/time.c
@@ -152,14 +152,17 @@ static cycle_t arc_read_rtc(struct clocksource *cs)
                 cycle_t  full;
         } stamp;
 
-
-        __asm__ __volatile(
-        "1:                                             \n"
-        "       lr              %0, [AUX_RTC_LOW]       \n"
-        "       lr              %1, [AUX_RTC_HIGH]      \n"
-        "       lr              %2, [AUX_RTC_CTRL]      \n"
-        "       bbit0.nt        %2, 31, 1b              \n"
-        : "=r" (stamp.low), "=r" (stamp.high), "=r" (status));
+        /*
+         * hardware has an internal state machine which tracks readout of
+         * low/high and updates the CTRL.status if
+         *  - interrupt/exception taken between the two reads
+         *  - high increments after low has been read
+         */
+        do {
+                stamp.low = read_aux_reg(AUX_RTC_LOW);
+                stamp.high = read_aux_reg(AUX_RTC_HIGH);
+                status = read_aux_reg(AUX_RTC_CTRL);
+        } while (!(status & _BITUL(31)));
 
         return stamp.full;
 }
diff --git a/arch/arc/mm/cache.c b/arch/arc/mm/cache.c
index 2b96cfc3be75..50d71695cd4e 100644
--- a/arch/arc/mm/cache.c
+++ b/arch/arc/mm/cache.c
@@ -23,7 +23,7 @@
 
 static int l2_line_sz;
 static int ioc_exists;
-int slc_enable = 1, ioc_enable = 1;
+int slc_enable = 1, ioc_enable = 0;
 unsigned long perip_base = ARC_UNCACHED_ADDR_SPACE; /* legacy value for boot */
 unsigned long perip_end = 0xFFFFFFFF; /* legacy value */
 
diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c
index 60aab5a7522b..cd8aad8226dd 100644
--- a/arch/arc/mm/dma.c
+++ b/arch/arc/mm/dma.c
@@ -105,6 +105,31 @@ static void arc_dma_free(struct device *dev, size_t size, void *vaddr,
         __free_pages(page, get_order(size));
 }
 
+static int arc_dma_mmap(struct device *dev, struct vm_area_struct *vma,
+                        void *cpu_addr, dma_addr_t dma_addr, size_t size,
+                        unsigned long attrs)
+{
+        unsigned long user_count = vma_pages(vma);
+        unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT;
+        unsigned long pfn = __phys_to_pfn(plat_dma_to_phys(dev, dma_addr));
+        unsigned long off = vma->vm_pgoff;
+        int ret = -ENXIO;
+
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
+        if (dma_mmap_from_coherent(dev, vma, cpu_addr, size, &ret))
+                return ret;
+
+        if (off < count && user_count <= (count - off)) {
+                ret = remap_pfn_range(vma, vma->vm_start,
+                                      pfn + off,
+                                      user_count << PAGE_SHIFT,
+                                      vma->vm_page_prot);
+        }
+
+        return ret;
+}
+
 /*
  * streaming DMA Mapping API...
  * CPU accesses page via normal paddr, thus needs to explicitly made
@@ -193,6 +218,7 @@ static int arc_dma_supported(struct device *dev, u64 dma_mask)
 struct dma_map_ops arc_dma_ops = {
         .alloc                  = arc_dma_alloc,
         .free                   = arc_dma_free,
+        .mmap                   = arc_dma_mmap,
         .map_page               = arc_dma_map_page,
         .map_sg                 = arc_dma_map_sg,
         .sync_single_for_device = arc_dma_sync_single_for_device,
diff --git a/arch/arc/plat-eznps/smp.c b/arch/arc/plat-eznps/smp.c
index 5e901f86e4bd..56a4c8522f11 100644
--- a/arch/arc/plat-eznps/smp.c
+++ b/arch/arc/plat-eznps/smp.c
@@ -140,16 +140,10 @@ static void eznps_init_per_cpu(int cpu)
         mtm_enable_core(cpu);
 }
 
-static void eznps_ipi_clear(int irq)
-{
-        write_aux_reg(CTOP_AUX_IACK, 1 << irq);
-}
-
 struct plat_smp_ops plat_smp_ops = {
         .info           = smp_cpuinfo_buf,
         .init_early_smp = eznps_init_cpumasks,
         .cpu_kick       = eznps_smp_wakeup_cpu,
         .ipi_send       = eznps_ipi_send,
         .init_per_cpu   = eznps_init_per_cpu,
-        .ipi_clear      = eznps_ipi_clear,
 };
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index befcd2619902..c558ba75cbcc 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -745,7 +745,6 @@ dtb-$(CONFIG_MACH_SUN4I) += \
         sun4i-a10-pcduino2.dtb \
         sun4i-a10-pov-protab2-ips9.dtb
 dtb-$(CONFIG_MACH_SUN5I) += \
-        ntc-gr8-evb.dtb \
         sun5i-a10s-auxtek-t003.dtb \
         sun5i-a10s-auxtek-t004.dtb \
         sun5i-a10s-mk802.dtb \
@@ -761,6 +760,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
         sun5i-a13-olinuxino-micro.dtb \
         sun5i-a13-q8-tablet.dtb \
         sun5i-a13-utoo-p66.dtb \
+        sun5i-gr8-evb.dtb \
         sun5i-r8-chip.dtb
 dtb-$(CONFIG_MACH_SUN6I) += \
         sun6i-a31-app4-evb1.dtb \
diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts
index dec4b073ceb1..379939699164 100644
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@ -64,8 +64,8 @@
                         };
 
                         ldo3_reg: ldo3 {
-                                regulator-min-microvolt = <600000>;
-                                regulator-max-microvolt = <1800000>;
+                                regulator-min-microvolt = <1725000>;
+                                regulator-max-microvolt = <3300000>;
                                 regulator-always-on;
                         };
 
@@ -76,8 +76,8 @@
                         };
 
                         ldo5_reg: ldo5 {
-                                regulator-min-microvolt = <1725000>;
-                                regulator-max-microvolt = <3300000>;
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3600000>;
                                 regulator-always-on;
                         };
 
@@ -100,14 +100,14 @@
                         };
 
                         ldo9_reg: ldo9 {
-                                regulator-min-microvolt = <1200000>;
+                                regulator-min-microvolt = <1250000>;
                                 regulator-max-microvolt = <3600000>;
                                 regulator-always-on;
                         };
 
                         ldo10_reg: ldo10 {
-                                regulator-min-microvolt = <1250000>;
-                                regulator-max-microvolt = <3650000>;
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3600000>;
                                 regulator-always-on;
                         };
                 };
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 0d7d5ac6257b..2b6cb05bc01a 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -643,9 +643,8 @@
                                 reg = <0x30730000 0x10000>;
                                 interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>,
-                                        <&clks IMX7D_CLK_DUMMY>,
-                                        <&clks IMX7D_CLK_DUMMY>;
-                                clock-names = "pix", "axi", "disp_axi";
+                                        <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>;
+                                clock-names = "pix", "axi";
                                 status = "disabled";
                         };
                 };
diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi
index 0ff1c2de95bf..26cce4d18405 100644
--- a/arch/arm/boot/dts/logicpd-som-lv.dtsi
+++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi
@@ -13,6 +13,11 @@
                 };
         };
 
+        memory@80000000 {
+                device_type = "memory";
+                reg = <0x80000000 0>;
+        };
+
         wl12xx_vmmc: wl12xx_vmmc {
                 compatible = "regulator-fixed";
                 regulator-name = "vwl1271";
diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
index 731ec37aed5b..8f9a69ca818c 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -13,9 +13,9 @@
                 };
         };
 
-        memory@0 {
+        memory@80000000 {
                 device_type = "memory";
-                reg = <0 0>;
+                reg = <0x80000000 0>;
         };
 
         leds {
diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index 6365635fea5c..4caadb253249 100644
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -124,6 +124,7 @@
                 compatible = "ti,abe-twl6040";
                 ti,model = "omap5-uevm";
 
+                ti,jack-detection;
                 ti,mclk-freq = <19200000>;
 
                 ti,mcpdm = <&mcpdm>;
@@ -415,7 +416,7 @@
                         ti,backup-battery-charge-high-current;
                 };
 
-                gpadc {
+                gpadc: gpadc {
                         compatible = "ti,palmas-gpadc";
                         interrupts = <18 0
                                       16 0
@@ -475,8 +476,8 @@
                                 smps6_reg: smps6 {
                                         /* VDD_DDR3 - over VDD_SMPS6 */
                                         regulator-name = "smps6";
-                                        regulator-min-microvolt = <1200000>;
-                                        regulator-max-microvolt = <1200000>;
+                                        regulator-min-microvolt = <1350000>;
+                                        regulator-max-microvolt = <1350000>;
                                         regulator-always-on;
                                         regulator-boot-on;
                                 };
diff --git a/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts b/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
index 1cf644bfd7ea..51dc734cd5b9 100644
--- a/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
+++ b/arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
@@ -82,6 +82,10 @@
         gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
 };
 
+&sata {
+        nr-ports = <2>;
+};
+
 &ehci1 {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index 91096a49efa9..8f79b4147bba 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -283,6 +283,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c0_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -296,6 +298,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c1_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -309,6 +313,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c2_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -322,6 +328,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c3_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -335,6 +343,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c4_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -348,6 +358,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c5_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -363,6 +375,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c10_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -376,6 +390,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c11_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts
index ef2ff2f518f6..7fb507fcba7e 100644
--- a/arch/arm/boot/dts/stih410-b2260.dts
+++ b/arch/arm/boot/dts/stih410-b2260.dts
@@ -74,7 +74,7 @@
                 /* Low speed expansion connector */
                 spi0: spi@9844000 {
                         label = "LS-SPI0";
-                        cs-gpio = <&pio30 3 0>;
+                        cs-gpios = <&pio30 3 0>;
                         status = "okay";
                 };
 
diff --git a/arch/arm/boot/dts/ntc-gr8-evb.dts b/arch/arm/boot/dts/sun5i-gr8-evb.dts
index 4b622f3b5220..714381fd64d7 100644
--- a/arch/arm/boot/dts/ntc-gr8-evb.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-evb.dts
@@ -44,7 +44,7 @@
  */
 
 /dts-v1/;
-#include "ntc-gr8.dtsi"
+#include "sun5i-gr8.dtsi"
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm/boot/dts/ntc-gr8.dtsi b/arch/arm/boot/dts/sun5i-gr8.dtsi
index ca54e03ef366..ca54e03ef366 100644
--- a/arch/arm/boot/dts/ntc-gr8.dtsi
+++ b/arch/arm/boot/dts/sun5i-gr8.dtsi
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index 48fc24f36fcb..300a1bd5a6ec 100644
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -282,11 +282,15 @@
                         uart1_pins_a: uart1@0 {
                                 allwinner,pins = "PG6", "PG7";
                                 allwinner,function = "uart1";
+                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                         };
 
                         uart1_pins_cts_rts_a: uart1-cts-rts@0 {
                                 allwinner,pins = "PG8", "PG9";
                                 allwinner,function = "uart1";
+                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                         };
 
                         mmc0_pins_a: mmc0@0 {
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index 75a865406d3e..f4ba088b225e 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -410,7 +410,7 @@
                         };
 
                         uart3_pins: uart3 {
-                                allwinner,pins = "PG13", "PG14";
+                                allwinner,pins = "PA13", "PA14";
                                 allwinner,function = "uart3";
                                 allwinner,drive = <SUN4I_PINCTRL_10_MA>;
                                 allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index 0745538b26d3..55e0e3ea9cb6 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -8,7 +8,6 @@ generic-y += early_ioremap.h
 generic-y += emergency-restart.h
 generic-y += errno.h
 generic-y += exec.h
-generic-y += export.h
 generic-y += ioctl.h
 generic-y += ipcbuf.h
 generic-y += irq_regs.h
diff --git a/arch/arm/include/asm/kvm_asm.h b/arch/arm/include/asm/kvm_asm.h
index d7ea6bcb29bf..8ef05381984b 100644
--- a/arch/arm/include/asm/kvm_asm.h
+++ b/arch/arm/include/asm/kvm_asm.h
@@ -66,6 +66,7 @@ extern char __kvm_hyp_vector[];
 extern void __kvm_flush_vm_context(void);
 extern void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa);
 extern void __kvm_tlb_flush_vmid(struct kvm *kvm);
+extern void __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu);
 
 extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);
 
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
index 2d19e02d03fd..d5423ab15ed5 100644
--- a/arch/arm/include/asm/kvm_host.h
+++ b/arch/arm/include/asm/kvm_host.h
@@ -57,6 +57,9 @@ struct kvm_arch {
         /* VTTBR value associated with below pgd and vmid */
         u64    vttbr;
 
+        /* The last vcpu id that ran on each physical CPU */
+        int __percpu *last_vcpu_ran;
+
         /* Timer */
         struct arch_timer_kvm   timer;
 
diff --git a/arch/arm/include/asm/kvm_hyp.h b/arch/arm/include/asm/kvm_hyp.h
index 343135ede5fa..58508900c4bb 100644
--- a/arch/arm/include/asm/kvm_hyp.h
+++ b/arch/arm/include/asm/kvm_hyp.h
@@ -71,6 +71,7 @@
 #define ICIALLUIS       __ACCESS_CP15(c7, 0, c1, 0)
 #define ATS1CPR         __ACCESS_CP15(c7, 0, c8, 0)
 #define TLBIALLIS       __ACCESS_CP15(c8, 0, c3, 0)
+#define TLBIALL         __ACCESS_CP15(c8, 0, c7, 0)
 #define TLBIALLNSNHIS   __ACCESS_CP15(c8, 4, c3, 4)
 #define PRRR            __ACCESS_CP15(c10, 0, c2, 0)
 #define NMRR            __ACCESS_CP15(c10, 0, c2, 1)
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 68c2c097cffe..ad325a8c7e1e 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -33,7 +33,7 @@ endif
 obj-$(CONFIG_CPU_IDLE)          += cpuidle.o
 obj-$(CONFIG_ISA_DMA_API)       += dma.o
 obj-$(CONFIG_FIQ)               += fiq.o fiqasm.o
-obj-$(CONFIG_MODULES)           += module.o
+obj-$(CONFIG_MODULES)           += armksyms.o module.o
 obj-$(CONFIG_ARM_MODULE_PLTS)   += module-plts.o
 obj-$(CONFIG_ISA_DMA)           += dma-isa.o
 obj-$(CONFIG_PCI)               += bios32.o isa.o
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
new file mode 100644
index 000000000000..7e45f69a0ddc
--- /dev/null
+++ b/arch/arm/kernel/armksyms.c
@@ -0,0 +1,183 @@
+/*
+ *  linux/arch/arm/kernel/armksyms.c
+ *
+ *  Copyright (C) 2000 Russell King
+ *
+ * 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/export.h>
+#include <linux/sched.h>
+#include <linux/string.h>
+#include <linux/cryptohash.h>
+#include <linux/delay.h>
+#include <linux/in6.h>
+#include <linux/syscalls.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
+#include <linux/arm-smccc.h>
+
+#include <asm/checksum.h>
+#include <asm/ftrace.h>
+
+/*
+ * libgcc functions - functions that are used internally by the
+ * compiler...  (prototypes are not correct though, but that
+ * doesn't really matter since they're not versioned).
+ */
+extern void __ashldi3(void);
+extern void __ashrdi3(void);
+extern void __divsi3(void);
+extern void __lshrdi3(void);
+extern void __modsi3(void);
+extern void __muldi3(void);
+extern void __ucmpdi2(void);
+extern void __udivsi3(void);
+extern void __umodsi3(void);
+extern void __do_div64(void);
+extern void __bswapsi2(void);
+extern void __bswapdi2(void);
+
+extern void __aeabi_idiv(void);
+extern void __aeabi_idivmod(void);
+extern void __aeabi_lasr(void);
+extern void __aeabi_llsl(void);
+extern void __aeabi_llsr(void);
+extern void __aeabi_lmul(void);
+extern void __aeabi_uidiv(void);
+extern void __aeabi_uidivmod(void);
+extern void __aeabi_ulcmp(void);
+
+extern void fpundefinstr(void);
+
+void mmioset(void *, unsigned int, size_t);
+void mmiocpy(void *, const void *, size_t);
+
+        /* platform dependent support */
+EXPORT_SYMBOL(arm_delay_ops);
+
+        /* networking */
+EXPORT_SYMBOL(csum_partial);
+EXPORT_SYMBOL(csum_partial_copy_from_user);
+EXPORT_SYMBOL(csum_partial_copy_nocheck);
+EXPORT_SYMBOL(__csum_ipv6_magic);
+
+        /* io */
+#ifndef __raw_readsb
+EXPORT_SYMBOL(__raw_readsb);
+#endif
+#ifndef __raw_readsw
+EXPORT_SYMBOL(__raw_readsw);
+#endif
+#ifndef __raw_readsl
+EXPORT_SYMBOL(__raw_readsl);
+#endif
+#ifndef __raw_writesb
+EXPORT_SYMBOL(__raw_writesb);
+#endif
+#ifndef __raw_writesw
+EXPORT_SYMBOL(__raw_writesw);
+#endif
+#ifndef __raw_writesl
+EXPORT_SYMBOL(__raw_writesl);
+#endif
+
+        /* string / mem functions */
+EXPORT_SYMBOL(strchr);
+EXPORT_SYMBOL(strrchr);
+EXPORT_SYMBOL(memset);
+EXPORT_SYMBOL(memcpy);
+EXPORT_SYMBOL(memmove);
+EXPORT_SYMBOL(memchr);
+EXPORT_SYMBOL(__memzero);
+
+EXPORT_SYMBOL(mmioset);
+EXPORT_SYMBOL(mmiocpy);
+
+#ifdef CONFIG_MMU
+EXPORT_SYMBOL(copy_page);
+
+EXPORT_SYMBOL(arm_copy_from_user);
+EXPORT_SYMBOL(arm_copy_to_user);
+EXPORT_SYMBOL(arm_clear_user);
+
+EXPORT_SYMBOL(__get_user_1);
+EXPORT_SYMBOL(__get_user_2);
+EXPORT_SYMBOL(__get_user_4);
+EXPORT_SYMBOL(__get_user_8);
+
+#ifdef __ARMEB__
+EXPORT_SYMBOL(__get_user_64t_1);
+EXPORT_SYMBOL(__get_user_64t_2);
+EXPORT_SYMBOL(__get_user_64t_4);
+EXPORT_SYMBOL(__get_user_32t_8);
+#endif
+
+EXPORT_SYMBOL(__put_user_1);
+EXPORT_SYMBOL(__put_user_2);
+EXPORT_SYMBOL(__put_user_4);
+EXPORT_SYMBOL(__put_user_8);
+#endif
+
+        /* gcc lib functions */
+EXPORT_SYMBOL(__ashldi3);
+EXPORT_SYMBOL(__ashrdi3);
+EXPORT_SYMBOL(__divsi3);
+EXPORT_SYMBOL(__lshrdi3);
+EXPORT_SYMBOL(__modsi3);
+EXPORT_SYMBOL(__muldi3);
+EXPORT_SYMBOL(__ucmpdi2);
+EXPORT_SYMBOL(__udivsi3);
+EXPORT_SYMBOL(__umodsi3);
+EXPORT_SYMBOL(__do_div64);
+EXPORT_SYMBOL(__bswapsi2);
+EXPORT_SYMBOL(__bswapdi2);
+
+#ifdef CONFIG_AEABI
+EXPORT_SYMBOL(__aeabi_idiv);
+EXPORT_SYMBOL(__aeabi_idivmod);
+EXPORT_SYMBOL(__aeabi_lasr);
+EXPORT_SYMBOL(__aeabi_llsl);
+EXPORT_SYMBOL(__aeabi_llsr);
+EXPORT_SYMBOL(__aeabi_lmul);
+EXPORT_SYMBOL(__aeabi_uidiv);
+EXPORT_SYMBOL(__aeabi_uidivmod);
+EXPORT_SYMBOL(__aeabi_ulcmp);
+#endif
+
+        /* bitops */
+EXPORT_SYMBOL(_set_bit);
+EXPORT_SYMBOL(_test_and_set_bit);
+EXPORT_SYMBOL(_clear_bit);
+EXPORT_SYMBOL(_test_and_clear_bit);
+EXPORT_SYMBOL(_change_bit);
+EXPORT_SYMBOL(_test_and_change_bit);
+EXPORT_SYMBOL(_find_first_zero_bit_le);
+EXPORT_SYMBOL(_find_next_zero_bit_le);
+EXPORT_SYMBOL(_find_first_bit_le);
+EXPORT_SYMBOL(_find_next_bit_le);
+
+#ifdef __ARMEB__
+EXPORT_SYMBOL(_find_first_zero_bit_be);
+EXPORT_SYMBOL(_find_next_zero_bit_be);
+EXPORT_SYMBOL(_find_first_bit_be);
+EXPORT_SYMBOL(_find_next_bit_be);
+#endif
+
+#ifdef CONFIG_FUNCTION_TRACER
+#ifdef CONFIG_OLD_MCOUNT
+EXPORT_SYMBOL(mcount);
+#endif
+EXPORT_SYMBOL(__gnu_mcount_nc);
+#endif
+
+#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
+EXPORT_SYMBOL(__pv_phys_pfn_offset);
+EXPORT_SYMBOL(__pv_offset);
+#endif
+
+#ifdef CONFIG_HAVE_ARM_SMCCC
+EXPORT_SYMBOL(arm_smccc_smc);
+EXPORT_SYMBOL(arm_smccc_hvc);
+#endif
diff --git a/arch/arm/kernel/entry-ftrace.S b/arch/arm/kernel/entry-ftrace.S
index b629d3f11c3d..c73c4030ca5d 100644
--- a/arch/arm/kernel/entry-ftrace.S
+++ b/arch/arm/kernel/entry-ftrace.S
@@ -7,7 +7,6 @@
 #include <asm/assembler.h>
 #include <asm/ftrace.h>
 #include <asm/unwind.h>
-#include <asm/export.h>
 
 #include "entry-header.S"
 
@@ -154,7 +153,6 @@ ENTRY(mcount)
         __mcount _old
 #endif
 ENDPROC(mcount)
-EXPORT_SYMBOL(mcount)
 
 #ifdef CONFIG_DYNAMIC_FTRACE
 ENTRY(ftrace_caller_old)
@@ -207,7 +205,6 @@ UNWIND(.fnstart)
 #endif
 UNWIND(.fnend)
 ENDPROC(__gnu_mcount_nc)
-EXPORT_SYMBOL(__gnu_mcount_nc)
 
 #ifdef CONFIG_DYNAMIC_FTRACE
 ENTRY(ftrace_caller)
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index f41cee4c5746..04286fd9e09c 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -22,7 +22,6 @@
 #include <asm/memory.h>
 #include <asm/thread_info.h>
 #include <asm/pgtable.h>
-#include <asm/export.h>
 
 #if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_SEMIHOSTING)
 #include CONFIG_DEBUG_LL_INCLUDE
@@ -728,8 +727,6 @@ __pv_phys_pfn_offset:
 __pv_offset:
         .quad   0
         .size   __pv_offset, . -__pv_offset
-EXPORT_SYMBOL(__pv_phys_pfn_offset)
-EXPORT_SYMBOL(__pv_offset)
 #endif
 
 #include "head-common.S"
diff --git a/arch/arm/kernel/smccc-call.S b/arch/arm/kernel/smccc-call.S
index 37669e7e13af..2e48b674aab1 100644
--- a/arch/arm/kernel/smccc-call.S
+++ b/arch/arm/kernel/smccc-call.S
@@ -16,7 +16,6 @@
 #include <asm/opcodes-sec.h>
 #include <asm/opcodes-virt.h>
 #include <asm/unwind.h>
-#include <asm/export.h>
 
         /*
          * Wrap c macros in asm macros to delay expansion until after the
@@ -52,7 +51,6 @@ UNWIND(	.fnend)
 ENTRY(arm_smccc_smc)
         SMCCC SMCCC_SMC
 ENDPROC(arm_smccc_smc)
-EXPORT_SYMBOL(arm_smccc_smc)
 
 /*
  * void smccc_hvc(unsigned long a0, unsigned long a1, unsigned long a2,
@@ -62,4 +60,3 @@ EXPORT_SYMBOL(arm_smccc_smc)
 ENTRY(arm_smccc_hvc)
         SMCCC SMCCC_HVC
 ENDPROC(arm_smccc_hvc)
-EXPORT_SYMBOL(arm_smccc_hvc)
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index bc698383e822..9688ec0c6ef4 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -74,6 +74,26 @@ void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long
                 dump_mem("", "Exception stack", frame + 4, frame + 4 + sizeof(struct pt_regs));
 }
 
+void dump_backtrace_stm(u32 *stack, u32 instruction)
+{
+        char str[80], *p;
+        unsigned int x;
+        int reg;
+
+        for (reg = 10, x = 0, p = str; reg >= 0; reg--) {
+                if (instruction & BIT(reg)) {
+                        p += sprintf(p, " r%d:%08x", reg, *stack--);
+                        if (++x == 6) {
+                                x = 0;
+                                p = str;
+                                printk("%s\n", str);
+                        }
+                }
+        }
+        if (p != str)
+                printk("%s\n", str);
+}
+
 #ifndef CONFIG_ARM_UNWIND
 /*
  * Stack pointers should always be within the kernels view of
diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S
index 7fa487ef7e2f..37b2a11af345 100644
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@@ -3,6 +3,9 @@
  * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
  */
 
+/* No __ro_after_init data in the .rodata section - which will always be ro */
+#define RO_AFTER_INIT_DATA
+
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/cache.h>
 #include <asm/thread_info.h>
@@ -223,6 +226,8 @@ SECTIONS
                 . = ALIGN(PAGE_SIZE);
                 __init_end = .;
 
+                *(.data..ro_after_init)
+
                 NOSAVE_DATA
                 CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
                 READ_MOSTLY_DATA(L1_CACHE_BYTES)
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 08bb84f2ad58..19b5f5c1c0ff 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -114,11 +114,18 @@ void kvm_arch_check_processor_compat(void *rtn)
  */
 int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
 {
-        int ret = 0;
+        int ret, cpu;
 
         if (type)
                 return -EINVAL;
 
+        kvm->arch.last_vcpu_ran = alloc_percpu(typeof(*kvm->arch.last_vcpu_ran));
+        if (!kvm->arch.last_vcpu_ran)
+                return -ENOMEM;
+
+        for_each_possible_cpu(cpu)
+                *per_cpu_ptr(kvm->arch.last_vcpu_ran, cpu) = -1;
+
         ret = kvm_alloc_stage2_pgd(kvm);
         if (ret)
                 goto out_fail_alloc;
@@ -141,6 +148,8 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
 out_free_stage2_pgd:
         kvm_free_stage2_pgd(kvm);
 out_fail_alloc:
+        free_percpu(kvm->arch.last_vcpu_ran);
+        kvm->arch.last_vcpu_ran = NULL;
         return ret;
 }
 
@@ -168,6 +177,9 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
 {
         int i;
 
+        free_percpu(kvm->arch.last_vcpu_ran);
+        kvm->arch.last_vcpu_ran = NULL;
+
         for (i = 0; i < KVM_MAX_VCPUS; ++i) {
                 if (kvm->vcpus[i]) {
                         kvm_arch_vcpu_free(kvm->vcpus[i]);
@@ -312,6 +324,19 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
 
 void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 {
+        int *last_ran;
+
+        last_ran = this_cpu_ptr(vcpu->kvm->arch.last_vcpu_ran);
+
+        /*
+         * We might get preempted before the vCPU actually runs, but
+         * over-invalidation doesn't affect correctness.
+         */
+        if (*last_ran != vcpu->vcpu_id) {
+                kvm_call_hyp(__kvm_tlb_flush_local_vmid, vcpu);
+                *last_ran = vcpu->vcpu_id;
+        }
+
         vcpu->cpu = cpu;
         vcpu->arch.host_cpu_context = this_cpu_ptr(kvm_host_cpu_state);
 
diff --git a/arch/arm/kvm/hyp/tlb.c b/arch/arm/kvm/hyp/tlb.c
index 729652854f90..6d810af2d9fd 100644
--- a/arch/arm/kvm/hyp/tlb.c
+++ b/arch/arm/kvm/hyp/tlb.c
@@ -55,6 +55,21 @@ void __hyp_text __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa)
         __kvm_tlb_flush_vmid(kvm);
 }
 
+void __hyp_text __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu)
+{
+        struct kvm *kvm = kern_hyp_va(kern_hyp_va(vcpu)->kvm);
+
+        /* Switch to requested VMID */
+        write_sysreg(kvm->arch.vttbr, VTTBR);
+        isb();
+
+        write_sysreg(0, TLBIALL);
+        dsb(nsh);
+        isb();
+
+        write_sysreg(0, VTTBR);
+}
+
 void __hyp_text __kvm_flush_vm_context(void)
 {
         write_sysreg(0, TLBIALLNSNHIS);
diff --git a/arch/arm/lib/ashldi3.S b/arch/arm/lib/ashldi3.S
index a7e7de89bd75..b05e95840651 100644
--- a/arch/arm/lib/ashldi3.S
+++ b/arch/arm/lib/ashldi3.S
@@ -28,7 +28,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 #ifdef __ARMEB__
 #define al r1
@@ -53,5 +52,3 @@ ENTRY(__aeabi_llsl)
 
 ENDPROC(__ashldi3)
 ENDPROC(__aeabi_llsl)
-EXPORT_SYMBOL(__ashldi3)
-EXPORT_SYMBOL(__aeabi_llsl)
diff --git a/arch/arm/lib/ashrdi3.S b/arch/arm/lib/ashrdi3.S
index 490336e42518..275d7d2341a4 100644
--- a/arch/arm/lib/ashrdi3.S
+++ b/arch/arm/lib/ashrdi3.S
@@ -28,7 +28,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 #ifdef __ARMEB__
 #define al r1
@@ -53,5 +52,3 @@ ENTRY(__aeabi_lasr)
 
 ENDPROC(__ashrdi3)
 ENDPROC(__aeabi_lasr)
-EXPORT_SYMBOL(__ashrdi3)
-EXPORT_SYMBOL(__aeabi_lasr)
diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S
index fab5a50503ae..7d7952e5a3b1 100644
--- a/arch/arm/lib/backtrace.S
+++ b/arch/arm/lib/backtrace.S
@@ -10,6 +10,7 @@
  * 27/03/03 Ian Molton Clean up CONFIG_CPU
  *
  */
+#include <linux/kern_levels.h>
 #include <linux/linkage.h>
 #include <asm/assembler.h>
                 .text
@@ -83,13 +84,13 @@ for_each_frame:	tst	frame, mask		@ Check for address exceptions
                 teq     r3, r1, lsr #11
                 ldreq   r0, [frame, #-8]        @ get sp
                 subeq   r0, r0, #4              @ point at the last arg
-                bleq    .Ldumpstm               @ dump saved registers
+                bleq    dump_backtrace_stm      @ dump saved registers
 
 1004:           ldr     r1, [sv_pc, #0]         @ if stmfd sp!, {..., fp, ip, lr, pc}
                 ldr     r3, .Ldsi               @ instruction exists,
                 teq     r3, r1, lsr #11
                 subeq   r0, frame, #16
-                bleq    .Ldumpstm               @ dump saved registers
+                bleq    dump_backtrace_stm      @ dump saved registers
 
                 teq     sv_fp, #0               @ zero saved fp means
                 beq     no_frame                @ no further frames
@@ -112,38 +113,6 @@ ENDPROC(c_backtrace)
                 .long   1004b, 1006b
                 .popsection
 
-#define instr r4
-#define reg   r5
-#define stack r6
-
-.Ldumpstm:      stmfd   sp!, {instr, reg, stack, r7, lr}
-                mov     stack, r0
-                mov     instr, r1
-                mov     reg, #10
-                mov     r7, #0
-1:              mov     r3, #1
- ARM(           tst     instr, r3, lsl reg      )
- THUMB(         lsl     r3, reg                 )
- THUMB(         tst     instr, r3               )
-                beq     2f
-                add     r7, r7, #1
-                teq     r7, #6
-                moveq   r7, #0
-                adr     r3, .Lcr
-                addne   r3, r3, #1              @ skip newline
-                ldr     r2, [stack], #-4
-                mov     r1, reg
-                adr     r0, .Lfp
-                bl      printk
-2:              subs    reg, reg, #1
-                bpl     1b
-                teq     r7, #0
-                adrne   r0, .Lcr
-                blne    printk
-                ldmfd   sp!, {instr, reg, stack, r7, pc}
-
-.Lfp:           .asciz  " r%d:%08x%s"
-.Lcr:           .asciz  "\n"
 .Lbad:          .asciz  "Backtrace aborted due to bad frame pointer <%p>\n"
                 .align
 .Ldsi:          .word   0xe92dd800 >> 11        @ stmfd sp!, {... fp, ip, lr, pc}
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h
index df06638b327c..7d807cfd8ef5 100644
--- a/arch/arm/lib/bitops.h
+++ b/arch/arm/lib/bitops.h
@@ -1,6 +1,5 @@
 #include <asm/assembler.h>
 #include <asm/unwind.h>
-#include <asm/export.h>
 
 #if __LINUX_ARM_ARCH__ >= 6
         .macro  bitop, name, instr
@@ -26,7 +25,6 @@ UNWIND(	.fnstart	)
         bx      lr
 UNWIND( .fnend          )
 ENDPROC(\name           )
-EXPORT_SYMBOL(\name     )
         .endm
 
         .macro  testop, name, instr, store
@@ -57,7 +55,6 @@ UNWIND(	.fnstart	)
 2:      bx      lr
 UNWIND( .fnend          )
 ENDPROC(\name           )
-EXPORT_SYMBOL(\name     )
         .endm
 #else
         .macro  bitop, name, instr
@@ -77,7 +74,6 @@ UNWIND(	.fnstart	)
         ret     lr
 UNWIND( .fnend          )
 ENDPROC(\name           )
-EXPORT_SYMBOL(\name     )
         .endm
 
 /**
@@ -106,6 +102,5 @@ UNWIND(	.fnstart	)
         ret     lr
 UNWIND( .fnend          )
 ENDPROC(\name           )
-EXPORT_SYMBOL(\name     )
         .endm
 #endif
diff --git a/arch/arm/lib/bswapsdi2.S b/arch/arm/lib/bswapsdi2.S
index f05f78247304..07cda737bb11 100644
--- a/arch/arm/lib/bswapsdi2.S
+++ b/arch/arm/lib/bswapsdi2.S
@@ -1,6 +1,5 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 #if __LINUX_ARM_ARCH__ >= 6
 ENTRY(__bswapsi2)
@@ -36,5 +35,3 @@ ENTRY(__bswapdi2)
         ret lr
 ENDPROC(__bswapdi2)
 #endif
-EXPORT_SYMBOL(__bswapsi2)
-EXPORT_SYMBOL(__bswapdi2)
diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
index b566154f5cf4..e936352ccb00 100644
--- a/arch/arm/lib/clear_user.S
+++ b/arch/arm/lib/clear_user.S
@@ -10,7 +10,6 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/unwind.h>
-#include <asm/export.h>
 
                 .text
 
@@ -51,9 +50,6 @@ USER(		strnebt	r2, [r0])
 UNWIND(.fnend)
 ENDPROC(arm_clear_user)
 ENDPROC(__clear_user_std)
-#ifndef CONFIG_UACCESS_WITH_MEMCPY
-EXPORT_SYMBOL(arm_clear_user)
-#endif
 
                 .pushsection .text.fixup,"ax"
                 .align  0
diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
index 63e4c1ed0225..7a4b06049001 100644
--- a/arch/arm/lib/copy_from_user.S
+++ b/arch/arm/lib/copy_from_user.S
@@ -13,7 +13,6 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/unwind.h>
-#include <asm/export.h>
 
 /*
  * Prototype:
@@ -95,7 +94,6 @@ ENTRY(arm_copy_from_user)
 #include "copy_template.S"
 
 ENDPROC(arm_copy_from_user)
-EXPORT_SYMBOL(arm_copy_from_user)
 
         .pushsection .fixup,"ax"
         .align 0
diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
index d97851d4af7a..6ee2f6706f86 100644
--- a/arch/arm/lib/copy_page.S
+++ b/arch/arm/lib/copy_page.S
@@ -13,7 +13,6 @@
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
 #include <asm/cache.h>
-#include <asm/export.h>
 
 #define COPY_COUNT (PAGE_SZ / (2 * L1_CACHE_BYTES) PLD( -1 ))
 
@@ -46,4 +45,3 @@ ENTRY(copy_page)
         PLD(    beq     2b                      )
                 ldmfd   sp!, {r4, pc}                   @       3
 ENDPROC(copy_page)
-EXPORT_SYMBOL(copy_page)
diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
index 592c179112d1..caf5019d8161 100644
--- a/arch/arm/lib/copy_to_user.S
+++ b/arch/arm/lib/copy_to_user.S
@@ -13,7 +13,6 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/unwind.h>
-#include <asm/export.h>
 
 /*
  * Prototype:
@@ -100,9 +99,6 @@ WEAK(arm_copy_to_user)
 
 ENDPROC(arm_copy_to_user)
 ENDPROC(__copy_to_user_std)
-#ifndef CONFIG_UACCESS_WITH_MEMCPY
-EXPORT_SYMBOL(arm_copy_to_user)
-#endif
 
         .pushsection .text.fixup,"ax"
         .align 0
diff --git a/arch/arm/lib/csumipv6.S b/arch/arm/lib/csumipv6.S
index 68603b5ee537..3ac6ef01bc43 100644
--- a/arch/arm/lib/csumipv6.S
+++ b/arch/arm/lib/csumipv6.S
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
                 .text
 
@@ -31,4 +30,4 @@ ENTRY(__csum_ipv6_magic)
                 adcs    r0, r0, #0
                 ldmfd   sp!, {pc}
 ENDPROC(__csum_ipv6_magic)
-EXPORT_SYMBOL(__csum_ipv6_magic)
+
diff --git a/arch/arm/lib/csumpartial.S b/arch/arm/lib/csumpartial.S
index 830b20e81c37..984e0f29d548 100644
--- a/arch/arm/lib/csumpartial.S
+++ b/arch/arm/lib/csumpartial.S
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
                 .text
 
@@ -141,4 +140,3 @@ ENTRY(csum_partial)
                 bne     4b
                 b       .Lless4
 ENDPROC(csum_partial)
-EXPORT_SYMBOL(csum_partial)
diff --git a/arch/arm/lib/csumpartialcopy.S b/arch/arm/lib/csumpartialcopy.S
index 9c3383fed129..d03fc71fc88c 100644
--- a/arch/arm/lib/csumpartialcopy.S
+++ b/arch/arm/lib/csumpartialcopy.S
@@ -49,6 +49,5 @@
 
 #define FN_ENTRY        ENTRY(csum_partial_copy_nocheck)
 #define FN_EXIT         ENDPROC(csum_partial_copy_nocheck)
-#define FN_EXPORT       EXPORT_SYMBOL(csum_partial_copy_nocheck)
 
 #include "csumpartialcopygeneric.S"
diff --git a/arch/arm/lib/csumpartialcopygeneric.S b/arch/arm/lib/csumpartialcopygeneric.S
index 8b94d20e51d1..10b45909610c 100644
--- a/arch/arm/lib/csumpartialcopygeneric.S
+++ b/arch/arm/lib/csumpartialcopygeneric.S
@@ -8,7 +8,6 @@
  * published by the Free Software Foundation.
  */
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 /*
  * unsigned int
@@ -332,4 +331,3 @@ FN_ENTRY
                 mov     r5, r4, get_byte_1
                 b       .Lexit
 FN_EXIT
-FN_EXPORT
diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
index 5d495edf3d83..1712f132b80d 100644
--- a/arch/arm/lib/csumpartialcopyuser.S
+++ b/arch/arm/lib/csumpartialcopyuser.S
@@ -73,7 +73,6 @@
 
 #define FN_ENTRY        ENTRY(csum_partial_copy_from_user)
 #define FN_EXIT         ENDPROC(csum_partial_copy_from_user)
-#define FN_EXPORT       EXPORT_SYMBOL(csum_partial_copy_from_user)
 
 #include "csumpartialcopygeneric.S"
 
diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
index 69aad80a3af4..2cef11884857 100644
--- a/arch/arm/lib/delay.c
+++ b/arch/arm/lib/delay.c
@@ -24,7 +24,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/export.h>
 #include <linux/timex.h>
 
 /*
@@ -35,7 +34,6 @@ struct arm_delay_ops arm_delay_ops __ro_after_init = {
         .const_udelay   = __loop_const_udelay,
         .udelay         = __loop_udelay,
 };
-EXPORT_SYMBOL(arm_delay_ops);
 
 static const struct delay_timer *delay_timer;
 static bool delay_calibrated;
diff --git a/arch/arm/lib/div64.S b/arch/arm/lib/div64.S
index 0c9e1c18fc9e..a9eafe4981eb 100644
--- a/arch/arm/lib/div64.S
+++ b/arch/arm/lib/div64.S
@@ -15,7 +15,6 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/unwind.h>
-#include <asm/export.h>
 
 #ifdef __ARMEB__
 #define xh r0
@@ -211,4 +210,3 @@ Ldiv0_64:
 
 UNWIND(.fnend)
 ENDPROC(__do_div64)
-EXPORT_SYMBOL(__do_div64)
diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S
index 26302b8cd38f..7848780e8834 100644
--- a/arch/arm/lib/findbit.S
+++ b/arch/arm/lib/findbit.S
@@ -15,7 +15,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
                 .text
 
 /*
@@ -38,7 +37,6 @@ ENTRY(_find_first_zero_bit_le)
 3:              mov     r0, r1                  @ no free bits
                 ret     lr
 ENDPROC(_find_first_zero_bit_le)
-EXPORT_SYMBOL(_find_first_zero_bit_le)
 
 /*
  * Purpose  : Find next 'zero' bit
@@ -59,7 +57,6 @@ ENTRY(_find_next_zero_bit_le)
                 add     r2, r2, #1              @ align bit pointer
                 b       2b                      @ loop for next bit
 ENDPROC(_find_next_zero_bit_le)
-EXPORT_SYMBOL(_find_next_zero_bit_le)
 
 /*
  * Purpose  : Find a 'one' bit
@@ -81,7 +78,6 @@ ENTRY(_find_first_bit_le)
 3:              mov     r0, r1                  @ no free bits
                 ret     lr
 ENDPROC(_find_first_bit_le)
-EXPORT_SYMBOL(_find_first_bit_le)
 
 /*
  * Purpose  : Find next 'one' bit
@@ -101,7 +97,6 @@ ENTRY(_find_next_bit_le)
                 add     r2, r2, #1              @ align bit pointer
                 b       2b                      @ loop for next bit
 ENDPROC(_find_next_bit_le)
-EXPORT_SYMBOL(_find_next_bit_le)
 
 #ifdef __ARMEB__
 
@@ -121,7 +116,6 @@ ENTRY(_find_first_zero_bit_be)
 3:              mov     r0, r1                  @ no free bits
                 ret     lr
 ENDPROC(_find_first_zero_bit_be)
-EXPORT_SYMBOL(_find_first_zero_bit_be)
 
 ENTRY(_find_next_zero_bit_be)
                 teq     r1, #0
@@ -139,7 +133,6 @@ ENTRY(_find_next_zero_bit_be)
                 add     r2, r2, #1              @ align bit pointer
                 b       2b                      @ loop for next bit
 ENDPROC(_find_next_zero_bit_be)
-EXPORT_SYMBOL(_find_next_zero_bit_be)
 
 ENTRY(_find_first_bit_be)
                 teq     r1, #0
@@ -157,7 +150,6 @@ ENTRY(_find_first_bit_be)
 3:              mov     r0, r1                  @ no free bits
                 ret     lr
 ENDPROC(_find_first_bit_be)
-EXPORT_SYMBOL(_find_first_bit_be)
 
 ENTRY(_find_next_bit_be)
                 teq     r1, #0
@@ -174,7 +166,6 @@ ENTRY(_find_next_bit_be)
                 add     r2, r2, #1              @ align bit pointer
                 b       2b                      @ loop for next bit
 ENDPROC(_find_next_bit_be)
-EXPORT_SYMBOL(_find_next_bit_be)
 
 #endif
 
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
index 9d09a38e73af..8ecfd15c3a02 100644
--- a/arch/arm/lib/getuser.S
+++ b/arch/arm/lib/getuser.S
@@ -31,7 +31,6 @@
 #include <asm/assembler.h>
 #include <asm/errno.h>
 #include <asm/domain.h>
-#include <asm/export.h>
 
 ENTRY(__get_user_1)
         check_uaccess r0, 1, r1, r2, __get_user_bad
@@ -39,7 +38,6 @@ ENTRY(__get_user_1)
         mov     r0, #0
         ret     lr
 ENDPROC(__get_user_1)
-EXPORT_SYMBOL(__get_user_1)
 
 ENTRY(__get_user_2)
         check_uaccess r0, 2, r1, r2, __get_user_bad
@@ -60,7 +58,6 @@ rb	.req	r0
         mov     r0, #0
         ret     lr
 ENDPROC(__get_user_2)
-EXPORT_SYMBOL(__get_user_2)
 
 ENTRY(__get_user_4)
         check_uaccess r0, 4, r1, r2, __get_user_bad
@@ -68,7 +65,6 @@ ENTRY(__get_user_4)
         mov     r0, #0
         ret     lr
 ENDPROC(__get_user_4)
-EXPORT_SYMBOL(__get_user_4)
 
 ENTRY(__get_user_8)
         check_uaccess r0, 8, r1, r2, __get_user_bad
@@ -82,7 +78,6 @@ ENTRY(__get_user_8)
         mov     r0, #0
         ret     lr
 ENDPROC(__get_user_8)
-EXPORT_SYMBOL(__get_user_8)
 
 #ifdef __ARMEB__
 ENTRY(__get_user_32t_8)
@@ -96,7 +91,6 @@ ENTRY(__get_user_32t_8)
         mov     r0, #0
         ret     lr
 ENDPROC(__get_user_32t_8)
-EXPORT_SYMBOL(__get_user_32t_8)
 
 ENTRY(__get_user_64t_1)
         check_uaccess r0, 1, r1, r2, __get_user_bad8
@@ -104,7 +98,6 @@ ENTRY(__get_user_64t_1)
         mov     r0, #0
         ret     lr
 ENDPROC(__get_user_64t_1)
-EXPORT_SYMBOL(__get_user_64t_1)
 
 ENTRY(__get_user_64t_2)
         check_uaccess r0, 2, r1, r2, __get_user_bad8
@@ -121,7 +114,6 @@ rb	.req	r0
         mov     r0, #0
         ret     lr
 ENDPROC(__get_user_64t_2)
-EXPORT_SYMBOL(__get_user_64t_2)
 
 ENTRY(__get_user_64t_4)
         check_uaccess r0, 4, r1, r2, __get_user_bad8
@@ -129,7 +121,6 @@ ENTRY(__get_user_64t_4)
         mov     r0, #0
         ret     lr
 ENDPROC(__get_user_64t_4)
-EXPORT_SYMBOL(__get_user_64t_4)
 #endif
 
 __get_user_bad8:
diff --git a/arch/arm/lib/io-readsb.S b/arch/arm/lib/io-readsb.S
index 3dff7a3a2aef..c31b2f3153f1 100644
--- a/arch/arm/lib/io-readsb.S
+++ b/arch/arm/lib/io-readsb.S
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 .Linsb_align:   rsb     ip, ip, #4
                 cmp     ip, r2
@@ -122,4 +121,3 @@ ENTRY(__raw_readsb)
 
                 ldmfd   sp!, {r4 - r6, pc}
 ENDPROC(__raw_readsb)
-EXPORT_SYMBOL(__raw_readsb)
diff --git a/arch/arm/lib/io-readsl.S b/arch/arm/lib/io-readsl.S
index bfd39682325b..2ed86fa5465f 100644
--- a/arch/arm/lib/io-readsl.S
+++ b/arch/arm/lib/io-readsl.S
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 ENTRY(__raw_readsl)
                 teq     r2, #0          @ do we have to check for the zero len?
@@ -78,4 +77,3 @@ ENTRY(__raw_readsl)
                 strb    r3, [r1, #0]
                 ret     lr
 ENDPROC(__raw_readsl)
-EXPORT_SYMBOL(__raw_readsl)
diff --git a/arch/arm/lib/io-readsw-armv3.S b/arch/arm/lib/io-readsw-armv3.S
index b3af3db6caac..413da9914529 100644
--- a/arch/arm/lib/io-readsw-armv3.S
+++ b/arch/arm/lib/io-readsw-armv3.S
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 .Linsw_bad_alignment:
                 adr     r0, .Linsw_bad_align_msg
@@ -104,4 +103,4 @@ ENTRY(__raw_readsw)
 
                 ldmfd   sp!, {r4, r5, r6, pc}
 
-EXPORT_SYMBOL(__raw_readsw)
+
diff --git a/arch/arm/lib/io-readsw-armv4.S b/arch/arm/lib/io-readsw-armv4.S
index 3c7a7a40b33e..d9a45e9692ae 100644
--- a/arch/arm/lib/io-readsw-armv4.S
+++ b/arch/arm/lib/io-readsw-armv4.S
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
                 .macro  pack, rd, hw1, hw2
 #ifndef __ARMEB__
@@ -130,4 +129,3 @@ ENTRY(__raw_readsw)
                 strneb  ip, [r1]
                 ldmfd   sp!, {r4, pc}
 ENDPROC(__raw_readsw)
-EXPORT_SYMBOL(__raw_readsw)
diff --git a/arch/arm/lib/io-writesb.S b/arch/arm/lib/io-writesb.S
index fa3633594415..a46bbc9b168b 100644
--- a/arch/arm/lib/io-writesb.S
+++ b/arch/arm/lib/io-writesb.S
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
                 .macro  outword, rd
 #ifndef __ARMEB__
@@ -93,4 +92,3 @@ ENTRY(__raw_writesb)
 
                 ldmfd   sp!, {r4, r5, pc}
 ENDPROC(__raw_writesb)
-EXPORT_SYMBOL(__raw_writesb)
diff --git a/arch/arm/lib/io-writesl.S b/arch/arm/lib/io-writesl.S
index 98ed6aec0b47..4ea2435988c1 100644
--- a/arch/arm/lib/io-writesl.S
+++ b/arch/arm/lib/io-writesl.S
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 ENTRY(__raw_writesl)
                 teq     r2, #0          @ do we have to check for the zero len?
@@ -66,4 +65,3 @@ ENTRY(__raw_writesl)
                 bne     6b
                 ret     lr
 ENDPROC(__raw_writesl)
-EXPORT_SYMBOL(__raw_writesl)
diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S
index 577184c082bb..121789eb6802 100644
--- a/arch/arm/lib/io-writesw-armv3.S
+++ b/arch/arm/lib/io-writesw-armv3.S
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 .Loutsw_bad_alignment:
                 adr     r0, .Loutsw_bad_align_msg
@@ -125,4 +124,3 @@ ENTRY(__raw_writesw)
                 strne   ip, [r0]
 
                 ldmfd   sp!, {r4, r5, r6, pc}
-EXPORT_SYMBOL(__raw_writesw)
diff --git a/arch/arm/lib/io-writesw-armv4.S b/arch/arm/lib/io-writesw-armv4.S
index e335f489d1fc..269f90c51ad2 100644
--- a/arch/arm/lib/io-writesw-armv4.S
+++ b/arch/arm/lib/io-writesw-armv4.S
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
                 .macro  outword, rd
 #ifndef __ARMEB__
@@ -99,4 +98,3 @@ ENTRY(__raw_writesw)
                 strneh  ip, [r0]
                 ret     lr
 ENDPROC(__raw_writesw)
-EXPORT_SYMBOL(__raw_writesw)
diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S
index f541bc013bff..9397b2e532af 100644
--- a/arch/arm/lib/lib1funcs.S
+++ b/arch/arm/lib/lib1funcs.S
@@ -36,7 +36,6 @@ Boston, MA 02111-1307, USA.  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/unwind.h>
-#include <asm/export.h>
 
 .macro ARM_DIV_BODY dividend, divisor, result, curbit
 
@@ -239,8 +238,6 @@ UNWIND(.fnstart)
 UNWIND(.fnend)
 ENDPROC(__udivsi3)
 ENDPROC(__aeabi_uidiv)
-EXPORT_SYMBOL(__udivsi3)
-EXPORT_SYMBOL(__aeabi_uidiv)
 
 ENTRY(__umodsi3)
 UNWIND(.fnstart)
@@ -259,7 +256,6 @@ UNWIND(.fnstart)
 
 UNWIND(.fnend)
 ENDPROC(__umodsi3)
-EXPORT_SYMBOL(__umodsi3)
 
 #ifdef CONFIG_ARM_PATCH_IDIV
         .align 3
@@ -307,8 +303,6 @@ UNWIND(.fnstart)
 UNWIND(.fnend)
 ENDPROC(__divsi3)
 ENDPROC(__aeabi_idiv)
-EXPORT_SYMBOL(__divsi3)
-EXPORT_SYMBOL(__aeabi_idiv)
 
 ENTRY(__modsi3)
 UNWIND(.fnstart)
@@ -333,7 +327,6 @@ UNWIND(.fnstart)
 
 UNWIND(.fnend)
 ENDPROC(__modsi3)
-EXPORT_SYMBOL(__modsi3)
 
 #ifdef CONFIG_AEABI
 
@@ -350,7 +343,6 @@ UNWIND(.save {r0, r1, ip, lr}	)
 
 UNWIND(.fnend)
 ENDPROC(__aeabi_uidivmod)
-EXPORT_SYMBOL(__aeabi_uidivmod)
 
 ENTRY(__aeabi_idivmod)
 UNWIND(.fnstart)
@@ -364,7 +356,6 @@ UNWIND(.save {r0, r1, ip, lr}	)
 
 UNWIND(.fnend)
 ENDPROC(__aeabi_idivmod)
-EXPORT_SYMBOL(__aeabi_idivmod)
 
 #endif
 
diff --git a/arch/arm/lib/lshrdi3.S b/arch/arm/lib/lshrdi3.S
index e40833981417..922dcd88b02b 100644
--- a/arch/arm/lib/lshrdi3.S
+++ b/arch/arm/lib/lshrdi3.S
@@ -28,7 +28,6 @@ Boston, MA 02110-1301, USA.  */
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 #ifdef __ARMEB__
 #define al r1
@@ -53,5 +52,3 @@ ENTRY(__aeabi_llsr)
 
 ENDPROC(__lshrdi3)
 ENDPROC(__aeabi_llsr)
-EXPORT_SYMBOL(__lshrdi3)
-EXPORT_SYMBOL(__aeabi_llsr)
diff --git a/arch/arm/lib/memchr.S b/arch/arm/lib/memchr.S
index 44182bf686a5..74a5bed6d999 100644
--- a/arch/arm/lib/memchr.S
+++ b/arch/arm/lib/memchr.S
@@ -11,7 +11,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
         .text
         .align  5
@@ -25,4 +24,3 @@ ENTRY(memchr)
 2:      movne   r0, #0
         ret     lr
 ENDPROC(memchr)
-EXPORT_SYMBOL(memchr)
diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S
index 1be5b6ddf37c..64111bd4440b 100644
--- a/arch/arm/lib/memcpy.S
+++ b/arch/arm/lib/memcpy.S
@@ -13,7 +13,6 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/unwind.h>
-#include <asm/export.h>
 
 #define LDR1W_SHIFT     0
 #define STR1W_SHIFT     0
@@ -69,5 +68,3 @@ ENTRY(memcpy)
 
 ENDPROC(memcpy)
 ENDPROC(mmiocpy)
-EXPORT_SYMBOL(memcpy)
-EXPORT_SYMBOL(mmiocpy)
diff --git a/arch/arm/lib/memmove.S b/arch/arm/lib/memmove.S
index 71dcc5400d02..69a9d47fc5ab 100644
--- a/arch/arm/lib/memmove.S
+++ b/arch/arm/lib/memmove.S
@@ -13,7 +13,6 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/unwind.h>
-#include <asm/export.h>
 
                 .text
 
@@ -226,4 +225,3 @@ ENTRY(memmove)
 18:             backward_copy_shift     push=24 pull=8
 
 ENDPROC(memmove)
-EXPORT_SYMBOL(memmove)
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S
index 7b72044cba62..3c65e3bd790f 100644
--- a/arch/arm/lib/memset.S
+++ b/arch/arm/lib/memset.S
@@ -12,7 +12,6 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/unwind.h>
-#include <asm/export.h>
 
         .text
         .align  5
@@ -136,5 +135,3 @@ UNWIND( .fnstart            )
 UNWIND( .fnend   )
 ENDPROC(memset)
 ENDPROC(mmioset)
-EXPORT_SYMBOL(memset)
-EXPORT_SYMBOL(mmioset)
diff --git a/arch/arm/lib/memzero.S b/arch/arm/lib/memzero.S
index 6dec26ed5bcc..0eded952e089 100644
--- a/arch/arm/lib/memzero.S
+++ b/arch/arm/lib/memzero.S
@@ -10,7 +10,6 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/unwind.h>
-#include <asm/export.h>
 
         .text
         .align  5
@@ -136,4 +135,3 @@ UNWIND(	.fnstart			)
         ret     lr                      @ 1
 UNWIND( .fnend                          )
 ENDPROC(__memzero)
-EXPORT_SYMBOL(__memzero)
diff --git a/arch/arm/lib/muldi3.S b/arch/arm/lib/muldi3.S
index b8f12388ccac..204305956925 100644
--- a/arch/arm/lib/muldi3.S
+++ b/arch/arm/lib/muldi3.S
@@ -12,7 +12,6 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 #ifdef __ARMEB__
 #define xh r0
@@ -47,5 +46,3 @@ ENTRY(__aeabi_lmul)
 
 ENDPROC(__muldi3)
 ENDPROC(__aeabi_lmul)
-EXPORT_SYMBOL(__muldi3)
-EXPORT_SYMBOL(__aeabi_lmul)
diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S
index 11de126e2ed6..38d660d3705f 100644
--- a/arch/arm/lib/putuser.S
+++ b/arch/arm/lib/putuser.S
@@ -31,7 +31,6 @@
 #include <asm/assembler.h>
 #include <asm/errno.h>
 #include <asm/domain.h>
-#include <asm/export.h>
 
 ENTRY(__put_user_1)
         check_uaccess r0, 1, r1, ip, __put_user_bad
@@ -39,7 +38,6 @@ ENTRY(__put_user_1)
         mov     r0, #0
         ret     lr
 ENDPROC(__put_user_1)
-EXPORT_SYMBOL(__put_user_1)
 
 ENTRY(__put_user_2)
         check_uaccess r0, 2, r1, ip, __put_user_bad
@@ -64,7 +62,6 @@ ENTRY(__put_user_2)
         mov     r0, #0
         ret     lr
 ENDPROC(__put_user_2)
-EXPORT_SYMBOL(__put_user_2)
 
 ENTRY(__put_user_4)
         check_uaccess r0, 4, r1, ip, __put_user_bad
@@ -72,7 +69,6 @@ ENTRY(__put_user_4)
         mov     r0, #0
         ret     lr
 ENDPROC(__put_user_4)
-EXPORT_SYMBOL(__put_user_4)
 
 ENTRY(__put_user_8)
         check_uaccess r0, 8, r1, ip, __put_user_bad
@@ -86,7 +82,6 @@ ENTRY(__put_user_8)
         mov     r0, #0
         ret     lr
 ENDPROC(__put_user_8)
-EXPORT_SYMBOL(__put_user_8)
 
 __put_user_bad:
         mov     r0, #-EFAULT
diff --git a/arch/arm/lib/strchr.S b/arch/arm/lib/strchr.S
index 7301f6e6046c..013d64c71e8d 100644
--- a/arch/arm/lib/strchr.S
+++ b/arch/arm/lib/strchr.S
@@ -11,7 +11,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
                 .text
                 .align  5
@@ -26,4 +25,3 @@ ENTRY(strchr)
                 subeq   r0, r0, #1
                 ret     lr
 ENDPROC(strchr)
-EXPORT_SYMBOL(strchr)
diff --git a/arch/arm/lib/strrchr.S b/arch/arm/lib/strrchr.S
index aaf9fd98b754..3cec1c7482c4 100644
--- a/arch/arm/lib/strrchr.S
+++ b/arch/arm/lib/strrchr.S
@@ -11,7 +11,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
                 .text
                 .align  5
@@ -25,4 +24,3 @@ ENTRY(strrchr)
                 mov     r0, r3
                 ret     lr
 ENDPROC(strrchr)
-EXPORT_SYMBOL(strrchr)
diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
index 1626e3a551a1..6bd1089b07e0 100644
--- a/arch/arm/lib/uaccess_with_memcpy.c
+++ b/arch/arm/lib/uaccess_with_memcpy.c
@@ -19,7 +19,6 @@
 #include <linux/gfp.h>
 #include <linux/highmem.h>
 #include <linux/hugetlb.h>
-#include <linux/export.h>
 #include <asm/current.h>
 #include <asm/page.h>
 
@@ -157,7 +156,6 @@ arm_copy_to_user(void __user *to, const void *from, unsigned long n)
         }
         return n;
 }
-EXPORT_SYMBOL(arm_copy_to_user);
         
 static unsigned long noinline
 __clear_user_memset(void __user *addr, unsigned long n)
@@ -215,7 +213,6 @@ unsigned long arm_clear_user(void __user *addr, unsigned long n)
         }
         return n;
 }
-EXPORT_SYMBOL(arm_clear_user);
 
 #if 0
 
diff --git a/arch/arm/lib/ucmpdi2.S b/arch/arm/lib/ucmpdi2.S
index 127a91af46f3..ad4a6309141a 100644
--- a/arch/arm/lib/ucmpdi2.S
+++ b/arch/arm/lib/ucmpdi2.S
@@ -12,7 +12,6 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 #ifdef __ARMEB__
 #define xh r0
@@ -36,7 +35,6 @@ ENTRY(__ucmpdi2)
         ret     lr
 
 ENDPROC(__ucmpdi2)
-EXPORT_SYMBOL(__ucmpdi2)
 
 #ifdef CONFIG_AEABI
 
@@ -50,7 +48,6 @@ ENTRY(__aeabi_ulcmp)
         ret     lr
 
 ENDPROC(__aeabi_ulcmp)
-EXPORT_SYMBOL(__aeabi_ulcmp)
 
 #endif
 
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 737450fe790c..cab128913e72 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -32,6 +32,7 @@ endif
 
 ifdef CONFIG_SND_IMX_SOC
 obj-y += ssi-fiq.o
+obj-y += ssi-fiq-ksym.o
 endif
 
 # i.MX21 based machines
diff --git a/arch/arm/mach-imx/ssi-fiq-ksym.c b/arch/arm/mach-imx/ssi-fiq-ksym.c
new file mode 100644
index 000000000000..792090f9a032
--- /dev/null
+++ b/arch/arm/mach-imx/ssi-fiq-ksym.c
@@ -0,0 +1,20 @@
+/*
+ * Exported ksyms for the SSI FIQ handler
+ *
+ * Copyright (C) 2009, Sascha Hauer <s.hauer@pengutronix.de>
+ *
+ * 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/platform_data/asoc-imx-ssi.h>
+
+EXPORT_SYMBOL(imx_ssi_fiq_tx_buffer);
+EXPORT_SYMBOL(imx_ssi_fiq_rx_buffer);
+EXPORT_SYMBOL(imx_ssi_fiq_start);
+EXPORT_SYMBOL(imx_ssi_fiq_end);
+EXPORT_SYMBOL(imx_ssi_fiq_base);
+
diff --git a/arch/arm/mach-imx/ssi-fiq.S b/arch/arm/mach-imx/ssi-fiq.S
index fd7917f1c204..a8b93c5f29b5 100644
--- a/arch/arm/mach-imx/ssi-fiq.S
+++ b/arch/arm/mach-imx/ssi-fiq.S
@@ -8,7 +8,6 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/export.h>
 
 /*
  * r8  = bit 0-15: tx offset, bit 16-31: tx buffer size
@@ -145,8 +144,4 @@ imx_ssi_fiq_tx_buffer:
                 .word 0x0
 .L_imx_ssi_fiq_end:
 imx_ssi_fiq_end:
-EXPORT_SYMBOL(imx_ssi_fiq_tx_buffer)
-EXPORT_SYMBOL(imx_ssi_fiq_rx_buffer)
-EXPORT_SYMBOL(imx_ssi_fiq_start)
-EXPORT_SYMBOL(imx_ssi_fiq_end)
-EXPORT_SYMBOL(imx_ssi_fiq_base)
+
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index a9afeebd59f2..0465338183c7 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -71,6 +71,7 @@ config SOC_AM43XX
         select HAVE_ARM_TWD
         select ARM_ERRATA_754322
         select ARM_ERRATA_775420
+        select OMAP_INTERCONNECT
 
 config SOC_DRA7XX
         bool "TI DRA7XX"
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 2abd53ae3e7a..cc6d9fa60924 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -205,11 +205,15 @@ void __init omap2xxx_check_revision(void)
 
 #define OMAP3_SHOW_FEATURE(feat)                \
         if (omap3_has_ ##feat())                \
-                printk(#feat" ");
+                n += scnprintf(buf + n, sizeof(buf) - n, #feat " ");
 
 static void __init omap3_cpuinfo(void)
 {
         const char *cpu_name;
+        char buf[64];
+        int n = 0;
+
+        memset(buf, 0, sizeof(buf));
 
         /*
          * OMAP3430 and OMAP3530 are assumed to be same.
@@ -241,10 +245,10 @@ static void __init omap3_cpuinfo(void)
                 cpu_name = "OMAP3503";
         }
 
-        sprintf(soc_name, "%s", cpu_name);
+        scnprintf(soc_name, sizeof(soc_name), "%s", cpu_name);
 
         /* Print verbose information */
-        pr_info("%s %s (", soc_name, soc_rev);
+        n += scnprintf(buf, sizeof(buf) - n, "%s %s (", soc_name, soc_rev);
 
         OMAP3_SHOW_FEATURE(l2cache);
         OMAP3_SHOW_FEATURE(iva);
@@ -252,8 +256,10 @@ static void __init omap3_cpuinfo(void)
         OMAP3_SHOW_FEATURE(neon);
         OMAP3_SHOW_FEATURE(isp);
         OMAP3_SHOW_FEATURE(192mhz_clk);
-
-        printk(")\n");
+        if (*(buf + n - 1) == ' ')
+                n--;
+        n += scnprintf(buf + n, sizeof(buf) - n, ")\n");
+        pr_info("%s", buf);
 }
 
 #define OMAP3_CHECK_FEATURE(status,feat)                                \
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index 62680aad2126..718981bb80cd 100644
--- a/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -319,6 +319,9 @@ void __init omap3_prm_init_pm(bool has_uart4, bool has_iva)
         if (has_uart4) {
                 en_uart4_mask = OMAP3630_EN_UART4_MASK;
                 grpsel_uart4_mask = OMAP3630_GRPSEL_UART4_MASK;
+        } else {
+                en_uart4_mask = 0;
+                grpsel_uart4_mask = 0;
         }
 
         /* Enable wakeups in PER */
diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c
index cba8cada8c81..cd15dbd62671 100644
--- a/arch/arm/mach-omap2/voltage.c
+++ b/arch/arm/mach-omap2/voltage.c
@@ -87,6 +87,12 @@ int voltdm_scale(struct voltagedomain *voltdm,
                 return -ENODATA;
         }
 
+        if (!voltdm->volt_data) {
+                pr_err("%s: No voltage data defined for vdd_%s\n",
+                        __func__, voltdm->name);
+                return -ENODATA;
+        }
+
         /* Adjust voltage to the exact voltage from the OPP table */
         for (i = 0; voltdm->volt_data[i].volt_nominal != 0; i++) {
                 if (voltdm->volt_data[i].volt_nominal >= target_volt) {
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index ab4f74536057..ab7710002ba6 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1167,7 +1167,7 @@ static int __init dma_debug_do_init(void)
         dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
         return 0;
 }
-fs_initcall(dma_debug_do_init);
+core_initcall(dma_debug_do_init);
 
 #ifdef CONFIG_ARM_DMA_USE_IOMMU
 
diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S
index f6d333f09bfe..8dea61640cc1 100644
--- a/arch/arm/mm/proc-v7m.S
+++ b/arch/arm/mm/proc-v7m.S
@@ -96,7 +96,7 @@ ENTRY(cpu_cm7_proc_fin)
         ret     lr
 ENDPROC(cpu_cm7_proc_fin)
 
-        .section ".text.init", #alloc, #execinstr
+        .section ".init.text", #alloc, #execinstr
 
 __v7m_cm7_setup:
         mov     r8, #(V7M_SCB_CCR_DC | V7M_SCB_CCR_IC| V7M_SCB_CCR_BP)
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 334271a25f70..7d3a2acc6a55 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -393,7 +393,7 @@
                 #address-cells = <3>;
                 #size-cells = <2>;
                 dma-coherent;
-                ranges = <0x01000000 0x00 0x5f800000 0x00 0x5f800000 0x0 0x00800000>,
+                ranges = <0x01000000 0x00 0x00000000 0x00 0x5f800000 0x0 0x00800000>,
                          <0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>,
                          <0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>;
                 #interrupt-cells = <1>;
diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts
index 123a58b29cbd..f0b857d6d73c 100644
--- a/arch/arm64/boot/dts/arm/juno-r1.dts
+++ b/arch/arm64/boot/dts/arm/juno-r1.dts
@@ -76,7 +76,7 @@
                                 compatible = "arm,idle-state";
                                 arm,psci-suspend-param = <0x1010000>;
                                 local-timer-stop;
-                                entry-latency-us = <300>;
+                                entry-latency-us = <400>;
                                 exit-latency-us = <1200>;
                                 min-residency-us = <2500>;
                         };
diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts
index 007be826efce..26aaa6a7670f 100644
--- a/arch/arm64/boot/dts/arm/juno-r2.dts
+++ b/arch/arm64/boot/dts/arm/juno-r2.dts
@@ -76,7 +76,7 @@
                                 compatible = "arm,idle-state";
                                 arm,psci-suspend-param = <0x1010000>;
                                 local-timer-stop;
-                                entry-latency-us = <300>;
+                                entry-latency-us = <400>;
                                 exit-latency-us = <1200>;
                                 min-residency-us = <2500>;
                         };
diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
index a7270eff6939..6e154d948a80 100644
--- a/arch/arm64/boot/dts/arm/juno.dts
+++ b/arch/arm64/boot/dts/arm/juno.dts
@@ -76,7 +76,7 @@
                                 compatible = "arm,idle-state";
                                 arm,psci-suspend-param = <0x1010000>;
                                 local-timer-stop;
-                                entry-latency-us = <300>;
+                                entry-latency-us = <400>;
                                 exit-latency-us = <1200>;
                                 min-residency-us = <2500>;
                         };
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index c4762538ec01..e9bd58793464 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -105,7 +105,7 @@
                                 status = "disabled";
                         };
 
-                        nb_perih_clk: nb-periph-clk@13000{
+                        nb_periph_clk: nb-periph-clk@13000 {
                                 compatible = "marvell,armada-3700-periph-clock-nb";
                                 reg = <0x13000 0x100>;
                                 clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,
@@ -113,7 +113,7 @@
                                 #clock-cells = <1>;
                         };
 
-                        sb_perih_clk: sb-periph-clk@18000{
+                        sb_periph_clk: sb-periph-clk@18000 {
                                 compatible = "marvell,armada-3700-periph-clock-sb";
                                 reg = <0x18000 0x100>;
                                 clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index 842fb333285c..6bf9e241179b 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -130,8 +130,8 @@
                                 reg = <0x700600 0x50>;
                                 #address-cells = <0x1>;
                                 #size-cells = <0x0>;
-                                cell-index = <1>;
-                                clocks = <&cps_syscon0 0 3>;
+                                cell-index = <3>;
+                                clocks = <&cps_syscon0 1 21>;
                                 status = "disabled";
                         };
 
@@ -140,7 +140,7 @@
                                 reg = <0x700680 0x50>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
-                                cell-index = <2>;
+                                cell-index = <4>;
                                 clocks = <&cps_syscon0 1 21>;
                                 status = "disabled";
                         };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index b65c193dc64e..7afbfb0f96a3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -300,8 +300,11 @@
                 ranges = <0x83000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x600000
                           0x81000000 0x0 0xfa600000 0x0 0xfa600000 0x0 0x100000>;
                 resets = <&cru SRST_PCIE_CORE>, <&cru SRST_PCIE_MGMT>,
-                         <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>;
-                reset-names = "core", "mgmt", "mgmt-sticky", "pipe";
+                         <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>,
+                         <&cru SRST_PCIE_PM>, <&cru SRST_P_PCIE>,
+                         <&cru SRST_A_PCIE>;
+                reset-names = "core", "mgmt", "mgmt-sticky", "pipe",
+                              "pm", "pclk", "aclk";
                 status = "disabled";
 
                 pcie0_intc: interrupt-controller {
diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h
index 39feb85a6931..6e1cb8c5af4d 100644
--- a/arch/arm64/include/asm/alternative.h
+++ b/arch/arm64/include/asm/alternative.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_ALTERNATIVE_H
 #define __ASM_ALTERNATIVE_H
 
-#include <asm/cpufeature.h>
+#include <asm/cpucaps.h>
 #include <asm/insn.h>
 
 #ifndef __ASSEMBLY__
diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h
new file mode 100644
index 000000000000..87b446535185
--- /dev/null
+++ b/arch/arm64/include/asm/cpucaps.h
@@ -0,0 +1,40 @@
+/*
+ * arch/arm64/include/asm/cpucaps.h
+ *
+ * Copyright (C) 2016 ARM Ltd.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef __ASM_CPUCAPS_H
+#define __ASM_CPUCAPS_H
+
+#define ARM64_WORKAROUND_CLEAN_CACHE            0
+#define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE    1
+#define ARM64_WORKAROUND_845719                 2
+#define ARM64_HAS_SYSREG_GIC_CPUIF              3
+#define ARM64_HAS_PAN                           4
+#define ARM64_HAS_LSE_ATOMICS                   5
+#define ARM64_WORKAROUND_CAVIUM_23154           6
+#define ARM64_WORKAROUND_834220                 7
+#define ARM64_HAS_NO_HW_PREFETCH                8
+#define ARM64_HAS_UAO                           9
+#define ARM64_ALT_PAN_NOT_UAO                   10
+#define ARM64_HAS_VIRT_HOST_EXTN                11
+#define ARM64_WORKAROUND_CAVIUM_27456           12
+#define ARM64_HAS_32BIT_EL0                     13
+#define ARM64_HYP_OFFSET_LOW                    14
+#define ARM64_MISMATCHED_CACHE_LINE_SIZE        15
+
+#define ARM64_NCAPS                             16
+
+#endif /* __ASM_CPUCAPS_H */
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index a27c3245ba21..0bc0b1de90c4 100644
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -11,6 +11,7 @@
 
 #include <linux/jump_label.h>
 
+#include <asm/cpucaps.h>
 #include <asm/hwcap.h>
 #include <asm/sysreg.h>
 
@@ -24,25 +25,6 @@
 #define MAX_CPU_FEATURES        (8 * sizeof(elf_hwcap))
 #define cpu_feature(x)          ilog2(HWCAP_ ## x)
 
-#define ARM64_WORKAROUND_CLEAN_CACHE            0
-#define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE    1
-#define ARM64_WORKAROUND_845719                 2
-#define ARM64_HAS_SYSREG_GIC_CPUIF              3
-#define ARM64_HAS_PAN                           4
-#define ARM64_HAS_LSE_ATOMICS                   5
-#define ARM64_WORKAROUND_CAVIUM_23154           6
-#define ARM64_WORKAROUND_834220                 7
-#define ARM64_HAS_NO_HW_PREFETCH                8
-#define ARM64_HAS_UAO                           9
-#define ARM64_ALT_PAN_NOT_UAO                   10
-#define ARM64_HAS_VIRT_HOST_EXTN                11
-#define ARM64_WORKAROUND_CAVIUM_27456           12
-#define ARM64_HAS_32BIT_EL0                     13
-#define ARM64_HYP_OFFSET_LOW                    14
-#define ARM64_MISMATCHED_CACHE_LINE_SIZE        15
-
-#define ARM64_NCAPS                             16
-
 #ifndef __ASSEMBLY__
 
 #include <linux/kernel.h>
diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h
index 18f746551bf6..ec3553eb9349 100644
--- a/arch/arm64/include/asm/kvm_asm.h
+++ b/arch/arm64/include/asm/kvm_asm.h
@@ -54,6 +54,7 @@ extern char __kvm_hyp_vector[];
 extern void __kvm_flush_vm_context(void);
 extern void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa);
 extern void __kvm_tlb_flush_vmid(struct kvm *kvm);
+extern void __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu);
 
 extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);
 
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index bd94e6766759..e5050388e062 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -62,6 +62,9 @@ struct kvm_arch {
         /* VTTBR value associated with above pgd and vmid */
         u64    vttbr;
 
+        /* The last vcpu id that ran on each physical CPU */
+        int __percpu *last_vcpu_ran;
+
         /* The maximum number of vCPUs depends on the used GIC model */
         int max_vcpus;
 
diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
index a79b969c26fc..6f72fe8b0e3e 100644
--- a/arch/arm64/include/asm/kvm_mmu.h
+++ b/arch/arm64/include/asm/kvm_mmu.h
@@ -128,7 +128,7 @@ static inline unsigned long __kern_hyp_va(unsigned long v)
         return v;
 }
 
-#define kern_hyp_va(v)  (typeof(v))(__kern_hyp_va((unsigned long)(v)))
+#define kern_hyp_va(v)  ((typeof(v))(__kern_hyp_va((unsigned long)(v))))
 
 /*
  * We currently only support a 40bit IPA.
diff --git a/arch/arm64/include/asm/lse.h b/arch/arm64/include/asm/lse.h
index 23acc00be32d..fc756e22c84c 100644
--- a/arch/arm64/include/asm/lse.h
+++ b/arch/arm64/include/asm/lse.h
@@ -5,7 +5,6 @@
 
 #include <linux/stringify.h>
 #include <asm/alternative.h>
-#include <asm/cpufeature.h>
 
 #ifdef __ASSEMBLER__
 
diff --git a/arch/arm64/include/asm/perf_event.h b/arch/arm64/include/asm/perf_event.h
index 2065f46fa740..38b6a2b49d68 100644
--- a/arch/arm64/include/asm/perf_event.h
+++ b/arch/arm64/include/asm/perf_event.h
@@ -46,7 +46,15 @@
 #define ARMV8_PMU_EVTYPE_MASK   0xc800ffff      /* Mask for writable bits */
 #define ARMV8_PMU_EVTYPE_EVENT  0xffff          /* Mask for EVENT bits */
 
-#define ARMV8_PMU_EVTYPE_EVENT_SW_INCR  0       /* Software increment event */
+/*
+ * PMUv3 event types: required events
+ */
+#define ARMV8_PMUV3_PERFCTR_SW_INCR                             0x00
+#define ARMV8_PMUV3_PERFCTR_L1D_CACHE_REFILL                    0x03
+#define ARMV8_PMUV3_PERFCTR_L1D_CACHE                           0x04
+#define ARMV8_PMUV3_PERFCTR_BR_MIS_PRED                         0x10
+#define ARMV8_PMUV3_PERFCTR_CPU_CYCLES                          0x11
+#define ARMV8_PMUV3_PERFCTR_BR_PRED                             0x12
 
 /*
  * Event filters for PMUv3
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index a9310a69fffd..57ae9d9ed9bb 100644
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -31,17 +31,9 @@
 
 /*
  * ARMv8 PMUv3 Performance Events handling code.
- * Common event types.
+ * Common event types (some are defined in asm/perf_event.h).
  */
 
-/* Required events. */
-#define ARMV8_PMUV3_PERFCTR_SW_INCR                             0x00
-#define ARMV8_PMUV3_PERFCTR_L1D_CACHE_REFILL                    0x03
-#define ARMV8_PMUV3_PERFCTR_L1D_CACHE                           0x04
-#define ARMV8_PMUV3_PERFCTR_BR_MIS_PRED                         0x10
-#define ARMV8_PMUV3_PERFCTR_CPU_CYCLES                          0x11
-#define ARMV8_PMUV3_PERFCTR_BR_PRED                             0x12
-
 /* At least one of the following is required. */
 #define ARMV8_PMUV3_PERFCTR_INST_RETIRED                        0x08
 #define ARMV8_PMUV3_PERFCTR_INST_SPEC                           0x1B
diff --git a/arch/arm64/kvm/hyp/tlb.c b/arch/arm64/kvm/hyp/tlb.c
index 9cc0ea784ae6..88e2f2b938f0 100644
--- a/arch/arm64/kvm/hyp/tlb.c
+++ b/arch/arm64/kvm/hyp/tlb.c
@@ -64,6 +64,21 @@ void __hyp_text __kvm_tlb_flush_vmid(struct kvm *kvm)
         write_sysreg(0, vttbr_el2);
 }
 
+void __hyp_text __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu)
+{
+        struct kvm *kvm = kern_hyp_va(kern_hyp_va(vcpu)->kvm);
+
+        /* Switch to requested VMID */
+        write_sysreg(kvm->arch.vttbr, vttbr_el2);
+        isb();
+
+        asm volatile("tlbi vmalle1" : : );
+        dsb(nsh);
+        isb();
+
+        write_sysreg(0, vttbr_el2);
+}
+
 void __hyp_text __kvm_flush_vm_context(void)
 {
         dsb(ishst);
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index f302fdb3a030..87e7e6608cd8 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -597,8 +597,14 @@ static bool access_pmu_evcntr(struct kvm_vcpu *vcpu,
 
                         idx = ARMV8_PMU_CYCLE_IDX;
                 } else {
-                        BUG();
+                        return false;
                 }
+        } else if (r->CRn == 0 && r->CRm == 9) {
+                /* PMCCNTR */
+                if (pmu_access_event_counter_el0_disabled(vcpu))
+                        return false;
+
+                idx = ARMV8_PMU_CYCLE_IDX;
         } else if (r->CRn == 14 && (r->CRm & 12) == 8) {
                 /* PMEVCNTRn_EL0 */
                 if (pmu_access_event_counter_el0_disabled(vcpu))
@@ -606,7 +612,7 @@ static bool access_pmu_evcntr(struct kvm_vcpu *vcpu,
 
                 idx = ((r->CRm & 3) << 3) | (r->Op2 & 7);
         } else {
-                BUG();
+                return false;
         }
 
         if (!pmu_counter_idx_valid(vcpu, idx))
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 55be7e3ff109..b98acd15ca22 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -95,9 +95,10 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -105,8 +106,10 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NETFILTER_XT_SET=m
@@ -366,6 +369,7 @@ CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VETH=m
 # CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_AMAZON is not set
 CONFIG_A2065=y
 CONFIG_ARIADNE=y
 # CONFIG_NET_VENDOR_ARC is not set
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 365dda66b0e6..f80dc57e6374 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -93,9 +93,10 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -103,8 +104,10 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NETFILTER_XT_SET=m
@@ -347,6 +350,7 @@ CONFIG_MACSEC=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VETH=m
+# CONFIG_NET_VENDOR_AMAZON is not set
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index ce3cbfd16fcd..4e16b1821fbb 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -93,9 +93,10 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -103,8 +104,10 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NETFILTER_XT_SET=m
@@ -356,6 +359,7 @@ CONFIG_MACSEC=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VETH=m
+# CONFIG_NET_VENDOR_AMAZON is not set
 CONFIG_ATARILANCE=y
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 8db496a9797d..2767bbf5ad61 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -91,9 +91,10 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -101,8 +102,10 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NETFILTER_XT_SET=m
@@ -346,6 +349,7 @@ CONFIG_MACSEC=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VETH=m
+# CONFIG_NET_VENDOR_AMAZON is not set
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 8314156f7149..d13ba309265e 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -93,9 +93,10 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -103,8 +104,10 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NETFILTER_XT_SET=m
@@ -347,6 +350,7 @@ CONFIG_MACSEC=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VETH=m
+# CONFIG_NET_VENDOR_AMAZON is not set
 CONFIG_HPLANCE=y
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 6600270b9622..78b5101c1aa6 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -92,9 +92,10 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -102,8 +103,10 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NETFILTER_XT_SET=m
@@ -363,6 +366,7 @@ CONFIG_MACSEC=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VETH=m
+# CONFIG_NET_VENDOR_AMAZON is not set
 CONFIG_MACMACE=y
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 90abfe9eabba..38e5bcbd0d62 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -102,9 +102,10 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -112,8 +113,10 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NETFILTER_XT_SET=m
@@ -397,6 +400,7 @@ CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VETH=m
 # CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_AMAZON is not set
 CONFIG_A2065=y
 CONFIG_ARIADNE=y
 CONFIG_ATARILANCE=y
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 0d502c2f73d5..28687192b68e 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -90,9 +90,10 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -100,8 +101,10 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NETFILTER_XT_SET=m
@@ -345,6 +348,7 @@ CONFIG_MACSEC=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VETH=m
+# CONFIG_NET_VENDOR_AMAZON is not set
 CONFIG_MVME147_NET=y
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 5930e91fc710..5a5f109ab3cd 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -91,9 +91,10 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -101,8 +102,10 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NETFILTER_XT_SET=m
@@ -346,6 +349,7 @@ CONFIG_MACSEC=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VETH=m
+# CONFIG_NET_VENDOR_AMAZON is not set
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 74e3ad82eca9..e557c9de3fbc 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -91,9 +91,10 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -101,8 +102,10 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NETFILTER_XT_SET=m
@@ -353,6 +356,7 @@ CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VETH=m
 # CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_AMAZON is not set
 # CONFIG_NET_VENDOR_AMD is not set
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 4ba8606a4e69..c6a748a36daf 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -88,9 +88,10 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -98,8 +99,10 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NETFILTER_XT_SET=m
@@ -343,6 +346,7 @@ CONFIG_MACSEC=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VETH=m
+# CONFIG_NET_VENDOR_AMAZON is not set
 CONFIG_SUN3LANCE=y
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index c6f49726a6c9..10d60857b9a6 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -88,9 +88,10 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -98,8 +99,10 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NETFILTER_XT_SET=m
@@ -343,6 +346,7 @@ CONFIG_MACSEC=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_VETH=m
+# CONFIG_NET_VENDOR_AMAZON is not set
 CONFIG_SUN3LANCE=y
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/include/asm/delay.h b/arch/m68k/include/asm/delay.h
index d28fa8fe26fe..c598d847d56b 100644
--- a/arch/m68k/include/asm/delay.h
+++ b/arch/m68k/include/asm/delay.h
@@ -114,6 +114,6 @@ static inline void __udelay(unsigned long usecs)
  */
 #define HZSCALE         (268435456 / (1000000 / HZ))
 
-#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000));
+#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000))
 
 #endif /* defined(_M68K_DELAY_H) */
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index 7dd2dd47909a..df78b2ca70eb 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -215,6 +215,12 @@
 #endif
 
 /*
+ * Wired register bits
+ */
+#define MIPSR6_WIRED_LIMIT      (_ULCAST_(0xffff) << 16)
+#define MIPSR6_WIRED_WIRED      (_ULCAST_(0xffff) << 0)
+
+/*
  * Values used for computation of new tlb entries
  */
 #define PL_4K           12
diff --git a/arch/mips/include/asm/tlb.h b/arch/mips/include/asm/tlb.h
index 4a2349302b55..dd179fd8acda 100644
--- a/arch/mips/include/asm/tlb.h
+++ b/arch/mips/include/asm/tlb.h
@@ -1,6 +1,9 @@
 #ifndef __ASM_TLB_H
 #define __ASM_TLB_H
 
+#include <asm/cpu-features.h>
+#include <asm/mipsregs.h>
+
 /*
  * MIPS doesn't need any special per-pte or per-vma handling, except
  * we need to flush cache for area to be unmapped.
@@ -22,6 +25,16 @@
                 ((CKSEG0 + ((idx) << (PAGE_SHIFT + 1))) |               \
                  (cpu_has_tlbinv ? MIPS_ENTRYHI_EHINV : 0))
 
+static inline unsigned int num_wired_entries(void)
+{
+        unsigned int wired = read_c0_wired();
+
+        if (cpu_has_mips_r6)
+                wired &= MIPSR6_WIRED_WIRED;
+
+        return wired;
+}
+
 #include <asm-generic/tlb.h>
 
 #endif /* __ASM_TLB_H */
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 8d0170969e22..a7f81261c781 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -36,7 +36,7 @@ EXPORT_SYMBOL(rtc_lock);
 
 int __weak rtc_mips_set_time(unsigned long sec)
 {
-        return 0;
+        return -ENODEV;
 }
 
 int __weak rtc_mips_set_mmss(unsigned long nowtime)
diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c
index 2a1b3021589c..82bbd0e2e298 100644
--- a/arch/mips/lantiq/falcon/sysctrl.c
+++ b/arch/mips/lantiq/falcon/sysctrl.c
@@ -24,7 +24,7 @@
 
 /* GPE frequency selection */
 #define GPPC_OFFSET             24
-#define GPEFREQ_MASK            0x00000C0
+#define GPEFREQ_MASK            0x0000C00
 #define GPEFREQ_OFFSET          10
 /* Clock status register */
 #define SYSCTL_CLKS             0x0000
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
index d56a855828c2..3bef306cdfdb 100644
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -209,17 +209,18 @@ bad_area_nosemaphore:
                 if (show_unhandled_signals &&
                     unhandled_signal(tsk, SIGSEGV) &&
                     __ratelimit(&ratelimit_state)) {
-                        pr_info("\ndo_page_fault(): sending SIGSEGV to %s for invalid %s %0*lx",
+                        pr_info("do_page_fault(): sending SIGSEGV to %s for invalid %s %0*lx\n",
                                 tsk->comm,
                                 write ? "write access to" : "read access from",
                                 field, address);
                         pr_info("epc = %0*lx in", field,
                                 (unsigned long) regs->cp0_epc);
-                        print_vma_addr(" ", regs->cp0_epc);
+                        print_vma_addr(KERN_CONT " ", regs->cp0_epc);
+                        pr_cont("\n");
                         pr_info("ra  = %0*lx in", field,
                                 (unsigned long) regs->regs[31]);
-                        print_vma_addr(" ", regs->regs[31]);
-                        pr_info("\n");
+                        print_vma_addr(KERN_CONT " ", regs->regs[31]);
+                        pr_cont("\n");
                 }
                 current->thread.trap_nr = (regs->cp0_cause >> 2) & 0x1f;
                 info.si_signo = SIGSEGV;
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 3a6edecc3f38..e86ebcf5c071 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -118,7 +118,7 @@ static void *__kmap_pgprot(struct page *page, unsigned long addr, pgprot_t prot)
                 writex_c0_entrylo1(entrylo);
         }
 #endif
-        tlbidx = read_c0_wired();
+        tlbidx = num_wired_entries();
         write_c0_wired(tlbidx + 1);
         write_c0_index(tlbidx);
         mtc0_tlbw_hazard();
@@ -147,7 +147,7 @@ void kunmap_coherent(void)
 
         local_irq_save(flags);
         old_ctx = read_c0_entryhi();
-        wired = read_c0_wired() - 1;
+        wired = num_wired_entries() - 1;
         write_c0_wired(wired);
         write_c0_index(wired);
         write_c0_entryhi(UNIQUE_ENTRYHI(wired));
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index bba9c1484b41..0596505770db 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -65,7 +65,7 @@ void local_flush_tlb_all(void)
         write_c0_entrylo0(0);
         write_c0_entrylo1(0);
 
-        entry = read_c0_wired();
+        entry = num_wired_entries();
 
         /*
          * Blast 'em all away.
@@ -385,7 +385,7 @@ void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
         old_ctx = read_c0_entryhi();
         htw_stop();
         old_pagemask = read_c0_pagemask();
-        wired = read_c0_wired();
+        wired = num_wired_entries();
         write_c0_wired(wired + 1);
         write_c0_index(wired);
         tlbw_use_hazard();      /* What is the hazard here? */
@@ -449,7 +449,7 @@ __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
         htw_stop();
         old_ctx = read_c0_entryhi();
         old_pagemask = read_c0_pagemask();
-        wired = read_c0_wired();
+        wired = num_wired_entries();
         if (--temp_tlb_entry < wired) {
                 printk(KERN_WARNING
                        "No TLB space left for add_temporary_entry\n");
diff --git a/arch/nios2/kernel/time.c b/arch/nios2/kernel/time.c
index d9563ddb337e..746bf5caaffc 100644
--- a/arch/nios2/kernel/time.c
+++ b/arch/nios2/kernel/time.c
@@ -324,6 +324,7 @@ static int __init nios2_time_init(struct device_node *timer)
                 ret = nios2_clocksource_init(timer);
                 break;
         default:
+                ret = 0;
                 break;
         }
 
diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
index 4ce7a01a252d..5f55da9cbfd5 100644
--- a/arch/openrisc/include/asm/cache.h
+++ b/arch/openrisc/include/asm/cache.h
@@ -23,6 +23,8 @@
  * they shouldn't be hard-coded!
  */
 
+#define __ro_after_init __read_mostly
+
 #define L1_CACHE_BYTES 16
 #define L1_CACHE_SHIFT 4
 
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 71c4a3aa3752..a14b86587013 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -34,7 +34,9 @@ config PARISC
         select HAVE_ARCH_HASH
         select HAVE_ARCH_SECCOMP_FILTER
         select HAVE_ARCH_TRACEHOOK
-        select HAVE_UNSTABLE_SCHED_CLOCK if (SMP || !64BIT)
+        select GENERIC_SCHED_CLOCK
+        select HAVE_UNSTABLE_SCHED_CLOCK if SMP
+        select GENERIC_CLOCKEVENTS
         select ARCH_NO_COHERENT_DMA_MMAP
         select CPU_NO_EFFICIENT_FFS
 
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index c2c43f714684..3a4ed9f91d57 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -65,9 +65,9 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
                 unsigned long flags;                            \
                 spin_lock_irqsave(&pa_tlb_lock, flags);         \
                 old_pte = *ptep;                                \
-                set_pte(ptep, pteval);                          \
                 if (pte_inserted(old_pte))                      \
                         purge_tlb_entries(mm, addr);            \
+                set_pte(ptep, pteval);                          \
                 spin_unlock_irqrestore(&pa_tlb_lock, flags);    \
         } while (0)
 
@@ -478,8 +478,8 @@ static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned
                 spin_unlock_irqrestore(&pa_tlb_lock, flags);
                 return 0;
         }
-        set_pte(ptep, pte_mkold(pte));
         purge_tlb_entries(vma->vm_mm, addr);
+        set_pte(ptep, pte_mkold(pte));
         spin_unlock_irqrestore(&pa_tlb_lock, flags);
         return 1;
 }
@@ -492,9 +492,9 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
 
         spin_lock_irqsave(&pa_tlb_lock, flags);
         old_pte = *ptep;
-        set_pte(ptep, __pte(0));
         if (pte_inserted(old_pte))
                 purge_tlb_entries(mm, addr);
+        set_pte(ptep, __pte(0));
         spin_unlock_irqrestore(&pa_tlb_lock, flags);
 
         return old_pte;
@@ -504,8 +504,8 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
 {
         unsigned long flags;
         spin_lock_irqsave(&pa_tlb_lock, flags);
-        set_pte(ptep, pte_wrprotect(*ptep));
         purge_tlb_entries(mm, addr);
+        set_pte(ptep, pte_wrprotect(*ptep));
         spin_unlock_irqrestore(&pa_tlb_lock, flags);
 }
 
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 629eb464d5ba..977f0a4f5ecf 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -369,6 +369,7 @@ void __init parisc_setup_cache_timing(void)
 {
         unsigned long rangetime, alltime;
         unsigned long size, start;
+        unsigned long threshold;
 
         alltime = mfctl(16);
         flush_data_cache();
@@ -382,26 +383,30 @@ void __init parisc_setup_cache_timing(void)
         printk(KERN_DEBUG "Whole cache flush %lu cycles, flushing %lu bytes %lu cycles\n",
                 alltime, size, rangetime);
 
-        /* Racy, but if we see an intermediate value, it's ok too... */
-        parisc_cache_flush_threshold = size * alltime / rangetime;
-
-        parisc_cache_flush_threshold = L1_CACHE_ALIGN(parisc_cache_flush_threshold);
-        if (!parisc_cache_flush_threshold)
-                parisc_cache_flush_threshold = FLUSH_THRESHOLD;
-
-        if (parisc_cache_flush_threshold > cache_info.dc_size)
-                parisc_cache_flush_threshold = cache_info.dc_size;
-
-        printk(KERN_INFO "Setting cache flush threshold to %lu kB\n",
+        threshold = L1_CACHE_ALIGN(size * alltime / rangetime);
+        if (threshold > cache_info.dc_size)
+                threshold = cache_info.dc_size;
+        if (threshold)
+                parisc_cache_flush_threshold = threshold;
+        printk(KERN_INFO "Cache flush threshold set to %lu KiB\n",
                 parisc_cache_flush_threshold/1024);
 
         /* calculate TLB flush threshold */
 
+        /* On SMP machines, skip the TLB measure of kernel text which
+         * has been mapped as huge pages. */
+        if (num_online_cpus() > 1 && !parisc_requires_coherency()) {
+                threshold = max(cache_info.it_size, cache_info.dt_size);
+                threshold *= PAGE_SIZE;
+                threshold /= num_online_cpus();
+                goto set_tlb_threshold;
+        }
+
         alltime = mfctl(16);
         flush_tlb_all();
         alltime = mfctl(16) - alltime;
 
-        size = PAGE_SIZE;
+        size = 0;
         start = (unsigned long) _text;
         rangetime = mfctl(16);
         while (start < (unsigned long) _end) {
@@ -414,13 +419,12 @@ void __init parisc_setup_cache_timing(void)
         printk(KERN_DEBUG "Whole TLB flush %lu cycles, flushing %lu bytes %lu cycles\n",
                 alltime, size, rangetime);
 
-        parisc_tlb_flush_threshold = size * alltime / rangetime;
-        parisc_tlb_flush_threshold *= num_online_cpus();
-        parisc_tlb_flush_threshold = PAGE_ALIGN(parisc_tlb_flush_threshold);
-        if (!parisc_tlb_flush_threshold)
-                parisc_tlb_flush_threshold = FLUSH_TLB_THRESHOLD;
+        threshold = PAGE_ALIGN(num_online_cpus() * size * alltime / rangetime);
 
-        printk(KERN_INFO "Setting TLB flush threshold to %lu kB\n",
+set_tlb_threshold:
+        if (threshold)
+                parisc_tlb_flush_threshold = threshold;
+        printk(KERN_INFO "TLB flush threshold set to %lu KiB\n",
                 parisc_tlb_flush_threshold/1024);
 }
 
diff --git a/arch/parisc/kernel/inventory.c b/arch/parisc/kernel/inventory.c
index 545f9d2fe711..c05d1876d27c 100644
--- a/arch/parisc/kernel/inventory.c
+++ b/arch/parisc/kernel/inventory.c
@@ -58,7 +58,7 @@ void __init setup_pdc(void)
         status = pdc_system_map_find_mods(&module_result, &module_path, 0);
         if (status == PDC_OK) {
                 pdc_type = PDC_TYPE_SYSTEM_MAP;
-                printk("System Map.\n");
+                pr_cont("System Map.\n");
                 return;
         }
 
@@ -77,7 +77,7 @@ void __init setup_pdc(void)
         status = pdc_pat_cell_get_number(&cell_info);
         if (status == PDC_OK) {
                 pdc_type = PDC_TYPE_PAT;
-                printk("64 bit PAT.\n");
+                pr_cont("64 bit PAT.\n");
                 return;
         }
 #endif
@@ -97,12 +97,12 @@ void __init setup_pdc(void)
         case 0xC:               /* 715/64, at least */
 
                 pdc_type = PDC_TYPE_SNAKE;
-                printk("Snake.\n");
+                pr_cont("Snake.\n");
                 return;
 
         default:                /* Everything else */
 
-                printk("Unsupported.\n");
+                pr_cont("Unsupported.\n");
                 panic("If this is a 64-bit machine, please try a 64-bit kernel.\n");
         }
 }
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
index 985e06da37f5..adf7187f8951 100644
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
@@ -96,7 +96,7 @@ fitmanyloop:					/* Loop if LOOP >= 2 */
 
 fitmanymiddle:                                  /* Loop if LOOP >= 2 */
         addib,COND(>)           -1, %r31, fitmanymiddle /* Adjusted inner loop decr */
-        pitlbe          0(%sr1, %r28)
+        pitlbe          %r0(%sr1, %r28)
         pitlbe,m        %arg1(%sr1, %r28)       /* Last pitlbe and addr adjust */
         addib,COND(>)           -1, %r29, fitmanymiddle /* Middle loop decr */
         copy            %arg3, %r31             /* Re-init inner loop count */
@@ -139,7 +139,7 @@ fdtmanyloop:					/* Loop if LOOP >= 2 */
 
 fdtmanymiddle:                                  /* Loop if LOOP >= 2 */
         addib,COND(>)           -1, %r31, fdtmanymiddle /* Adjusted inner loop decr */
-        pdtlbe          0(%sr1, %r28)
+        pdtlbe          %r0(%sr1, %r28)
         pdtlbe,m        %arg1(%sr1, %r28)       /* Last pdtlbe and addr adjust */
         addib,COND(>)           -1, %r29, fdtmanymiddle /* Middle loop decr */
         copy            %arg3, %r31             /* Re-init inner loop count */
@@ -626,12 +626,12 @@ ENTRY_CFI(copy_user_page_asm)
         /* Purge any old translations */
 
 #ifdef CONFIG_PA20
-        pdtlb,l         0(%r28)
-        pdtlb,l         0(%r29)
+        pdtlb,l         %r0(%r28)
+        pdtlb,l         %r0(%r29)
 #else
         tlb_lock        %r20,%r21,%r22
-        pdtlb           0(%r28)
-        pdtlb           0(%r29)
+        pdtlb           %r0(%r28)
+        pdtlb           %r0(%r29)
         tlb_unlock      %r20,%r21,%r22
 #endif
 
@@ -774,10 +774,10 @@ ENTRY_CFI(clear_user_page_asm)
         /* Purge any old translation */
 
 #ifdef CONFIG_PA20
-        pdtlb,l         0(%r28)
+        pdtlb,l         %r0(%r28)
 #else
         tlb_lock        %r20,%r21,%r22
-        pdtlb           0(%r28)
+        pdtlb           %r0(%r28)
         tlb_unlock      %r20,%r21,%r22
 #endif
 
@@ -858,10 +858,10 @@ ENTRY_CFI(flush_dcache_page_asm)
         /* Purge any old translation */
 
 #ifdef CONFIG_PA20
-        pdtlb,l         0(%r28)
+        pdtlb,l         %r0(%r28)
 #else
         tlb_lock        %r20,%r21,%r22
-        pdtlb           0(%r28)
+        pdtlb           %r0(%r28)
         tlb_unlock      %r20,%r21,%r22
 #endif
 
@@ -892,19 +892,10 @@ ENTRY_CFI(flush_dcache_page_asm)
         fdc,m           r31(%r28)
         fdc,m           r31(%r28)
         fdc,m           r31(%r28)
-        cmpb,COND(<<)           %r28, %r25,1b
+        cmpb,COND(<<)   %r28, %r25,1b
         fdc,m           r31(%r28)
 
         sync
-
-#ifdef CONFIG_PA20
-        pdtlb,l         0(%r25)
-#else
-        tlb_lock        %r20,%r21,%r22
-        pdtlb           0(%r25)
-        tlb_unlock      %r20,%r21,%r22
-#endif
-
         bv              %r0(%r2)
         nop
         .exit
@@ -931,13 +922,18 @@ ENTRY_CFI(flush_icache_page_asm)
         depwi           0, 31,PAGE_SHIFT, %r28  /* Clear any offset bits */
 #endif
 
-        /* Purge any old translation */
+        /* Purge any old translation.  Note that the FIC instruction
+         * may use either the instruction or data TLB.  Given that we
+         * have a flat address space, it's not clear which TLB will be
+         * used.  So, we purge both entries.  */
 
 #ifdef CONFIG_PA20
+        pdtlb,l         %r0(%r28)
         pitlb,l         %r0(%sr4,%r28)
 #else
         tlb_lock        %r20,%r21,%r22
-        pitlb           (%sr4,%r28)
+        pdtlb           %r0(%r28)
+        pitlb           %r0(%sr4,%r28)
         tlb_unlock      %r20,%r21,%r22
 #endif
 
@@ -974,15 +970,6 @@ ENTRY_CFI(flush_icache_page_asm)
         fic,m           %r31(%sr4,%r28)
 
         sync
-
-#ifdef CONFIG_PA20
-        pitlb,l         %r0(%sr4,%r25)
-#else
-        tlb_lock        %r20,%r21,%r22
-        pitlb           (%sr4,%r25)
-        tlb_unlock      %r20,%r21,%r22
-#endif
-
         bv              %r0(%r2)
         nop
         .exit
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
index 02d9ed0f3949..494ff6e8c88a 100644
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
@@ -95,8 +95,8 @@ static inline int map_pte_uncached(pte_t * pte,
 
                 if (!pte_none(*pte))
                         printk(KERN_ERR "map_pte_uncached: page already exists\n");
-                set_pte(pte, __mk_pte(*paddr_ptr, PAGE_KERNEL_UNC));
                 purge_tlb_start(flags);
+                set_pte(pte, __mk_pte(*paddr_ptr, PAGE_KERNEL_UNC));
                 pdtlb_kernel(orig_vaddr);
                 purge_tlb_end(flags);
                 vaddr += PAGE_SIZE;
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 81d6f6391944..2e66a887788e 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -334,6 +334,10 @@ static int __init parisc_init(void)
         /* tell PDC we're Linux. Nevermind failure. */
         pdc_stable_write(0x40, &osid, sizeof(osid));
         
+        /* start with known state */
+        flush_cache_all_local();
+        flush_tlb_all_local(NULL);
+
         processor_init();
 #ifdef CONFIG_SMP
         pr_info("CPU(s): %d out of %d %s at %d.%06d MHz online\n",
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 9b63b876a13a..325f30d82b64 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/rtc.h>
 #include <linux/sched.h>
+#include <linux/sched_clock.h>
 #include <linux/kernel.h>
 #include <linux/param.h>
 #include <linux/string.h>
@@ -39,18 +40,6 @@
 
 static unsigned long clocktick __read_mostly;   /* timer cycles per tick */
 
-#ifndef CONFIG_64BIT
-/*
- * The processor-internal cycle counter (Control Register 16) is used as time
- * source for the sched_clock() function.  This register is 64bit wide on a
- * 64-bit kernel and 32bit on a 32-bit kernel. Since sched_clock() always
- * requires a 64bit counter we emulate on the 32-bit kernel the higher 32bits
- * with a per-cpu variable which we increase every time the counter
- * wraps-around (which happens every ~4 secounds).
- */
-static DEFINE_PER_CPU(unsigned long, cr16_high_32_bits);
-#endif
-
 /*
  * We keep time on PA-RISC Linux by using the Interval Timer which is
  * a pair of registers; one is read-only and one is write-only; both
@@ -121,12 +110,6 @@ irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id)
          */
         mtctl(next_tick, 16);
 
-#if !defined(CONFIG_64BIT)
-        /* check for overflow on a 32bit kernel (every ~4 seconds). */
-        if (unlikely(next_tick < now))
-                this_cpu_inc(cr16_high_32_bits);
-#endif
-
         /* Skip one clocktick on purpose if we missed next_tick.
          * The new CR16 must be "later" than current CR16 otherwise
          * itimer would not fire until CR16 wrapped - e.g 4 seconds
@@ -208,7 +191,7 @@ EXPORT_SYMBOL(profile_pc);
 
 /* clock source code */
 
-static cycle_t read_cr16(struct clocksource *cs)
+static cycle_t notrace read_cr16(struct clocksource *cs)
 {
         return get_cycles();
 }
@@ -287,26 +270,9 @@ void read_persistent_clock(struct timespec *ts)
 }
 
 
-/*
- * sched_clock() framework
- */
-
-static u32 cyc2ns_mul __read_mostly;
-static u32 cyc2ns_shift __read_mostly;
-
-u64 sched_clock(void)
+static u64 notrace read_cr16_sched_clock(void)
 {
-        u64 now;
-
-        /* Get current cycle counter (Control Register 16). */
-#ifdef CONFIG_64BIT
-        now = mfctl(16);
-#else
-        now = mfctl(16) + (((u64) this_cpu_read(cr16_high_32_bits)) << 32);
-#endif
-
-        /* return the value in ns (cycles_2_ns) */
-        return mul_u64_u32_shr(now, cyc2ns_mul, cyc2ns_shift);
+        return get_cycles();
 }
 
 
@@ -316,17 +282,16 @@ u64 sched_clock(void)
 
 void __init time_init(void)
 {
-        unsigned long current_cr16_khz;
+        unsigned long cr16_hz;
 
-        current_cr16_khz = PAGE0->mem_10msec/10;  /* kHz */
         clocktick = (100 * PAGE0->mem_10msec) / HZ;
-
-        /* calculate mult/shift values for cr16 */
-        clocks_calc_mult_shift(&cyc2ns_mul, &cyc2ns_shift, current_cr16_khz,
-                                NSEC_PER_MSEC, 0);
-
         start_cpu_itimer();     /* get CPU 0 started */
 
+        cr16_hz = 100 * PAGE0->mem_10msec;  /* Hz */
+
         /* register at clocksource framework */
-        clocksource_register_khz(&clocksource_cr16, current_cr16_khz);
+        clocksource_register_hz(&clocksource_cr16, cr16_hz);
+
+        /* register as sched_clock source */
+        sched_clock_register(read_cr16_sched_clock, BITS_PER_LONG, cr16_hz);
 }
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index eae2dc8bc218..9d47f2efa830 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -100,7 +100,8 @@ src-wlib-y := string.S crt0.S crtsavres.S stdio.c decompress.c main.c \
                 ns16550.c serial.c simple_alloc.c div64.S util.S \
                 elf_util.c $(zlib-y) devtree.c stdlib.c \
                 oflib.c ofconsole.c cuboot.c mpsc.c cpm-serial.c \
-                uartlite.c mpc52xx-psc.c opal.c opal-calls.S
+                uartlite.c mpc52xx-psc.c opal.c
+src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) +=  opal-calls.S
 src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c
 src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c
 src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c fsl-soc.c
diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index 57d42d129033..78aaf4ffd7ab 100644
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
@@ -232,8 +232,12 @@ void start(void)
                 console_ops.close();
 
         kentry = (kernel_entry_t) vmlinux.addr;
-        if (ft_addr)
-                kentry(ft_addr, 0, NULL);
+        if (ft_addr) {
+                if(platform_ops.kentry)
+                        platform_ops.kentry(ft_addr, vmlinux.addr);
+                else
+                        kentry(ft_addr, 0, NULL);
+        }
         else
                 kentry((unsigned long)initrd.addr, initrd.size,
                        loader_info.promptr);
diff --git a/arch/powerpc/boot/opal-calls.S b/arch/powerpc/boot/opal-calls.S
index ff2f1b97bc53..2a99fc9a3ccf 100644
--- a/arch/powerpc/boot/opal-calls.S
+++ b/arch/powerpc/boot/opal-calls.S
@@ -12,6 +12,19 @@
 
         .text
 
+        .globl opal_kentry
+opal_kentry:
+        /* r3 is the fdt ptr */
+        mtctr r4
+        li      r4, 0
+        li      r5, 0
+        li      r6, 0
+        li      r7, 0
+        ld      r11,opal@got(r2)
+        ld      r8,0(r11)
+        ld      r9,8(r11)
+        bctr
+
 #define OPAL_CALL(name, token)                          \
         .globl name;                                    \
 name:                                                   \
diff --git a/arch/powerpc/boot/opal.c b/arch/powerpc/boot/opal.c
index 1f37e1c1d6d8..0272570d02de 100644
--- a/arch/powerpc/boot/opal.c
+++ b/arch/powerpc/boot/opal.c
@@ -13,7 +13,7 @@
 #include <libfdt.h>
 #include "../include/asm/opal-api.h"
 
-#ifdef __powerpc64__
+#ifdef CONFIG_PPC64_BOOT_WRAPPER
 
 /* Global OPAL struct used by opal-call.S */
 struct opal {
@@ -23,14 +23,25 @@ struct opal {
 
 static u32 opal_con_id;
 
+/* see opal-wrappers.S */
 int64_t opal_console_write(int64_t term_number, u64 *length, const u8 *buffer);
 int64_t opal_console_read(int64_t term_number, uint64_t *length, u8 *buffer);
 int64_t opal_console_write_buffer_space(uint64_t term_number, uint64_t *length);
 int64_t opal_console_flush(uint64_t term_number);
 int64_t opal_poll_events(uint64_t *outstanding_event_mask);
 
+void opal_kentry(unsigned long fdt_addr, void *vmlinux_addr);
+
 static int opal_con_open(void)
 {
+        /*
+         * When OPAL loads the boot kernel it stashes the OPAL base and entry
+         * address in r8 and r9 so the kernel can use the OPAL console
+         * before unflattening the devicetree. While executing the wrapper will
+         * probably trash r8 and r9 so this kentry hook restores them before
+         * entering the decompressed kernel.
+         */
+        platform_ops.kentry = opal_kentry;
         return 0;
 }
 
diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index 309d1b127e96..fad1862f4b2d 100644
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -30,6 +30,7 @@ struct platform_ops {
         void *  (*realloc)(void *ptr, unsigned long size);
         void    (*exit)(void);
         void *  (*vmlinux_alloc)(unsigned long size);
+        void    (*kentry)(unsigned long fdt_addr, void *vmlinux_addr);
 };
 extern struct platform_ops platform_ops;
 
diff --git a/arch/powerpc/include/asm/asm-prototypes.h b/arch/powerpc/include/asm/asm-prototypes.h
index d1492736d852..e0baba1535e6 100644
--- a/arch/powerpc/include/asm/asm-prototypes.h
+++ b/arch/powerpc/include/asm/asm-prototypes.h
@@ -14,6 +14,10 @@
 
 #include <linux/threads.h>
 #include <linux/kprobes.h>
+#include <asm/cacheflush.h>
+#include <asm/checksum.h>
+#include <asm/uaccess.h>
+#include <asm/epapr_hcalls.h>
 
 #include <uapi/asm/ucontext.h>
 
@@ -109,4 +113,12 @@ void early_setup_secondary(void);
 /* time */
 void accumulate_stolen_time(void);
 
+/* misc runtime */
+extern u64 __bswapdi2(u64);
+extern s64 __lshrdi3(s64, int);
+extern s64 __ashldi3(s64, int);
+extern s64 __ashrdi3(s64, int);
+extern int __cmpdi2(s64, s64);
+extern int __ucmpdi2(u64, u64);
+
 #endif /* _ASM_POWERPC_ASM_PROTOTYPES_H */
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 84d49b197c32..9a3eee661297 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -91,7 +91,7 @@
  */
 #define LOAD_HANDLER(reg, label)                                        \
         ld      reg,PACAKBASE(r13);     /* get high part of &label */   \
-        ori     reg,reg,(FIXED_SYMBOL_ABS_ADDR(label))@l;
+        ori     reg,reg,FIXED_SYMBOL_ABS_ADDR(label);
 
 #define __LOAD_HANDLER(reg, label)                                      \
         ld      reg,PACAKBASE(r13);                                     \
@@ -158,14 +158,17 @@ BEGIN_FTR_SECTION_NESTED(943)						\
         std     ra,offset(r13);                                         \
 END_FTR_SECTION_NESTED(ftr,ftr,943)
 
-#define EXCEPTION_PROLOG_0(area)                                        \
-        GET_PACA(r13);                                                  \
+#define EXCEPTION_PROLOG_0_PACA(area)                                   \
         std     r9,area+EX_R9(r13);     /* save r9 */                   \
         OPT_GET_SPR(r9, SPRN_PPR, CPU_FTR_HAS_PPR);                     \
         HMT_MEDIUM;                                                     \
         std     r10,area+EX_R10(r13);   /* save r10 - r12 */            \
         OPT_GET_SPR(r10, SPRN_CFAR, CPU_FTR_CFAR)
 
+#define EXCEPTION_PROLOG_0(area)                                        \
+        GET_PACA(r13);                                                  \
+        EXCEPTION_PROLOG_0_PACA(area)
+
 #define __EXCEPTION_PROLOG_1(area, extra, vec)                          \
         OPT_SAVE_REG_TO_PACA(area+EX_PPR, r9, CPU_FTR_HAS_PPR);         \
         OPT_SAVE_REG_TO_PACA(area+EX_CFAR, r10, CPU_FTR_CFAR);          \
@@ -196,6 +199,12 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
         EXCEPTION_PROLOG_1(area, extra, vec);                           \
         EXCEPTION_PROLOG_PSERIES_1(label, h);
 
+/* Have the PACA in r13 already */
+#define EXCEPTION_PROLOG_PSERIES_PACA(area, label, h, extra, vec)       \
+        EXCEPTION_PROLOG_0_PACA(area);                                  \
+        EXCEPTION_PROLOG_1(area, extra, vec);                           \
+        EXCEPTION_PROLOG_PSERIES_1(label, h);
+
 #define __KVMTEST(h, n)                                                 \
         lbz     r10,HSTATE_IN_GUEST(r13);                               \
         cmpwi   r10,0;                                                  \
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index e88368354e49..e311c25751a4 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -29,6 +29,12 @@
  */
 
 /*
+ * Kernel read only support.
+ * We added the ppp value 0b110 in ISA 2.04.
+ */
+#define MMU_FTR_KERNEL_RO               ASM_CONST(0x00004000)
+
+/*
  * We need to clear top 16bits of va (from the remaining 64 bits )in
  * tlbie* instructions
  */
@@ -103,10 +109,10 @@
 #define MMU_FTRS_POWER4         MMU_FTRS_DEFAULT_HPTE_ARCH_V2
 #define MMU_FTRS_PPC970         MMU_FTRS_POWER4 | MMU_FTR_TLBIE_CROP_VA
 #define MMU_FTRS_POWER5         MMU_FTRS_POWER4 | MMU_FTR_LOCKLESS_TLBIE
-#define MMU_FTRS_POWER6         MMU_FTRS_POWER4 | MMU_FTR_LOCKLESS_TLBIE
-#define MMU_FTRS_POWER7         MMU_FTRS_POWER4 | MMU_FTR_LOCKLESS_TLBIE
-#define MMU_FTRS_POWER8         MMU_FTRS_POWER4 | MMU_FTR_LOCKLESS_TLBIE
-#define MMU_FTRS_POWER9         MMU_FTRS_POWER4 | MMU_FTR_LOCKLESS_TLBIE
+#define MMU_FTRS_POWER6         MMU_FTRS_POWER4 | MMU_FTR_LOCKLESS_TLBIE | MMU_FTR_KERNEL_RO
+#define MMU_FTRS_POWER7         MMU_FTRS_POWER4 | MMU_FTR_LOCKLESS_TLBIE | MMU_FTR_KERNEL_RO
+#define MMU_FTRS_POWER8         MMU_FTRS_POWER4 | MMU_FTR_LOCKLESS_TLBIE | MMU_FTR_KERNEL_RO
+#define MMU_FTRS_POWER9         MMU_FTRS_POWER4 | MMU_FTR_LOCKLESS_TLBIE | MMU_FTR_KERNEL_RO
 #define MMU_FTRS_CELL           MMU_FTRS_DEFAULT_HPTE_ARCH_V2 | \
                                 MMU_FTR_CI_LARGE_PAGE
 #define MMU_FTRS_PA6T           MMU_FTRS_DEFAULT_HPTE_ARCH_V2 | \
diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
index 0132831b3081..c56ea8c84abb 100644
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -460,5 +460,6 @@
 
 #define PPC_SLBIA(IH)   stringify_in_c(.long PPC_INST_SLBIA | \
                                        ((IH & 0x7) << 21))
+#define PPC_INVALIDATE_ERAT     PPC_SLBIA(7)
 
 #endif /* _ASM_POWERPC_PPC_OPCODE_H */
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 9cd4e8cbc78c..9e1499f98def 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -355,6 +355,7 @@
 #define     LPCR_PECE0          ASM_CONST(0x0000000000004000)   /* ext. exceptions can cause exit */
 #define     LPCR_PECE1          ASM_CONST(0x0000000000002000)   /* decrementer can cause exit */
 #define     LPCR_PECE2          ASM_CONST(0x0000000000001000)   /* machine check etc can cause exit */
+#define     LPCR_PECE_HVEE      ASM_CONST(0x0000400000000000)   /* P9 Wakeup on HV interrupts */
 #define   LPCR_MER              ASM_CONST(0x0000000000000800)   /* Mediated External Exception */
 #define   LPCR_MER_SH           11
 #define   LPCR_TC               ASM_CONST(0x0000000000000200)   /* Translation control */
diff --git a/arch/powerpc/kernel/cpu_setup_power.S b/arch/powerpc/kernel/cpu_setup_power.S
index 52ff3f025437..37c027ca83b2 100644
--- a/arch/powerpc/kernel/cpu_setup_power.S
+++ b/arch/powerpc/kernel/cpu_setup_power.S
@@ -98,8 +98,8 @@ _GLOBAL(__setup_cpu_power9)
         li      r0,0
         mtspr   SPRN_LPID,r0
         mfspr   r3,SPRN_LPCR
-        ori     r3, r3, LPCR_PECEDH
-        ori     r3, r3, LPCR_HVICE
+        LOAD_REG_IMMEDIATE(r4, LPCR_PECEDH | LPCR_PECE_HVEE | LPCR_HVICE)
+        or      r3, r3, r4
         bl      __init_LPCR
         bl      __init_HFSCR
         bl      __init_tlb_power9
@@ -118,8 +118,8 @@ _GLOBAL(__restore_cpu_power9)
         li      r0,0
         mtspr   SPRN_LPID,r0
         mfspr   r3,SPRN_LPCR
-        ori     r3, r3, LPCR_PECEDH
-        ori     r3, r3, LPCR_HVICE
+        LOAD_REG_IMMEDIATE(r4, LPCR_PECEDH | LPCR_PECE_HVEE | LPCR_HVICE)
+        or      r3, r3, r4
         bl      __init_LPCR
         bl      __init_HFSCR
         bl      __init_tlb_power9
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index a62be72da274..5c31369435f2 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -671,8 +671,10 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
 
         /* Clear frozen state */
         rc = eeh_clear_pe_frozen_state(pe, false);
-        if (rc)
+        if (rc) {
+                pci_unlock_rescan_remove();
                 return rc;
+        }
 
         /* Give the system 5 seconds to finish running the user-space
          * hotplug shutdown scripts, e.g. ifdown for ethernet.  Yes,
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 08ba447a4b3d..1ba82ea90230 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -116,7 +116,9 @@ EXC_VIRT_NONE(0x4000, 0x4100)
 
 EXC_REAL_BEGIN(system_reset, 0x100, 0x200)
         SET_SCRATCH0(r13)
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common, EXC_STD,
+        GET_PACA(r13)
+        clrrdi  r13,r13,1 /* Last bit of HSPRG0 is set if waking from winkle */
+        EXCEPTION_PROLOG_PSERIES_PACA(PACA_EXGEN, system_reset_common, EXC_STD,
                                  IDLETEST, 0x100)
 
 EXC_REAL_END(system_reset, 0x100, 0x200)
@@ -124,6 +126,9 @@ EXC_VIRT_NONE(0x4100, 0x4200)
 
 #ifdef CONFIG_PPC_P7_NAP
 EXC_COMMON_BEGIN(system_reset_idle_common)
+BEGIN_FTR_SECTION
+        GET_PACA(r13) /* Restore HSPRG0 to get the winkle bit in r13 */
+END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300)
         bl      pnv_restore_hyp_resource
 
         li      r0,PNV_THREAD_RUNNING
@@ -169,7 +174,7 @@ EXC_REAL_BEGIN(machine_check, 0x200, 0x300)
         SET_SCRATCH0(r13)               /* save r13 */
         /*
          * Running native on arch 2.06 or later, we may wakeup from winkle
-         * inside machine check. If yes, then last bit of HSPGR0 would be set
+         * inside machine check. If yes, then last bit of HSPRG0 would be set
          * to 1. Hence clear it unconditionally.
          */
         GET_PACA(r13)
@@ -388,7 +393,7 @@ EXC_COMMON_BEGIN(machine_check_handle_early)
         /*
          * Go back to winkle. Please note that this thread was woken up in
          * machine check from winkle and have not restored the per-subcore
-         * state. Hence before going back to winkle, set last bit of HSPGR0
+         * state. Hence before going back to winkle, set last bit of HSPRG0
          * to 1. This will make sure that if this thread gets woken up
          * again at reset vector 0x100 then it will get chance to restore
          * the subcore state.
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index ce6dc61b15b2..49a680d5ae37 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1215,7 +1215,7 @@ static void show_instructions(struct pt_regs *regs)
                 int instr;
 
                 if (!(i % 8))
-                        printk("\n");
+                        pr_cont("\n");
 
 #if !defined(CONFIG_BOOKE)
                 /* If executing with the IMMU off, adjust pc rather
@@ -1227,18 +1227,18 @@ static void show_instructions(struct pt_regs *regs)
 
                 if (!__kernel_text_address(pc) ||
                      probe_kernel_address((unsigned int __user *)pc, instr)) {
-                        printk(KERN_CONT "XXXXXXXX ");
+                        pr_cont("XXXXXXXX ");
                 } else {
                         if (regs->nip == pc)
-                                printk(KERN_CONT "<%08x> ", instr);
+                                pr_cont("<%08x> ", instr);
                         else
-                                printk(KERN_CONT "%08x ", instr);
+                                pr_cont("%08x ", instr);
                 }
 
                 pc += sizeof(int);
         }
 
-        printk("\n");
+        pr_cont("\n");
 }
 
 struct regbit {
@@ -1282,7 +1282,7 @@ static void print_bits(unsigned long val, struct regbit *bits, const char *sep)
 
         for (; bits->bit; ++bits)
                 if (val & bits->bit) {
-                        printk("%s%s", s, bits->name);
+                        pr_cont("%s%s", s, bits->name);
                         s = sep;
                 }
 }
@@ -1305,9 +1305,9 @@ static void print_tm_bits(unsigned long val)
  *   T: Transactional   (bit 34)
  */
         if (val & (MSR_TM | MSR_TS_S | MSR_TS_T)) {
-                printk(",TM[");
+                pr_cont(",TM[");
                 print_bits(val, msr_tm_bits, "");
-                printk("]");
+                pr_cont("]");
         }
 }
 #else
@@ -1316,10 +1316,10 @@ static void print_tm_bits(unsigned long val) {}
 
 static void print_msr_bits(unsigned long val)
 {
-        printk("<");
+        pr_cont("<");
         print_bits(val, msr_bits, ",");
         print_tm_bits(val);
-        printk(">");
+        pr_cont(">");
 }
 
 #ifdef CONFIG_PPC64
@@ -1347,29 +1347,29 @@ void show_regs(struct pt_regs * regs)
         printk("  CR: %08lx  XER: %08lx\n", regs->ccr, regs->xer);
         trap = TRAP(regs);
         if ((regs->trap != 0xc00) && cpu_has_feature(CPU_FTR_CFAR))
-                printk("CFAR: "REG" ", regs->orig_gpr3);
+                pr_cont("CFAR: "REG" ", regs->orig_gpr3);
         if (trap == 0x200 || trap == 0x300 || trap == 0x600)
 #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
-                printk("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);
+                pr_cont("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);
 #else
-                printk("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
+                pr_cont("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
 #endif
 #ifdef CONFIG_PPC64
-        printk("SOFTE: %ld ", regs->softe);
+        pr_cont("SOFTE: %ld ", regs->softe);
 #endif
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
         if (MSR_TM_ACTIVE(regs->msr))
-                printk("\nPACATMSCRATCH: %016llx ", get_paca()->tm_scratch);
+                pr_cont("\nPACATMSCRATCH: %016llx ", get_paca()->tm_scratch);
 #endif
 
         for (i = 0;  i < 32;  i++) {
                 if ((i % REGS_PER_LINE) == 0)
-                        printk("\nGPR%02d: ", i);
-                printk(REG " ", regs->gpr[i]);
+                        pr_cont("\nGPR%02d: ", i);
+                pr_cont(REG " ", regs->gpr[i]);
                 if (i == LAST_VOLATILE && !FULL_REGS(regs))
                         break;
         }
-        printk("\n");
+        pr_cont("\n");
 #ifdef CONFIG_KALLSYMS
         /*
          * Lookup NIP late so we have the best change of getting the
@@ -1900,14 +1900,14 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
                         printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
                         if ((ip == rth) && curr_frame >= 0) {
-                                printk(" (%pS)",
+                                pr_cont(" (%pS)",
                                        (void *)current->ret_stack[curr_frame].ret);
                                 curr_frame--;
                         }
 #endif
                         if (firstframe)
-                                printk(" (unreliable)");
-                        printk("\n");
+                                pr_cont(" (unreliable)");
+                        pr_cont("\n");
                 }
                 firstframe = 0;
 
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 7ac8e6eaab5b..8d586cff8a41 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -226,17 +226,25 @@ static void __init configure_exceptions(void)
                 if (firmware_has_feature(FW_FEATURE_OPAL))
                         opal_configure_cores();
 
-                /* Enable AIL if supported, and we are in hypervisor mode */
-                if (early_cpu_has_feature(CPU_FTR_HVMODE) &&
-                    early_cpu_has_feature(CPU_FTR_ARCH_207S)) {
-                        unsigned long lpcr = mfspr(SPRN_LPCR);
-                        mtspr(SPRN_LPCR, lpcr | LPCR_AIL_3);
-                }
+                /* AIL on native is done in cpu_ready_for_interrupts() */
         }
 }
 
 static void cpu_ready_for_interrupts(void)
 {
+        /*
+         * Enable AIL if supported, and we are in hypervisor mode. This
+         * is called once for every processor.
+         *
+         * If we are not in hypervisor mode the job is done once for
+         * the whole partition in configure_exceptions().
+         */
+        if (early_cpu_has_feature(CPU_FTR_HVMODE) &&
+            early_cpu_has_feature(CPU_FTR_ARCH_207S)) {
+                unsigned long lpcr = mfspr(SPRN_LPCR);
+                mtspr(SPRN_LPCR, lpcr | LPCR_AIL_3);
+        }
+
         /* Set IR and DR in PACA MSR */
         get_paca()->kernel_msr = MSR_KERNEL;
 }
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 8295f51c1a5f..7394b770ae1f 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -94,8 +94,17 @@ SECTIONS
          * detected, and will result in a crash at boot due to offsets being
          * wrong.
          */
+#ifdef CONFIG_PPC64
+        /*
+         * BLOCK(0) overrides the default output section alignment because
+         * this needs to start right after .head.text in order for fixed
+         * section placement to work.
+         */
+        .text BLOCK(0) : AT(ADDR(.text) - LOAD_OFFSET) {
+#else
         .text : AT(ADDR(.text) - LOAD_OFFSET) {
                 ALIGN_FUNCTION();
+#endif
                 /* careful! __ftr_alt_* sections need to be close to .text */
                 *(.text .fixup __ftr_alt_* .ref.text)
                 SCHED_TEXT
diff --git a/arch/powerpc/mm/hash64_4k.c b/arch/powerpc/mm/hash64_4k.c
index 42c702b3be1f..6fa450c12d6d 100644
--- a/arch/powerpc/mm/hash64_4k.c
+++ b/arch/powerpc/mm/hash64_4k.c
@@ -55,7 +55,7 @@ int __hash_page_4K(unsigned long ea, unsigned long access, unsigned long vsid,
          */
         rflags = htab_convert_pte_flags(new_pte);
 
-        if (!cpu_has_feature(CPU_FTR_NOEXECUTE) &&
+        if (cpu_has_feature(CPU_FTR_NOEXECUTE) &&
             !cpu_has_feature(CPU_FTR_COHERENT_ICACHE))
                 rflags = hash_page_do_lazy_icache(rflags, __pte(old_pte), trap);
 
diff --git a/arch/powerpc/mm/hash64_64k.c b/arch/powerpc/mm/hash64_64k.c
index 3bbbea07378c..1a68cb19b0e3 100644
--- a/arch/powerpc/mm/hash64_64k.c
+++ b/arch/powerpc/mm/hash64_64k.c
@@ -87,7 +87,7 @@ int __hash_page_4K(unsigned long ea, unsigned long access, unsigned long vsid,
         subpg_pte = new_pte & ~subpg_prot;
         rflags = htab_convert_pte_flags(subpg_pte);
 
-        if (!cpu_has_feature(CPU_FTR_NOEXECUTE) &&
+        if (cpu_has_feature(CPU_FTR_NOEXECUTE) &&
             !cpu_has_feature(CPU_FTR_COHERENT_ICACHE)) {
 
                 /*
@@ -258,7 +258,7 @@ int __hash_page_64K(unsigned long ea, unsigned long access,
 
         rflags = htab_convert_pte_flags(new_pte);
 
-        if (!cpu_has_feature(CPU_FTR_NOEXECUTE) &&
+        if (cpu_has_feature(CPU_FTR_NOEXECUTE) &&
             !cpu_has_feature(CPU_FTR_COHERENT_ICACHE))
                 rflags = hash_page_do_lazy_icache(rflags, __pte(old_pte), trap);
 
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 44d3c3a38e3e..78dabf065ba9 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -193,8 +193,12 @@ unsigned long htab_convert_pte_flags(unsigned long pteflags)
                 /*
                  * Kernel read only mapped with ppp bits 0b110
                  */
-                if (!(pteflags & _PAGE_WRITE))
-                        rflags |= (HPTE_R_PP0 | 0x2);
+                if (!(pteflags & _PAGE_WRITE)) {
+                        if (mmu_has_feature(MMU_FTR_KERNEL_RO))
+                                rflags |= (HPTE_R_PP0 | 0x2);
+                        else
+                                rflags |= 0x3;
+                }
         } else {
                 if (pteflags & _PAGE_RWX)
                         rflags |= 0x2;
@@ -1029,6 +1033,10 @@ void hash__early_init_mmu_secondary(void)
 {
         /* Initialize hash table for that CPU */
         if (!firmware_has_feature(FW_FEATURE_LPAR)) {
+
+                if (cpu_has_feature(CPU_FTR_POWER9_DD1))
+                        update_hid_for_hash();
+
                 if (!cpu_has_feature(CPU_FTR_ARCH_300))
                         mtspr(SPRN_SDR1, _SDR1);
                 else
diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c
index ed7bddc456b7..688b54517655 100644
--- a/arch/powerpc/mm/pgtable-radix.c
+++ b/arch/powerpc/mm/pgtable-radix.c
@@ -388,6 +388,10 @@ void radix__early_init_mmu_secondary(void)
          * update partition table control register and UPRT
          */
         if (!firmware_has_feature(FW_FEATURE_LPAR)) {
+
+                if (cpu_has_feature(CPU_FTR_POWER9_DD1))
+                        update_hid_for_radix();
+
                 lpcr = mfspr(SPRN_LPCR);
                 mtspr(SPRN_LPCR, lpcr | LPCR_UPRT | LPCR_HR);
 
diff --git a/arch/powerpc/mm/tlb-radix.c b/arch/powerpc/mm/tlb-radix.c
index bda8c43be78a..3493cf4e0452 100644
--- a/arch/powerpc/mm/tlb-radix.c
+++ b/arch/powerpc/mm/tlb-radix.c
@@ -50,6 +50,8 @@ static inline void _tlbiel_pid(unsigned long pid, unsigned long ric)
         for (set = 0; set < POWER9_TLB_SETS_RADIX ; set++) {
                 __tlbiel_pid(pid, set, ric);
         }
+        if (cpu_has_feature(CPU_FTR_POWER9_DD1))
+                asm volatile(PPC_INVALIDATE_ERAT : : :"memory");
         return;
 }
 
@@ -83,6 +85,8 @@ static inline void _tlbiel_va(unsigned long va, unsigned long pid,
         asm volatile(PPC_TLBIEL(%0, %4, %3, %2, %1)
                      : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory");
         asm volatile("ptesync": : :"memory");
+        if (cpu_has_feature(CPU_FTR_POWER9_DD1))
+                asm volatile(PPC_INVALIDATE_ERAT : : :"memory");
 }
 
 static inline void _tlbie_va(unsigned long va, unsigned long pid,
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
index 28f03ca60100..794bebb43d23 100644
--- a/arch/s390/hypfs/hypfs_diag.c
+++ b/arch/s390/hypfs/hypfs_diag.c
@@ -363,11 +363,11 @@ out:
 static int diag224_get_name_table(void)
 {
         /* memory must be below 2GB */
-        diag224_cpu_names = kmalloc(PAGE_SIZE, GFP_KERNEL | GFP_DMA);
+        diag224_cpu_names = (char *) __get_free_page(GFP_KERNEL | GFP_DMA);
         if (!diag224_cpu_names)
                 return -ENOMEM;
         if (diag224(diag224_cpu_names)) {
-                kfree(diag224_cpu_names);
+                free_page((unsigned long) diag224_cpu_names);
                 return -EOPNOTSUPP;
         }
         EBCASC(diag224_cpu_names + 16, (*diag224_cpu_names + 1) * 16);
@@ -376,7 +376,7 @@ static int diag224_get_name_table(void)
 
 static void diag224_delete_name_table(void)
 {
-        kfree(diag224_cpu_names);
+        free_page((unsigned long) diag224_cpu_names);
 }
 
 static int diag224_idx2name(int index, char *name)
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 000e6e91f6a0..3667d20e997f 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -62,9 +62,11 @@ SECTIONS
 
         . = ALIGN(PAGE_SIZE);
         __start_ro_after_init = .;
+        __start_data_ro_after_init = .;
         .data..ro_after_init : {
                  *(.data..ro_after_init)
         }
+        __end_data_ro_after_init = .;
         EXCEPTION_TABLE(16)
         . = ALIGN(PAGE_SIZE);
         __end_ro_after_init = .;
diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index 7350c8bc13a2..6b2f72f523b9 100644
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -423,7 +423,7 @@ static int __s390_dma_map_sg(struct device *dev, struct scatterlist *sg,
         dma_addr_t dma_addr_base, dma_addr;
         int flags = ZPCI_PTE_VALID;
         struct scatterlist *s;
-        unsigned long pa;
+        unsigned long pa = 0;
         int ret;
 
         size = PAGE_ALIGN(size);
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index b23c76b42d6e..165ecdd24d22 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -43,6 +43,7 @@ config SPARC
         select ARCH_HAS_SG_CHAIN
         select CPU_NO_EFFICIENT_FFS
         select HAVE_ARCH_HARDENED_USERCOPY
+        select PROVE_LOCKING_SMALL if PROVE_LOCKING
 
 config SPARC32
         def_bool !64BIT
@@ -89,6 +90,14 @@ config ARCH_DEFCONFIG
 config ARCH_PROC_KCORE_TEXT
         def_bool y
 
+config ARCH_ATU
+        bool
+        default y if SPARC64
+
+config ARCH_DMA_ADDR_T_64BIT
+        bool
+        default y if ARCH_ATU
+
 config IOMMU_HELPER
         bool
         default y if SPARC64
@@ -304,6 +313,20 @@ config ARCH_SPARSEMEM_ENABLE
 config ARCH_SPARSEMEM_DEFAULT
         def_bool y if SPARC64
 
+config FORCE_MAX_ZONEORDER
+        int "Maximum zone order"
+        default "13"
+        help
+          The kernel memory allocator divides physically contiguous memory
+          blocks into "zones", where each zone is a power of two number of
+          pages.  This option selects the largest power of two that the kernel
+          keeps in the memory allocator.  If you need to allocate very large
+          blocks of physically contiguous memory, then you may need to
+          increase this value.
+
+          This config option is actually maximum order plus one. For example,
+          a value of 13 means that the largest free memory block is 2^12 pages.
+
 source "mm/Kconfig"
 
 if SPARC64
diff --git a/arch/sparc/include/asm/hypervisor.h b/arch/sparc/include/asm/hypervisor.h
index 666d5ba230d2..73cb8978df58 100644
--- a/arch/sparc/include/asm/hypervisor.h
+++ b/arch/sparc/include/asm/hypervisor.h
@@ -2335,6 +2335,348 @@ unsigned long sun4v_vintr_set_target(unsigned long dev_handle,
  */
 #define HV_FAST_PCI_MSG_SETVALID        0xd3
 
+/* PCI IOMMU v2 definitions and services
+ *
+ * While the PCI IO definitions above is valid IOMMU v2 adds new PCI IO
+ * definitions and services.
+ *
+ *      CTE             Clump Table Entry. First level table entry in the ATU.
+ *
+ *      pci_device_list
+ *                      A 32-bit aligned list of pci_devices.
+ *
+ *      pci_device_listp
+ *                      real address of a pci_device_list. 32-bit aligned.
+ *
+ *      iotte           IOMMU translation table entry.
+ *
+ *      iotte_attributes
+ *                      IO Attributes for IOMMU v2 mappings. In addition to
+ *                      read, write IOMMU v2 supports relax ordering
+ *
+ *      io_page_list    A 64-bit aligned list of real addresses. Each real
+ *                      address in an io_page_list must be properly aligned
+ *                      to the pagesize of the given IOTSB.
+ *
+ *      io_page_list_p  Real address of an io_page_list, 64-bit aligned.
+ *
+ *      IOTSB           IO Translation Storage Buffer. An aligned table of
+ *                      IOTTEs. Each IOTSB has a pagesize, table size, and
+ *                      virtual address associated with it that must match
+ *                      a pagesize and table size supported by the un-derlying
+ *                      hardware implementation. The alignment requirements
+ *                      for an IOTSB depend on the pagesize used for that IOTSB.
+ *                      Each IOTTE in an IOTSB maps one pagesize-sized page.
+ *                      The size of the IOTSB dictates how large of a virtual
+ *                      address space the IOTSB is capable of mapping.
+ *
+ *      iotsb_handle    An opaque identifier for an IOTSB. A devhandle plus
+ *                      iotsb_handle represents a binding of an IOTSB to a
+ *                      PCI root complex.
+ *
+ *      iotsb_index     Zero-based IOTTE number within an IOTSB.
+ */
+
+/* The index_count argument consists of two fields:
+ * bits 63:48 #iottes and bits 47:0 iotsb_index
+ */
+#define HV_PCI_IOTSB_INDEX_COUNT(__iottes, __iotsb_index) \
+        (((u64)(__iottes) << 48UL) | ((u64)(__iotsb_index)))
+
+/* pci_iotsb_conf()
+ * TRAP:        HV_FAST_TRAP
+ * FUNCTION:    HV_FAST_PCI_IOTSB_CONF
+ * ARG0:        devhandle
+ * ARG1:        r_addr
+ * ARG2:        size
+ * ARG3:        pagesize
+ * ARG4:        iova
+ * RET0:        status
+ * RET1:        iotsb_handle
+ * ERRORS:      EINVAL          Invalid devhandle, size, iova, or pagesize
+ *              EBADALIGN       r_addr is not properly aligned
+ *              ENORADDR        r_addr is not a valid real address
+ *              ETOOMANY        No further IOTSBs may be configured
+ *              EBUSY           Duplicate devhandle, raddir, iova combination
+ *
+ * Create an IOTSB suitable for the PCI root complex identified by devhandle,
+ * for the DMA virtual address defined by the argument iova.
+ *
+ * r_addr is the properly aligned base address of the IOTSB and size is the
+ * IOTSB (table) size in bytes.The IOTSB is required to be zeroed prior to
+ * being configured. If it contains any values other than zeros then the
+ * behavior is undefined.
+ *
+ * pagesize is the size of each page in the IOTSB. Note that the combination of
+ * size (table size) and pagesize must be valid.
+ *
+ * virt is the DMA virtual address this IOTSB will map.
+ *
+ * If successful, the opaque 64-bit handle iotsb_handle is returned in ret1.
+ * Once configured, privileged access to the IOTSB memory is prohibited and
+ * creates undefined behavior. The only permitted access is indirect via these
+ * services.
+ */
+#define HV_FAST_PCI_IOTSB_CONF          0x190
+
+/* pci_iotsb_info()
+ * TRAP:        HV_FAST_TRAP
+ * FUNCTION:    HV_FAST_PCI_IOTSB_INFO
+ * ARG0:        devhandle
+ * ARG1:        iotsb_handle
+ * RET0:        status
+ * RET1:        r_addr
+ * RET2:        size
+ * RET3:        pagesize
+ * RET4:        iova
+ * RET5:        #bound
+ * ERRORS:      EINVAL  Invalid devhandle or iotsb_handle
+ *
+ * This service returns configuration information about an IOTSB previously
+ * created with pci_iotsb_conf.
+ *
+ * iotsb_handle value 0 may be used with this service to inquire about the
+ * legacy IOTSB that may or may not exist. If the service succeeds, the return
+ * values describe the legacy IOTSB and I/O virtual addresses mapped by that
+ * table. However, the table base address r_addr may contain the value -1 which
+ * indicates a memory range that cannot be accessed or be reclaimed.
+ *
+ * The return value #bound contains the number of PCI devices that iotsb_handle
+ * is currently bound to.
+ */
+#define HV_FAST_PCI_IOTSB_INFO          0x191
+
+/* pci_iotsb_unconf()
+ * TRAP:        HV_FAST_TRAP
+ * FUNCTION:    HV_FAST_PCI_IOTSB_UNCONF
+ * ARG0:        devhandle
+ * ARG1:        iotsb_handle
+ * RET0:        status
+ * ERRORS:      EINVAL  Invalid devhandle or iotsb_handle
+ *              EBUSY   The IOTSB is bound and may not be unconfigured
+ *
+ * This service unconfigures the IOTSB identified by the devhandle and
+ * iotsb_handle arguments, previously created with pci_iotsb_conf.
+ * The IOTSB must not be currently bound to any device or the service will fail
+ *
+ * If the call succeeds, iotsb_handle is no longer valid.
+ */
+#define HV_FAST_PCI_IOTSB_UNCONF        0x192
+
+/* pci_iotsb_bind()
+ * TRAP:        HV_FAST_TRAP
+ * FUNCTION:    HV_FAST_PCI_IOTSB_BIND
+ * ARG0:        devhandle
+ * ARG1:        iotsb_handle
+ * ARG2:        pci_device
+ * RET0:        status
+ * ERRORS:      EINVAL  Invalid devhandle, iotsb_handle, or pci_device
+ *              EBUSY   A PCI function is already bound to an IOTSB at the same
+ *                      address range as specified by devhandle, iotsb_handle.
+ *
+ * This service binds the PCI function specified by the argument pci_device to
+ * the IOTSB specified by the arguments devhandle and iotsb_handle.
+ *
+ * The PCI device function is bound to the specified IOTSB with the IOVA range
+ * specified when the IOTSB was configured via pci_iotsb_conf. If the function
+ * is already bound then it is unbound first.
+ */
+#define HV_FAST_PCI_IOTSB_BIND          0x193
+
+/* pci_iotsb_unbind()
+ * TRAP:        HV_FAST_TRAP
+ * FUNCTION:    HV_FAST_PCI_IOTSB_UNBIND
+ * ARG0:        devhandle
+ * ARG1:        iotsb_handle
+ * ARG2:        pci_device
+ * RET0:        status
+ * ERRORS:      EINVAL  Invalid devhandle, iotsb_handle, or pci_device
+ *              ENOMAP  The PCI function was not bound to the specified IOTSB
+ *
+ * This service unbinds the PCI device specified by the argument pci_device
+ * from the IOTSB identified  * by the arguments devhandle and iotsb_handle.
+ *
+ * If the PCI device is not bound to the specified IOTSB then this service will
+ * fail with status ENOMAP
+ */
+#define HV_FAST_PCI_IOTSB_UNBIND        0x194
+
+/* pci_iotsb_get_binding()
+ * TRAP:        HV_FAST_TRAP
+ * FUNCTION:    HV_FAST_PCI_IOTSB_GET_BINDING
+ * ARG0:        devhandle
+ * ARG1:        iotsb_handle
+ * ARG2:        iova
+ * RET0:        status
+ * RET1:        iotsb_handle
+ * ERRORS:      EINVAL  Invalid devhandle, pci_device, or iova
+ *              ENOMAP  The PCI function is not bound to an IOTSB at iova
+ *
+ * This service returns the IOTSB binding, iotsb_handle, for a given pci_device
+ * and DMA virtual address, iova.
+ *
+ * iova must be the base address of a DMA virtual address range as defined by
+ * the iommu-address-ranges property in the root complex device node defined
+ * by the argument devhandle.
+ */
+#define HV_FAST_PCI_IOTSB_GET_BINDING   0x195
+
+/* pci_iotsb_map()
+ * TRAP:        HV_FAST_TRAP
+ * FUNCTION:    HV_FAST_PCI_IOTSB_MAP
+ * ARG0:        devhandle
+ * ARG1:        iotsb_handle
+ * ARG2:        index_count
+ * ARG3:        iotte_attributes
+ * ARG4:        io_page_list_p
+ * RET0:        status
+ * RET1:        #mapped
+ * ERRORS:      EINVAL          Invalid devhandle, iotsb_handle, #iottes,
+ *                              iotsb_index or iotte_attributes
+ *              EBADALIGN       Improperly aligned io_page_list_p or I/O page
+ *                              address in the I/O page list.
+ *              ENORADDR        Invalid io_page_list_p or I/O page address in
+ *                              the I/O page list.
+ *
+ * This service creates and flushes mappings in the IOTSB defined by the
+ * arguments devhandle, iotsb.
+ *
+ * The index_count argument consists of two fields. Bits 63:48 contain #iotte
+ * and bits 47:0 contain iotsb_index
+ *
+ * The first mapping is created in the IOTSB index specified by iotsb_index.
+ * Subsequent mappings are  created at iotsb_index+1 and so on.
+ *
+ * The attributes of each mapping are defined by the argument iotte_attributes.
+ *
+ * The io_page_list_p specifies the real address of the 64-bit-aligned list of
+ * #iottes I/O page addresses. Each page address must be a properly aligned
+ * real address of a page to be mapped in the IOTSB. The first entry in the I/O
+ * page list contains the real address of the first page, the 2nd entry for the
+ * 2nd page, and so on.
+ *
+ * #iottes must be greater than zero.
+ *
+ * The return value #mapped is the actual number of mappings created, which may
+ * be less than or equal to the argument #iottes. If the function returns
+ * successfully with a #mapped value less than the requested #iottes then the
+ * caller should continue to invoke the service with updated iotsb_index,
+ * #iottes, and io_page_list_p arguments until all pages are mapped.
+ *
+ * This service must not be used to demap a mapping. In other words, all
+ * mappings must be valid and have  one or both of the RW attribute bits set.
+ *
+ * Note:
+ * It is implementation-defined whether I/O page real address validity checking
+ * is done at time mappings are established or deferred until they are
+ * accessed.
+ */
+#define HV_FAST_PCI_IOTSB_MAP           0x196
+
+/* pci_iotsb_map_one()
+ * TRAP:        HV_FAST_TRAP
+ * FUNCTION:    HV_FAST_PCI_IOTSB_MAP_ONE
+ * ARG0:        devhandle
+ * ARG1:        iotsb_handle
+ * ARG2:        iotsb_index
+ * ARG3:        iotte_attributes
+ * ARG4:        r_addr
+ * RET0:        status
+ * ERRORS:      EINVAL          Invalid devhandle,iotsb_handle, iotsb_index
+ *                              or iotte_attributes
+ *              EBADALIGN       Improperly aligned r_addr
+ *              ENORADDR        Invalid r_addr
+ *
+ * This service creates and flushes a single mapping in the IOTSB defined by the
+ * arguments devhandle, iotsb.
+ *
+ * The mapping for the page at r_addr is created at the IOTSB index specified by
+ * iotsb_index with  the attributes iotte_attributes.
+ *
+ * This service must not be used to demap a mapping. In other words, the mapping
+ * must be valid and have one or both of the RW attribute bits set.
+ *
+ * Note:
+ * It is implementation-defined whether I/O page real address validity checking
+ * is done at time mappings are established or deferred until they are
+ * accessed.
+ */
+#define HV_FAST_PCI_IOTSB_MAP_ONE       0x197
+
+/* pci_iotsb_demap()
+ * TRAP:        HV_FAST_TRAP
+ * FUNCTION:    HV_FAST_PCI_IOTSB_DEMAP
+ * ARG0:        devhandle
+ * ARG1:        iotsb_handle
+ * ARG2:        iotsb_index
+ * ARG3:        #iottes
+ * RET0:        status
+ * RET1:        #unmapped
+ * ERRORS:      EINVAL  Invalid devhandle, iotsb_handle, iotsb_index or #iottes
+ *
+ * This service unmaps and flushes up to #iottes mappings starting at index
+ * iotsb_index from the IOTSB defined by the arguments devhandle, iotsb.
+ *
+ * #iottes must be greater than zero.
+ *
+ * The actual number of IOTTEs unmapped is returned in #unmapped and may be less
+ * than or equal to the requested number of IOTTEs, #iottes.
+ *
+ * If #unmapped is less than #iottes, the caller should continue to invoke this
+ * service with updated iotsb_index and #iottes arguments until all pages are
+ * demapped.
+ */
+#define HV_FAST_PCI_IOTSB_DEMAP         0x198
+
+/* pci_iotsb_getmap()
+ * TRAP:        HV_FAST_TRAP
+ * FUNCTION:    HV_FAST_PCI_IOTSB_GETMAP
+ * ARG0:        devhandle
+ * ARG1:        iotsb_handle
+ * ARG2:        iotsb_index
+ * RET0:        status
+ * RET1:        r_addr
+ * RET2:        iotte_attributes
+ * ERRORS:      EINVAL  Invalid devhandle, iotsb_handle, or iotsb_index
+ *              ENOMAP  No mapping was found
+ *
+ * This service returns the mapping specified by index iotsb_index from the
+ * IOTSB defined by the arguments devhandle, iotsb.
+ *
+ * Upon success, the real address of the mapping shall be returned in
+ * r_addr and thethe IOTTE mapping attributes shall be returned in
+ * iotte_attributes.
+ *
+ * The return value iotte_attributes may not include optional features used in
+ * the call to create the  mapping.
+ */
+#define HV_FAST_PCI_IOTSB_GETMAP        0x199
+
+/* pci_iotsb_sync_mappings()
+ * TRAP:        HV_FAST_TRAP
+ * FUNCTION:    HV_FAST_PCI_IOTSB_SYNC_MAPPINGS
+ * ARG0:        devhandle
+ * ARG1:        iotsb_handle
+ * ARG2:        iotsb_index
+ * ARG3:        #iottes
+ * RET0:        status
+ * RET1:        #synced
+ * ERROS:       EINVAL  Invalid devhandle, iotsb_handle, iotsb_index, or #iottes
+ *
+ * This service synchronizes #iottes mappings starting at index iotsb_index in
+ * the IOTSB defined by the arguments devhandle, iotsb.
+ *
+ * #iottes must be greater than zero.
+ *
+ * The actual number of IOTTEs synchronized is returned in #synced, which may
+ * be less than or equal to the requested number, #iottes.
+ *
+ * Upon a successful return, #synced is less than #iottes, the caller should
+ * continue to invoke this service with updated iotsb_index and #iottes
+ * arguments until all pages are synchronized.
+ */
+#define HV_FAST_PCI_IOTSB_SYNC_MAPPINGS 0x19a
+
 /* Logical Domain Channel services.  */
 
 #define LDC_CHANNEL_DOWN                0
@@ -2993,6 +3335,7 @@ unsigned long sun4v_m7_set_perfreg(unsigned long reg_num,
 #define HV_GRP_SDIO                     0x0108
 #define HV_GRP_SDIO_ERR                 0x0109
 #define HV_GRP_REBOOT_DATA              0x0110
+#define HV_GRP_ATU                      0x0111
 #define HV_GRP_M7_PERF                  0x0114
 #define HV_GRP_NIAG_PERF                0x0200
 #define HV_GRP_FIRE_PERF                0x0201
diff --git a/arch/sparc/include/asm/iommu_64.h b/arch/sparc/include/asm/iommu_64.h
index cd0d69fa7592..f24f356f2503 100644
--- a/arch/sparc/include/asm/iommu_64.h
+++ b/arch/sparc/include/asm/iommu_64.h
@@ -24,8 +24,36 @@ struct iommu_arena {
         unsigned int    limit;
 };
 
+#define ATU_64_SPACE_SIZE 0x800000000 /* 32G */
+
+/* Data structures for SPARC ATU architecture */
+struct atu_iotsb {
+        void    *table;         /* IOTSB table base virtual addr*/
+        u64     ra;             /* IOTSB table real addr */
+        u64     dvma_size;      /* ranges[3].size or OS slected 32G size */
+        u64     dvma_base;      /* ranges[3].base */
+        u64     table_size;     /* IOTSB table size */
+        u64     page_size;      /* IO PAGE size for IOTSB */
+        u32     iotsb_num;      /* tsbnum is same as iotsb_handle */
+};
+
+struct atu_ranges {
+        u64     base;
+        u64     size;
+};
+
+struct atu {
+        struct  atu_ranges      *ranges;
+        struct  atu_iotsb       *iotsb;
+        struct  iommu_map_table tbl;
+        u64                     base;
+        u64                     size;
+        u64                     dma_addr_mask;
+};
+
 struct iommu {
         struct iommu_map_table  tbl;
+        struct atu              *atu;
         spinlock_t              lock;
         u32                     dma_addr_mask;
         iopte_t                 *page_table;
diff --git a/arch/sparc/kernel/hvapi.c b/arch/sparc/kernel/hvapi.c
index 662500fa555f..267731234ce8 100644
--- a/arch/sparc/kernel/hvapi.c
+++ b/arch/sparc/kernel/hvapi.c
@@ -39,6 +39,7 @@ static struct api_info api_table[] = {
         { .group = HV_GRP_SDIO,                                 },
         { .group = HV_GRP_SDIO_ERR,                             },
         { .group = HV_GRP_REBOOT_DATA,                          },
+        { .group = HV_GRP_ATU,          .flags = FLAG_PRE_API   },
         { .group = HV_GRP_NIAG_PERF,    .flags = FLAG_PRE_API   },
         { .group = HV_GRP_FIRE_PERF,                            },
         { .group = HV_GRP_N2_CPU,                               },
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
index 5c615abff030..852a3291db96 100644
--- a/arch/sparc/kernel/iommu.c
+++ b/arch/sparc/kernel/iommu.c
@@ -760,8 +760,12 @@ int dma_supported(struct device *dev, u64 device_mask)
         struct iommu *iommu = dev->archdata.iommu;
         u64 dma_addr_mask = iommu->dma_addr_mask;
 
-        if (device_mask >= (1UL << 32UL))
-                return 0;
+        if (device_mask > DMA_BIT_MASK(32)) {
+                if (iommu->atu)
+                        dma_addr_mask = iommu->atu->dma_addr_mask;
+                else
+                        return 0;
+        }
 
         if ((device_mask & dma_addr_mask) == dma_addr_mask)
                 return 1;
diff --git a/arch/sparc/kernel/iommu_common.h b/arch/sparc/kernel/iommu_common.h
index b40cec252905..828493329f68 100644
--- a/arch/sparc/kernel/iommu_common.h
+++ b/arch/sparc/kernel/iommu_common.h
@@ -13,7 +13,6 @@
 #include <linux/scatterlist.h>
 #include <linux/device.h>
 #include <linux/iommu-helper.h>
-#include <linux/scatterlist.h>
 
 #include <asm/iommu.h>
 
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
index db57d8acdc01..06981cc716b6 100644
--- a/arch/sparc/kernel/pci_sun4v.c
+++ b/arch/sparc/kernel/pci_sun4v.c
@@ -44,6 +44,9 @@ static struct vpci_version vpci_versions[] = {
         { .major = 1, .minor = 1 },
 };
 
+static unsigned long vatu_major = 1;
+static unsigned long vatu_minor = 1;
+
 #define PGLIST_NENTS    (PAGE_SIZE / sizeof(u64))
 
 struct iommu_batch {
@@ -69,34 +72,57 @@ static inline void iommu_batch_start(struct device *dev, unsigned long prot, uns
 }
 
 /* Interrupts must be disabled.  */
-static long iommu_batch_flush(struct iommu_batch *p)
+static long iommu_batch_flush(struct iommu_batch *p, u64 mask)
 {
         struct pci_pbm_info *pbm = p->dev->archdata.host_controller;
+        u64 *pglist = p->pglist;
+        u64 index_count;
         unsigned long devhandle = pbm->devhandle;
         unsigned long prot = p->prot;
         unsigned long entry = p->entry;
-        u64 *pglist = p->pglist;
         unsigned long npages = p->npages;
+        unsigned long iotsb_num;
+        unsigned long ret;
+        long num;
 
         /* VPCI maj=1, min=[0,1] only supports read and write */
         if (vpci_major < 2)
                 prot &= (HV_PCI_MAP_ATTR_READ | HV_PCI_MAP_ATTR_WRITE);
 
         while (npages != 0) {
-                long num;
-
-                num = pci_sun4v_iommu_map(devhandle, HV_PCI_TSBID(0, entry),
-                                          npages, prot, __pa(pglist));
-                if (unlikely(num < 0)) {
-                        if (printk_ratelimit())
-                                printk("iommu_batch_flush: IOMMU map of "
-                                       "[%08lx:%08llx:%lx:%lx:%lx] failed with "
-                                       "status %ld\n",
-                                       devhandle, HV_PCI_TSBID(0, entry),
-                                       npages, prot, __pa(pglist), num);
-                        return -1;
+                if (mask <= DMA_BIT_MASK(32)) {
+                        num = pci_sun4v_iommu_map(devhandle,
+                                                  HV_PCI_TSBID(0, entry),
+                                                  npages,
+                                                  prot,
+                                                  __pa(pglist));
+                        if (unlikely(num < 0)) {
+                                pr_err_ratelimited("%s: IOMMU map of [%08lx:%08llx:%lx:%lx:%lx] failed with status %ld\n",
+                                                   __func__,
+                                                   devhandle,
+                                                   HV_PCI_TSBID(0, entry),
+                                                   npages, prot, __pa(pglist),
+                                                   num);
+                                return -1;
+                        }
+                } else {
+                        index_count = HV_PCI_IOTSB_INDEX_COUNT(npages, entry),
+                        iotsb_num = pbm->iommu->atu->iotsb->iotsb_num;
+                        ret = pci_sun4v_iotsb_map(devhandle,
+                                                  iotsb_num,
+                                                  index_count,
+                                                  prot,
+                                                  __pa(pglist),
+                                                  &num);
+                        if (unlikely(ret != HV_EOK)) {
+                                pr_err_ratelimited("%s: ATU map of [%08lx:%lx:%llx:%lx:%lx] failed with status %ld\n",
+                                                   __func__,
+                                                   devhandle, iotsb_num,
+                                                   index_count, prot,
+                                                   __pa(pglist), ret);
+                                return -1;
+                        }
                 }
-
                 entry += num;
                 npages -= num;
                 pglist += num;
@@ -108,19 +134,19 @@ static long iommu_batch_flush(struct iommu_batch *p)
         return 0;
 }
 
-static inline void iommu_batch_new_entry(unsigned long entry)
+static inline void iommu_batch_new_entry(unsigned long entry, u64 mask)
 {
         struct iommu_batch *p = this_cpu_ptr(&iommu_batch);
 
         if (p->entry + p->npages == entry)
                 return;
         if (p->entry != ~0UL)
-                iommu_batch_flush(p);
+                iommu_batch_flush(p, mask);
         p->entry = entry;
 }
 
 /* Interrupts must be disabled.  */
-static inline long iommu_batch_add(u64 phys_page)
+static inline long iommu_batch_add(u64 phys_page, u64 mask)
 {
         struct iommu_batch *p = this_cpu_ptr(&iommu_batch);
 
@@ -128,28 +154,31 @@ static inline long iommu_batch_add(u64 phys_page)
 
         p->pglist[p->npages++] = phys_page;
         if (p->npages == PGLIST_NENTS)
-                return iommu_batch_flush(p);
+                return iommu_batch_flush(p, mask);
 
         return 0;
 }
 
 /* Interrupts must be disabled.  */
-static inline long iommu_batch_end(void)
+static inline long iommu_batch_end(u64 mask)
 {
         struct iommu_batch *p = this_cpu_ptr(&iommu_batch);
 
         BUG_ON(p->npages >= PGLIST_NENTS);
 
-        return iommu_batch_flush(p);
+        return iommu_batch_flush(p, mask);
 }
 
 static void *dma_4v_alloc_coherent(struct device *dev, size_t size,
                                    dma_addr_t *dma_addrp, gfp_t gfp,
                                    unsigned long attrs)
 {
+        u64 mask;
         unsigned long flags, order, first_page, npages, n;
         unsigned long prot = 0;
         struct iommu *iommu;
+        struct atu *atu;
+        struct iommu_map_table *tbl;
         struct page *page;
         void *ret;
         long entry;
@@ -174,14 +203,21 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,
         memset((char *)first_page, 0, PAGE_SIZE << order);
 
         iommu = dev->archdata.iommu;
+        atu = iommu->atu;
+
+        mask = dev->coherent_dma_mask;
+        if (mask <= DMA_BIT_MASK(32))
+                tbl = &iommu->tbl;
+        else
+                tbl = &atu->tbl;
 
-        entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages, NULL,
+        entry = iommu_tbl_range_alloc(dev, tbl, npages, NULL,
                                       (unsigned long)(-1), 0);
 
         if (unlikely(entry == IOMMU_ERROR_CODE))
                 goto range_alloc_fail;
 
-        *dma_addrp = (iommu->tbl.table_map_base + (entry << IO_PAGE_SHIFT));
+        *dma_addrp = (tbl->table_map_base + (entry << IO_PAGE_SHIFT));
         ret = (void *) first_page;
         first_page = __pa(first_page);
 
@@ -193,12 +229,12 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,
                           entry);
 
         for (n = 0; n < npages; n++) {
-                long err = iommu_batch_add(first_page + (n * PAGE_SIZE));
+                long err = iommu_batch_add(first_page + (n * PAGE_SIZE), mask);
                 if (unlikely(err < 0L))
                         goto iommu_map_fail;
         }
 
-        if (unlikely(iommu_batch_end() < 0L))
+        if (unlikely(iommu_batch_end(mask) < 0L))
                 goto iommu_map_fail;
 
         local_irq_restore(flags);
@@ -206,25 +242,71 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,
         return ret;
 
 iommu_map_fail:
-        iommu_tbl_range_free(&iommu->tbl, *dma_addrp, npages, IOMMU_ERROR_CODE);
+        iommu_tbl_range_free(tbl, *dma_addrp, npages, IOMMU_ERROR_CODE);
 
 range_alloc_fail:
         free_pages(first_page, order);
         return NULL;
 }
 
-static void dma_4v_iommu_demap(void *demap_arg, unsigned long entry,
-                               unsigned long npages)
+unsigned long dma_4v_iotsb_bind(unsigned long devhandle,
+                                unsigned long iotsb_num,
+                                struct pci_bus *bus_dev)
+{
+        struct pci_dev *pdev;
+        unsigned long err;
+        unsigned int bus;
+        unsigned int device;
+        unsigned int fun;
+
+        list_for_each_entry(pdev, &bus_dev->devices, bus_list) {
+                if (pdev->subordinate) {
+                        /* No need to bind pci bridge */
+                        dma_4v_iotsb_bind(devhandle, iotsb_num,
+                                          pdev->subordinate);
+                } else {
+                        bus = bus_dev->number;
+                        device = PCI_SLOT(pdev->devfn);
+                        fun = PCI_FUNC(pdev->devfn);
+                        err = pci_sun4v_iotsb_bind(devhandle, iotsb_num,
+                                                   HV_PCI_DEVICE_BUILD(bus,
+                                                                       device,
+                                                                       fun));
+
+                        /* If bind fails for one device it is going to fail
+                         * for rest of the devices because we are sharing
+                         * IOTSB. So in case of failure simply return with
+                         * error.
+                         */
+                        if (err)
+                                return err;
+                }
+        }
+
+        return 0;
+}
+
+static void dma_4v_iommu_demap(struct device *dev, unsigned long devhandle,
+                               dma_addr_t dvma, unsigned long iotsb_num,
+                               unsigned long entry, unsigned long npages)
 {
-        u32 devhandle = *(u32 *)demap_arg;
         unsigned long num, flags;
+        unsigned long ret;
 
         local_irq_save(flags);
         do {
-                num = pci_sun4v_iommu_demap(devhandle,
-                                            HV_PCI_TSBID(0, entry),
-                                            npages);
-
+                if (dvma <= DMA_BIT_MASK(32)) {
+                        num = pci_sun4v_iommu_demap(devhandle,
+                                                    HV_PCI_TSBID(0, entry),
+                                                    npages);
+                } else {
+                        ret = pci_sun4v_iotsb_demap(devhandle, iotsb_num,
+                                                    entry, npages, &num);
+                        if (unlikely(ret != HV_EOK)) {
+                                pr_err_ratelimited("pci_iotsb_demap() failed with error: %ld\n",
+                                                   ret);
+                        }
+                }
                 entry += num;
                 npages -= num;
         } while (npages != 0);
@@ -236,16 +318,28 @@ static void dma_4v_free_coherent(struct device *dev, size_t size, void *cpu,
 {
         struct pci_pbm_info *pbm;
         struct iommu *iommu;
+        struct atu *atu;
+        struct iommu_map_table *tbl;
         unsigned long order, npages, entry;
+        unsigned long iotsb_num;
         u32 devhandle;
 
         npages = IO_PAGE_ALIGN(size) >> IO_PAGE_SHIFT;
         iommu = dev->archdata.iommu;
         pbm = dev->archdata.host_controller;
+        atu = iommu->atu;
         devhandle = pbm->devhandle;
-        entry = ((dvma - iommu->tbl.table_map_base) >> IO_PAGE_SHIFT);
-        dma_4v_iommu_demap(&devhandle, entry, npages);
-        iommu_tbl_range_free(&iommu->tbl, dvma, npages, IOMMU_ERROR_CODE);
+
+        if (dvma <= DMA_BIT_MASK(32)) {
+                tbl = &iommu->tbl;
+                iotsb_num = 0; /* we don't care for legacy iommu */
+        } else {
+                tbl = &atu->tbl;
+                iotsb_num = atu->iotsb->iotsb_num;
+        }
+        entry = ((dvma - tbl->table_map_base) >> IO_PAGE_SHIFT);
+        dma_4v_iommu_demap(dev, devhandle, dvma, iotsb_num, entry, npages);
+        iommu_tbl_range_free(tbl, dvma, npages, IOMMU_ERROR_CODE);
         order = get_order(size);
         if (order < 10)
                 free_pages((unsigned long)cpu, order);
@@ -257,13 +351,17 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page,
                                   unsigned long attrs)
 {
         struct iommu *iommu;
+        struct atu *atu;
+        struct iommu_map_table *tbl;
+        u64 mask;
         unsigned long flags, npages, oaddr;
         unsigned long i, base_paddr;
-        u32 bus_addr, ret;
         unsigned long prot;
+        dma_addr_t bus_addr, ret;
         long entry;
 
         iommu = dev->archdata.iommu;
+        atu = iommu->atu;
 
         if (unlikely(direction == DMA_NONE))
                 goto bad;
@@ -272,13 +370,19 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page,
         npages = IO_PAGE_ALIGN(oaddr + sz) - (oaddr & IO_PAGE_MASK);
         npages >>= IO_PAGE_SHIFT;
 
-        entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages, NULL,
+        mask = *dev->dma_mask;
+        if (mask <= DMA_BIT_MASK(32))
+                tbl = &iommu->tbl;
+        else
+                tbl = &atu->tbl;
+
+        entry = iommu_tbl_range_alloc(dev, tbl, npages, NULL,
                                       (unsigned long)(-1), 0);
 
         if (unlikely(entry == IOMMU_ERROR_CODE))
                 goto bad;
 
-        bus_addr = (iommu->tbl.table_map_base + (entry << IO_PAGE_SHIFT));
+        bus_addr = (tbl->table_map_base + (entry << IO_PAGE_SHIFT));
         ret = bus_addr | (oaddr & ~IO_PAGE_MASK);
         base_paddr = __pa(oaddr & IO_PAGE_MASK);
         prot = HV_PCI_MAP_ATTR_READ;
@@ -293,11 +397,11 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page,
         iommu_batch_start(dev, prot, entry);
 
         for (i = 0; i < npages; i++, base_paddr += IO_PAGE_SIZE) {
-                long err = iommu_batch_add(base_paddr);
+                long err = iommu_batch_add(base_paddr, mask);
                 if (unlikely(err < 0L))
                         goto iommu_map_fail;
         }
-        if (unlikely(iommu_batch_end() < 0L))
+        if (unlikely(iommu_batch_end(mask) < 0L))
                 goto iommu_map_fail;
 
         local_irq_restore(flags);
@@ -310,7 +414,7 @@ bad:
         return DMA_ERROR_CODE;
 
 iommu_map_fail:
-        iommu_tbl_range_free(&iommu->tbl, bus_addr, npages, IOMMU_ERROR_CODE);
+        iommu_tbl_range_free(tbl, bus_addr, npages, IOMMU_ERROR_CODE);
         return DMA_ERROR_CODE;
 }
 
@@ -320,7 +424,10 @@ static void dma_4v_unmap_page(struct device *dev, dma_addr_t bus_addr,
 {
         struct pci_pbm_info *pbm;
         struct iommu *iommu;
+        struct atu *atu;
+        struct iommu_map_table *tbl;
         unsigned long npages;
+        unsigned long iotsb_num;
         long entry;
         u32 devhandle;
 
@@ -332,14 +439,23 @@ static void dma_4v_unmap_page(struct device *dev, dma_addr_t bus_addr,
 
         iommu = dev->archdata.iommu;
         pbm = dev->archdata.host_controller;
+        atu = iommu->atu;
         devhandle = pbm->devhandle;
 
         npages = IO_PAGE_ALIGN(bus_addr + sz) - (bus_addr & IO_PAGE_MASK);
         npages >>= IO_PAGE_SHIFT;
         bus_addr &= IO_PAGE_MASK;
-        entry = (bus_addr - iommu->tbl.table_map_base) >> IO_PAGE_SHIFT;
-        dma_4v_iommu_demap(&devhandle, entry, npages);
-        iommu_tbl_range_free(&iommu->tbl, bus_addr, npages, IOMMU_ERROR_CODE);
+
+        if (bus_addr <= DMA_BIT_MASK(32)) {
+                iotsb_num = 0; /* we don't care for legacy iommu */
+                tbl = &iommu->tbl;
+        } else {
+                iotsb_num = atu->iotsb->iotsb_num;
+                tbl = &atu->tbl;
+        }
+        entry = (bus_addr - tbl->table_map_base) >> IO_PAGE_SHIFT;
+        dma_4v_iommu_demap(dev, devhandle, bus_addr, iotsb_num, entry, npages);
+        iommu_tbl_range_free(tbl, bus_addr, npages, IOMMU_ERROR_CODE);
 }
 
 static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
@@ -353,12 +469,17 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
         unsigned long seg_boundary_size;
         int outcount, incount, i;
         struct iommu *iommu;
+        struct atu *atu;
+        struct iommu_map_table *tbl;
+        u64 mask;
         unsigned long base_shift;
         long err;
 
         BUG_ON(direction == DMA_NONE);
 
         iommu = dev->archdata.iommu;
+        atu = iommu->atu;
+
         if (nelems == 0 || !iommu)
                 return 0;
         
@@ -384,7 +505,15 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
         max_seg_size = dma_get_max_seg_size(dev);
         seg_boundary_size = ALIGN(dma_get_seg_boundary(dev) + 1,
                                   IO_PAGE_SIZE) >> IO_PAGE_SHIFT;
-        base_shift = iommu->tbl.table_map_base >> IO_PAGE_SHIFT;
+
+        mask = *dev->dma_mask;
+        if (mask <= DMA_BIT_MASK(32))
+                tbl = &iommu->tbl;
+        else
+                tbl = &atu->tbl;
+
+        base_shift = tbl->table_map_base >> IO_PAGE_SHIFT;
+
         for_each_sg(sglist, s, nelems, i) {
                 unsigned long paddr, npages, entry, out_entry = 0, slen;
 
@@ -397,27 +526,26 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
                 /* Allocate iommu entries for that segment */
                 paddr = (unsigned long) SG_ENT_PHYS_ADDRESS(s);
                 npages = iommu_num_pages(paddr, slen, IO_PAGE_SIZE);
-                entry = iommu_tbl_range_alloc(dev, &iommu->tbl, npages,
+                entry = iommu_tbl_range_alloc(dev, tbl, npages,
                                               &handle, (unsigned long)(-1), 0);
 
                 /* Handle failure */
                 if (unlikely(entry == IOMMU_ERROR_CODE)) {
-                        if (printk_ratelimit())
-                                printk(KERN_INFO "iommu_alloc failed, iommu %p paddr %lx"
-                                       " npages %lx\n", iommu, paddr, npages);
+                        pr_err_ratelimited("iommu_alloc failed, iommu %p paddr %lx npages %lx\n",
+                                           tbl, paddr, npages);
                         goto iommu_map_failed;
                 }
 
-                iommu_batch_new_entry(entry);
+                iommu_batch_new_entry(entry, mask);
 
                 /* Convert entry to a dma_addr_t */
-                dma_addr = iommu->tbl.table_map_base + (entry << IO_PAGE_SHIFT);
+                dma_addr = tbl->table_map_base + (entry << IO_PAGE_SHIFT);
                 dma_addr |= (s->offset & ~IO_PAGE_MASK);
 
                 /* Insert into HW table */
                 paddr &= IO_PAGE_MASK;
                 while (npages--) {
-                        err = iommu_batch_add(paddr);
+                        err = iommu_batch_add(paddr, mask);
                         if (unlikely(err < 0L))
                                 goto iommu_map_failed;
                         paddr += IO_PAGE_SIZE;
@@ -452,7 +580,7 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
                 dma_next = dma_addr + slen;
         }
 
-        err = iommu_batch_end();
+        err = iommu_batch_end(mask);
 
         if (unlikely(err < 0L))
                 goto iommu_map_failed;
@@ -475,7 +603,7 @@ iommu_map_failed:
                         vaddr = s->dma_address & IO_PAGE_MASK;
                         npages = iommu_num_pages(s->dma_address, s->dma_length,
                                                  IO_PAGE_SIZE);
-                        iommu_tbl_range_free(&iommu->tbl, vaddr, npages,
+                        iommu_tbl_range_free(tbl, vaddr, npages,
                                              IOMMU_ERROR_CODE);
                         /* XXX demap? XXX */
                         s->dma_address = DMA_ERROR_CODE;
@@ -496,13 +624,16 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,
         struct pci_pbm_info *pbm;
         struct scatterlist *sg;
         struct iommu *iommu;
+        struct atu *atu;
         unsigned long flags, entry;
+        unsigned long iotsb_num;
         u32 devhandle;
 
         BUG_ON(direction == DMA_NONE);
 
         iommu = dev->archdata.iommu;
         pbm = dev->archdata.host_controller;
+        atu = iommu->atu;
         devhandle = pbm->devhandle;
         
         local_irq_save(flags);
@@ -512,15 +643,24 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,
                 dma_addr_t dma_handle = sg->dma_address;
                 unsigned int len = sg->dma_length;
                 unsigned long npages;
-                struct iommu_map_table *tbl = &iommu->tbl;
+                struct iommu_map_table *tbl;
                 unsigned long shift = IO_PAGE_SHIFT;
 
                 if (!len)
                         break;
                 npages = iommu_num_pages(dma_handle, len, IO_PAGE_SIZE);
+
+                if (dma_handle <= DMA_BIT_MASK(32)) {
+                        iotsb_num = 0; /* we don't care for legacy iommu */
+                        tbl = &iommu->tbl;
+                } else {
+                        iotsb_num = atu->iotsb->iotsb_num;
+                        tbl = &atu->tbl;
+                }
                 entry = ((dma_handle - tbl->table_map_base) >> shift);
-                dma_4v_iommu_demap(&devhandle, entry, npages);
-                iommu_tbl_range_free(&iommu->tbl, dma_handle, npages,
+                dma_4v_iommu_demap(dev, devhandle, dma_handle, iotsb_num,
+                                   entry, npages);
+                iommu_tbl_range_free(tbl, dma_handle, npages,
                                      IOMMU_ERROR_CODE);
                 sg = sg_next(sg);
         }
@@ -581,6 +721,132 @@ static unsigned long probe_existing_entries(struct pci_pbm_info *pbm,
         return cnt;
 }
 
+static int pci_sun4v_atu_alloc_iotsb(struct pci_pbm_info *pbm)
+{
+        struct atu *atu = pbm->iommu->atu;
+        struct atu_iotsb *iotsb;
+        void *table;
+        u64 table_size;
+        u64 iotsb_num;
+        unsigned long order;
+        unsigned long err;
+
+        iotsb = kzalloc(sizeof(*iotsb), GFP_KERNEL);
+        if (!iotsb) {
+                err = -ENOMEM;
+                goto out_err;
+        }
+        atu->iotsb = iotsb;
+
+        /* calculate size of IOTSB */
+        table_size = (atu->size / IO_PAGE_SIZE) * 8;
+        order = get_order(table_size);
+        table = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, order);
+        if (!table) {
+                err = -ENOMEM;
+                goto table_failed;
+        }
+        iotsb->table = table;
+        iotsb->ra = __pa(table);
+        iotsb->dvma_size = atu->size;
+        iotsb->dvma_base = atu->base;
+        iotsb->table_size = table_size;
+        iotsb->page_size = IO_PAGE_SIZE;
+
+        /* configure and register IOTSB with HV */
+        err = pci_sun4v_iotsb_conf(pbm->devhandle,
+                                   iotsb->ra,
+                                   iotsb->table_size,
+                                   iotsb->page_size,
+                                   iotsb->dvma_base,
+                                   &iotsb_num);
+        if (err) {
+                pr_err(PFX "pci_iotsb_conf failed error: %ld\n", err);
+                goto iotsb_conf_failed;
+        }
+        iotsb->iotsb_num = iotsb_num;
+
+        err = dma_4v_iotsb_bind(pbm->devhandle, iotsb_num, pbm->pci_bus);
+        if (err) {
+                pr_err(PFX "pci_iotsb_bind failed error: %ld\n", err);
+                goto iotsb_conf_failed;
+        }
+
+        return 0;
+
+iotsb_conf_failed:
+        free_pages((unsigned long)table, order);
+table_failed:
+        kfree(iotsb);
+out_err:
+        return err;
+}
+
+static int pci_sun4v_atu_init(struct pci_pbm_info *pbm)
+{
+        struct atu *atu = pbm->iommu->atu;
+        unsigned long err;
+        const u64 *ranges;
+        u64 map_size, num_iotte;
+        u64 dma_mask;
+        const u32 *page_size;
+        int len;
+
+        ranges = of_get_property(pbm->op->dev.of_node, "iommu-address-ranges",
+                                 &len);
+        if (!ranges) {
+                pr_err(PFX "No iommu-address-ranges\n");
+                return -EINVAL;
+        }
+
+        page_size = of_get_property(pbm->op->dev.of_node, "iommu-pagesizes",
+                                    NULL);
+        if (!page_size) {
+                pr_err(PFX "No iommu-pagesizes\n");
+                return -EINVAL;
+        }
+
+        /* There are 4 iommu-address-ranges supported. Each range is pair of
+         * {base, size}. The ranges[0] and ranges[1] are 32bit address space
+         * while ranges[2] and ranges[3] are 64bit space.  We want to use 64bit
+         * address ranges to support 64bit addressing. Because 'size' for
+         * address ranges[2] and ranges[3] are same we can select either of
+         * ranges[2] or ranges[3] for mapping. However due to 'size' is too
+         * large for OS to allocate IOTSB we are using fix size 32G
+         * (ATU_64_SPACE_SIZE) which is more than enough for all PCIe devices
+         * to share.
+         */
+        atu->ranges = (struct atu_ranges *)ranges;
+        atu->base = atu->ranges[3].base;
+        atu->size = ATU_64_SPACE_SIZE;
+
+        /* Create IOTSB */
+        err = pci_sun4v_atu_alloc_iotsb(pbm);
+        if (err) {
+                pr_err(PFX "Error creating ATU IOTSB\n");
+                return err;
+        }
+
+        /* Create ATU iommu map.
+         * One bit represents one iotte in IOTSB table.
+         */
+        dma_mask = (roundup_pow_of_two(atu->size) - 1UL);
+        num_iotte = atu->size / IO_PAGE_SIZE;
+        map_size = num_iotte / 8;
+        atu->tbl.table_map_base = atu->base;
+        atu->dma_addr_mask = dma_mask;
+        atu->tbl.map = kzalloc(map_size, GFP_KERNEL);
+        if (!atu->tbl.map)
+                return -ENOMEM;
+
+        iommu_tbl_pool_init(&atu->tbl, num_iotte, IO_PAGE_SHIFT,
+                            NULL, false /* no large_pool */,
+                            0 /* default npools */,
+                            false /* want span boundary checking */);
+
+        return 0;
+}
+
 static int pci_sun4v_iommu_init(struct pci_pbm_info *pbm)
 {
         static const u32 vdma_default[] = { 0x80000000, 0x80000000 };
@@ -918,6 +1184,18 @@ static int pci_sun4v_pbm_init(struct pci_pbm_info *pbm,
 
         pci_sun4v_scan_bus(pbm, &op->dev);
 
+        /* if atu_init fails its not complete failure.
+         * we can still continue using legacy iommu.
+         */
+        if (pbm->iommu->atu) {
+                err = pci_sun4v_atu_init(pbm);
+                if (err) {
+                        kfree(pbm->iommu->atu);
+                        pbm->iommu->atu = NULL;
+                        pr_err(PFX "ATU init failed, err=%d\n", err);
+                }
+        }
+
         pbm->next = pci_pbm_root;
         pci_pbm_root = pbm;
 
@@ -931,8 +1209,10 @@ static int pci_sun4v_probe(struct platform_device *op)
         struct pci_pbm_info *pbm;
         struct device_node *dp;
         struct iommu *iommu;
+        struct atu *atu;
         u32 devhandle;
         int i, err = -ENODEV;
+        static bool hv_atu = true;
 
         dp = op->dev.of_node;
 
@@ -954,6 +1234,19 @@ static int pci_sun4v_probe(struct platform_device *op)
                 pr_info(PFX "Registered hvapi major[%lu] minor[%lu]\n",
                         vpci_major, vpci_minor);
 
+                err = sun4v_hvapi_register(HV_GRP_ATU, vatu_major, &vatu_minor);
+                if (err) {
+                        /* don't return an error if we fail to register the
+                         * ATU group, but ATU hcalls won't be available.
+                         */
+                        hv_atu = false;
+                        pr_err(PFX "Could not register hvapi ATU err=%d\n",
+                               err);
+                } else {
+                        pr_info(PFX "Registered hvapi ATU major[%lu] minor[%lu]\n",
+                                vatu_major, vatu_minor);
+                }
+
                 dma_ops = &sun4v_dma_ops;
         }
 
@@ -991,6 +1284,14 @@ static int pci_sun4v_probe(struct platform_device *op)
         }
 
         pbm->iommu = iommu;
+        iommu->atu = NULL;
+        if (hv_atu) {
+                atu = kzalloc(sizeof(*atu), GFP_KERNEL);
+                if (!atu)
+                        pr_err(PFX "Could not allocate atu\n");
+                else
+                        iommu->atu = atu;
+        }
 
         err = pci_sun4v_pbm_init(pbm, op, devhandle);
         if (err)
@@ -1001,6 +1302,7 @@ static int pci_sun4v_probe(struct platform_device *op)
         return 0;
 
 out_free_iommu:
+        kfree(iommu->atu);
         kfree(pbm->iommu);
 
 out_free_controller:
diff --git a/arch/sparc/kernel/pci_sun4v.h b/arch/sparc/kernel/pci_sun4v.h
index 5642212390b2..22603a4e48bf 100644
--- a/arch/sparc/kernel/pci_sun4v.h
+++ b/arch/sparc/kernel/pci_sun4v.h
@@ -89,4 +89,25 @@ unsigned long pci_sun4v_msg_setvalid(unsigned long devhandle,
                                      unsigned long msinum,
                                      unsigned long valid);
 
+/* Sun4v HV IOMMU v2 APIs */
+unsigned long pci_sun4v_iotsb_conf(unsigned long devhandle,
+                                   unsigned long ra,
+                                   unsigned long table_size,
+                                   unsigned long page_size,
+                                   unsigned long dvma_base,
+                                   u64 *iotsb_num);
+unsigned long pci_sun4v_iotsb_bind(unsigned long devhandle,
+                                   unsigned long iotsb_num,
+                                   unsigned int pci_device);
+unsigned long pci_sun4v_iotsb_map(unsigned long devhandle,
+                                  unsigned long iotsb_num,
+                                  unsigned long iotsb_index_iottes,
+                                  unsigned long io_attributes,
+                                  unsigned long io_page_list_pa,
+                                  long *mapped);
+unsigned long pci_sun4v_iotsb_demap(unsigned long devhandle,
+                                    unsigned long iotsb_num,
+                                    unsigned long iotsb_index,
+                                    unsigned long iottes,
+                                    unsigned long *demapped);
 #endif /* !(_PCI_SUN4V_H) */
diff --git a/arch/sparc/kernel/pci_sun4v_asm.S b/arch/sparc/kernel/pci_sun4v_asm.S
index e606d46c6815..578f09657916 100644
--- a/arch/sparc/kernel/pci_sun4v_asm.S
+++ b/arch/sparc/kernel/pci_sun4v_asm.S
@@ -360,3 +360,71 @@ ENTRY(pci_sun4v_msg_setvalid)
          mov    %o0, %o0
 ENDPROC(pci_sun4v_msg_setvalid)
 
+        /*
+         * %o0: devhandle
+         * %o1: r_addr
+         * %o2: size
+         * %o3: pagesize
+         * %o4: virt
+         * %o5: &iotsb_num/&iotsb_handle
+         *
+         * returns %o0: status
+         *         %o1: iotsb_num/iotsb_handle
+         */
+ENTRY(pci_sun4v_iotsb_conf)
+        mov     %o5, %g1
+        mov     HV_FAST_PCI_IOTSB_CONF, %o5
+        ta      HV_FAST_TRAP
+        retl
+         stx    %o1, [%g1]
+ENDPROC(pci_sun4v_iotsb_conf)
+
+        /*
+         * %o0: devhandle
+         * %o1: iotsb_num/iotsb_handle
+         * %o2: pci_device
+         *
+         * returns %o0: status
+         */
+ENTRY(pci_sun4v_iotsb_bind)
+        mov     HV_FAST_PCI_IOTSB_BIND, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+ENDPROC(pci_sun4v_iotsb_bind)
+
+        /*
+         * %o0: devhandle
+         * %o1: iotsb_num/iotsb_handle
+         * %o2: index_count
+         * %o3: iotte_attributes
+         * %o4: io_page_list_p
+         * %o5: &mapped
+         *
+         * returns %o0: status
+         *         %o1: #mapped
+         */
+ENTRY(pci_sun4v_iotsb_map)
+        mov     %o5, %g1
+        mov     HV_FAST_PCI_IOTSB_MAP, %o5
+        ta      HV_FAST_TRAP
+        retl
+         stx    %o1, [%g1]
+ENDPROC(pci_sun4v_iotsb_map)
+
+        /*
+         * %o0: devhandle
+         * %o1: iotsb_num/iotsb_handle
+         * %o2: iotsb_index
+         * %o3: #iottes
+         * %o4: &demapped
+         *
+         * returns %o0: status
+         *         %o1: #demapped
+         */
+ENTRY(pci_sun4v_iotsb_demap)
+        mov     HV_FAST_PCI_IOTSB_DEMAP, %o5
+        ta      HV_FAST_TRAP
+        retl
+         stx    %o1, [%o4]
+ENDPROC(pci_sun4v_iotsb_demap)
diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
index c3c12efe0bc0..9c0c8fd0b292 100644
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@ -89,7 +89,7 @@ asmlinkage void do_sigreturn(struct pt_regs *regs)
         sf = (struct signal_frame __user *) regs->u_regs[UREG_FP];
 
         /* 1. Make sure we are not getting garbage from the user */
-        if (!invalid_frame_pointer(sf, sizeof(*sf)))
+        if (invalid_frame_pointer(sf, sizeof(*sf)))
                 goto segv_and_exit;
 
         if (get_user(ufp, &sf->info.si_regs.u_regs[UREG_FP]))
@@ -150,7 +150,7 @@ asmlinkage void do_rt_sigreturn(struct pt_regs *regs)
 
         synchronize_user_stack();
         sf = (struct rt_signal_frame __user *) regs->u_regs[UREG_FP];
-        if (!invalid_frame_pointer(sf, sizeof(*sf)))
+        if (invalid_frame_pointer(sf, sizeof(*sf)))
                 goto segv;
 
         if (get_user(ufp, &sf->regs.u_regs[UREG_FP]))
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 439784b7b7ac..37aa537b3ad8 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -802,8 +802,10 @@ struct mdesc_mblock {
 };
 static struct mdesc_mblock *mblocks;
 static int num_mblocks;
+static int find_numa_node_for_addr(unsigned long pa,
+                                   struct node_mem_mask *pnode_mask);
 
-static unsigned long ra_to_pa(unsigned long addr)
+static unsigned long __init ra_to_pa(unsigned long addr)
 {
         int i;
 
@@ -819,8 +821,11 @@ static unsigned long ra_to_pa(unsigned long addr)
         return addr;
 }
 
-static int find_node(unsigned long addr)
+static int __init find_node(unsigned long addr)
 {
+        static bool search_mdesc = true;
+        static struct node_mem_mask last_mem_mask = { ~0UL, ~0UL };
+        static int last_index;
         int i;
 
         addr = ra_to_pa(addr);
@@ -830,13 +835,30 @@ static int find_node(unsigned long addr)
                 if ((addr & p->mask) == p->val)
                         return i;
         }
-        /* The following condition has been observed on LDOM guests.*/
-        WARN_ONCE(1, "find_node: A physical address doesn't match a NUMA node"
-                " rule. Some physical memory will be owned by node 0.");
-        return 0;
+        /* The following condition has been observed on LDOM guests because
+         * node_masks only contains the best latency mask and value.
+         * LDOM guest's mdesc can contain a single latency group to
+         * cover multiple address range. Print warning message only if the
+         * address cannot be found in node_masks nor mdesc.
+         */
+        if ((search_mdesc) &&
+            ((addr & last_mem_mask.mask) != last_mem_mask.val)) {
+                /* find the available node in the mdesc */
+                last_index = find_numa_node_for_addr(addr, &last_mem_mask);
+                numadbg("find_node: latency group for address 0x%lx is %d\n",
+                        addr, last_index);
+                if ((last_index < 0) || (last_index >= num_node_masks)) {
+                        /* WARN_ONCE() and use default group 0 */
+                        WARN_ONCE(1, "find_node: A physical address doesn't match a NUMA node rule. Some physical memory will be owned by node 0.");
+                        search_mdesc = false;
+                        last_index = 0;
+                }
+        }
+
+        return last_index;
 }
 
-static u64 memblock_nid_range(u64 start, u64 end, int *nid)
+static u64 __init memblock_nid_range(u64 start, u64 end, int *nid)
 {
         *nid = find_node(start);
         start += PAGE_SIZE;
@@ -1160,6 +1182,41 @@ int __node_distance(int from, int to)
         return numa_latency[from][to];
 }
 
+static int find_numa_node_for_addr(unsigned long pa,
+                                   struct node_mem_mask *pnode_mask)
+{
+        struct mdesc_handle *md = mdesc_grab();
+        u64 node, arc;
+        int i = 0;
+
+        node = mdesc_node_by_name(md, MDESC_NODE_NULL, "latency-groups");
+        if (node == MDESC_NODE_NULL)
+                goto out;
+
+        mdesc_for_each_node_by_name(md, node, "group") {
+                mdesc_for_each_arc(arc, md, node, MDESC_ARC_TYPE_FWD) {
+                        u64 target = mdesc_arc_target(md, arc);
+                        struct mdesc_mlgroup *m = find_mlgroup(target);
+
+                        if (!m)
+                                continue;
+                        if ((pa & m->mask) == m->match) {
+                                if (pnode_mask) {
+                                        pnode_mask->mask = m->mask;
+                                        pnode_mask->val = m->match;
+                                }
+                                mdesc_release(md);
+                                return i;
+                        }
+                }
+                i++;
+        }
+
+out:
+        mdesc_release(md);
+        return -1;
+}
+
 static int __init find_best_numa_node_for_mlgroup(struct mdesc_mlgroup *grp)
 {
         int i;
diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
index 6160761d5f61..4810e48dbbbf 100644
--- a/arch/tile/include/asm/cache.h
+++ b/arch/tile/include/asm/cache.h
@@ -61,4 +61,7 @@
  */
 #define __write_once __read_mostly
 
+/* __ro_after_init is the generic name for the tile arch __write_once. */
+#define __ro_after_init __read_mostly
+
 #endif /* _ASM_TILE_CACHE_H */
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index 178989e6d3e3..ea960d660917 100644
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
@@ -218,8 +218,8 @@ void do_timer_interrupt(struct pt_regs *regs, int fault_num)
  */
 unsigned long long sched_clock(void)
 {
-        return clocksource_cyc2ns(get_cycles(),
-                                  sched_clock_mult, SCHED_CLOCK_SHIFT);
+        return mult_frac(get_cycles(),
+                         sched_clock_mult, 1ULL << SCHED_CLOCK_SHIFT);
 }
 
 int setup_profiling_timer(unsigned int multiplier)
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index 536ccfcc01c6..34d9e15857c3 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -40,8 +40,8 @@ GCOV_PROFILE := n
 UBSAN_SANITIZE :=n
 
 LDFLAGS := -m elf_$(UTS_MACHINE)
-ifeq ($(CONFIG_RELOCATABLE),y)
-# If kernel is relocatable, build compressed kernel as PIE.
+# Compressed kernel should be built as PIE since it may be loaded at any
+# address by the bootloader.
 ifeq ($(CONFIG_X86_32),y)
 LDFLAGS += $(call ld-option, -pie) $(call ld-option, --no-dynamic-linker)
 else
@@ -51,7 +51,6 @@ else
 LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \
         && echo "-z noreloc-overflow -pie --no-dynamic-linker")
 endif
-endif
 LDFLAGS_vmlinux := -T
 
 hostprogs-y     := mkpiggy
diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c
index 26240dde081e..4224ede43b4e 100644
--- a/arch/x86/boot/cpu.c
+++ b/arch/x86/boot/cpu.c
@@ -87,6 +87,12 @@ int validate_cpu(void)
                 return -1;
         }
 
+        if (CONFIG_X86_MINIMUM_CPU_FAMILY <= 4 && !IS_ENABLED(CONFIG_M486) &&
+            !has_eflag(X86_EFLAGS_ID)) {
+                printf("This kernel requires a CPU with the CPUID instruction.  Build with CONFIG_M486=y to run on this CPU.\n");
+                return -1;
+        }
+
         if (err_flags) {
                 puts("This kernel requires the following features "
                      "not present on the CPU:\n");
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index 0ab5ee1c26af..aa8b0672f87a 100644
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -888,7 +888,7 @@ static int helper_rfc4106_encrypt(struct aead_request *req)
         unsigned long auth_tag_len = crypto_aead_authsize(tfm);
         u8 iv[16] __attribute__ ((__aligned__(AESNI_ALIGN)));
         struct scatter_walk src_sg_walk;
-        struct scatter_walk dst_sg_walk;
+        struct scatter_walk dst_sg_walk = {};
         unsigned int i;
 
         /* Assuming we are supporting rfc4106 64-bit extended */
@@ -968,7 +968,7 @@ static int helper_rfc4106_decrypt(struct aead_request *req)
         u8 iv[16] __attribute__ ((__aligned__(AESNI_ALIGN)));
         u8 authTag[16];
         struct scatter_walk src_sg_walk;
-        struct scatter_walk dst_sg_walk;
+        struct scatter_walk dst_sg_walk = {};
         unsigned int i;
 
         if (unlikely(req->assoclen != 16 && req->assoclen != 20))
diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c
index f5f4b3fbbbc2..afb222b63cae 100644
--- a/arch/x86/events/amd/core.c
+++ b/arch/x86/events/amd/core.c
@@ -662,7 +662,13 @@ static int __init amd_core_pmu_init(void)
                 pr_cont("Fam15h ");
                 x86_pmu.get_event_constraints = amd_get_event_constraints_f15h;
                 break;
-
+        case 0x17:
+                pr_cont("Fam17h ");
+                /*
+                 * In family 17h, there are no event constraints in the PMC hardware.
+                 * We fallback to using default amd_get_event_constraints.
+                 */
+                break;
         default:
                 pr_err("core perfctr but no constraints; unknown hardware!\n");
                 return -ENODEV;
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index d31735f37ed7..6e395c996900 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -69,7 +69,7 @@ u64 x86_perf_event_update(struct perf_event *event)
         int shift = 64 - x86_pmu.cntval_bits;
         u64 prev_raw_count, new_raw_count;
         int idx = hwc->idx;
-        s64 delta;
+        u64 delta;
 
         if (idx == INTEL_PMC_IDX_FIXED_BTS)
                 return 0;
@@ -2352,7 +2352,7 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent
                 frame.next_frame     = 0;
                 frame.return_address = 0;
 
-                if (!access_ok(VERIFY_READ, fp, 8))
+                if (!valid_user_frame(fp, sizeof(frame)))
                         break;
 
                 bytes = __copy_from_user_nmi(&frame.next_frame, fp, 4);
@@ -2362,9 +2362,6 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent
                 if (bytes != 0)
                         break;
 
-                if (!valid_user_frame(fp, sizeof(frame)))
-                        break;
-
                 perf_callchain_store(entry, cs_base + frame.return_address);
                 fp = compat_ptr(ss_base + frame.next_frame);
         }
@@ -2413,7 +2410,7 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs
                 frame.next_frame             = NULL;
                 frame.return_address = 0;
 
-                if (!access_ok(VERIFY_READ, fp, sizeof(*fp) * 2))
+                if (!valid_user_frame(fp, sizeof(frame)))
                         break;
 
                 bytes = __copy_from_user_nmi(&frame.next_frame, fp, sizeof(*fp));
@@ -2423,9 +2420,6 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs
                 if (bytes != 0)
                         break;
 
-                if (!valid_user_frame(fp, sizeof(frame)))
-                        break;
-
                 perf_callchain_store(entry, frame.return_address);
                 fp = (void __user *)frame.next_frame;
         }
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index a74a2dbc0180..cb8522290e6a 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -4034,7 +4034,7 @@ __init int intel_pmu_init(void)
 
         /* Support full width counters using alternative MSR range */
         if (x86_pmu.intel_cap.full_width_write) {
-                x86_pmu.max_period = x86_pmu.cntval_mask;
+                x86_pmu.max_period = x86_pmu.cntval_mask >> 1;
                 x86_pmu.perfctr = MSR_IA32_PMC0;
                 pr_cont("full-width counters, ");
         }
diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index 4f5ac726335f..da51e5a3e2ff 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -540,6 +540,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
         X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_DESKTOP, snb_cstates),
 
         X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNL, knl_cstates),
+        X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates),
         { },
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);
diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c
index 0319311dbdbb..be202390bbd3 100644
--- a/arch/x86/events/intel/ds.c
+++ b/arch/x86/events/intel/ds.c
@@ -1108,20 +1108,20 @@ static void setup_pebs_sample_data(struct perf_event *event,
         }
 
         /*
-         * We use the interrupt regs as a base because the PEBS record
-         * does not contain a full regs set, specifically it seems to
-         * lack segment descriptors, which get used by things like
-         * user_mode().
+         * We use the interrupt regs as a base because the PEBS record does not
+         * contain a full regs set, specifically it seems to lack segment
+         * descriptors, which get used by things like user_mode().
          *
-         * In the simple case fix up only the IP and BP,SP regs, for
-         * PERF_SAMPLE_IP and PERF_SAMPLE_CALLCHAIN to function properly.
-         * A possible PERF_SAMPLE_REGS will have to transfer all regs.
+         * In the simple case fix up only the IP for PERF_SAMPLE_IP.
+         *
+         * We must however always use BP,SP from iregs for the unwinder to stay
+         * sane; the record BP,SP can point into thin air when the record is
+         * from a previous PMI context or an (I)RET happend between the record
+         * and PMI.
          */
         *regs = *iregs;
         regs->flags = pebs->flags;
         set_linear_ip(regs, pebs->ip);
-        regs->bp = pebs->bp;
-        regs->sp = pebs->sp;
 
         if (sample_type & PERF_SAMPLE_REGS_INTR) {
                 regs->ax = pebs->ax;
@@ -1130,10 +1130,21 @@ static void setup_pebs_sample_data(struct perf_event *event,
                 regs->dx = pebs->dx;
                 regs->si = pebs->si;
                 regs->di = pebs->di;
-                regs->bp = pebs->bp;
-                regs->sp = pebs->sp;
 
-                regs->flags = pebs->flags;
+                /*
+                 * Per the above; only set BP,SP if we don't need callchains.
+                 *
+                 * XXX: does this make sense?
+                 */
+                if (!(sample_type & PERF_SAMPLE_CALLCHAIN)) {
+                        regs->bp = pebs->bp;
+                        regs->sp = pebs->sp;
+                }
+
+                /*
+                 * Preserve PERF_EFLAGS_VM from set_linear_ip().
+                 */
+                regs->flags = pebs->flags | (regs->flags & PERF_EFLAGS_VM);
 #ifndef CONFIG_X86_32
                 regs->r8 = pebs->r8;
                 regs->r9 = pebs->r9;
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index efca2685d876..dbaaf7dc8373 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -319,9 +319,9 @@ static struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type,
  */
 static int uncore_pmu_event_init(struct perf_event *event);
 
-static bool is_uncore_event(struct perf_event *event)
+static bool is_box_event(struct intel_uncore_box *box, struct perf_event *event)
 {
-        return event->pmu->event_init == uncore_pmu_event_init;
+        return &box->pmu->pmu == event->pmu;
 }
 
 static int
@@ -340,7 +340,7 @@ uncore_collect_events(struct intel_uncore_box *box, struct perf_event *leader,
 
         n = box->n_events;
 
-        if (is_uncore_event(leader)) {
+        if (is_box_event(box, leader)) {
                 box->event_list[n] = leader;
                 n++;
         }
@@ -349,7 +349,7 @@ uncore_collect_events(struct intel_uncore_box *box, struct perf_event *leader,
                 return n;
 
         list_for_each_entry(event, &leader->sibling_list, group_entry) {
-                if (!is_uncore_event(event) ||
+                if (!is_box_event(box, event) ||
                     event->state <= PERF_EVENT_STATE_OFF)
                         continue;
 
diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c
index 5f845eef9a4d..a3dcc12bef4a 100644
--- a/arch/x86/events/intel/uncore_snb.c
+++ b/arch/x86/events/intel/uncore_snb.c
@@ -8,8 +8,12 @@
 #define PCI_DEVICE_ID_INTEL_HSW_IMC     0x0c00
 #define PCI_DEVICE_ID_INTEL_HSW_U_IMC   0x0a04
 #define PCI_DEVICE_ID_INTEL_BDW_IMC     0x1604
-#define PCI_DEVICE_ID_INTEL_SKL_IMC     0x191f
-#define PCI_DEVICE_ID_INTEL_SKL_U_IMC   0x190c
+#define PCI_DEVICE_ID_INTEL_SKL_U_IMC   0x1904
+#define PCI_DEVICE_ID_INTEL_SKL_Y_IMC   0x190c
+#define PCI_DEVICE_ID_INTEL_SKL_HD_IMC  0x1900
+#define PCI_DEVICE_ID_INTEL_SKL_HQ_IMC  0x1910
+#define PCI_DEVICE_ID_INTEL_SKL_SD_IMC  0x190f
+#define PCI_DEVICE_ID_INTEL_SKL_SQ_IMC  0x191f
 
 /* SNB event control */
 #define SNB_UNC_CTL_EV_SEL_MASK                 0x000000ff
@@ -486,24 +490,12 @@ static int snb_uncore_imc_event_add(struct perf_event *event, int flags)
 
         snb_uncore_imc_event_start(event, 0);
 
-        box->n_events++;
-
         return 0;
 }
 
 static void snb_uncore_imc_event_del(struct perf_event *event, int flags)
 {
-        struct intel_uncore_box *box = uncore_event_to_box(event);
-        int i;
-
         snb_uncore_imc_event_stop(event, PERF_EF_UPDATE);
-
-        for (i = 0; i < box->n_events; i++) {
-                if (event == box->event_list[i]) {
-                        --box->n_events;
-                        break;
-                }
-        }
 }
 
 int snb_pci2phy_map_init(int devid)
@@ -616,13 +608,29 @@ static const struct pci_device_id bdw_uncore_pci_ids[] = {
 
 static const struct pci_device_id skl_uncore_pci_ids[] = {
         { /* IMC */
-                PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SKL_IMC),
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SKL_Y_IMC),
                 .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
         },
         { /* IMC */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SKL_U_IMC),
                 .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
         },
+        { /* IMC */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SKL_HD_IMC),
+                .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
+        },
+        { /* IMC */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SKL_HQ_IMC),
+                .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
+        },
+        { /* IMC */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SKL_SD_IMC),
+                .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
+        },
+        { /* IMC */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SKL_SQ_IMC),
+                .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
+        },
 
         { /* end: all zeroes */ },
 };
@@ -666,8 +674,12 @@ static const struct imc_uncore_pci_dev desktop_imc_pci_ids[] = {
         IMC_DEV(HSW_IMC, &hsw_uncore_pci_driver),    /* 4th Gen Core Processor */
         IMC_DEV(HSW_U_IMC, &hsw_uncore_pci_driver),  /* 4th Gen Core ULT Mobile Processor */
         IMC_DEV(BDW_IMC, &bdw_uncore_pci_driver),    /* 5th Gen Core U */
-        IMC_DEV(SKL_IMC, &skl_uncore_pci_driver),    /* 6th Gen Core */
+        IMC_DEV(SKL_Y_IMC, &skl_uncore_pci_driver),  /* 6th Gen Core Y */
         IMC_DEV(SKL_U_IMC, &skl_uncore_pci_driver),  /* 6th Gen Core U */
+        IMC_DEV(SKL_HD_IMC, &skl_uncore_pci_driver),  /* 6th Gen Core H Dual Core */
+        IMC_DEV(SKL_HQ_IMC, &skl_uncore_pci_driver),  /* 6th Gen Core H Quad Core */
+        IMC_DEV(SKL_SD_IMC, &skl_uncore_pci_driver),  /* 6th Gen Core S Dual Core */
+        IMC_DEV(SKL_SQ_IMC, &skl_uncore_pci_driver),  /* 6th Gen Core S Quad Core */
         {  /* end marker */ }
 };
 
diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h
index 5874d8de1f8d..a77ee026643d 100644
--- a/arch/x86/events/perf_event.h
+++ b/arch/x86/events/perf_event.h
@@ -113,7 +113,7 @@ struct debug_store {
  * Per register state.
  */
 struct er_account {
-        raw_spinlock_t          lock;   /* per-core: protect structure */
+        raw_spinlock_t      lock;       /* per-core: protect structure */
         u64                 config;     /* extra MSR config */
         u64                 reg;        /* extra MSR number */
         atomic_t            ref;        /* reference count */
diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
index 03d269bed941..24118c0b4640 100644
--- a/arch/x86/include/asm/compat.h
+++ b/arch/x86/include/asm/compat.h
@@ -272,7 +272,6 @@ struct compat_shmid64_ds {
 /*
  * The type of struct elf_prstatus.pr_reg in compatible core dumps.
  */
-#ifdef CONFIG_X86_X32_ABI
 typedef struct user_regs_struct compat_elf_gregset_t;
 
 /* Full regset -- prstatus on x32, otherwise on ia32 */
@@ -281,10 +280,9 @@ typedef struct user_regs_struct compat_elf_gregset_t;
   do { *(int *) (((void *) &((S)->pr_reg)) + R) = (V); } \
   while (0)
 
+#ifdef CONFIG_X86_X32_ABI
 #define COMPAT_USE_64BIT_TIME \
         (!!(task_pt_regs(current)->orig_ax & __X32_SYSCALL_BIT))
-#else
-typedef struct user_regs_struct32 compat_elf_gregset_t;
 #endif
 
 /*
diff --git a/arch/x86/include/asm/intel-mid.h b/arch/x86/include/asm/intel-mid.h
index 5b6753d1f7f4..49da9f497b90 100644
--- a/arch/x86/include/asm/intel-mid.h
+++ b/arch/x86/include/asm/intel-mid.h
@@ -17,6 +17,7 @@
 
 extern int intel_mid_pci_init(void);
 extern int intel_mid_pci_set_power_state(struct pci_dev *pdev, pci_power_t state);
+extern pci_power_t intel_mid_pci_get_power_state(struct pci_dev *pdev);
 
 extern void intel_mid_pwr_power_off(void);
 
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index aeef53ce93e1..35690a168cf7 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -815,9 +815,9 @@ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode)
                                 l = li;
                         }
                         addr1 = (base << shift) +
-                                f * (unsigned long)(1 << m_io);
+                                f * (1ULL << m_io);
                         addr2 = (base << shift) +
-                                (l + 1) * (unsigned long)(1 << m_io);
+                                (l + 1) * (1ULL << m_io);
                         pr_info("UV: %s[%03d..%03d] NASID 0x%04x ADDR 0x%016lx - 0x%016lx\n",
                                 id, fi, li, lnasid, addr1, addr2);
                         if (max_io < l)
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index c7364bd633e1..51287cd90bf6 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1042,8 +1042,11 @@ static int apm_get_power_status(u_short *status, u_short *bat, u_short *life)
 
         if (apm_info.get_power_status_broken)
                 return APM_32_UNSUPPORTED;
-        if (apm_bios_call(&call))
+        if (apm_bios_call(&call)) {
+                if (!call.err)
+                        return APM_NO_ERROR;
                 return call.err;
+        }
         *status = call.ebx;
         *bat = call.ecx;
         if (apm_info.get_power_status_swabinminutes) {
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index b81fe2d63e15..1e81a37c034e 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -347,7 +347,6 @@ static void amd_detect_cmp(struct cpuinfo_x86 *c)
 #ifdef CONFIG_SMP
         unsigned bits;
         int cpu = smp_processor_id();
-        unsigned int socket_id, core_complex_id;
 
         bits = c->x86_coreid_bits;
         /* Low order bits define the core id (index of core in socket) */
@@ -365,10 +364,7 @@ static void amd_detect_cmp(struct cpuinfo_x86 *c)
          if (c->x86 != 0x17 || !cpuid_edx(0x80000006))
                 return;
 
-        socket_id       = (c->apicid >> bits) - 1;
-        core_complex_id = (c->apicid & ((1 << bits) - 1)) >> 3;
-
-        per_cpu(cpu_llc_id, cpu) = (socket_id << 3) | core_complex_id;
+        per_cpu(cpu_llc_id, cpu) = c->apicid >> 3;
 #endif
 }
 
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 9bd910a7dd0a..cc9e980c68ec 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -979,6 +979,35 @@ static void x86_init_cache_qos(struct cpuinfo_x86 *c)
 }
 
 /*
+ * The physical to logical package id mapping is initialized from the
+ * acpi/mptables information. Make sure that CPUID actually agrees with
+ * that.
+ */
+static void sanitize_package_id(struct cpuinfo_x86 *c)
+{
+#ifdef CONFIG_SMP
+        unsigned int pkg, apicid, cpu = smp_processor_id();
+
+        apicid = apic->cpu_present_to_apicid(cpu);
+        pkg = apicid >> boot_cpu_data.x86_coreid_bits;
+
+        if (apicid != c->initial_apicid) {
+                pr_err(FW_BUG "CPU%u: APIC id mismatch. Firmware: %x CPUID: %x\n",
+                       cpu, apicid, c->initial_apicid);
+                c->initial_apicid = apicid;
+        }
+        if (pkg != c->phys_proc_id) {
+                pr_err(FW_BUG "CPU%u: Using firmware package id %u instead of %u\n",
+                       cpu, pkg, c->phys_proc_id);
+                c->phys_proc_id = pkg;
+        }
+        c->logical_proc_id = topology_phys_to_logical_pkg(pkg);
+#else
+        c->logical_proc_id = 0;
+#endif
+}
+
+/*
  * This does the hard work of actually picking apart the CPU stuff...
  */
 static void identify_cpu(struct cpuinfo_x86 *c)
@@ -1103,8 +1132,7 @@ static void identify_cpu(struct cpuinfo_x86 *c)
 #ifdef CONFIG_NUMA
         numa_add_cpu(smp_processor_id());
 #endif
-        /* The boot/hotplug time assigment got cleared, restore it */
-        c->logical_proc_id = topology_phys_to_logical_pkg(c->phys_proc_id);
+        sanitize_package_id(c);
 }
 
 /*
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 9b7cf5c28f5f..85f854b98a9d 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -112,7 +112,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
                 for (; stack < stack_info.end; stack++) {
                         unsigned long real_addr;
                         int reliable = 0;
-                        unsigned long addr = *stack;
+                        unsigned long addr = READ_ONCE_NOCHECK(*stack);
                         unsigned long *ret_addr_p =
                                 unwind_get_return_address_ptr(&state);
 
diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index 47004010ad5d..ebb4e95fbd74 100644
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -521,14 +521,14 @@ void fpu__clear(struct fpu *fpu)
 {
         WARN_ON_FPU(fpu != &current->thread.fpu); /* Almost certainly an anomaly */
 
-        if (!use_eager_fpu() || !static_cpu_has(X86_FEATURE_FPU)) {
-                /* FPU state will be reallocated lazily at the first use. */
-                fpu__drop(fpu);
-        } else {
-                if (!fpu->fpstate_active) {
-                        fpu__activate_curr(fpu);
-                        user_fpu_begin();
-                }
+        fpu__drop(fpu);
+
+        /*
+         * Make sure fpstate is cleared and initialized.
+         */
+        if (static_cpu_has(X86_FEATURE_FPU)) {
+                fpu__activate_curr(fpu);
+                user_fpu_begin();
                 copy_init_fpstate_to_fpregs();
         }
 }
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index b6b2f0264af3..2dabea46f039 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -665,14 +665,17 @@ __PAGE_ALIGNED_BSS
 initial_pg_pmd:
         .fill 1024*KPMDS,4,0
 #else
-ENTRY(initial_page_table)
+.globl initial_page_table
+initial_page_table:
         .fill 1024,4,0
 #endif
 initial_pg_fixmap:
         .fill 1024,4,0
-ENTRY(empty_zero_page)
+.globl empty_zero_page
+empty_zero_page:
         .fill 4096,1,0
-ENTRY(swapper_pg_dir)
+.globl swapper_pg_dir
+swapper_pg_dir:
         .fill 1024,4,0
 EXPORT_SYMBOL(empty_zero_page)
 
diff --git a/arch/x86/kernel/sysfb_simplefb.c b/arch/x86/kernel/sysfb_simplefb.c
index 764a29f84de7..85195d447a92 100644
--- a/arch/x86/kernel/sysfb_simplefb.c
+++ b/arch/x86/kernel/sysfb_simplefb.c
@@ -66,13 +66,36 @@ __init int create_simplefb(const struct screen_info *si,
 {
         struct platform_device *pd;
         struct resource res;
-        unsigned long len;
+        u64 base, size;
+        u32 length;
 
-        /* don't use lfb_size as it may contain the whole VMEM instead of only
-         * the part that is occupied by the framebuffer */
-        len = mode->height * mode->stride;
-        len = PAGE_ALIGN(len);
-        if (len > (u64)si->lfb_size << 16) {
+        /*
+         * If the 64BIT_BASE capability is set, ext_lfb_base will contain the
+         * upper half of the base address. Assemble the address, then make sure
+         * it is valid and we can actually access it.
+         */
+        base = si->lfb_base;
+        if (si->capabilities & VIDEO_CAPABILITY_64BIT_BASE)
+                base |= (u64)si->ext_lfb_base << 32;
+        if (!base || (u64)(resource_size_t)base != base) {
+                printk(KERN_DEBUG "sysfb: inaccessible VRAM base\n");
+                return -EINVAL;
+        }
+
+        /*
+         * Don't use lfb_size as IORESOURCE size, since it may contain the
+         * entire VMEM, and thus require huge mappings. Use just the part we
+         * need, that is, the part where the framebuffer is located. But verify
+         * that it does not exceed the advertised VMEM.
+         * Note that in case of VBE, the lfb_size is shifted by 16 bits for
+         * historical reasons.
+         */
+        size = si->lfb_size;
+        if (si->orig_video_isVGA == VIDEO_TYPE_VLFB)
+                size <<= 16;
+        length = mode->height * mode->stride;
+        length = PAGE_ALIGN(length);
+        if (length > size) {
                 printk(KERN_WARNING "sysfb: VRAM smaller than advertised\n");
                 return -EINVAL;
         }
@@ -81,8 +104,8 @@ __init int create_simplefb(const struct screen_info *si,
         memset(&res, 0, sizeof(res));
         res.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
         res.name = simplefb_resname;
-        res.start = si->lfb_base;
-        res.end = si->lfb_base + len - 1;
+        res.start = base;
+        res.end = res.start + length - 1;
         if (res.end <= res.start)
                 return -EINVAL;
 
diff --git a/arch/x86/kernel/unwind_guess.c b/arch/x86/kernel/unwind_guess.c
index 2d721e533cf4..22881ddcbb9f 100644
--- a/arch/x86/kernel/unwind_guess.c
+++ b/arch/x86/kernel/unwind_guess.c
@@ -7,11 +7,15 @@
 
 unsigned long unwind_get_return_address(struct unwind_state *state)
 {
+        unsigned long addr;
+
         if (unwind_done(state))
                 return 0;
 
+        addr = READ_ONCE_NOCHECK(*state->sp);
+
         return ftrace_graph_ret_addr(state->task, &state->graph_idx,
-                                     *state->sp, state->sp);
+                                     addr, state->sp);
 }
 EXPORT_SYMBOL_GPL(unwind_get_return_address);
 
@@ -23,9 +27,12 @@ bool unwind_next_frame(struct unwind_state *state)
                 return false;
 
         do {
-                for (state->sp++; state->sp < info->end; state->sp++)
-                        if (__kernel_text_address(*state->sp))
+                for (state->sp++; state->sp < info->end; state->sp++) {
+                        unsigned long addr = READ_ONCE_NOCHECK(*state->sp);
+
+                        if (__kernel_text_address(addr))
                                 return true;
+                }
 
                 state->sp = info->next_sp;
 
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index cbd7b92585bb..a3ce9d260d68 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2105,16 +2105,10 @@ static int em_iret(struct x86_emulate_ctxt *ctxt)
 static int em_jmp_far(struct x86_emulate_ctxt *ctxt)
 {
         int rc;
-        unsigned short sel, old_sel;
-        struct desc_struct old_desc, new_desc;
-        const struct x86_emulate_ops *ops = ctxt->ops;
+        unsigned short sel;
+        struct desc_struct new_desc;
         u8 cpl = ctxt->ops->cpl(ctxt);
 
-        /* Assignment of RIP may only fail in 64-bit mode */
-        if (ctxt->mode == X86EMUL_MODE_PROT64)
-                ops->get_segment(ctxt, &old_sel, &old_desc, NULL,
-                                 VCPU_SREG_CS);
-
         memcpy(&sel, ctxt->src.valptr + ctxt->op_bytes, 2);
 
         rc = __load_segment_descriptor(ctxt, sel, VCPU_SREG_CS, cpl,
@@ -2124,12 +2118,10 @@ static int em_jmp_far(struct x86_emulate_ctxt *ctxt)
                 return rc;
 
         rc = assign_eip_far(ctxt, ctxt->src.val, &new_desc);
-        if (rc != X86EMUL_CONTINUE) {
-                WARN_ON(ctxt->mode != X86EMUL_MODE_PROT64);
-                /* assigning eip failed; restore the old cs */
-                ops->set_segment(ctxt, old_sel, &old_desc, 0, VCPU_SREG_CS);
-                return rc;
-        }
+        /* Error handling is not implemented. */
+        if (rc != X86EMUL_CONTINUE)
+                return X86EMUL_UNHANDLEABLE;
+
         return rc;
 }
 
@@ -2189,14 +2181,8 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt)
 {
         int rc;
         unsigned long eip, cs;
-        u16 old_cs;
         int cpl = ctxt->ops->cpl(ctxt);
-        struct desc_struct old_desc, new_desc;
-        const struct x86_emulate_ops *ops = ctxt->ops;
-
-        if (ctxt->mode == X86EMUL_MODE_PROT64)
-                ops->get_segment(ctxt, &old_cs, &old_desc, NULL,
-                                 VCPU_SREG_CS);
+        struct desc_struct new_desc;
 
         rc = emulate_pop(ctxt, &eip, ctxt->op_bytes);
         if (rc != X86EMUL_CONTINUE)
@@ -2213,10 +2199,10 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt)
         if (rc != X86EMUL_CONTINUE)
                 return rc;
         rc = assign_eip_far(ctxt, eip, &new_desc);
-        if (rc != X86EMUL_CONTINUE) {
-                WARN_ON(ctxt->mode != X86EMUL_MODE_PROT64);
-                ops->set_segment(ctxt, old_cs, &old_desc, 0, VCPU_SREG_CS);
-        }
+        /* Error handling is not implemented. */
+        if (rc != X86EMUL_CONTINUE)
+                return X86EMUL_UNHANDLEABLE;
+
         return rc;
 }
 
diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c
index 1a22de70f7f7..6e219e5c07d2 100644
--- a/arch/x86/kvm/ioapic.c
+++ b/arch/x86/kvm/ioapic.c
@@ -94,7 +94,7 @@ static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic,
 static void rtc_irq_eoi_tracking_reset(struct kvm_ioapic *ioapic)
 {
         ioapic->rtc_status.pending_eoi = 0;
-        bitmap_zero(ioapic->rtc_status.dest_map.map, KVM_MAX_VCPUS);
+        bitmap_zero(ioapic->rtc_status.dest_map.map, KVM_MAX_VCPU_ID);
 }
 
 static void kvm_rtc_eoi_tracking_restore_all(struct kvm_ioapic *ioapic);
diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h
index 7d2692a49657..1cc6e54436db 100644
--- a/arch/x86/kvm/ioapic.h
+++ b/arch/x86/kvm/ioapic.h
@@ -42,13 +42,13 @@ struct kvm_vcpu;
 
 struct dest_map {
         /* vcpu bitmap where IRQ has been sent */
-        DECLARE_BITMAP(map, KVM_MAX_VCPUS);
+        DECLARE_BITMAP(map, KVM_MAX_VCPU_ID);
 
         /*
          * Vector sent to a given vcpu, only valid when
          * the vcpu's bit in map is set
          */
-        u8 vectors[KVM_MAX_VCPUS];
+        u8 vectors[KVM_MAX_VCPU_ID];
 };
 
 
diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c
index 25810b144b58..6c0191615f23 100644
--- a/arch/x86/kvm/irq_comm.c
+++ b/arch/x86/kvm/irq_comm.c
@@ -41,6 +41,15 @@ static int kvm_set_pic_irq(struct kvm_kernel_irq_routing_entry *e,
                            bool line_status)
 {
         struct kvm_pic *pic = pic_irqchip(kvm);
+
+        /*
+         * XXX: rejecting pic routes when pic isn't in use would be better,
+         * but the default routing table is installed while kvm->arch.vpic is
+         * NULL and KVM_CREATE_IRQCHIP can race with KVM_IRQ_LINE.
+         */
+        if (!pic)
+                return -1;
+
         return kvm_pic_set_irq(pic, e->irqchip.pin, irq_source_id, level);
 }
 
@@ -49,6 +58,10 @@ static int kvm_set_ioapic_irq(struct kvm_kernel_irq_routing_entry *e,
                               bool line_status)
 {
         struct kvm_ioapic *ioapic = kvm->arch.vioapic;
+
+        if (!ioapic)
+                return -1;
+
         return kvm_ioapic_set_irq(ioapic, e->irqchip.pin, irq_source_id, level,
                                 line_status);
 }
@@ -156,6 +169,16 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,
 }
 
 
+static int kvm_hv_set_sint(struct kvm_kernel_irq_routing_entry *e,
+                    struct kvm *kvm, int irq_source_id, int level,
+                    bool line_status)
+{
+        if (!level)
+                return -1;
+
+        return kvm_hv_synic_set_irq(kvm, e->hv_sint.vcpu, e->hv_sint.sint);
+}
+
 int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e,
                               struct kvm *kvm, int irq_source_id, int level,
                               bool line_status)
@@ -163,18 +186,26 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e,
         struct kvm_lapic_irq irq;
         int r;
 
-        if (unlikely(e->type != KVM_IRQ_ROUTING_MSI))
-                return -EWOULDBLOCK;
+        switch (e->type) {
+        case KVM_IRQ_ROUTING_HV_SINT:
+                return kvm_hv_set_sint(e, kvm, irq_source_id, level,
+                                       line_status);
 
-        if (kvm_msi_route_invalid(kvm, e))
-                return -EINVAL;
+        case KVM_IRQ_ROUTING_MSI:
+                if (kvm_msi_route_invalid(kvm, e))
+                        return -EINVAL;
 
-        kvm_set_msi_irq(kvm, e, &irq);
+                kvm_set_msi_irq(kvm, e, &irq);
 
-        if (kvm_irq_delivery_to_apic_fast(kvm, NULL, &irq, &r, NULL))
-                return r;
-        else
-                return -EWOULDBLOCK;
+                if (kvm_irq_delivery_to_apic_fast(kvm, NULL, &irq, &r, NULL))
+                        return r;
+                break;
+
+        default:
+                break;
+        }
+
+        return -EWOULDBLOCK;
 }
 
 int kvm_request_irq_source_id(struct kvm *kvm)
@@ -254,16 +285,6 @@ void kvm_fire_mask_notifiers(struct kvm *kvm, unsigned irqchip, unsigned pin,
         srcu_read_unlock(&kvm->irq_srcu, idx);
 }
 
-static int kvm_hv_set_sint(struct kvm_kernel_irq_routing_entry *e,
-                    struct kvm *kvm, int irq_source_id, int level,
-                    bool line_status)
-{
-        if (!level)
-                return -1;
-
-        return kvm_hv_synic_set_irq(kvm, e->hv_sint.vcpu, e->hv_sint.sint);
-}
-
 int kvm_set_routing_entry(struct kvm *kvm,
                           struct kvm_kernel_irq_routing_entry *e,
                           const struct kvm_irq_routing_entry *ue)
@@ -423,18 +444,6 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,
         srcu_read_unlock(&kvm->irq_srcu, idx);
 }
 
-int kvm_arch_set_irq(struct kvm_kernel_irq_routing_entry *irq, struct kvm *kvm,
-                     int irq_source_id, int level, bool line_status)
-{
-        switch (irq->type) {
-        case KVM_IRQ_ROUTING_HV_SINT:
-                return kvm_hv_set_sint(irq, kvm, irq_source_id, level,
-                                       line_status);
-        default:
-                return -EWOULDBLOCK;
-        }
-}
-
 void kvm_arch_irq_routing_update(struct kvm *kvm)
 {
         kvm_hv_irq_routing_update(kvm);
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 23b99f305382..6f69340f9fa3 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -138,7 +138,7 @@ static inline bool kvm_apic_map_get_logical_dest(struct kvm_apic_map *map,
                 *mask = dest_id & 0xff;
                 return true;
         case KVM_APIC_MODE_XAPIC_CLUSTER:
-                *cluster = map->xapic_cluster_map[dest_id >> 4];
+                *cluster = map->xapic_cluster_map[(dest_id >> 4) & 0xf];
                 *mask = dest_id & 0xf;
                 return true;
         default:
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 3017de0431bd..04c5d96b1d67 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -210,7 +210,18 @@ static void kvm_on_user_return(struct user_return_notifier *urn)
         struct kvm_shared_msrs *locals
                 = container_of(urn, struct kvm_shared_msrs, urn);
         struct kvm_shared_msr_values *values;
+        unsigned long flags;
 
+        /*
+         * Disabling irqs at this point since the following code could be
+         * interrupted and executed through kvm_arch_hardware_disable()
+         */
+        local_irq_save(flags);
+        if (locals->registered) {
+                locals->registered = false;
+                user_return_notifier_unregister(urn);
+        }
+        local_irq_restore(flags);
         for (slot = 0; slot < shared_msrs_global.nr; ++slot) {
                 values = &locals->values[slot];
                 if (values->host != values->curr) {
@@ -218,8 +229,6 @@ static void kvm_on_user_return(struct user_return_notifier *urn)
                         values->curr = values->host;
                 }
         }
-        locals->registered = false;
-        user_return_notifier_unregister(urn);
 }
 
 static void shared_msr_update(unsigned slot, u32 msr)
@@ -1724,18 +1733,23 @@ static void kvm_gen_update_masterclock(struct kvm *kvm)
 
 static u64 __get_kvmclock_ns(struct kvm *kvm)
 {
-        struct kvm_vcpu *vcpu = kvm_get_vcpu(kvm, 0);
         struct kvm_arch *ka = &kvm->arch;
-        s64 ns;
+        struct pvclock_vcpu_time_info hv_clock;
 
-        if (vcpu->arch.hv_clock.flags & PVCLOCK_TSC_STABLE_BIT) {
-                u64 tsc = kvm_read_l1_tsc(vcpu, rdtsc());
-                ns = __pvclock_read_cycles(&vcpu->arch.hv_clock, tsc);
-        } else {
-                ns = ktime_get_boot_ns() + ka->kvmclock_offset;
+        spin_lock(&ka->pvclock_gtod_sync_lock);
+        if (!ka->use_master_clock) {
+                spin_unlock(&ka->pvclock_gtod_sync_lock);
+                return ktime_get_boot_ns() + ka->kvmclock_offset;
         }
 
-        return ns;
+        hv_clock.tsc_timestamp = ka->master_cycle_now;
+        hv_clock.system_time = ka->master_kernel_ns + ka->kvmclock_offset;
+        spin_unlock(&ka->pvclock_gtod_sync_lock);
+
+        kvm_get_time_scale(NSEC_PER_SEC, __this_cpu_read(cpu_tsc_khz) * 1000LL,
+                           &hv_clock.tsc_shift,
+                           &hv_clock.tsc_to_system_mul);
+        return __pvclock_read_cycles(&hv_clock, rdtsc());
 }
 
 u64 get_kvmclock_ns(struct kvm *kvm)
@@ -2596,7 +2610,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
         case KVM_CAP_PIT_STATE2:
         case KVM_CAP_SET_IDENTITY_MAP_ADDR:
         case KVM_CAP_XEN_HVM:
-        case KVM_CAP_ADJUST_CLOCK:
         case KVM_CAP_VCPU_EVENTS:
         case KVM_CAP_HYPERV:
         case KVM_CAP_HYPERV_VAPIC:
@@ -2623,6 +2636,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 #endif
                 r = 1;
                 break;
+        case KVM_CAP_ADJUST_CLOCK:
+                r = KVM_CLOCK_TSC_STABLE;
+                break;
         case KVM_CAP_X86_SMM:
                 /* SMBASE is usually relocated above 1M on modern chipsets,
                  * and SMM handlers might indeed rely on 4G segment limits,
@@ -3415,6 +3431,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
         };
         case KVM_SET_VAPIC_ADDR: {
                 struct kvm_vapic_addr va;
+                int idx;
 
                 r = -EINVAL;
                 if (!lapic_in_kernel(vcpu))
@@ -3422,7 +3439,9 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
                 r = -EFAULT;
                 if (copy_from_user(&va, argp, sizeof va))
                         goto out;
+                idx = srcu_read_lock(&vcpu->kvm->srcu);
                 r = kvm_lapic_set_vapic_addr(vcpu, va.vapic_addr);
+                srcu_read_unlock(&vcpu->kvm->srcu, idx);
                 break;
         }
         case KVM_X86_SETUP_MCE: {
@@ -4103,9 +4122,11 @@ long kvm_arch_vm_ioctl(struct file *filp,
                 struct kvm_clock_data user_ns;
                 u64 now_ns;
 
-                now_ns = get_kvmclock_ns(kvm);
+                local_irq_disable();
+                now_ns = __get_kvmclock_ns(kvm);
                 user_ns.clock = now_ns;
-                user_ns.flags = 0;
+                user_ns.flags = kvm->arch.use_master_clock ? KVM_CLOCK_TSC_STABLE : 0;
+                local_irq_enable();
                 memset(&user_ns.pad, 0, sizeof(user_ns.pad));
 
                 r = -EFAULT;
diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
index 79ae939970d3..fcd06f7526de 100644
--- a/arch/x86/mm/extable.c
+++ b/arch/x86/mm/extable.c
@@ -135,7 +135,12 @@ void __init early_fixup_exception(struct pt_regs *regs, int trapnr)
         if (early_recursion_flag > 2)
                 goto halt_loop;
 
-        if (regs->cs != __KERNEL_CS)
+        /*
+         * Old CPUs leave the high bits of CS on the stack
+         * undefined.  I'm not sure which CPUs do this, but at least
+         * the 486 DX works this way.
+         */
+        if ((regs->cs & 0xFFFF) != __KERNEL_CS)
                 goto fail;
 
         /*
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index bf99aa7005eb..936a488d6cf6 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -861,7 +861,7 @@ static void __init __efi_enter_virtual_mode(void)
         int count = 0, pg_shift = 0;
         void *new_memmap = NULL;
         efi_status_t status;
-        phys_addr_t pa;
+        unsigned long pa;
 
         efi.systab = NULL;
 
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index 58b0f801f66f..319148bd4b05 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -31,6 +31,7 @@
 #include <linux/io.h>
 #include <linux/reboot.h>
 #include <linux/slab.h>
+#include <linux/ucs2_string.h>
 
 #include <asm/setup.h>
 #include <asm/page.h>
@@ -211,6 +212,35 @@ void efi_sync_low_kernel_mappings(void)
         memcpy(pud_efi, pud_k, sizeof(pud_t) * num_entries);
 }
 
+/*
+ * Wrapper for slow_virt_to_phys() that handles NULL addresses.
+ */
+static inline phys_addr_t
+virt_to_phys_or_null_size(void *va, unsigned long size)
+{
+        bool bad_size;
+
+        if (!va)
+                return 0;
+
+        if (virt_addr_valid(va))
+                return virt_to_phys(va);
+
+        /*
+         * A fully aligned variable on the stack is guaranteed not to
+         * cross a page bounary. Try to catch strings on the stack by
+         * checking that 'size' is a power of two.
+         */
+        bad_size = size > PAGE_SIZE || !is_power_of_2(size);
+
+        WARN_ON(!IS_ALIGNED((unsigned long)va, size) || bad_size);
+
+        return slow_virt_to_phys(va);
+}
+
+#define virt_to_phys_or_null(addr)                              \
+        virt_to_phys_or_null_size((addr), sizeof(*(addr)))
+
 int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
 {
         unsigned long pfn, text;
@@ -494,8 +524,8 @@ static efi_status_t efi_thunk_get_time(efi_time_t *tm, efi_time_cap_t *tc)
 
         spin_lock(&rtc_lock);
 
-        phys_tm = virt_to_phys(tm);
-        phys_tc = virt_to_phys(tc);
+        phys_tm = virt_to_phys_or_null(tm);
+        phys_tc = virt_to_phys_or_null(tc);
 
         status = efi_thunk(get_time, phys_tm, phys_tc);
 
@@ -511,7 +541,7 @@ static efi_status_t efi_thunk_set_time(efi_time_t *tm)
 
         spin_lock(&rtc_lock);
 
-        phys_tm = virt_to_phys(tm);
+        phys_tm = virt_to_phys_or_null(tm);
 
         status = efi_thunk(set_time, phys_tm);
 
@@ -529,9 +559,9 @@ efi_thunk_get_wakeup_time(efi_bool_t *enabled, efi_bool_t *pending,
 
         spin_lock(&rtc_lock);
 
-        phys_enabled = virt_to_phys(enabled);
-        phys_pending = virt_to_phys(pending);
-        phys_tm = virt_to_phys(tm);
+        phys_enabled = virt_to_phys_or_null(enabled);
+        phys_pending = virt_to_phys_or_null(pending);
+        phys_tm = virt_to_phys_or_null(tm);
 
         status = efi_thunk(get_wakeup_time, phys_enabled,
                              phys_pending, phys_tm);
@@ -549,7 +579,7 @@ efi_thunk_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
 
         spin_lock(&rtc_lock);
 
-        phys_tm = virt_to_phys(tm);
+        phys_tm = virt_to_phys_or_null(tm);
 
         status = efi_thunk(set_wakeup_time, enabled, phys_tm);
 
@@ -558,6 +588,10 @@ efi_thunk_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
         return status;
 }
 
+static unsigned long efi_name_size(efi_char16_t *name)
+{
+        return ucs2_strsize(name, EFI_VAR_NAME_LEN) + 1;
+}
 
 static efi_status_t
 efi_thunk_get_variable(efi_char16_t *name, efi_guid_t *vendor,
@@ -567,11 +601,11 @@ efi_thunk_get_variable(efi_char16_t *name, efi_guid_t *vendor,
         u32 phys_name, phys_vendor, phys_attr;
         u32 phys_data_size, phys_data;
 
-        phys_data_size = virt_to_phys(data_size);
-        phys_vendor = virt_to_phys(vendor);
-        phys_name = virt_to_phys(name);
-        phys_attr = virt_to_phys(attr);
-        phys_data = virt_to_phys(data);
+        phys_data_size = virt_to_phys_or_null(data_size);
+        phys_vendor = virt_to_phys_or_null(vendor);
+        phys_name = virt_to_phys_or_null_size(name, efi_name_size(name));
+        phys_attr = virt_to_phys_or_null(attr);
+        phys_data = virt_to_phys_or_null_size(data, *data_size);
 
         status = efi_thunk(get_variable, phys_name, phys_vendor,
                            phys_attr, phys_data_size, phys_data);
@@ -586,9 +620,9 @@ efi_thunk_set_variable(efi_char16_t *name, efi_guid_t *vendor,
         u32 phys_name, phys_vendor, phys_data;
         efi_status_t status;
 
-        phys_name = virt_to_phys(name);
-        phys_vendor = virt_to_phys(vendor);
-        phys_data = virt_to_phys(data);
+        phys_name = virt_to_phys_or_null_size(name, efi_name_size(name));
+        phys_vendor = virt_to_phys_or_null(vendor);
+        phys_data = virt_to_phys_or_null_size(data, data_size);
 
         /* If data_size is > sizeof(u32) we've got problems */
         status = efi_thunk(set_variable, phys_name, phys_vendor,
@@ -605,9 +639,9 @@ efi_thunk_get_next_variable(unsigned long *name_size,
         efi_status_t status;
         u32 phys_name_size, phys_name, phys_vendor;
 
-        phys_name_size = virt_to_phys(name_size);
-        phys_vendor = virt_to_phys(vendor);
-        phys_name = virt_to_phys(name);
+        phys_name_size = virt_to_phys_or_null(name_size);
+        phys_vendor = virt_to_phys_or_null(vendor);
+        phys_name = virt_to_phys_or_null_size(name, *name_size);
 
         status = efi_thunk(get_next_variable, phys_name_size,
                            phys_name, phys_vendor);
@@ -621,7 +655,7 @@ efi_thunk_get_next_high_mono_count(u32 *count)
         efi_status_t status;
         u32 phys_count;
 
-        phys_count = virt_to_phys(count);
+        phys_count = virt_to_phys_or_null(count);
         status = efi_thunk(get_next_high_mono_count, phys_count);
 
         return status;
@@ -633,7 +667,7 @@ efi_thunk_reset_system(int reset_type, efi_status_t status,
 {
         u32 phys_data;
 
-        phys_data = virt_to_phys(data);
+        phys_data = virt_to_phys_or_null_size(data, data_size);
 
         efi_thunk(reset_system, reset_type, status, data_size, phys_data);
 }
@@ -661,9 +695,9 @@ efi_thunk_query_variable_info(u32 attr, u64 *storage_space,
         if (efi.runtime_version < EFI_2_00_SYSTEM_TABLE_REVISION)
                 return EFI_UNSUPPORTED;
 
-        phys_storage = virt_to_phys(storage_space);
-        phys_remaining = virt_to_phys(remaining_space);
-        phys_max = virt_to_phys(max_variable_size);
+        phys_storage = virt_to_phys_or_null(storage_space);
+        phys_remaining = virt_to_phys_or_null(remaining_space);
+        phys_max = virt_to_phys_or_null(max_variable_size);
 
         status = efi_thunk(query_variable_info, attr, phys_storage,
                            phys_remaining, phys_max);
diff --git a/arch/x86/platform/intel-mid/device_libs/Makefile b/arch/x86/platform/intel-mid/device_libs/Makefile
index 429d08be7848..dd6cfa4ad3ac 100644
--- a/arch/x86/platform/intel-mid/device_libs/Makefile
+++ b/arch/x86/platform/intel-mid/device_libs/Makefile
@@ -28,4 +28,4 @@ obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_pcal9555a.o
 obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o
 # MISC Devices
 obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o
-obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_wdt.o
+obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_mrfld_wdt.o
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_wdt.c b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c
index de734134bc8d..3f1f1c77d090 100644
--- a/arch/x86/platform/intel-mid/device_libs/platform_wdt.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c
@@ -1,5 +1,5 @@
 /*
- * platform_wdt.c: Watchdog platform library file
+ * Intel Merrifield watchdog platform device library file
  *
  * (C) Copyright 2014 Intel Corporation
  * Author: David Cohen <david.a.cohen@linux.intel.com>
@@ -14,7 +14,9 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/intel-mid_wdt.h>
+
 #include <asm/intel-mid.h>
+#include <asm/intel_scu_ipc.h>
 #include <asm/io_apic.h>
 
 #define TANGIER_EXT_TIMER0_MSI 15
@@ -50,14 +52,34 @@ static struct intel_mid_wdt_pdata tangier_pdata = {
         .probe = tangier_probe,
 };
 
-static int __init register_mid_wdt(void)
+static int wdt_scu_status_change(struct notifier_block *nb,
+                                 unsigned long code, void *data)
 {
-        if (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_TANGIER) {
-                wdt_dev.dev.platform_data = &tangier_pdata;
-                return platform_device_register(&wdt_dev);
+        if (code == SCU_DOWN) {
+                platform_device_unregister(&wdt_dev);
+                return 0;
         }
 
-        return -ENODEV;
+        return platform_device_register(&wdt_dev);
 }
 
+static struct notifier_block wdt_scu_notifier = {
+        .notifier_call  = wdt_scu_status_change,
+};
+
+static int __init register_mid_wdt(void)
+{
+        if (intel_mid_identify_cpu() != INTEL_MID_CPU_CHIP_TANGIER)
+                return -ENODEV;
+
+        wdt_dev.dev.platform_data = &tangier_pdata;
+
+        /*
+         * We need to be sure that the SCU IPC is ready before watchdog device
+         * can be registered:
+         */
+        intel_scu_notifier_add(&wdt_scu_notifier);
+
+        return 0;
+}
 rootfs_initcall(register_mid_wdt);
diff --git a/arch/x86/platform/intel-mid/pwr.c b/arch/x86/platform/intel-mid/pwr.c
index 5d3b45ad1c03..67375dda451c 100644
--- a/arch/x86/platform/intel-mid/pwr.c
+++ b/arch/x86/platform/intel-mid/pwr.c
@@ -272,6 +272,25 @@ int intel_mid_pci_set_power_state(struct pci_dev *pdev, pci_power_t state)
 }
 EXPORT_SYMBOL_GPL(intel_mid_pci_set_power_state);
 
+pci_power_t intel_mid_pci_get_power_state(struct pci_dev *pdev)
+{
+        struct mid_pwr *pwr = midpwr;
+        int id, reg, bit;
+        u32 power;
+
+        if (!pwr || !pwr->available)
+                return PCI_UNKNOWN;
+
+        id = intel_mid_pwr_get_lss_id(pdev);
+        if (id < 0)
+                return PCI_UNKNOWN;
+
+        reg = (id * LSS_PWS_BITS) / 32;
+        bit = (id * LSS_PWS_BITS) % 32;
+        power = mid_pwr_get_state(pwr, reg);
+        return (__force pci_power_t)((power >> bit) & 3);
+}
+
 void intel_mid_pwr_power_off(void)
 {
         struct mid_pwr *pwr = midpwr;
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c
index 55130846ac87..c0533fbc39e3 100644
--- a/arch/x86/platform/olpc/olpc-xo15-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo15-sci.c
@@ -196,6 +196,7 @@ static int xo15_sci_remove(struct acpi_device *device)
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int xo15_sci_resume(struct device *dev)
 {
         /* Enable all EC events */
@@ -207,6 +208,7 @@ static int xo15_sci_resume(struct device *dev)
 
         return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(xo15_sci_pm, NULL, xo15_sci_resume);
 
diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile
index ac58c1616408..555b9fa0ad43 100644
--- a/arch/x86/purgatory/Makefile
+++ b/arch/x86/purgatory/Makefile
@@ -16,6 +16,7 @@ KCOV_INSTRUMENT := n
 
 KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes -fno-zero-initialized-in-bss -fno-builtin -ffreestanding -c -MD -Os -mcmodel=large
 KBUILD_CFLAGS += -m$(BITS)
+KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
 
 $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
                 $(call if_changed,ld)
diff --git a/arch/x86/tools/relocs.h b/arch/x86/tools/relocs.h
index f59590645b68..1d23bf953a4a 100644
--- a/arch/x86/tools/relocs.h
+++ b/arch/x86/tools/relocs.h
@@ -16,7 +16,7 @@
 #include <regex.h>
 #include <tools/le_byteshift.h>
 
-void die(char *fmt, ...);
+void die(char *fmt, ...) __attribute__((noreturn));
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
diff --git a/arch/xtensa/include/uapi/asm/unistd.h b/arch/xtensa/include/uapi/asm/unistd.h
index de9b14b2d348..cd400af4a6b2 100644
--- a/arch/xtensa/include/uapi/asm/unistd.h
+++ b/arch/xtensa/include/uapi/asm/unistd.h
@@ -767,7 +767,14 @@ __SYSCALL(346, sys_preadv2, 6)
 #define __NR_pwritev2                           347
 __SYSCALL(347, sys_pwritev2, 6)
 
-#define __NR_syscall_count                      348
+#define __NR_pkey_mprotect                      348
+__SYSCALL(348, sys_pkey_mprotect, 4)
+#define __NR_pkey_alloc                         349
+__SYSCALL(349, sys_pkey_alloc, 2)
+#define __NR_pkey_free                          350
+__SYSCALL(350, sys_pkey_free, 1)
+
+#define __NR_syscall_count                      351
 
 /*
  * sysxtensa syscall handler
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 9a5bcd0381a7..be81e69b25bc 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -172,10 +172,11 @@ void __init time_init(void)
 {
         of_clk_init(NULL);
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
-        printk("Calibrating CPU frequency ");
+        pr_info("Calibrating CPU frequency ");
         calibrate_ccount();
-        printk("%d.%02d MHz\n", (int)ccount_freq/1000000,
-                        (int)(ccount_freq/10000)%100);
+        pr_cont("%d.%02d MHz\n",
+                (int)ccount_freq / 1000000,
+                (int)(ccount_freq / 10000) % 100);
 #else
         ccount_freq = CONFIG_XTENSA_CPU_CLOCK*1000000UL;
 #endif
@@ -210,9 +211,8 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)
 void calibrate_delay(void)
 {
         loops_per_jiffy = ccount_freq / HZ;
-        printk("Calibrating delay loop (skipped)... "
-               "%lu.%02lu BogoMIPS preset\n",
-               loops_per_jiffy/(1000000/HZ),
-               (loops_per_jiffy/(10000/HZ)) % 100);
+        pr_info("Calibrating delay loop (skipped)... %lu.%02lu BogoMIPS preset\n",
+                loops_per_jiffy / (1000000 / HZ),
+                (loops_per_jiffy / (10000 / HZ)) % 100);
 }
 #endif
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index d02fc304b31c..ce37d5b899fe 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -465,26 +465,25 @@ void show_regs(struct pt_regs * regs)
 
         for (i = 0; i < 16; i++) {
                 if ((i % 8) == 0)
-                        printk(KERN_INFO "a%02d:", i);
-                printk(KERN_CONT " %08lx", regs->areg[i]);
+                        pr_info("a%02d:", i);
+                pr_cont(" %08lx", regs->areg[i]);
         }
-        printk(KERN_CONT "\n");
-
-        printk("pc: %08lx, ps: %08lx, depc: %08lx, excvaddr: %08lx\n",
-               regs->pc, regs->ps, regs->depc, regs->excvaddr);
-        printk("lbeg: %08lx, lend: %08lx lcount: %08lx, sar: %08lx\n",
-               regs->lbeg, regs->lend, regs->lcount, regs->sar);
+        pr_cont("\n");
+        pr_info("pc: %08lx, ps: %08lx, depc: %08lx, excvaddr: %08lx\n",
+                regs->pc, regs->ps, regs->depc, regs->excvaddr);
+        pr_info("lbeg: %08lx, lend: %08lx lcount: %08lx, sar: %08lx\n",
+                regs->lbeg, regs->lend, regs->lcount, regs->sar);
         if (user_mode(regs))
-                printk("wb: %08lx, ws: %08lx, wmask: %08lx, syscall: %ld\n",
-                       regs->windowbase, regs->windowstart, regs->wmask,
-                       regs->syscall);
+                pr_cont("wb: %08lx, ws: %08lx, wmask: %08lx, syscall: %ld\n",
+                        regs->windowbase, regs->windowstart, regs->wmask,
+                        regs->syscall);
 }
 
 static int show_trace_cb(struct stackframe *frame, void *data)
 {
         if (kernel_text_address(frame->pc)) {
-                printk(" [<%08lx>] ", frame->pc);
-                print_symbol("%s\n", frame->pc);
+                pr_cont(" [<%08lx>]", frame->pc);
+                print_symbol(" %s\n", frame->pc);
         }
         return 0;
 }
@@ -494,19 +493,13 @@ void show_trace(struct task_struct *task, unsigned long *sp)
         if (!sp)
                 sp = stack_pointer(task);
 
-        printk("Call Trace:");
-#ifdef CONFIG_KALLSYMS
-        printk("\n");
-#endif
+        pr_info("Call Trace:\n");
         walk_stackframe(sp, show_trace_cb, NULL);
-        printk("\n");
+#ifndef CONFIG_KALLSYMS
+        pr_cont("\n");
+#endif
 }
 
-/*
- * This routine abuses get_user()/put_user() to reference pointers
- * with at least a bit of error checking ...
- */
-
 static int kstack_depth_to_print = 24;
 
 void show_stack(struct task_struct *task, unsigned long *sp)
@@ -518,52 +511,29 @@ void show_stack(struct task_struct *task, unsigned long *sp)
                 sp = stack_pointer(task);
         stack = sp;
 
-        printk("\nStack: ");
+        pr_info("Stack:\n");
 
         for (i = 0; i < kstack_depth_to_print; i++) {
                 if (kstack_end(sp))
                         break;
-                if (i && ((i % 8) == 0))
-                        printk("\n       ");
-                printk("%08lx ", *sp++);
+                pr_cont(" %08lx", *sp++);
+                if (i % 8 == 7)
+                        pr_cont("\n");
         }
-        printk("\n");
         show_trace(task, stack);
 }
 
-void show_code(unsigned int *pc)
-{
-        long i;
-
-        printk("\nCode:");
-
-        for(i = -3 ; i < 6 ; i++) {
-                unsigned long insn;
-                if (__get_user(insn, pc + i)) {
-                        printk(" (Bad address in pc)\n");
-                        break;
-                }
-                printk("%c%08lx%c",(i?' ':'<'),insn,(i?' ':'>'));
-        }
-}
-
 DEFINE_SPINLOCK(die_lock);
 
 void die(const char * str, struct pt_regs * regs, long err)
 {
         static int die_counter;
-        int nl = 0;
 
         console_verbose();
         spin_lock_irq(&die_lock);
 
-        printk("%s: sig: %ld [#%d]\n", str, err, ++die_counter);
-#ifdef CONFIG_PREEMPT
-        printk("PREEMPT ");
-        nl = 1;
-#endif
-        if (nl)
-                printk("\n");
+        pr_info("%s: sig: %ld [#%d]%s\n", str, err, ++die_counter,
+                IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "");
         show_regs(regs);
         if (!user_mode(regs))
                 show_stack(NULL, (unsigned long*)regs->areg[1]);
diff --git a/block/blk-map.c b/block/blk-map.c
index b8657fa8dc9a..27fd8d92892d 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -118,6 +118,9 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
         struct iov_iter i;
         int ret;
 
+        if (!iter_is_iovec(iter))
+                goto fail;
+
         if (map_data)
                 copy = true;
         else if (iov_iter_alignment(iter) & align)
@@ -140,6 +143,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
 
 unmap_rq:
         __blk_rq_unmap_user(bio);
+fail:
         rq->bio = NULL;
         return -EINVAL;
 }
diff --git a/crypto/Makefile b/crypto/Makefile
index 99cc64ac70ef..bd6a029094e6 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o
 
 $(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h
 $(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h
+$(obj)/rsa_helper.o: $(obj)/rsapubkey-asn1.h $(obj)/rsaprivkey-asn1.h
 clean-files += rsapubkey-asn1.c rsapubkey-asn1.h
 clean-files += rsaprivkey-asn1.c rsaprivkey-asn1.h
 
diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index 80a0f1a78551..e9c0993b131d 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -81,7 +81,11 @@ static inline bool aead_sufficient_data(struct aead_ctx *ctx)
 {
         unsigned as = crypto_aead_authsize(crypto_aead_reqtfm(&ctx->aead_req));
 
-        return ctx->used >= ctx->aead_assoclen + as;
+        /*
+         * The minimum amount of memory needed for an AEAD cipher is
+         * the AAD and in case of decryption the tag.
+         */
+        return ctx->used >= ctx->aead_assoclen + (ctx->enc ? 0 : as);
 }
 
 static void aead_reset_ctx(struct aead_ctx *ctx)
@@ -416,7 +420,7 @@ static int aead_recvmsg_async(struct socket *sock, struct msghdr *msg,
         unsigned int i, reqlen = GET_REQ_SIZE(tfm);
         int err = -ENOMEM;
         unsigned long used;
-        size_t outlen;
+        size_t outlen = 0;
         size_t usedpages = 0;
 
         lock_sock(sk);
@@ -426,12 +430,15 @@ static int aead_recvmsg_async(struct socket *sock, struct msghdr *msg,
                         goto unlock;
         }
 
-        used = ctx->used;
-        outlen = used;
-
         if (!aead_sufficient_data(ctx))
                 goto unlock;
 
+        used = ctx->used;
+        if (ctx->enc)
+                outlen = used + as;
+        else
+                outlen = used - as;
+
         req = sock_kmalloc(sk, reqlen, GFP_KERNEL);
         if (unlikely(!req))
                 goto unlock;
@@ -445,7 +452,7 @@ static int aead_recvmsg_async(struct socket *sock, struct msghdr *msg,
         aead_request_set_ad(req, ctx->aead_assoclen);
         aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
                                   aead_async_cb, sk);
-        used -= ctx->aead_assoclen + (ctx->enc ? as : 0);
+        used -= ctx->aead_assoclen;
 
         /* take over all tx sgls from ctx */
         areq->tsgl = sock_kmalloc(sk, sizeof(*areq->tsgl) * sgl->cur,
@@ -461,7 +468,7 @@ static int aead_recvmsg_async(struct socket *sock, struct msghdr *msg,
         areq->tsgls = sgl->cur;
 
         /* create rx sgls */
-        while (iov_iter_count(&msg->msg_iter)) {
+        while (outlen > usedpages && iov_iter_count(&msg->msg_iter)) {
                 size_t seglen = min_t(size_t, iov_iter_count(&msg->msg_iter),
                                       (outlen - usedpages));
 
@@ -491,16 +498,14 @@ static int aead_recvmsg_async(struct socket *sock, struct msghdr *msg,
 
                 last_rsgl = rsgl;
 
-                /* we do not need more iovecs as we have sufficient memory */
-                if (outlen <= usedpages)
-                        break;
-
                 iov_iter_advance(&msg->msg_iter, err);
         }
-        err = -EINVAL;
+
         /* ensure output buffer is sufficiently large */
-        if (usedpages < outlen)
-                goto free;
+        if (usedpages < outlen) {
+                err = -EINVAL;
+                goto unlock;
+        }
 
         aead_request_set_crypt(req, areq->tsgl, areq->first_rsgl.sgl.sg, used,
                                areq->iv);
@@ -571,6 +576,7 @@ static int aead_recvmsg_sync(struct socket *sock, struct msghdr *msg, int flags)
                         goto unlock;
         }
 
+        /* data length provided by caller via sendmsg/sendpage */
         used = ctx->used;
 
         /*
@@ -585,16 +591,27 @@ static int aead_recvmsg_sync(struct socket *sock, struct msghdr *msg, int flags)
         if (!aead_sufficient_data(ctx))
                 goto unlock;
 
-        outlen = used;
+        /*
+         * Calculate the minimum output buffer size holding the result of the
+         * cipher operation. When encrypting data, the receiving buffer is
+         * larger by the tag length compared to the input buffer as the
+         * encryption operation generates the tag. For decryption, the input
+         * buffer provides the tag which is consumed resulting in only the
+         * plaintext without a buffer for the tag returned to the caller.
+         */
+        if (ctx->enc)
+                outlen = used + as;
+        else
+                outlen = used - as;
 
         /*
          * The cipher operation input data is reduced by the associated data
          * length as this data is processed separately later on.
          */
-        used -= ctx->aead_assoclen + (ctx->enc ? as : 0);
+        used -= ctx->aead_assoclen;
 
         /* convert iovecs of output buffers into scatterlists */
-        while (iov_iter_count(&msg->msg_iter)) {
+        while (outlen > usedpages && iov_iter_count(&msg->msg_iter)) {
                 size_t seglen = min_t(size_t, iov_iter_count(&msg->msg_iter),
                                       (outlen - usedpages));
 
@@ -621,16 +638,14 @@ static int aead_recvmsg_sync(struct socket *sock, struct msghdr *msg, int flags)
 
                 last_rsgl = rsgl;
 
-                /* we do not need more iovecs as we have sufficient memory */
-                if (outlen <= usedpages)
-                        break;
                 iov_iter_advance(&msg->msg_iter, err);
         }
 
-        err = -EINVAL;
         /* ensure output buffer is sufficiently large */
-        if (usedpages < outlen)
+        if (usedpages < outlen) {
+                err = -EINVAL;
                 goto unlock;
+        }
 
         sg_mark_end(sgl->sg + sgl->cur - 1);
         aead_request_set_crypt(&ctx->aead_req, sgl->sg, ctx->first_rsgl.sgl.sg,
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index 2d8466f9e49b..d19b09cdf284 100644
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -214,23 +214,26 @@ static int hash_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
 
         ahash_request_set_crypt(&ctx->req, NULL, ctx->result, 0);
 
-        if (ctx->more) {
+        if (!result && !ctx->more) {
+                err = af_alg_wait_for_completion(
+                                crypto_ahash_init(&ctx->req),
+                                &ctx->completion);
+                if (err)
+                        goto unlock;
+        }
+
+        if (!result || ctx->more) {
                 ctx->more = 0;
                 err = af_alg_wait_for_completion(crypto_ahash_final(&ctx->req),
                                                  &ctx->completion);
                 if (err)
                         goto unlock;
-        } else if (!result) {
-                err = af_alg_wait_for_completion(
-                                crypto_ahash_digest(&ctx->req),
-                                &ctx->completion);
         }
 
         err = memcpy_to_msg(msg, ctx->result, len);
 
-        hash_free_result(sk, ctx);
-
 unlock:
+        hash_free_result(sk, ctx);
         release_sock(sk);
 
         return err ?: len;
diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c
index 865f46ea724f..c80765b211cf 100644
--- a/crypto/asymmetric_keys/x509_cert_parser.c
+++ b/crypto/asymmetric_keys/x509_cert_parser.c
@@ -133,7 +133,6 @@ struct x509_certificate *x509_cert_parse(const void *data, size_t datalen)
         return cert;
 
 error_decode:
-        kfree(cert->pub->key);
         kfree(ctx);
 error_no_ctx:
         x509_free_certificate(cert);
diff --git a/crypto/drbg.c b/crypto/drbg.c
index fb33f7d3b052..053035b5c8f8 100644
--- a/crypto/drbg.c
+++ b/crypto/drbg.c
@@ -262,6 +262,7 @@ static int drbg_kcapi_sym_ctr(struct drbg_state *drbg,
                               u8 *inbuf, u32 inbuflen,
                               u8 *outbuf, u32 outlen);
 #define DRBG_CTR_NULL_LEN 128
+#define DRBG_OUTSCRATCHLEN DRBG_CTR_NULL_LEN
 
 /* BCC function for CTR DRBG as defined in 10.4.3 */
 static int drbg_ctr_bcc(struct drbg_state *drbg,
@@ -1644,6 +1645,9 @@ static int drbg_fini_sym_kernel(struct drbg_state *drbg)
         kfree(drbg->ctr_null_value_buf);
         drbg->ctr_null_value = NULL;
 
+        kfree(drbg->outscratchpadbuf);
+        drbg->outscratchpadbuf = NULL;
+
         return 0;
 }
 
@@ -1708,6 +1712,15 @@ static int drbg_init_sym_kernel(struct drbg_state *drbg)
         drbg->ctr_null_value = (u8 *)PTR_ALIGN(drbg->ctr_null_value_buf,
                                                alignmask + 1);
 
+        drbg->outscratchpadbuf = kmalloc(DRBG_OUTSCRATCHLEN + alignmask,
+                                         GFP_KERNEL);
+        if (!drbg->outscratchpadbuf) {
+                drbg_fini_sym_kernel(drbg);
+                return -ENOMEM;
+        }
+        drbg->outscratchpad = (u8 *)PTR_ALIGN(drbg->outscratchpadbuf,
+                                              alignmask + 1);
+
         return alignmask;
 }
 
@@ -1737,15 +1750,16 @@ static int drbg_kcapi_sym_ctr(struct drbg_state *drbg,
                               u8 *outbuf, u32 outlen)
 {
         struct scatterlist sg_in;
+        int ret;
 
         sg_init_one(&sg_in, inbuf, inlen);
 
         while (outlen) {
-                u32 cryptlen = min_t(u32, inlen, outlen);
+                u32 cryptlen = min3(inlen, outlen, (u32)DRBG_OUTSCRATCHLEN);
                 struct scatterlist sg_out;
-                int ret;
 
-                sg_init_one(&sg_out, outbuf, cryptlen);
+                /* Output buffer may not be valid for SGL, use scratchpad */
+                sg_init_one(&sg_out, drbg->outscratchpad, cryptlen);
                 skcipher_request_set_crypt(drbg->ctr_req, &sg_in, &sg_out,
                                            cryptlen, drbg->V);
                 ret = crypto_skcipher_encrypt(drbg->ctr_req);
@@ -1761,14 +1775,19 @@ static int drbg_kcapi_sym_ctr(struct drbg_state *drbg,
                                 break;
                         }
                 default:
-                        return ret;
+                        goto out;
                 }
                 init_completion(&drbg->ctr_completion);
 
+                memcpy(outbuf, drbg->outscratchpad, cryptlen);
+
                 outlen -= cryptlen;
         }
+        ret = 0;
 
-        return 0;
+out:
+        memzero_explicit(drbg->outscratchpad, DRBG_OUTSCRATCHLEN);
+        return ret;
 }
 #endif /* CONFIG_CRYPTO_DRBG_CTR */
 
diff --git a/crypto/mcryptd.c b/crypto/mcryptd.c
index 94ee44acd465..c207458d6299 100644
--- a/crypto/mcryptd.c
+++ b/crypto/mcryptd.c
@@ -254,18 +254,22 @@ out_free_inst:
         goto out;
 }
 
-static inline void mcryptd_check_internal(struct rtattr **tb, u32 *type,
+static inline bool mcryptd_check_internal(struct rtattr **tb, u32 *type,
                                           u32 *mask)
 {
         struct crypto_attr_type *algt;
 
         algt = crypto_get_attr_type(tb);
         if (IS_ERR(algt))
-                return;
-        if ((algt->type & CRYPTO_ALG_INTERNAL))
-                *type |= CRYPTO_ALG_INTERNAL;
-        if ((algt->mask & CRYPTO_ALG_INTERNAL))
-                *mask |= CRYPTO_ALG_INTERNAL;
+                return false;
+
+        *type |= algt->type & CRYPTO_ALG_INTERNAL;
+        *mask |= algt->mask & CRYPTO_ALG_INTERNAL;
+
+        if (*type & *mask & CRYPTO_ALG_INTERNAL)
+                return true;
+        else
+                return false;
 }
 
 static int mcryptd_hash_init_tfm(struct crypto_tfm *tfm)
@@ -492,7 +496,8 @@ static int mcryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,
         u32 mask = 0;
         int err;
 
-        mcryptd_check_internal(tb, &type, &mask);
+        if (!mcryptd_check_internal(tb, &type, &mask))
+                return -EINVAL;
 
         halg = ahash_attr_alg(tb[1], type, mask);
         if (IS_ERR(halg))
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index 52ce17a3dd63..c16c94f88733 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -68,10 +68,6 @@ void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,
 
         sg = scatterwalk_ffwd(tmp, sg, start);
 
-        if (sg_page(sg) == virt_to_page(buf) &&
-            sg->offset == offset_in_page(buf))
-                return;
-
         scatterwalk_start(&walk, sg);
         scatterwalk_copychunks(buf, &walk, nbytes, out);
         scatterwalk_done(&walk, out, 0);
diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
index d58fbf7f04e6..7dd70927991e 100644
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@ -122,7 +122,7 @@ static int acpi_apd_create_device(struct acpi_device *adev,
         int ret;
 
         if (!dev_desc) {
-                pdev = acpi_create_platform_device(adev);
+                pdev = acpi_create_platform_device(adev, NULL);
                 return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;
         }
 
@@ -139,14 +139,8 @@ static int acpi_apd_create_device(struct acpi_device *adev,
                         goto err_out;
         }
 
-        if (dev_desc->properties) {
-                ret = device_add_properties(&adev->dev, dev_desc->properties);
-                if (ret)
-                        goto err_out;
-        }
-
         adev->driver_data = pdata;
-        pdev = acpi_create_platform_device(adev);
+        pdev = acpi_create_platform_device(adev, dev_desc->properties);
         if (!IS_ERR_OR_NULL(pdev))
                 return 1;
 
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 552010288135..373657f7e35a 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -395,7 +395,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
 
         dev_desc = (const struct lpss_device_desc *)id->driver_data;
         if (!dev_desc) {
-                pdev = acpi_create_platform_device(adev);
+                pdev = acpi_create_platform_device(adev, NULL);
                 return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;
         }
         pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
@@ -451,14 +451,8 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
                 goto err_out;
         }
 
-        if (dev_desc->properties) {
-                ret = device_add_properties(&adev->dev, dev_desc->properties);
-                if (ret)
-                        goto err_out;
-        }
-
         adev->driver_data = pdata;
-        pdev = acpi_create_platform_device(adev);
+        pdev = acpi_create_platform_device(adev, dev_desc->properties);
         if (!IS_ERR_OR_NULL(pdev)) {
                 return 1;
         }
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index b200ae1f3c6f..b4c1a6a51da4 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -50,6 +50,7 @@ static void acpi_platform_fill_resource(struct acpi_device *adev,
 /**
  * acpi_create_platform_device - Create platform device for ACPI device node
  * @adev: ACPI device node to create a platform device for.
+ * @properties: Optional collection of build-in properties.
  *
  * Check if the given @adev can be represented as a platform device and, if
  * that's the case, create and register a platform device, populate its common
@@ -57,7 +58,8 @@ static void acpi_platform_fill_resource(struct acpi_device *adev,
  *
  * Name of the platform device will be the same as @adev's.
  */
-struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
+struct platform_device *acpi_create_platform_device(struct acpi_device *adev,
+                                        struct property_entry *properties)
 {
         struct platform_device *pdev = NULL;
         struct platform_device_info pdevinfo;
@@ -106,6 +108,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
         pdevinfo.res = resources;
         pdevinfo.num_res = count;
         pdevinfo.fwnode = acpi_fwnode_handle(adev);
+        pdevinfo.properties = properties;
 
         if (acpi_dma_supported(adev))
                 pdevinfo.dma_mask = DMA_BIT_MASK(32);
diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index 046c4d0394ee..5fb838e592dc 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -480,19 +480,17 @@ static void acpi_tb_convert_fadt(void)
         u32 i;
 
         /*
-         * For ACPI 1.0 FADTs (revision 1), ensure that reserved fields which
+         * For ACPI 1.0 FADTs (revision 1 or 2), ensure that reserved fields which
          * should be zero are indeed zero. This will workaround BIOSs that
          * inadvertently place values in these fields.
          *
          * The ACPI 1.0 reserved fields that will be zeroed are the bytes located
          * at offset 45, 55, 95, and the word located at offset 109, 110.
          *
-         * Note: The FADT revision value is unreliable because of BIOS errors.
-         * The table length is instead used as the final word on the version.
-         *
-         * Note: FADT revision 3 is the ACPI 2.0 version of the FADT.
+         * Note: The FADT revision value is unreliable. Only the length can be
+         * trusted.
          */
-        if (acpi_gbl_FADT.header.length <= ACPI_FADT_V3_SIZE) {
+        if (acpi_gbl_FADT.header.length <= ACPI_FADT_V2_SIZE) {
                 acpi_gbl_FADT.preferred_profile = 0;
                 acpi_gbl_FADT.pstate_control = 0;
                 acpi_gbl_FADT.cst_control = 0;
diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c
index 33505c651f62..86364097e236 100644
--- a/drivers/acpi/dptf/int340x_thermal.c
+++ b/drivers/acpi/dptf/int340x_thermal.c
@@ -34,11 +34,11 @@ static int int340x_thermal_handler_attach(struct acpi_device *adev,
                                         const struct acpi_device_id *id)
 {
         if (IS_ENABLED(CONFIG_INT340X_THERMAL))
-                acpi_create_platform_device(adev);
+                acpi_create_platform_device(adev, NULL);
         /* Intel SoC DTS thermal driver needs INT3401 to set IRQ descriptor */
         else if (IS_ENABLED(CONFIG_INTEL_SOC_DTS_THERMAL) &&
                  id->driver_data == INT3401_DEVICE)
-                acpi_create_platform_device(adev);
+                acpi_create_platform_device(adev, NULL);
         return 1;
 }
 
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 71a7d07c28c9..312c4b4dc363 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -94,7 +94,7 @@ static struct acpi_device *to_acpi_dev(struct acpi_nfit_desc *acpi_desc)
         return to_acpi_device(acpi_desc->dev);
 }
 
-static int xlat_status(void *buf, unsigned int cmd, u32 status)
+static int xlat_bus_status(void *buf, unsigned int cmd, u32 status)
 {
         struct nd_cmd_clear_error *clear_err;
         struct nd_cmd_ars_status *ars_status;
@@ -113,7 +113,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
                 flags = ND_ARS_PERSISTENT | ND_ARS_VOLATILE;
                 if ((status >> 16 & flags) == 0)
                         return -ENOTTY;
-                break;
+                return 0;
         case ND_CMD_ARS_START:
                 /* ARS is in progress */
                 if ((status & 0xffff) == NFIT_ARS_START_BUSY)
@@ -122,7 +122,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
                 /* Command failed */
                 if (status & 0xffff)
                         return -EIO;
-                break;
+                return 0;
         case ND_CMD_ARS_STATUS:
                 ars_status = buf;
                 /* Command failed */
@@ -146,7 +146,8 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
                  * then just continue with the returned results.
                  */
                 if (status == NFIT_ARS_STATUS_INTR) {
-                        if (ars_status->flags & NFIT_ARS_F_OVERFLOW)
+                        if (ars_status->out_length >= 40 && (ars_status->flags
+                                                & NFIT_ARS_F_OVERFLOW))
                                 return -ENOSPC;
                         return 0;
                 }
@@ -154,7 +155,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
                 /* Unknown status */
                 if (status >> 16)
                         return -EIO;
-                break;
+                return 0;
         case ND_CMD_CLEAR_ERROR:
                 clear_err = buf;
                 if (status & 0xffff)
@@ -163,7 +164,7 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
                         return -EIO;
                 if (clear_err->length > clear_err->cleared)
                         return clear_err->cleared;
-                break;
+                return 0;
         default:
                 break;
         }
@@ -174,9 +175,18 @@ static int xlat_status(void *buf, unsigned int cmd, u32 status)
         return 0;
 }
 
-static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
-                struct nvdimm *nvdimm, unsigned int cmd, void *buf,
-                unsigned int buf_len, int *cmd_rc)
+static int xlat_status(struct nvdimm *nvdimm, void *buf, unsigned int cmd,
+                u32 status)
+{
+        if (!nvdimm)
+                return xlat_bus_status(buf, cmd, status);
+        if (status)
+                return -EIO;
+        return 0;
+}
+
+int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
+                unsigned int cmd, void *buf, unsigned int buf_len, int *cmd_rc)
 {
         struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc);
         union acpi_object in_obj, in_buf, *out_obj;
@@ -298,7 +308,8 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
 
         for (i = 0, offset = 0; i < desc->out_num; i++) {
                 u32 out_size = nd_cmd_out_size(nvdimm, cmd, desc, i, buf,
-                                (u32 *) out_obj->buffer.pointer);
+                                (u32 *) out_obj->buffer.pointer,
+                                out_obj->buffer.length - offset);
 
                 if (offset + out_size > out_obj->buffer.length) {
                         dev_dbg(dev, "%s:%s output object underflow cmd: %s field: %d\n",
@@ -333,7 +344,8 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
                          */
                         rc = buf_len - offset - in_buf.buffer.length;
                         if (cmd_rc)
-                                *cmd_rc = xlat_status(buf, cmd, fw_status);
+                                *cmd_rc = xlat_status(nvdimm, buf, cmd,
+                                                fw_status);
                 } else {
                         dev_err(dev, "%s:%s underrun cmd: %s buf_len: %d out_len: %d\n",
                                         __func__, dimm_name, cmd_name, buf_len,
@@ -343,7 +355,7 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
         } else {
                 rc = 0;
                 if (cmd_rc)
-                        *cmd_rc = xlat_status(buf, cmd, fw_status);
+                        *cmd_rc = xlat_status(nvdimm, buf, cmd, fw_status);
         }
 
  out:
@@ -351,6 +363,7 @@ static int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc,
 
         return rc;
 }
+EXPORT_SYMBOL_GPL(acpi_nfit_ctl);
 
 static const char *spa_type_name(u16 type)
 {
@@ -2001,19 +2014,32 @@ static int ars_get_status(struct acpi_nfit_desc *acpi_desc)
         return cmd_rc;
 }
 
-static int ars_status_process_records(struct nvdimm_bus *nvdimm_bus,
+static int ars_status_process_records(struct acpi_nfit_desc *acpi_desc,
                 struct nd_cmd_ars_status *ars_status)
 {
+        struct nvdimm_bus *nvdimm_bus = acpi_desc->nvdimm_bus;
         int rc;
         u32 i;
 
+        /*
+         * First record starts at 44 byte offset from the start of the
+         * payload.
+         */
+        if (ars_status->out_length < 44)
+                return 0;
         for (i = 0; i < ars_status->num_records; i++) {
+                /* only process full records */
+                if (ars_status->out_length
+                                < 44 + sizeof(struct nd_ars_record) * (i + 1))
+                        break;
                 rc = nvdimm_bus_add_poison(nvdimm_bus,
                                 ars_status->records[i].err_address,
                                 ars_status->records[i].length);
                 if (rc)
                         return rc;
         }
+        if (i < ars_status->num_records)
+                dev_warn(acpi_desc->dev, "detected truncated ars results\n");
 
         return 0;
 }
@@ -2266,8 +2292,7 @@ static int acpi_nfit_query_poison(struct acpi_nfit_desc *acpi_desc,
         if (rc < 0 && rc != -ENOSPC)
                 return rc;
 
-        if (ars_status_process_records(acpi_desc->nvdimm_bus,
-                                acpi_desc->ars_status))
+        if (ars_status_process_records(acpi_desc, acpi_desc->ars_status))
                 return -ENOMEM;
 
         return 0;
diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h
index 14296f5267c8..fc29c2e9832e 100644
--- a/drivers/acpi/nfit/nfit.h
+++ b/drivers/acpi/nfit/nfit.h
@@ -240,5 +240,7 @@ const u8 *to_nfit_uuid(enum nfit_uuids id);
 int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, void *nfit, acpi_size sz);
 void __acpi_nfit_notify(struct device *dev, acpi_handle handle, u32 event);
 void __acpi_nvdimm_notify(struct device *dev, u32 event);
+int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
+                unsigned int cmd, void *buf, unsigned int buf_len, int *cmd_rc);
 void acpi_nfit_desc_init(struct acpi_nfit_desc *acpi_desc, struct device *dev);
 #endif /* __NFIT_H__ */
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 035ac646d8db..3d1856f1f4d0 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1734,7 +1734,7 @@ static void acpi_default_enumeration(struct acpi_device *device)
                                &is_spi_i2c_slave);
         acpi_dev_free_resource_list(&resource_list);
         if (!is_spi_i2c_slave) {
-                acpi_create_platform_device(device);
+                acpi_create_platform_device(device, NULL);
                 acpi_device_set_enumerated(device);
         } else {
                 blocking_notifier_call_chain(&acpi_reconfig_chain,
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index deb0ff78eba8..54abb26b7366 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -47,32 +47,15 @@ static void acpi_sleep_tts_switch(u32 acpi_state)
         }
 }
 
-static void acpi_sleep_pts_switch(u32 acpi_state)
-{
-        acpi_status status;
-
-        status = acpi_execute_simple_method(NULL, "\\_PTS", acpi_state);
-        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                /*
-                 * OS can't evaluate the _PTS object correctly. Some warning
-                 * message will be printed. But it won't break anything.
-                 */
-                printk(KERN_NOTICE "Failure in evaluating _PTS object\n");
-        }
-}
-
-static int sleep_notify_reboot(struct notifier_block *this,
+static int tts_notify_reboot(struct notifier_block *this,
                         unsigned long code, void *x)
 {
         acpi_sleep_tts_switch(ACPI_STATE_S5);
-
-        acpi_sleep_pts_switch(ACPI_STATE_S5);
-
         return NOTIFY_DONE;
 }
 
-static struct notifier_block sleep_notifier = {
-        .notifier_call  = sleep_notify_reboot,
+static struct notifier_block tts_notifier = {
+        .notifier_call  = tts_notify_reboot,
         .next           = NULL,
         .priority       = 0,
 };
@@ -916,9 +899,9 @@ int __init acpi_sleep_init(void)
         pr_info(PREFIX "(supports%s)\n", supported);
 
         /*
-         * Register the sleep_notifier to reboot notifier list so that the _TTS
-         * and _PTS object can also be evaluated when the system enters S5.
+         * Register the tts_notifier to reboot notifier list so that the _TTS
+         * object can also be evaluated when the system enters S5.
          */
-        register_reboot_notifier(&sleep_notifier);
+        register_reboot_notifier(&tts_notifier);
         return 0;
 }
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 9669fc7c19df..74f4c662f776 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1436,13 +1436,6 @@ static int ahci_init_msi(struct pci_dev *pdev, unsigned int n_ports,
                                 "ahci: MRSM is on, fallback to single MSI\n");
                         pci_free_irq_vectors(pdev);
                 }
-
-                /*
-                 * -ENOSPC indicated we don't have enough vectors.  Don't bother
-                 * trying a single vectors for any other error:
-                 */
-                if (nvec < 0 && nvec != -ENOSPC)
-                        return nvec;
         }
 
         /*
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 9cceb4a875a5..8e575fbdf31d 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1088,7 +1088,7 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
                 desc[1] = tf->command; /* status */
                 desc[2] = tf->device;
                 desc[3] = tf->nsect;
-                desc[0] = 0;
+                desc[7] = 0;
                 if (tf->flags & ATA_TFLAG_LBA48)  {
                         desc[8] |= 0x80;
                         if (tf->hob_nsect)
@@ -1159,6 +1159,7 @@ static void ata_scsi_sdev_config(struct scsi_device *sdev)
 {
         sdev->use_10_for_rw = 1;
         sdev->use_10_for_ms = 1;
+        sdev->no_write_same = 1;
 
         /* Schedule policy is determined by ->qc_defer() callback and
          * it needs to see every deferred qc.  Set dev_blocked to 1 to
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index efc48bf89d51..823e938c9a78 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -4090,7 +4090,20 @@ static int mv_platform_probe(struct platform_device *pdev)
 
         /* allocate host */
         if (pdev->dev.of_node) {
-                of_property_read_u32(pdev->dev.of_node, "nr-ports", &n_ports);
+                rc = of_property_read_u32(pdev->dev.of_node, "nr-ports",
+                                           &n_ports);
+                if (rc) {
+                        dev_err(&pdev->dev,
+                                "error parsing nr-ports property: %d\n", rc);
+                        return rc;
+                }
+
+                if (n_ports <= 0) {
+                        dev_err(&pdev->dev, "nr-ports must be positive: %d\n",
+                                n_ports);
+                        return -EINVAL;
+                }
+
                 irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
         } else {
                 mv_platform_data = dev_get_platdata(&pdev->dev);
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index f2aaf9e32a36..40c2d561417b 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1727,7 +1727,7 @@ static int eni_do_init(struct atm_dev *dev)
                 printk("\n");
                 printk(KERN_ERR DEV_LABEL "(itf %d): can't set up page "
                     "mapping\n",dev->number);
-                return error;
+                return -ENOMEM;
         }
         eni_dev->ioaddr = base;
         eni_dev->base_diff = real_base - (unsigned long) base;
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index ce43ae3e87b3..445505d9ea07 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -2143,6 +2143,7 @@ static int lanai_dev_open(struct atm_dev *atmdev)
         lanai->base = (bus_addr_t) ioremap(raw_base, LANAI_MAPPING_SIZE);
         if (lanai->base == NULL) {
                 printk(KERN_ERR DEV_LABEL ": couldn't remap I/O space\n");
+                result = -ENOMEM;
                 goto error_pci;
         }
         /* 3.3: Reset lanai and PHY */
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index d22a7260f42b..d76cd97a98b6 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -324,7 +324,8 @@ static int really_probe(struct device *dev, struct device_driver *drv)
 {
         int ret = -EPROBE_DEFER;
         int local_trigger_count = atomic_read(&deferred_trigger_count);
-        bool test_remove = IS_ENABLED(CONFIG_DEBUG_TEST_DRIVER_REMOVE);
+        bool test_remove = IS_ENABLED(CONFIG_DEBUG_TEST_DRIVER_REMOVE) &&
+                           !drv->suppress_bind_attrs;
 
         if (defer_all_probes) {
                 /*
@@ -383,7 +384,7 @@ re_probe:
         if (test_remove) {
                 test_remove = false;
 
-                if (dev->bus && dev->bus->remove)
+                if (dev->bus->remove)
                         dev->bus->remove(dev);
                 else if (drv->remove)
                         drv->remove(dev);
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index e44944f4be77..2932a5bd892f 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1027,6 +1027,8 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a
         TRACE_DEVICE(dev);
         TRACE_SUSPEND(0);
 
+        dpm_wait_for_children(dev, async);
+
         if (async_error)
                 goto Complete;
 
@@ -1038,8 +1040,6 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a
         if (dev->power.syscore || dev->power.direct_complete)
                 goto Complete;
 
-        dpm_wait_for_children(dev, async);
-
         if (dev->pm_domain) {
                 info = "noirq power domain ";
                 callback = pm_noirq_op(&dev->pm_domain->ops, state);
@@ -1174,6 +1174,8 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as
 
         __pm_runtime_disable(dev, false);
 
+        dpm_wait_for_children(dev, async);
+
         if (async_error)
                 goto Complete;
 
@@ -1185,8 +1187,6 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as
         if (dev->power.syscore || dev->power.direct_complete)
                 goto Complete;
 
-        dpm_wait_for_children(dev, async);
-
         if (dev->pm_domain) {
                 info = "late power domain ";
                 callback = pm_late_early_op(&dev->pm_domain->ops, state);
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index ab19adb07a12..3c606c09fd5a 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -853,45 +853,6 @@ rqbiocnt(struct request *r)
         return n;
 }
 
-/* This can be removed if we are certain that no users of the block
- * layer will ever use zero-count pages in bios.  Otherwise we have to
- * protect against the put_page sometimes done by the network layer.
- *
- * See http://oss.sgi.com/archives/xfs/2007-01/msg00594.html for
- * discussion.
- *
- * We cannot use get_page in the workaround, because it insists on a
- * positive page count as a precondition.  So we use _refcount directly.
- */
-static void
-bio_pageinc(struct bio *bio)
-{
-        struct bio_vec bv;
-        struct page *page;
-        struct bvec_iter iter;
-
-        bio_for_each_segment(bv, bio, iter) {
-                /* Non-zero page count for non-head members of
-                 * compound pages is no longer allowed by the kernel.
-                 */
-                page = compound_head(bv.bv_page);
-                page_ref_inc(page);
-        }
-}
-
-static void
-bio_pagedec(struct bio *bio)
-{
-        struct page *page;
-        struct bio_vec bv;
-        struct bvec_iter iter;
-
-        bio_for_each_segment(bv, bio, iter) {
-                page = compound_head(bv.bv_page);
-                page_ref_dec(page);
-        }
-}
-
 static void
 bufinit(struct buf *buf, struct request *rq, struct bio *bio)
 {
@@ -899,7 +860,6 @@ bufinit(struct buf *buf, struct request *rq, struct bio *bio)
         buf->rq = rq;
         buf->bio = bio;
         buf->iter = bio->bi_iter;
-        bio_pageinc(bio);
 }
 
 static struct buf *
@@ -1127,7 +1087,6 @@ aoe_end_buf(struct aoedev *d, struct buf *buf)
         if (buf == d->ip.buf)
                 d->ip.buf = NULL;
         rq = buf->rq;
-        bio_pagedec(buf->bio);
         mempool_free(buf, d->bufpool);
         n = (unsigned long) rq->special;
         rq->special = (void *) --n;
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 100be556e613..83482721bc01 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1871,7 +1871,7 @@ int drbd_send(struct drbd_connection *connection, struct socket *sock,
                 drbd_update_congested(connection);
         }
         do {
-                rv = kernel_sendmsg(sock, &msg, &iov, 1, size);
+                rv = kernel_sendmsg(sock, &msg, &iov, 1, iov.iov_len);
                 if (rv == -EAGAIN) {
                         if (we_should_drop_the_connection(connection, sock))
                                 break;
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 19a16b2dbb91..7a1048755914 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -599,7 +599,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                         return -EINVAL;
 
                 sreq = blk_mq_alloc_request(bdev_get_queue(bdev), WRITE, 0);
-                if (!sreq)
+                if (IS_ERR(sreq))
                         return -ENOMEM;
 
                 mutex_unlock(&nbd->tx_lock);
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 04365b17ee67..5497f7fc44d0 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1403,7 +1403,8 @@ static ssize_t hot_remove_store(struct class *class,
         zram = idr_find(&zram_index_idr, dev_id);
         if (zram) {
                 ret = zram_remove(zram);
-                idr_remove(&zram_index_idr, dev_id);
+                if (!ret)
+                        idr_remove(&zram_index_idr, dev_id);
         } else {
                 ret = -ENODEV;
         }
@@ -1412,8 +1413,14 @@ static ssize_t hot_remove_store(struct class *class,
         return ret ? ret : count;
 }
 
+/*
+ * NOTE: hot_add attribute is not the usual read-only sysfs attribute. In a
+ * sense that reading from this file does alter the state of your system -- it
+ * creates a new un-initialized zram device and returns back this device's
+ * device_id (or an error code if it fails to create a new device).
+ */
 static struct class_attribute zram_control_class_attrs[] = {
-        __ATTR_RO(hot_add),
+        __ATTR(hot_add, 0400, hot_add_show, NULL),
         __ATTR_WO(hot_remove),
         __ATTR_NULL,
 };
diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c
index b49e61320952..fc9e8891eae3 100644
--- a/drivers/char/ipmi/bt-bmc.c
+++ b/drivers/char/ipmi/bt-bmc.c
@@ -484,7 +484,7 @@ static int bt_bmc_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id bt_bmc_match[] = {
-        { .compatible = "aspeed,ast2400-bt-bmc" },
+        { .compatible = "aspeed,ast2400-ibt-bmc" },
         { },
 };
 
@@ -502,4 +502,4 @@ module_platform_driver(bt_bmc_driver);
 MODULE_DEVICE_TABLE(of, bt_bmc_match);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Alistair Popple <alistair@popple.id.au>");
-MODULE_DESCRIPTION("Linux device interface to the BT interface");
+MODULE_DESCRIPTION("Linux device interface to the IPMI BT interface");
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index d23368874710..6af1ce04b3da 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -748,10 +748,7 @@ static int pp_release(struct inode *inode, struct file *file)
         }
 
         if (pp->pdev) {
-                const char *name = pp->pdev->name;
-
                 parport_unregister_device(pp->pdev);
-                kfree(name);
                 pp->pdev = NULL;
                 pr_debug(CHRDEV "%x: unregistered pardevice\n", minor);
         }
diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
index f21e9b7afd1a..e3eed5a78404 100644
--- a/drivers/clk/bcm/Kconfig
+++ b/drivers/clk/bcm/Kconfig
@@ -20,7 +20,7 @@ config CLK_BCM_KONA
 
 config COMMON_CLK_IPROC
         bool "Broadcom iProc clock support"
-        depends on ARCH_BCM_IPROC || COMPILE_TEST
+        depends on ARCH_BCM_IPROC || ARCH_BCM_63XX || COMPILE_TEST
         depends on COMMON_CLK
         default ARCH_BCM_IPROC
         help
diff --git a/drivers/clk/berlin/bg2.c b/drivers/clk/berlin/bg2.c
index edf3b96b3b73..1d99292e2039 100644
--- a/drivers/clk/berlin/bg2.c
+++ b/drivers/clk/berlin/bg2.c
@@ -685,7 +685,7 @@ static void __init berlin2_clock_setup(struct device_node *np)
         }
 
         /* register clk-provider */
-        of_clk_add_hw_provider(np, of_clk_hw_onecell_get, &clk_data);
+        of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_data);
 
         return;
 
diff --git a/drivers/clk/berlin/bg2q.c b/drivers/clk/berlin/bg2q.c
index 0718e831475f..3b784b593afd 100644
--- a/drivers/clk/berlin/bg2q.c
+++ b/drivers/clk/berlin/bg2q.c
@@ -382,7 +382,7 @@ static void __init berlin2q_clock_setup(struct device_node *np)
         }
 
         /* register clk-provider */
-        of_clk_add_hw_provider(np, of_clk_hw_onecell_get, &clk_data);
+        of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_data);
 
         return;
 
diff --git a/drivers/clk/clk-efm32gg.c b/drivers/clk/clk-efm32gg.c
index 8802a2dd56ac..f674778fb3ac 100644
--- a/drivers/clk/clk-efm32gg.c
+++ b/drivers/clk/clk-efm32gg.c
@@ -82,6 +82,6 @@ static void __init efm32gg_cmu_init(struct device_node *np)
         hws[clk_HFPERCLKDAC0] = clk_hw_register_gate(NULL, "HFPERCLK.DAC0",
                         "HFXO", 0, base + CMU_HFPERCLKEN0, 17, 0, NULL);
 
-        of_clk_add_hw_provider(np, of_clk_hw_onecell_get, &clk_data);
+        of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_data);
 }
 CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init);
diff --git a/drivers/clk/clk-qoriq.c b/drivers/clk/clk-qoriq.c
index 20b105584f82..80ae2a51452d 100644
--- a/drivers/clk/clk-qoriq.c
+++ b/drivers/clk/clk-qoriq.c
@@ -700,6 +700,7 @@ static struct clk * __init create_mux_common(struct clockgen *cg,
                                              struct mux_hwclock *hwc,
                                              const struct clk_ops *ops,
                                              unsigned long min_rate,
+                                             unsigned long max_rate,
                                              unsigned long pct80_rate,
                                              const char *fmt, int idx)
 {
@@ -728,6 +729,8 @@ static struct clk * __init create_mux_common(struct clockgen *cg,
                         continue;
                 if (rate < min_rate)
                         continue;
+                if (rate > max_rate)
+                        continue;
 
                 parent_names[j] = div->name;
                 hwc->parent_to_clksel[j] = i;
@@ -759,7 +762,7 @@ static struct clk * __init create_one_cmux(struct clockgen *cg, int idx)
         struct mux_hwclock *hwc;
         const struct clockgen_pll_div *div;
         unsigned long plat_rate, min_rate;
-        u64 pct80_rate;
+        u64 max_rate, pct80_rate;
         u32 clksel;
 
         hwc = kzalloc(sizeof(*hwc), GFP_KERNEL);
@@ -787,8 +790,8 @@ static struct clk * __init create_one_cmux(struct clockgen *cg, int idx)
                 return NULL;
         }
 
-        pct80_rate = clk_get_rate(div->clk);
-        pct80_rate *= 8;
+        max_rate = clk_get_rate(div->clk);
+        pct80_rate = max_rate * 8;
         do_div(pct80_rate, 10);
 
         plat_rate = clk_get_rate(cg->pll[PLATFORM_PLL].div[PLL_DIV1].clk);
@@ -798,7 +801,7 @@ static struct clk * __init create_one_cmux(struct clockgen *cg, int idx)
         else
                 min_rate = plat_rate / 2;
 
-        return create_mux_common(cg, hwc, &cmux_ops, min_rate,
+        return create_mux_common(cg, hwc, &cmux_ops, min_rate, max_rate,
                                  pct80_rate, "cg-cmux%d", idx);
 }
 
@@ -813,7 +816,7 @@ static struct clk * __init create_one_hwaccel(struct clockgen *cg, int idx)
         hwc->reg = cg->regs + 0x20 * idx + 0x10;
         hwc->info = cg->info.hwaccel[idx];
 
-        return create_mux_common(cg, hwc, &hwaccel_ops, 0, 0,
+        return create_mux_common(cg, hwc, &hwaccel_ops, 0, ULONG_MAX, 0,
                                  "cg-hwaccel%d", idx);
 }
 
diff --git a/drivers/clk/clk-xgene.c b/drivers/clk/clk-xgene.c
index 5daddf5ecc4b..bc37030e38ba 100644
--- a/drivers/clk/clk-xgene.c
+++ b/drivers/clk/clk-xgene.c
@@ -463,22 +463,20 @@ static int xgene_clk_enable(struct clk_hw *hw)
         struct xgene_clk *pclk = to_xgene_clk(hw);
         unsigned long flags = 0;
         u32 data;
-        phys_addr_t reg;
 
         if (pclk->lock)
                 spin_lock_irqsave(pclk->lock, flags);
 
         if (pclk->param.csr_reg != NULL) {
                 pr_debug("%s clock enabled\n", clk_hw_get_name(hw));
-                reg = __pa(pclk->param.csr_reg);
                 /* First enable the clock */
                 data = xgene_clk_read(pclk->param.csr_reg +
                                         pclk->param.reg_clk_offset);
                 data |= pclk->param.reg_clk_mask;
                 xgene_clk_write(data, pclk->param.csr_reg +
                                         pclk->param.reg_clk_offset);
-                pr_debug("%s clock PADDR base %pa clk offset 0x%08X mask 0x%08X value 0x%08X\n",
-                        clk_hw_get_name(hw), &reg,
+                pr_debug("%s clk offset 0x%08X mask 0x%08X value 0x%08X\n",
+                        clk_hw_get_name(hw),
                         pclk->param.reg_clk_offset, pclk->param.reg_clk_mask,
                         data);
 
@@ -488,8 +486,8 @@ static int xgene_clk_enable(struct clk_hw *hw)
                 data &= ~pclk->param.reg_csr_mask;
                 xgene_clk_write(data, pclk->param.csr_reg +
                                         pclk->param.reg_csr_offset);
-                pr_debug("%s CSR RESET PADDR base %pa csr offset 0x%08X mask 0x%08X value 0x%08X\n",
-                        clk_hw_get_name(hw), &reg,
+                pr_debug("%s csr offset 0x%08X mask 0x%08X value 0x%08X\n",
+                        clk_hw_get_name(hw),
                         pclk->param.reg_csr_offset, pclk->param.reg_csr_mask,
                         data);
         }
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index 19f9b622981a..7a6acc3e4a92 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -223,7 +223,7 @@ static unsigned long clk_pllv3_av_recalc_rate(struct clk_hw *hw,
         temp64 *= mfn;
         do_div(temp64, mfd);
 
-        return (parent_rate * div) + (u32)temp64;
+        return parent_rate * div + (unsigned long)temp64;
 }
 
 static long clk_pllv3_av_round_rate(struct clk_hw *hw, unsigned long rate,
@@ -247,7 +247,11 @@ static long clk_pllv3_av_round_rate(struct clk_hw *hw, unsigned long rate,
         do_div(temp64, parent_rate);
         mfn = temp64;
 
-        return parent_rate * div + parent_rate * mfn / mfd;
+        temp64 = (u64)parent_rate;
+        temp64 *= mfn;
+        do_div(temp64, mfd);
+
+        return parent_rate * div + (unsigned long)temp64;
 }
 
 static int clk_pllv3_av_set_rate(struct clk_hw *hw, unsigned long rate,
diff --git a/drivers/clk/mmp/clk-of-mmp2.c b/drivers/clk/mmp/clk-of-mmp2.c
index 3a51fff1b0e7..9adaf48aea23 100644
--- a/drivers/clk/mmp/clk-of-mmp2.c
+++ b/drivers/clk/mmp/clk-of-mmp2.c
@@ -313,7 +313,7 @@ static void __init mmp2_clk_init(struct device_node *np)
         }
 
         pxa_unit->apmu_base = of_iomap(np, 1);
-        if (!pxa_unit->mpmu_base) {
+        if (!pxa_unit->apmu_base) {
                 pr_err("failed to map apmu registers\n");
                 return;
         }
diff --git a/drivers/clk/mmp/clk-of-pxa168.c b/drivers/clk/mmp/clk-of-pxa168.c
index 87f2317b2a00..f110c02e83cb 100644
--- a/drivers/clk/mmp/clk-of-pxa168.c
+++ b/drivers/clk/mmp/clk-of-pxa168.c
@@ -262,7 +262,7 @@ static void __init pxa168_clk_init(struct device_node *np)
         }
 
         pxa_unit->apmu_base = of_iomap(np, 1);
-        if (!pxa_unit->mpmu_base) {
+        if (!pxa_unit->apmu_base) {
                 pr_err("failed to map apmu registers\n");
                 return;
         }
diff --git a/drivers/clk/mmp/clk-of-pxa910.c b/drivers/clk/mmp/clk-of-pxa910.c
index e22a67f76d93..64d1ef49caeb 100644
--- a/drivers/clk/mmp/clk-of-pxa910.c
+++ b/drivers/clk/mmp/clk-of-pxa910.c
@@ -282,7 +282,7 @@ static void __init pxa910_clk_init(struct device_node *np)
         }
 
         pxa_unit->apmu_base = of_iomap(np, 1);
-        if (!pxa_unit->mpmu_base) {
+        if (!pxa_unit->apmu_base) {
                 pr_err("failed to map apmu registers\n");
                 return;
         }
@@ -294,7 +294,7 @@ static void __init pxa910_clk_init(struct device_node *np)
         }
 
         pxa_unit->apbcp_base = of_iomap(np, 3);
-        if (!pxa_unit->mpmu_base) {
+        if (!pxa_unit->apbcp_base) {
                 pr_err("failed to map apbcp registers\n");
                 return;
         }
diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c
index 8feba93672c5..e8075359366b 100644
--- a/drivers/clk/rockchip/clk-ddr.c
+++ b/drivers/clk/rockchip/clk-ddr.c
@@ -144,11 +144,8 @@ struct clk *rockchip_clk_register_ddrclk(const char *name, int flags,
         ddrclk->ddr_flag = ddr_flag;
 
         clk = clk_register(NULL, &ddrclk->hw);
-        if (IS_ERR(clk)) {
-                pr_err("%s: could not register ddrclk %s\n", __func__,  name);
+        if (IS_ERR(clk))
                 kfree(ddrclk);
-                return NULL;
-        }
 
         return clk;
 }
diff --git a/drivers/clk/samsung/clk-exynos-clkout.c b/drivers/clk/samsung/clk-exynos-clkout.c
index 96fab6cfb202..6c6afb87b4ce 100644
--- a/drivers/clk/samsung/clk-exynos-clkout.c
+++ b/drivers/clk/samsung/clk-exynos-clkout.c
@@ -132,28 +132,34 @@ free_clkout:
         pr_err("%s: failed to register clkout clock\n", __func__);
 }
 
+/*
+ * We use CLK_OF_DECLARE_DRIVER initialization method to avoid setting
+ * the OF_POPULATED flag on the pmu device tree node, so later the
+ * Exynos PMU platform device can be properly probed with PMU driver.
+ */
+
 static void __init exynos4_clkout_init(struct device_node *node)
 {
         exynos_clkout_init(node, EXYNOS4_CLKOUT_MUX_MASK);
 }
-CLK_OF_DECLARE(exynos4210_clkout, "samsung,exynos4210-pmu",
+CLK_OF_DECLARE_DRIVER(exynos4210_clkout, "samsung,exynos4210-pmu",
                 exynos4_clkout_init);
-CLK_OF_DECLARE(exynos4212_clkout, "samsung,exynos4212-pmu",
+CLK_OF_DECLARE_DRIVER(exynos4212_clkout, "samsung,exynos4212-pmu",
                 exynos4_clkout_init);
-CLK_OF_DECLARE(exynos4412_clkout, "samsung,exynos4412-pmu",
+CLK_OF_DECLARE_DRIVER(exynos4412_clkout, "samsung,exynos4412-pmu",
                 exynos4_clkout_init);
-CLK_OF_DECLARE(exynos3250_clkout, "samsung,exynos3250-pmu",
+CLK_OF_DECLARE_DRIVER(exynos3250_clkout, "samsung,exynos3250-pmu",
                 exynos4_clkout_init);
 
 static void __init exynos5_clkout_init(struct device_node *node)
 {
         exynos_clkout_init(node, EXYNOS5_CLKOUT_MUX_MASK);
 }
-CLK_OF_DECLARE(exynos5250_clkout, "samsung,exynos5250-pmu",
+CLK_OF_DECLARE_DRIVER(exynos5250_clkout, "samsung,exynos5250-pmu",
                 exynos5_clkout_init);
-CLK_OF_DECLARE(exynos5410_clkout, "samsung,exynos5410-pmu",
+CLK_OF_DECLARE_DRIVER(exynos5410_clkout, "samsung,exynos5410-pmu",
                 exynos5_clkout_init);
-CLK_OF_DECLARE(exynos5420_clkout, "samsung,exynos5420-pmu",
+CLK_OF_DECLARE_DRIVER(exynos5420_clkout, "samsung,exynos5420-pmu",
                 exynos5_clkout_init);
-CLK_OF_DECLARE(exynos5433_clkout, "samsung,exynos5433-pmu",
+CLK_OF_DECLARE_DRIVER(exynos5433_clkout, "samsung,exynos5433-pmu",
                 exynos5_clkout_init);
diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c
index 79596463e0d9..fc75a335a7ce 100644
--- a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c
+++ b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c
@@ -143,7 +143,7 @@ static SUNXI_CCU_NKM_WITH_MUX_GATE_LOCK(pll_mipi_clk, "pll-mipi",
                                         4, 2,   /* K */
                                         0, 4,   /* M */
                                         21, 0,  /* mux */
-                                        BIT(31),        /* gate */
+                                        BIT(31) | BIT(23) | BIT(22), /* gate */
                                         BIT(28),        /* lock */
                                         CLK_SET_RATE_UNGATE);
 
@@ -191,6 +191,8 @@ static struct clk_div_table axi_div_table[] = {
 static SUNXI_CCU_DIV_TABLE(axi_clk, "axi", "cpu",
                            0x050, 0, 3, axi_div_table, 0);
 
+#define SUN6I_A31_AHB1_REG  0x054
+
 static const char * const ahb1_parents[] = { "osc32k", "osc24M",
                                              "axi", "pll-periph" };
 
@@ -1230,6 +1232,16 @@ static void __init sun6i_a31_ccu_setup(struct device_node *node)
         val &= BIT(16);
         writel(val, reg + SUN6I_A31_PLL_MIPI_REG);
 
+        /* Force AHB1 to PLL6 / 3 */
+        val = readl(reg + SUN6I_A31_AHB1_REG);
+        /* set PLL6 pre-div = 3 */
+        val &= ~GENMASK(7, 6);
+        val |= 0x2 << 6;
+        /* select PLL6 / pre-div */
+        val &= ~GENMASK(13, 12);
+        val |= 0x3 << 12;
+        writel(val, reg + SUN6I_A31_AHB1_REG);
+
         sunxi_ccu_probe(node, reg, &sun6i_a31_ccu_desc);
 
         ccu_mux_notifier_register(pll_cpu_clk.common.hw.clk,
diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-a33.c b/drivers/clk/sunxi-ng/ccu-sun8i-a33.c
index 96b40ca57697..9bd1f78a0547 100644
--- a/drivers/clk/sunxi-ng/ccu-sun8i-a33.c
+++ b/drivers/clk/sunxi-ng/ccu-sun8i-a33.c
@@ -131,7 +131,7 @@ static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_mipi_clk, "pll-mipi",
                                     8, 4,               /* N */
                                     4, 2,               /* K */
                                     0, 4,               /* M */
-                                    BIT(31),            /* gate */
+                                    BIT(31) | BIT(23) | BIT(22), /* gate */
                                     BIT(28),            /* lock */
                                     CLK_SET_RATE_UNGATE);
 
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 838b22aa8b67..f2c9274b8bd5 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -373,7 +373,7 @@ static void sun4i_get_apb1_factors(struct factors_request *req)
         else
                 calcp = 3;
 
-        calcm = (req->parent_rate >> calcp) - 1;
+        calcm = (div >> calcp) - 1;
 
         req->rate = (req->parent_rate >> calcp) / (calcm + 1);
         req->m = calcm;
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 156aad167cd6..954a64c7757b 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -137,7 +137,7 @@ static void dbg_dump_sg(const char *level, const char *prefix_str,
                 }
 
                 buf = it_page + it->offset;
-                len = min(tlen, it->length);
+                len = min_t(size_t, tlen, it->length);
                 print_hex_dump(level, prefix_str, prefix_type, rowsize,
                                groupsize, buf, len, ascii);
                 tlen -= len;
@@ -4583,6 +4583,15 @@ static int __init caam_algapi_init(void)
                 if (!aes_inst && (alg_sel == OP_ALG_ALGSEL_AES))
                                 continue;
 
+                /*
+                 * Check support for AES modes not available
+                 * on LP devices.
+                 */
+                if ((cha_vid & CHA_ID_LS_AES_MASK) == CHA_ID_LS_AES_LP)
+                        if ((alg->class1_alg_type & OP_ALG_AAI_MASK) ==
+                             OP_ALG_AAI_XTS)
+                                continue;
+
                 t_alg = caam_alg_alloc(alg);
                 if (IS_ERR(t_alg)) {
                         err = PTR_ERR(t_alg);
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 72ff19658985..e483b78c6343 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -558,8 +558,9 @@ static int caam_probe(struct platform_device *pdev)
          * Enable DECO watchdogs and, if this is a PHYS_ADDR_T_64BIT kernel,
          * long pointers in master configuration register
          */
-        clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK, MCFGR_AWCACHE_CACH |
-                      MCFGR_AWCACHE_BUFF | MCFGR_WDENABLE | MCFGR_LARGE_BURST |
+        clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK | MCFGR_LONG_PTR,
+                      MCFGR_AWCACHE_CACH | MCFGR_AWCACHE_BUFF |
+                      MCFGR_WDENABLE | MCFGR_LARGE_BURST |
                       (sizeof(dma_addr_t) == sizeof(u64) ? MCFGR_LONG_PTR : 0));
 
         /*
diff --git a/drivers/crypto/chelsio/chcr_algo.h b/drivers/crypto/chelsio/chcr_algo.h
index ec64fbcdeb49..199b0bb69b89 100644
--- a/drivers/crypto/chelsio/chcr_algo.h
+++ b/drivers/crypto/chelsio/chcr_algo.h
@@ -422,7 +422,7 @@ static inline void get_aes_decrypt_key(unsigned char *dec_key,
 {
         u32 temp;
         u32 w_ring[MAX_NK];
-        int i, j, k = 0;
+        int i, j, k;
         u8  nr, nk;
 
         switch (keylength) {
@@ -460,6 +460,7 @@ static inline void get_aes_decrypt_key(unsigned char *dec_key,
                 temp = w_ring[i % nk];
                 i++;
         }
+        i--;
         for (k = 0, j = i % nk; k < nk; k++) {
                 *((u32 *)dec_key + k) = htonl(w_ring[j]);
                 j--;
diff --git a/drivers/crypto/marvell/hash.c b/drivers/crypto/marvell/hash.c
index 9f284682c091..77712b375b84 100644
--- a/drivers/crypto/marvell/hash.c
+++ b/drivers/crypto/marvell/hash.c
@@ -168,12 +168,11 @@ static void mv_cesa_ahash_std_step(struct ahash_request *req)
         mv_cesa_adjust_op(engine, &creq->op_tmpl);
         memcpy_toio(engine->sram, &creq->op_tmpl, sizeof(creq->op_tmpl));
 
-        digsize = crypto_ahash_digestsize(crypto_ahash_reqtfm(req));
-        for (i = 0; i < digsize / 4; i++)
-                writel_relaxed(creq->state[i], engine->regs + CESA_IVDIG(i));
-
-        mv_cesa_adjust_op(engine, &creq->op_tmpl);
-        memcpy_toio(engine->sram, &creq->op_tmpl, sizeof(creq->op_tmpl));
+        if (!sreq->offset) {
+                digsize = crypto_ahash_digestsize(crypto_ahash_reqtfm(req));
+                for (i = 0; i < digsize / 4; i++)
+                        writel_relaxed(creq->state[i], engine->regs + CESA_IVDIG(i));
+        }
 
         if (creq->cache_ptr)
                 memcpy_toio(engine->sram + CESA_SA_DATA_SRAM_OFFSET,
diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c
index 0e499bfca41c..286447a83dab 100644
--- a/drivers/dax/dax.c
+++ b/drivers/dax/dax.c
@@ -270,8 +270,8 @@ static int check_vma(struct dax_dev *dax_dev, struct vm_area_struct *vma,
         if (!dax_dev->alive)
                 return -ENXIO;
 
-        /* prevent private / writable mappings from being established */
-        if ((vma->vm_flags & (VM_NORESERVE|VM_SHARED|VM_WRITE)) == VM_WRITE) {
+        /* prevent private mappings from being established */
+        if ((vma->vm_flags & VM_MAYSHARE) != VM_MAYSHARE) {
                 dev_info(dev, "%s: %s: fail, attempted private mapping\n",
                                 current->comm, func);
                 return -EINVAL;
diff --git a/drivers/dax/pmem.c b/drivers/dax/pmem.c
index 4a15fa5df98b..73c6ce93a0d9 100644
--- a/drivers/dax/pmem.c
+++ b/drivers/dax/pmem.c
@@ -78,7 +78,9 @@ static int dax_pmem_probe(struct device *dev)
         nsio = to_nd_namespace_io(&ndns->dev);
 
         /* parse the 'pfn' info block via ->rw_bytes */
-        devm_nsio_enable(dev, nsio);
+        rc = devm_nsio_enable(dev, nsio);
+        if (rc)
+                return rc;
         altmap = nvdimm_setup_pfn(nd_pfn, &res, &__altmap);
         if (IS_ERR(altmap))
                 return PTR_ERR(altmap);
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index af63a6bcf564..141aefbe37ec 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -306,6 +306,7 @@ config MMP_TDMA
         depends on ARCH_MMP || COMPILE_TEST
         select DMA_ENGINE
         select MMP_SRAM if ARCH_MMP
+        select GENERIC_ALLOCATOR
         help
           Support the MMP Two-Channel DMA engine.
           This engine used for MMP Audio DMA and pxa910 SQU.
diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c
index bac5f023013b..d5ba43a87a68 100644
--- a/drivers/dma/cppi41.c
+++ b/drivers/dma/cppi41.c
@@ -317,6 +317,12 @@ static irqreturn_t cppi41_irq(int irq, void *data)
 
                 while (val) {
                         u32 desc, len;
+                        int error;
+
+                        error = pm_runtime_get(cdd->ddev.dev);
+                        if (error < 0)
+                                dev_err(cdd->ddev.dev, "%s pm runtime get: %i\n",
+                                        __func__, error);
 
                         q_num = __fls(val);
                         val &= ~(1 << q_num);
@@ -338,7 +344,6 @@ static irqreturn_t cppi41_irq(int irq, void *data)
                         dma_cookie_complete(&c->txd);
                         dmaengine_desc_get_callback_invoke(&c->txd, NULL);
 
-                        /* Paired with cppi41_dma_issue_pending */
                         pm_runtime_mark_last_busy(cdd->ddev.dev);
                         pm_runtime_put_autosuspend(cdd->ddev.dev);
                 }
@@ -362,8 +367,13 @@ static int cppi41_dma_alloc_chan_resources(struct dma_chan *chan)
         int error;
 
         error = pm_runtime_get_sync(cdd->ddev.dev);
-        if (error < 0)
+        if (error < 0) {
+                dev_err(cdd->ddev.dev, "%s pm runtime get: %i\n",
+                        __func__, error);
+                pm_runtime_put_noidle(cdd->ddev.dev);
+
                 return error;
+        }
 
         dma_cookie_init(chan);
         dma_async_tx_descriptor_init(&c->txd, chan);
@@ -385,8 +395,11 @@ static void cppi41_dma_free_chan_resources(struct dma_chan *chan)
         int error;
 
         error = pm_runtime_get_sync(cdd->ddev.dev);
-        if (error < 0)
+        if (error < 0) {
+                pm_runtime_put_noidle(cdd->ddev.dev);
+
                 return;
+        }
 
         WARN_ON(!list_empty(&cdd->pending));
 
@@ -460,9 +473,9 @@ static void cppi41_dma_issue_pending(struct dma_chan *chan)
         struct cppi41_dd *cdd = c->cdd;
         int error;
 
-        /* PM runtime paired with dmaengine_desc_get_callback_invoke */
         error = pm_runtime_get(cdd->ddev.dev);
         if ((error != -EINPROGRESS) && error < 0) {
+                pm_runtime_put_noidle(cdd->ddev.dev);
                 dev_err(cdd->ddev.dev, "Failed to pm_runtime_get: %i\n",
                         error);
 
@@ -473,6 +486,9 @@ static void cppi41_dma_issue_pending(struct dma_chan *chan)
                 push_desc_queue(c);
         else
                 pending_desc(c);
+
+        pm_runtime_mark_last_busy(cdd->ddev.dev);
+        pm_runtime_put_autosuspend(cdd->ddev.dev);
 }
 
 static u32 get_host_pd0(u32 length)
@@ -1059,8 +1075,8 @@ err_chans:
         deinit_cppi41(dev, cdd);
 err_init_cppi:
         pm_runtime_dont_use_autosuspend(dev);
-        pm_runtime_put_sync(dev);
 err_get_sync:
+        pm_runtime_put_sync(dev);
         pm_runtime_disable(dev);
         iounmap(cdd->usbss_mem);
         iounmap(cdd->ctrl_mem);
@@ -1072,7 +1088,12 @@ err_get_sync:
 static int cppi41_dma_remove(struct platform_device *pdev)
 {
         struct cppi41_dd *cdd = platform_get_drvdata(pdev);
+        int error;
 
+        error = pm_runtime_get_sync(&pdev->dev);
+        if (error < 0)
+                dev_err(&pdev->dev, "%s could not pm_runtime_get: %i\n",
+                        __func__, error);
         of_dma_controller_free(pdev->dev.of_node);
         dma_async_device_unregister(&cdd->ddev);
 
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index e18a58068bca..77242b37ef87 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -1628,6 +1628,7 @@ static int edma_alloc_chan_resources(struct dma_chan *chan)
         if (echan->slot[0] < 0) {
                 dev_err(dev, "Entry slot allocation failed for channel %u\n",
                         EDMA_CHAN_SLOT(echan->ch_num));
+                ret = echan->slot[0];
                 goto err_slot;
         }
 
diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c
index 83461994e418..a2358780ab2c 100644
--- a/drivers/dma/sun6i-dma.c
+++ b/drivers/dma/sun6i-dma.c
@@ -578,7 +578,7 @@ static struct dma_async_tx_descriptor *sun6i_dma_prep_dma_memcpy(
 
         burst = convert_burst(8);
         width = convert_buswidth(DMA_SLAVE_BUSWIDTH_4_BYTES);
-        v_lli->cfg |= DMA_CHAN_CFG_SRC_DRQ(DRQ_SDRAM) |
+        v_lli->cfg = DMA_CHAN_CFG_SRC_DRQ(DRQ_SDRAM) |
                 DMA_CHAN_CFG_DST_DRQ(DRQ_SDRAM) |
                 DMA_CHAN_CFG_DST_LINEAR_MODE |
                 DMA_CHAN_CFG_SRC_LINEAR_MODE |
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 56e6c4c7c60d..d836d4ce5ee4 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -274,9 +274,10 @@ static void arizona_extcon_pulse_micbias(struct arizona_extcon_info *info)
         struct arizona *arizona = info->arizona;
         const char *widget = arizona_extcon_get_micbias(info);
         struct snd_soc_dapm_context *dapm = arizona->dapm;
+        struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
         int ret;
 
-        ret = snd_soc_dapm_force_enable_pin(dapm, widget);
+        ret = snd_soc_component_force_enable_pin(component, widget);
         if (ret != 0)
                 dev_warn(arizona->dev, "Failed to enable %s: %d\n",
                          widget, ret);
@@ -284,7 +285,7 @@ static void arizona_extcon_pulse_micbias(struct arizona_extcon_info *info)
         snd_soc_dapm_sync(dapm);
 
         if (!arizona->pdata.micd_force_micbias) {
-                ret = snd_soc_dapm_disable_pin(arizona->dapm, widget);
+                ret = snd_soc_component_disable_pin(component, widget);
                 if (ret != 0)
                         dev_warn(arizona->dev, "Failed to disable %s: %d\n",
                                  widget, ret);
@@ -349,6 +350,7 @@ static void arizona_stop_mic(struct arizona_extcon_info *info)
         struct arizona *arizona = info->arizona;
         const char *widget = arizona_extcon_get_micbias(info);
         struct snd_soc_dapm_context *dapm = arizona->dapm;
+        struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
         bool change;
         int ret;
 
@@ -356,7 +358,7 @@ static void arizona_stop_mic(struct arizona_extcon_info *info)
                                  ARIZONA_MICD_ENA, 0,
                                  &change);
 
-        ret = snd_soc_dapm_disable_pin(dapm, widget);
+        ret = snd_soc_component_disable_pin(component, widget);
         if (ret != 0)
                 dev_warn(arizona->dev,
                          "Failed to disable %s: %d\n",
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d011cb89d25e..ed37e5908b91 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -22,10 +22,6 @@ menuconfig GPIOLIB
 
 if GPIOLIB
 
-config GPIO_DEVRES
-        def_bool y
-        depends on HAS_IOMEM
-
 config OF_GPIO
         def_bool y
         depends on OF
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index ab28a2daeacc..d074c2299393 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -2,7 +2,7 @@
 
 ccflags-$(CONFIG_DEBUG_GPIO)    += -DDEBUG
 
-obj-$(CONFIG_GPIO_DEVRES)       += devres.o
+obj-$(CONFIG_GPIOLIB)           += devres.o
 obj-$(CONFIG_GPIOLIB)           += gpiolib.o
 obj-$(CONFIG_GPIOLIB)           += gpiolib-legacy.o
 obj-$(CONFIG_OF_GPIO)           += gpiolib-of.o
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index e422568e14ad..fe731f094257 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -372,14 +372,15 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc,
 
         bank_shift = fls((chip->gpio_chip.ngpio - 1) / BANK_SZ);
 
-        memcpy(reg_val, chip->reg_output, NBANK(chip));
         mutex_lock(&chip->i2c_lock);
+        memcpy(reg_val, chip->reg_output, NBANK(chip));
         for (bank = 0; bank < NBANK(chip); bank++) {
                 bank_mask = mask[bank / sizeof(*mask)] >>
                            ((bank % sizeof(*mask)) * 8);
                 if (bank_mask) {
                         bank_val = bits[bank / sizeof(*bits)] >>
                                   ((bank % sizeof(*bits)) * 8);
+                        bank_val &= bank_mask;
                         reg_val[bank] = (reg_val[bank] & ~bank_mask) | bank_val;
                 }
         }
@@ -607,7 +608,6 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
 
         if (client->irq && irq_base != -1
                         && (chip->driver_data & PCA_INT)) {
-
                 ret = pca953x_read_regs(chip,
                                         chip->regs->input, chip->irq_stat);
                 if (ret)
diff --git a/drivers/gpio/gpio-tc3589x.c b/drivers/gpio/gpio-tc3589x.c
index 5a5a6cb00eea..d6e21f1a70a9 100644
--- a/drivers/gpio/gpio-tc3589x.c
+++ b/drivers/gpio/gpio-tc3589x.c
@@ -97,7 +97,7 @@ static int tc3589x_gpio_get_direction(struct gpio_chip *chip,
         if (ret < 0)
                 return ret;
 
-        return !!(ret & BIT(pos));
+        return !(ret & BIT(pos));
 }
 
 static int tc3589x_gpio_set_single_ended(struct gpio_chip *chip,
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 93ed0e00c578..868128a676ba 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -2737,8 +2737,11 @@ int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
         if (IS_ERR(desc))
                 return PTR_ERR(desc);
 
-        /* Flush direction if something changed behind our back */
-        if (chip->get_direction) {
+        /*
+         * If it's fast: flush the direction setting if something changed
+         * behind our back
+         */
+        if (!chip->can_sleep && chip->get_direction) {
                 int dir = chip->get_direction(chip, offset);
 
                 if (dir)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 039b57e4644c..05c2850c04b0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -459,6 +459,7 @@ struct amdgpu_bo {
         u64                             metadata_flags;
         void                            *metadata;
         u32                             metadata_size;
+        unsigned                        prime_shared_count;
         /* list of all virtual address to which this bo
          * is associated to
          */
@@ -2471,6 +2472,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
                                  struct drm_file *file_priv);
 void amdgpu_driver_preclose_kms(struct drm_device *dev,
                                 struct drm_file *file_priv);
+int amdgpu_suspend(struct amdgpu_device *adev);
 int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon);
 int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon);
 u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
index 892d60fb225b..2057683f7b59 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
@@ -395,9 +395,12 @@ static int acp_hw_fini(void *handle)
 {
         int i, ret;
         struct device *dev;
-
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+        /* return early if no ACP */
+        if (!adev->acp.acp_genpd)
+                return 0;
+
         for (i = 0; i < ACP_DEVS ; i++) {
                 dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, i);
                 ret = pm_genpd_remove_device(&adev->acp.acp_genpd->gpd, dev);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
index dae35a96a694..6c343a933182 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
@@ -34,6 +34,7 @@ struct amdgpu_atpx {
 
 static struct amdgpu_atpx_priv {
         bool atpx_detected;
+        bool bridge_pm_usable;
         /* handle for device - and atpx */
         acpi_handle dhandle;
         acpi_handle other_handle;
@@ -205,7 +206,11 @@ static int amdgpu_atpx_validate(struct amdgpu_atpx *atpx)
         atpx->is_hybrid = false;
         if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {
                 printk("ATPX Hybrid Graphics\n");
-                atpx->functions.power_cntl = false;
+                /*
+                 * Disable legacy PM methods only when pcie port PM is usable,
+                 * otherwise the device might fail to power off or power on.
+                 */
+                atpx->functions.power_cntl = !amdgpu_atpx_priv.bridge_pm_usable;
                 atpx->is_hybrid = true;
         }
 
@@ -555,17 +560,25 @@ static bool amdgpu_atpx_detect(void)
         struct pci_dev *pdev = NULL;
         bool has_atpx = false;
         int vga_count = 0;
+        bool d3_supported = false;
+        struct pci_dev *parent_pdev;
 
         while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
                 vga_count++;
 
                 has_atpx |= (amdgpu_atpx_pci_probe_handle(pdev) == true);
+
+                parent_pdev = pci_upstream_bridge(pdev);
+                d3_supported |= parent_pdev && parent_pdev->bridge_d3;
         }
 
         while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
                 vga_count++;
 
                 has_atpx |= (amdgpu_atpx_pci_probe_handle(pdev) == true);
+
+                parent_pdev = pci_upstream_bridge(pdev);
+                d3_supported |= parent_pdev && parent_pdev->bridge_d3;
         }
 
         if (has_atpx && vga_count == 2) {
@@ -573,6 +586,7 @@ static bool amdgpu_atpx_detect(void)
                 printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n",
                        acpi_method_name);
                 amdgpu_atpx_priv.atpx_detected = true;
+                amdgpu_atpx_priv.bridge_pm_usable = d3_supported;
                 amdgpu_atpx_init();
                 return true;
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
index 651115dcce12..c02db01f6583 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
@@ -132,7 +132,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
                 entry->priority = min(info[i].bo_priority,
                                       AMDGPU_BO_LIST_MAX_PRIORITY);
                 entry->tv.bo = &entry->robj->tbo;
-                entry->tv.shared = true;
+                entry->tv.shared = !entry->robj->prime_shared_count;
 
                 if (entry->robj->prefered_domains == AMDGPU_GEM_DOMAIN_GDS)
                         gds_obj = entry->robj;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index 7a8bfa34682f..662976292535 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -795,10 +795,19 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                 if (!adev->pm.fw) {
                         switch (adev->asic_type) {
                         case CHIP_TOPAZ:
-                                strcpy(fw_name, "amdgpu/topaz_smc.bin");
+                                if (((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0x81)) ||
+                                    ((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0x83)) ||
+                                    ((adev->pdev->device == 0x6907) && (adev->pdev->revision == 0x87)))
+                                        strcpy(fw_name, "amdgpu/topaz_k_smc.bin");
+                                else
+                                        strcpy(fw_name, "amdgpu/topaz_smc.bin");
                                 break;
                         case CHIP_TONGA:
-                                strcpy(fw_name, "amdgpu/tonga_smc.bin");
+                                if (((adev->pdev->device == 0x6939) && (adev->pdev->revision == 0xf1)) ||
+                                    ((adev->pdev->device == 0x6938) && (adev->pdev->revision == 0xf1)))
+                                        strcpy(fw_name, "amdgpu/tonga_k_smc.bin");
+                                else
+                                        strcpy(fw_name, "amdgpu/tonga_smc.bin");
                                 break;
                         case CHIP_FIJI:
                                 strcpy(fw_name, "amdgpu/fiji_smc.bin");
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
index e3281d4e3e41..086aa5c9c634 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
@@ -769,7 +769,7 @@ static void amdgpu_connector_unregister(struct drm_connector *connector)
 {
         struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);
 
-        if (amdgpu_connector->ddc_bus->has_aux) {
+        if (amdgpu_connector->ddc_bus && amdgpu_connector->ddc_bus->has_aux) {
                 drm_dp_aux_unregister(&amdgpu_connector->ddc_bus->aux);
                 amdgpu_connector->ddc_bus->has_aux = false;
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 7ca07e7b25c1..e41d4baebf86 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -658,12 +658,10 @@ static bool amdgpu_vpost_needed(struct amdgpu_device *adev)
                 return false;
 
         if (amdgpu_passthrough(adev)) {
-                /* for FIJI: In whole GPU pass-through virtualization case
-                 * old smc fw won't clear some registers (e.g. MEM_SIZE, BIOS_SCRATCH)
-                 * so amdgpu_card_posted return false and driver will incorrectly skip vPost.
-                 * but if we force vPost do in pass-through case, the driver reload will hang.
-                 * whether doing vPost depends on amdgpu_card_posted if smc version is above
-                 * 00160e00 for FIJI.
+                /* for FIJI: In whole GPU pass-through virtualization case, after VM reboot
+                 * some old smc fw still need driver do vPost otherwise gpu hang, while
+                 * those smc fw version above 22.15 doesn't have this flaw, so we force
+                 * vpost executed for smc version below 22.15
                  */
                 if (adev->asic_type == CHIP_FIJI) {
                         int err;
@@ -674,22 +672,11 @@ static bool amdgpu_vpost_needed(struct amdgpu_device *adev)
                                 return true;
 
                         fw_ver = *((uint32_t *)adev->pm.fw->data + 69);
-                        if (fw_ver >= 0x00160e00)
-                                return !amdgpu_card_posted(adev);
+                        if (fw_ver < 0x00160e00)
+                                return true;
                 }
-        } else {
-                /* in bare-metal case, amdgpu_card_posted return false
-                 * after system reboot/boot, and return true if driver
-                 * reloaded.
-                 * we shouldn't do vPost after driver reload otherwise GPU
-                 * could hang.
-                 */
-                if (amdgpu_card_posted(adev))
-                        return false;
         }
-
-        /* we assume vPost is neede for all other cases */
-        return true;
+        return !amdgpu_card_posted(adev);
 }
 
 /**
@@ -1506,7 +1493,7 @@ static int amdgpu_fini(struct amdgpu_device *adev)
         return 0;
 }
 
-static int amdgpu_suspend(struct amdgpu_device *adev)
+int amdgpu_suspend(struct amdgpu_device *adev)
 {
         int i, r;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 71ed27eb3dde..e0890deccb2f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -479,12 +479,15 @@ amdgpu_pci_remove(struct pci_dev *pdev)
 static void
 amdgpu_pci_shutdown(struct pci_dev *pdev)
 {
+        struct drm_device *dev = pci_get_drvdata(pdev);
+        struct amdgpu_device *adev = dev->dev_private;
+
         /* if we are running in a VM, make sure the device
          * torn down properly on reboot/shutdown.
          * unfortunately we can't detect certain
          * hypervisors so just do this all the time.
          */
-        amdgpu_pci_remove(pdev);
+        amdgpu_suspend(adev);
 }
 
 static int amdgpu_pmops_suspend(struct device *dev)
@@ -735,8 +738,20 @@ static struct pci_driver amdgpu_kms_pci_driver = {
 
 static int __init amdgpu_init(void)
 {
-        amdgpu_sync_init();
-        amdgpu_fence_slab_init();
+        int r;
+
+        r = amdgpu_sync_init();
+        if (r)
+                goto error_sync;
+
+        r = amdgpu_fence_slab_init();
+        if (r)
+                goto error_fence;
+
+        r = amd_sched_fence_slab_init();
+        if (r)
+                goto error_sched;
+
         if (vgacon_text_force()) {
                 DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");
                 return -EINVAL;
@@ -748,6 +763,15 @@ static int __init amdgpu_init(void)
         amdgpu_register_atpx_handler();
         /* let modprobe override vga console setting */
         return drm_pci_init(driver, pdriver);
+
+error_sched:
+        amdgpu_fence_slab_fini();
+
+error_fence:
+        amdgpu_sync_fini();
+
+error_sync:
+        return r;
 }
 
 static void __exit amdgpu_exit(void)
@@ -756,6 +780,7 @@ static void __exit amdgpu_exit(void)
         drm_pci_exit(driver, pdriver);
         amdgpu_unregister_atpx_handler();
         amdgpu_sync_fini();
+        amd_sched_fence_slab_fini();
         amdgpu_fence_slab_fini();
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 203d98b00555..3938fca1ea8e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -99,6 +99,8 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)
 
         if ((amdgpu_runtime_pm != 0) &&
             amdgpu_has_atpx() &&
+            (amdgpu_is_atpx_hybrid() ||
+             amdgpu_has_atpx_dgpu_power_cntl()) &&
             ((flags & AMD_IS_APU) == 0))
                 flags |= AMD_IS_PX;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
index 7700dc22f243..3826d5aea0a6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
@@ -74,20 +74,36 @@ amdgpu_gem_prime_import_sg_table(struct drm_device *dev,
         if (ret)
                 return ERR_PTR(ret);
 
+        bo->prime_shared_count = 1;
         return &bo->gem_base;
 }
 
 int amdgpu_gem_prime_pin(struct drm_gem_object *obj)
 {
         struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
-        int ret = 0;
+        long ret = 0;
 
         ret = amdgpu_bo_reserve(bo, false);
         if (unlikely(ret != 0))
                 return ret;
 
+        /*
+         * Wait for all shared fences to complete before we switch to future
+         * use of exclusive fence on this prime shared bo.
+         */
+        ret = reservation_object_wait_timeout_rcu(bo->tbo.resv, true, false,
+                                                  MAX_SCHEDULE_TIMEOUT);
+        if (unlikely(ret < 0)) {
+                DRM_DEBUG_PRIME("Fence wait failed: %li\n", ret);
+                amdgpu_bo_unreserve(bo);
+                return ret;
+        }
+
         /* pin buffer into GTT */
         ret = amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT, NULL);
+        if (likely(ret == 0))
+                bo->prime_shared_count++;
+
         amdgpu_bo_unreserve(bo);
         return ret;
 }
@@ -102,6 +118,8 @@ void amdgpu_gem_prime_unpin(struct drm_gem_object *obj)
                 return;
 
         amdgpu_bo_unpin(bo);
+        if (bo->prime_shared_count)
+                bo->prime_shared_count--;
         amdgpu_bo_unreserve(bo);
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 7c13090df7c0..f62f1a74f890 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -80,7 +80,9 @@
 #include "dce_virtual.h"
 
 MODULE_FIRMWARE("amdgpu/topaz_smc.bin");
+MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin");
 MODULE_FIRMWARE("amdgpu/tonga_smc.bin");
+MODULE_FIRMWARE("amdgpu/tonga_k_smc.bin");
 MODULE_FIRMWARE("amdgpu/fiji_smc.bin");
 MODULE_FIRMWARE("amdgpu/polaris10_smc.bin");
 MODULE_FIRMWARE("amdgpu/polaris10_smc_sk.bin");
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
index 14f8c1f4da3d..0723758ed065 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
@@ -272,7 +272,7 @@ bool phm_check_smc_update_required_for_display_configuration(struct pp_hwmgr *hw
         PHM_FUNC_CHECK(hwmgr);
 
         if (hwmgr->hwmgr_func->check_smc_update_required_for_display_configuration == NULL)
-                return -EINVAL;
+                return false;
 
         return hwmgr->hwmgr_func->check_smc_update_required_for_display_configuration(hwmgr);
 }
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index 2ba7937d2545..e03dcb6ea9c1 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -710,8 +710,10 @@ int phm_get_voltage_evv_on_sclk(struct pp_hwmgr *hwmgr, uint8_t voltage_type,
         uint32_t vol;
         int ret = 0;
 
-        if (hwmgr->chip_id < CHIP_POLARIS10) {
-                atomctrl_get_voltage_evv_on_sclk(hwmgr, voltage_type, sclk, id, voltage);
+        if (hwmgr->chip_id < CHIP_TONGA) {
+                ret = atomctrl_get_voltage_evv(hwmgr, id, voltage);
+        } else if (hwmgr->chip_id < CHIP_POLARIS10) {
+                ret = atomctrl_get_voltage_evv_on_sclk(hwmgr, voltage_type, sclk, id, voltage);
                 if (*voltage >= 2000 || *voltage == 0)
                         *voltage = 1150;
         } else {
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index 75854021f403..08cd0bd3ebe5 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -1460,19 +1460,17 @@ static int smu7_get_evv_voltages(struct pp_hwmgr *hwmgr)
         struct phm_ppt_v1_clock_voltage_dependency_table *sclk_table = NULL;
 
 
-        if (table_info == NULL)
-                return -EINVAL;
-
-        sclk_table = table_info->vdd_dep_on_sclk;
-
         for (i = 0; i < SMU7_MAX_LEAKAGE_COUNT; i++) {
                 vv_id = ATOM_VIRTUAL_VOLTAGE_ID0 + i;
 
                 if (data->vdd_gfx_control == SMU7_VOLTAGE_CONTROL_BY_SVID2) {
-                        if (0 == phm_get_sclk_for_voltage_evv(hwmgr,
+                        if ((hwmgr->pp_table_version == PP_TABLE_V1)
+                            && !phm_get_sclk_for_voltage_evv(hwmgr,
                                                 table_info->vddgfx_lookup_table, vv_id, &sclk)) {
                                 if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
                                                         PHM_PlatformCaps_ClockStretcher)) {
+                                        sclk_table = table_info->vdd_dep_on_sclk;
+
                                         for (j = 1; j < sclk_table->count; j++) {
                                                 if (sclk_table->entries[j].clk == sclk &&
                                                                 sclk_table->entries[j].cks_enable == 0) {
@@ -1498,12 +1496,15 @@ static int smu7_get_evv_voltages(struct pp_hwmgr *hwmgr)
                                 }
                         }
                 } else {
-
                         if ((hwmgr->pp_table_version == PP_TABLE_V0)
                                 || !phm_get_sclk_for_voltage_evv(hwmgr,
                                         table_info->vddc_lookup_table, vv_id, &sclk)) {
                                 if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
                                                 PHM_PlatformCaps_ClockStretcher)) {
+                                        if (table_info == NULL)
+                                                return -EINVAL;
+                                        sclk_table = table_info->vdd_dep_on_sclk;
+
                                         for (j = 1; j < sclk_table->count; j++) {
                                                 if (sclk_table->entries[j].clk == sclk &&
                                                                 sclk_table->entries[j].cks_enable == 0) {
@@ -2133,9 +2134,11 @@ static int smu7_patch_limits_vddc(struct pp_hwmgr *hwmgr,
         struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
 
         if (tab) {
+                vddc = tab->vddc;
                 smu7_patch_ppt_v0_with_vdd_leakage(hwmgr, &vddc,
                                                    &data->vddc_leakage);
                 tab->vddc = vddc;
+                vddci = tab->vddci;
                 smu7_patch_ppt_v0_with_vdd_leakage(hwmgr, &vddci,
                                                    &data->vddci_leakage);
                 tab->vddci = vddci;
@@ -2981,19 +2984,19 @@ static int smu7_get_pp_table_entry_callback_func_v0(struct pp_hwmgr *hwmgr,
         if (!(data->mc_micro_code_feature & DISABLE_MC_LOADMICROCODE) && memory_clock > data->highest_mclk)
                 data->highest_mclk = memory_clock;
 
-        performance_level = &(ps->performance_levels
-                        [ps->performance_level_count++]);
-
         PP_ASSERT_WITH_CODE(
                         (ps->performance_level_count < smum_get_mac_definition(hwmgr->smumgr, SMU_MAX_LEVELS_GRAPHICS)),
                         "Performance levels exceeds SMC limit!",
                         return -EINVAL);
 
         PP_ASSERT_WITH_CODE(
-                        (ps->performance_level_count <=
+                        (ps->performance_level_count <
                                         hwmgr->platform_descriptor.hardwareActivityPerformanceLevels),
-                        "Performance levels exceeds Driver limit!",
-                        return -EINVAL);
+                        "Performance levels exceeds Driver limit, Skip!",
+                        return 0);
+
+        performance_level = &(ps->performance_levels
+                        [ps->performance_level_count++]);
 
         /* Performance levels are arranged from low to high. */
         performance_level->memory_clock = memory_clock;
@@ -4228,18 +4231,26 @@ static int smu7_get_sclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks)
 {
         struct phm_ppt_v1_information *table_info =
                         (struct phm_ppt_v1_information *)hwmgr->pptable;
-        struct phm_ppt_v1_clock_voltage_dependency_table *dep_sclk_table;
+        struct phm_ppt_v1_clock_voltage_dependency_table *dep_sclk_table = NULL;
+        struct phm_clock_voltage_dependency_table *sclk_table;
         int i;
 
-        if (table_info == NULL)
-                return -EINVAL;
-
-        dep_sclk_table = table_info->vdd_dep_on_sclk;
-
-        for (i = 0; i < dep_sclk_table->count; i++) {
-                clocks->clock[i] = dep_sclk_table->entries[i].clk;
-                clocks->count++;
+        if (hwmgr->pp_table_version == PP_TABLE_V1) {
+                if (table_info == NULL || table_info->vdd_dep_on_sclk == NULL)
+                        return -EINVAL;
+                dep_sclk_table = table_info->vdd_dep_on_sclk;
+                for (i = 0; i < dep_sclk_table->count; i++) {
+                        clocks->clock[i] = dep_sclk_table->entries[i].clk;
+                        clocks->count++;
+                }
+        } else if (hwmgr->pp_table_version == PP_TABLE_V0) {
+                sclk_table = hwmgr->dyn_state.vddc_dependency_on_sclk;
+                for (i = 0; i < sclk_table->count; i++) {
+                        clocks->clock[i] = sclk_table->entries[i].clk;
+                        clocks->count++;
+                }
         }
+
         return 0;
 }
 
@@ -4261,17 +4272,24 @@ static int smu7_get_mclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks)
                         (struct phm_ppt_v1_information *)hwmgr->pptable;
         struct phm_ppt_v1_clock_voltage_dependency_table *dep_mclk_table;
         int i;
+        struct phm_clock_voltage_dependency_table *mclk_table;
 
-        if (table_info == NULL)
-                return -EINVAL;
-
-        dep_mclk_table = table_info->vdd_dep_on_mclk;
-
-        for (i = 0; i < dep_mclk_table->count; i++) {
-                clocks->clock[i] = dep_mclk_table->entries[i].clk;
-                clocks->latency[i] = smu7_get_mem_latency(hwmgr,
+        if (hwmgr->pp_table_version == PP_TABLE_V1) {
+                if (table_info == NULL)
+                        return -EINVAL;
+                dep_mclk_table = table_info->vdd_dep_on_mclk;
+                for (i = 0; i < dep_mclk_table->count; i++) {
+                        clocks->clock[i] = dep_mclk_table->entries[i].clk;
+                        clocks->latency[i] = smu7_get_mem_latency(hwmgr,
                                                 dep_mclk_table->entries[i].clk);
-                clocks->count++;
+                        clocks->count++;
+                }
+        } else if (hwmgr->pp_table_version == PP_TABLE_V0) {
+                mclk_table = hwmgr->dyn_state.vddc_dependency_on_mclk;
+                for (i = 0; i < mclk_table->count; i++) {
+                        clocks->clock[i] = mclk_table->entries[i].clk;
+                        clocks->count++;
+                }
         }
         return 0;
 }
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c
index fb6c6f6106d5..29d0319b22e6 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c
@@ -30,7 +30,7 @@ int smu7_fan_ctrl_get_fan_speed_info(struct pp_hwmgr *hwmgr,
                 struct phm_fan_speed_info *fan_speed_info)
 {
         if (hwmgr->thermal_controller.fanInfo.bNoFan)
-                return 0;
+                return -ENODEV;
 
         fan_speed_info->supports_percent_read = true;
         fan_speed_info->supports_percent_write = true;
@@ -60,7 +60,7 @@ int smu7_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
         uint64_t tmp64;
 
         if (hwmgr->thermal_controller.fanInfo.bNoFan)
-                return 0;
+                return -ENODEV;
 
         duty100 = PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
                         CG_FDO_CTRL1, FMAX_DUTY100);
@@ -89,7 +89,7 @@ int smu7_fan_ctrl_get_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t *speed)
         if (hwmgr->thermal_controller.fanInfo.bNoFan ||
                         (hwmgr->thermal_controller.fanInfo.
                                 ucTachometerPulsesPerRevolution == 0))
-                return 0;
+                return -ENODEV;
 
         tach_period = PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
                         CG_TACH_STATUS, TACH_PERIOD);
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
index 4ccc0b72324d..71bb2f8dc157 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
@@ -2214,6 +2214,7 @@ uint32_t polaris10_get_mac_definition(uint32_t value)
 int polaris10_process_firmware_header(struct pp_hwmgr *hwmgr)
 {
         struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(hwmgr->smumgr->backend);
+        struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
         uint32_t tmp;
         int result;
         bool error = false;
@@ -2233,8 +2234,10 @@ int polaris10_process_firmware_header(struct pp_hwmgr *hwmgr)
                         offsetof(SMU74_Firmware_Header, SoftRegisters),
                         &tmp, SMC_RAM_END);
 
-        if (!result)
+        if (!result) {
+                data->soft_regs_start = tmp;
                 smu_data->smu7_data.soft_regs_start = tmp;
+        }
 
         error |= (0 != result);
 
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index 910b8d5b21c5..ffe1f85ce300 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -34,9 +34,6 @@ static bool amd_sched_entity_is_ready(struct amd_sched_entity *entity);
 static void amd_sched_wakeup(struct amd_gpu_scheduler *sched);
 static void amd_sched_process_job(struct fence *f, struct fence_cb *cb);
 
-struct kmem_cache *sched_fence_slab;
-atomic_t sched_fence_slab_ref = ATOMIC_INIT(0);
-
 /* Initialize a given run queue struct */
 static void amd_sched_rq_init(struct amd_sched_rq *rq)
 {
@@ -618,13 +615,6 @@ int amd_sched_init(struct amd_gpu_scheduler *sched,
         INIT_LIST_HEAD(&sched->ring_mirror_list);
         spin_lock_init(&sched->job_list_lock);
         atomic_set(&sched->hw_rq_count, 0);
-        if (atomic_inc_return(&sched_fence_slab_ref) == 1) {
-                sched_fence_slab = kmem_cache_create(
-                        "amd_sched_fence", sizeof(struct amd_sched_fence), 0,
-                        SLAB_HWCACHE_ALIGN, NULL);
-                if (!sched_fence_slab)
-                        return -ENOMEM;
-        }
 
         /* Each scheduler will run on a seperate kernel thread */
         sched->thread = kthread_run(amd_sched_main, sched, sched->name);
@@ -645,7 +635,4 @@ void amd_sched_fini(struct amd_gpu_scheduler *sched)
 {
         if (sched->thread)
                 kthread_stop(sched->thread);
-        rcu_barrier();
-        if (atomic_dec_and_test(&sched_fence_slab_ref))
-                kmem_cache_destroy(sched_fence_slab);
 }
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
index 7cbbbfb502ef..51068e6c3d9a 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
@@ -30,9 +30,6 @@
 struct amd_gpu_scheduler;
 struct amd_sched_rq;
 
-extern struct kmem_cache *sched_fence_slab;
-extern atomic_t sched_fence_slab_ref;
-
 /**
  * A scheduler entity is a wrapper around a job queue or a group
  * of other entities. Entities take turns emitting jobs from their
@@ -145,6 +142,9 @@ void amd_sched_entity_fini(struct amd_gpu_scheduler *sched,
                            struct amd_sched_entity *entity);
 void amd_sched_entity_push_job(struct amd_sched_job *sched_job);
 
+int amd_sched_fence_slab_init(void);
+void amd_sched_fence_slab_fini(void);
+
 struct amd_sched_fence *amd_sched_fence_create(
         struct amd_sched_entity *s_entity, void *owner);
 void amd_sched_fence_scheduled(struct amd_sched_fence *fence);
diff --git a/drivers/gpu/drm/amd/scheduler/sched_fence.c b/drivers/gpu/drm/amd/scheduler/sched_fence.c
index 3653b5a40494..88fc2d662579 100644
--- a/drivers/gpu/drm/amd/scheduler/sched_fence.c
+++ b/drivers/gpu/drm/amd/scheduler/sched_fence.c
@@ -27,6 +27,25 @@
 #include <drm/drmP.h>
 #include "gpu_scheduler.h"
 
+static struct kmem_cache *sched_fence_slab;
+
+int amd_sched_fence_slab_init(void)
+{
+        sched_fence_slab = kmem_cache_create(
+                "amd_sched_fence", sizeof(struct amd_sched_fence), 0,
+                SLAB_HWCACHE_ALIGN, NULL);
+        if (!sched_fence_slab)
+                return -ENOMEM;
+
+        return 0;
+}
+
+void amd_sched_fence_slab_fini(void)
+{
+        rcu_barrier();
+        kmem_cache_destroy(sched_fence_slab);
+}
+
 struct amd_sched_fence *amd_sched_fence_create(struct amd_sched_entity *entity,
                                                void *owner)
 {
diff --git a/drivers/gpu/drm/arc/arcpgu_hdmi.c b/drivers/gpu/drm/arc/arcpgu_hdmi.c
index b7a8b2ac4055..b69c66b4897e 100644
--- a/drivers/gpu/drm/arc/arcpgu_hdmi.c
+++ b/drivers/gpu/drm/arc/arcpgu_hdmi.c
@@ -14,170 +14,45 @@
  *
  */
 
-#include <drm/drm_crtc_helper.h>
+#include <drm/drm_crtc.h>
 #include <drm/drm_encoder_slave.h>
-#include <drm/drm_atomic_helper.h>
 
 #include "arcpgu.h"
 
-struct arcpgu_drm_connector {
-        struct drm_connector connector;
-        struct drm_encoder_slave *encoder_slave;
-};
-
-static int arcpgu_drm_connector_get_modes(struct drm_connector *connector)
-{
-        const struct drm_encoder_slave_funcs *sfuncs;
-        struct drm_encoder_slave *slave;
-        struct arcpgu_drm_connector *con =
-                container_of(connector, struct arcpgu_drm_connector, connector);
-
-        slave = con->encoder_slave;
-        if (slave == NULL) {
-                dev_err(connector->dev->dev,
-                        "connector_get_modes: cannot find slave encoder for connector\n");
-                return 0;
-        }
-
-        sfuncs = slave->slave_funcs;
-        if (sfuncs->get_modes == NULL)
-                return 0;
-
-        return sfuncs->get_modes(&slave->base, connector);
-}
-
-static enum drm_connector_status
-arcpgu_drm_connector_detect(struct drm_connector *connector, bool force)
-{
-        enum drm_connector_status status = connector_status_unknown;
-        const struct drm_encoder_slave_funcs *sfuncs;
-        struct drm_encoder_slave *slave;
-
-        struct arcpgu_drm_connector *con =
-                container_of(connector, struct arcpgu_drm_connector, connector);
-
-        slave = con->encoder_slave;
-        if (slave == NULL) {
-                dev_err(connector->dev->dev,
-                        "connector_detect: cannot find slave encoder for connector\n");
-                return status;
-        }
-
-        sfuncs = slave->slave_funcs;
-        if (sfuncs && sfuncs->detect)
-                return sfuncs->detect(&slave->base, connector);
-
-        dev_err(connector->dev->dev, "connector_detect: could not detect slave funcs\n");
-        return status;
-}
-
-static void arcpgu_drm_connector_destroy(struct drm_connector *connector)
-{
-        drm_connector_unregister(connector);
-        drm_connector_cleanup(connector);
-}
-
-static const struct drm_connector_helper_funcs
-arcpgu_drm_connector_helper_funcs = {
-        .get_modes = arcpgu_drm_connector_get_modes,
-};
-
-static const struct drm_connector_funcs arcpgu_drm_connector_funcs = {
-        .dpms = drm_helper_connector_dpms,
-        .reset = drm_atomic_helper_connector_reset,
-        .detect = arcpgu_drm_connector_detect,
-        .fill_modes = drm_helper_probe_single_connector_modes,
-        .destroy = arcpgu_drm_connector_destroy,
-        .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
-        .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-};
-
-static struct drm_encoder_helper_funcs arcpgu_drm_encoder_helper_funcs = {
-        .dpms = drm_i2c_encoder_dpms,
-        .mode_fixup = drm_i2c_encoder_mode_fixup,
-        .mode_set = drm_i2c_encoder_mode_set,
-        .prepare = drm_i2c_encoder_prepare,
-        .commit = drm_i2c_encoder_commit,
-        .detect = drm_i2c_encoder_detect,
-};
-
 static struct drm_encoder_funcs arcpgu_drm_encoder_funcs = {
         .destroy = drm_encoder_cleanup,
 };
 
 int arcpgu_drm_hdmi_init(struct drm_device *drm, struct device_node *np)
 {
-        struct arcpgu_drm_connector *arcpgu_connector;
-        struct drm_i2c_encoder_driver *driver;
-        struct drm_encoder_slave *encoder;
-        struct drm_connector *connector;
-        struct i2c_client *i2c_slave;
-        int ret;
+        struct drm_encoder *encoder;
+        struct drm_bridge *bridge;
+
+        int ret = 0;
 
         encoder = devm_kzalloc(drm->dev, sizeof(*encoder), GFP_KERNEL);
         if (encoder == NULL)
                 return -ENOMEM;
 
-        i2c_slave = of_find_i2c_device_by_node(np);
-        if (!i2c_slave || !i2c_get_clientdata(i2c_slave)) {
-                dev_err(drm->dev, "failed to find i2c slave encoder\n");
-                return -EPROBE_DEFER;
-        }
-
-        if (i2c_slave->dev.driver == NULL) {
-                dev_err(drm->dev, "failed to find i2c slave driver\n");
+        /* Locate drm bridge from the hdmi encoder DT node */
+        bridge = of_drm_find_bridge(np);
+        if (!bridge)
                 return -EPROBE_DEFER;
-        }
 
-        driver =
-            to_drm_i2c_encoder_driver(to_i2c_driver(i2c_slave->dev.driver));
-        ret = driver->encoder_init(i2c_slave, drm, encoder);
-        if (ret) {
-                dev_err(drm->dev, "failed to initialize i2c encoder slave\n");
-                return ret;
-        }
-
-        encoder->base.possible_crtcs = 1;
-        encoder->base.possible_clones = 0;
-        ret = drm_encoder_init(drm, &encoder->base, &arcpgu_drm_encoder_funcs,
+        encoder->possible_crtcs = 1;
+        encoder->possible_clones = 0;
+        ret = drm_encoder_init(drm, encoder, &arcpgu_drm_encoder_funcs,
                                DRM_MODE_ENCODER_TMDS, NULL);
         if (ret)
                 return ret;
 
-        drm_encoder_helper_add(&encoder->base,
-                               &arcpgu_drm_encoder_helper_funcs);
-
-        arcpgu_connector = devm_kzalloc(drm->dev, sizeof(*arcpgu_connector),
-                                        GFP_KERNEL);
-        if (!arcpgu_connector) {
-                ret = -ENOMEM;
-                goto error_encoder_cleanup;
-        }
-
-        connector = &arcpgu_connector->connector;
-        drm_connector_helper_add(connector, &arcpgu_drm_connector_helper_funcs);
-        ret = drm_connector_init(drm, connector, &arcpgu_drm_connector_funcs,
-                        DRM_MODE_CONNECTOR_HDMIA);
-        if (ret < 0) {
-                dev_err(drm->dev, "failed to initialize drm connector\n");
-                goto error_encoder_cleanup;
-        }
+        /* Link drm_bridge to encoder */
+        bridge->encoder = encoder;
+        encoder->bridge = bridge;
 
-        ret = drm_mode_connector_attach_encoder(connector, &encoder->base);
-        if (ret < 0) {
-                dev_err(drm->dev, "could not attach connector to encoder\n");
-                drm_connector_unregister(connector);
-                goto error_connector_cleanup;
-        }
-
-        arcpgu_connector->encoder_slave = encoder;
-
-        return 0;
-
-error_connector_cleanup:
-        drm_connector_cleanup(connector);
+        ret = drm_bridge_attach(drm, bridge);
+        if (ret)
+                drm_encoder_cleanup(encoder);
 
-error_encoder_cleanup:
-        drm_encoder_cleanup(&encoder->base);
         return ret;
 }
diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c
index 48019ae22ddb..28341b32067f 100644
--- a/drivers/gpu/drm/arm/hdlcd_crtc.c
+++ b/drivers/gpu/drm/arm/hdlcd_crtc.c
@@ -150,15 +150,14 @@ static void hdlcd_crtc_enable(struct drm_crtc *crtc)
         clk_prepare_enable(hdlcd->clk);
         hdlcd_crtc_mode_set_nofb(crtc);
         hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1);
+        drm_crtc_vblank_on(crtc);
 }
 
 static void hdlcd_crtc_disable(struct drm_crtc *crtc)
 {
         struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 
-        if (!crtc->state->active)
-                return;
-
+        drm_crtc_vblank_off(crtc);
         hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 0);
         clk_disable_unprepare(hdlcd->clk);
 }
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index fb6a418ce6be..e138fb51e8ce 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -375,7 +375,6 @@ static int hdlcd_drm_bind(struct device *dev)
 
 err_fbdev:
         drm_kms_helper_poll_fini(drm);
-        drm_mode_config_cleanup(drm);
         drm_vblank_cleanup(drm);
 err_vblank:
         pm_runtime_disable(drm->dev);
@@ -387,6 +386,7 @@ err_unload:
         drm_irq_uninstall(drm);
         of_reserved_mem_device_release(drm->dev);
 err_free:
+        drm_mode_config_cleanup(drm);
         dev_set_drvdata(dev, NULL);
         drm_dev_unref(drm);
 
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index 0ad2c47f808f..71c3473476c7 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -254,10 +254,12 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_
                 req->value = dev->mode_config.async_page_flip;
                 break;
         case DRM_CAP_PAGE_FLIP_TARGET:
-                req->value = 1;
-                drm_for_each_crtc(crtc, dev) {
-                        if (!crtc->funcs->page_flip_target)
-                                req->value = 0;
+                if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                        req->value = 1;
+                        drm_for_each_crtc(crtc, dev) {
+                                if (!crtc->funcs->page_flip_target)
+                                        req->value = 0;
+                        }
                 }
                 break;
         case DRM_CAP_CURSOR_WIDTH:
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index e8fb6ef947ee..38eaa63afb31 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -1907,6 +1907,8 @@ err_disable_pm_runtime:
 err_hdmiphy:
         if (hdata->hdmiphy_port)
                 put_device(&hdata->hdmiphy_port->dev);
+        if (hdata->regs_hdmiphy)
+                iounmap(hdata->regs_hdmiphy);
 err_ddc:
         put_device(&hdata->ddc_adpt->dev);
 
@@ -1929,6 +1931,9 @@ static int hdmi_remove(struct platform_device *pdev)
         if (hdata->hdmiphy_port)
                 put_device(&hdata->hdmiphy_port->dev);
 
+        if (hdata->regs_hdmiphy)
+                iounmap(hdata->regs_hdmiphy);
+
         put_device(&hdata->ddc_adpt->dev);
 
         return 0;
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
index b2d5e188b1b8..deb57435cc89 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
@@ -25,8 +25,13 @@
 static void fsl_dcu_drm_crtc_atomic_flush(struct drm_crtc *crtc,
                                           struct drm_crtc_state *old_crtc_state)
 {
+        struct drm_device *dev = crtc->dev;
+        struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;
         struct drm_pending_vblank_event *event = crtc->state->event;
 
+        regmap_write(fsl_dev->regmap,
+                     DCU_UPDATE_MODE, DCU_UPDATE_MODE_READREG);
+
         if (event) {
                 crtc->state->event = NULL;
 
@@ -39,11 +44,15 @@ static void fsl_dcu_drm_crtc_atomic_flush(struct drm_crtc *crtc,
         }
 }
 
-static void fsl_dcu_drm_disable_crtc(struct drm_crtc *crtc)
+static void fsl_dcu_drm_crtc_atomic_disable(struct drm_crtc *crtc,
+                                        struct drm_crtc_state *old_crtc_state)
 {
         struct drm_device *dev = crtc->dev;
         struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;
 
+        /* always disable planes on the CRTC */
+        drm_atomic_helper_disable_planes_on_crtc(old_crtc_state, true);
+
         drm_crtc_vblank_off(crtc);
 
         regmap_update_bits(fsl_dev->regmap, DCU_DCU_MODE,
@@ -122,8 +131,8 @@ static void fsl_dcu_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
 }
 
 static const struct drm_crtc_helper_funcs fsl_dcu_drm_crtc_helper_funcs = {
+        .atomic_disable = fsl_dcu_drm_crtc_atomic_disable,
         .atomic_flush = fsl_dcu_drm_crtc_atomic_flush,
-        .disable = fsl_dcu_drm_disable_crtc,
         .enable = fsl_dcu_drm_crtc_enable,
         .mode_set_nofb = fsl_dcu_drm_crtc_mode_set_nofb,
 };
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index e04efbed1a54..cc2fde2ae5ef 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -59,8 +59,6 @@ static int fsl_dcu_drm_irq_init(struct drm_device *dev)
 
         regmap_write(fsl_dev->regmap, DCU_INT_STATUS, 0);
         regmap_write(fsl_dev->regmap, DCU_INT_MASK, ~0);
-        regmap_write(fsl_dev->regmap, DCU_UPDATE_MODE,
-                     DCU_UPDATE_MODE_READREG);
 
         return ret;
 }
@@ -139,8 +137,6 @@ static irqreturn_t fsl_dcu_drm_irq(int irq, void *arg)
                 drm_handle_vblank(dev, 0);
 
         regmap_write(fsl_dev->regmap, DCU_INT_STATUS, int_status);
-        regmap_write(fsl_dev->regmap, DCU_UPDATE_MODE,
-                     DCU_UPDATE_MODE_READREG);
 
         return IRQ_HANDLED;
 }
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
index 9e6f7d8112b3..a99f48847420 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
@@ -160,11 +160,6 @@ static void fsl_dcu_drm_plane_atomic_update(struct drm_plane *plane,
                              DCU_LAYER_POST_SKIP(0) |
                              DCU_LAYER_PRE_SKIP(0));
         }
-        regmap_update_bits(fsl_dev->regmap, DCU_DCU_MODE,
-                           DCU_MODE_DCU_MODE_MASK,
-                           DCU_MODE_DCU_MODE(DCU_MODE_NORMAL));
-        regmap_write(fsl_dev->regmap,
-                     DCU_UPDATE_MODE, DCU_UPDATE_MODE_READREG);
 
         return;
 }
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 23960de81b57..00eb4814b913 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1806,7 +1806,7 @@ int i915_gem_fault(struct vm_area_struct *area, struct vm_fault *vmf)
                 /* Use a partial view if it is bigger than available space */
                 chunk_size = MIN_CHUNK_PAGES;
                 if (i915_gem_object_is_tiled(obj))
-                        chunk_size = max(chunk_size, tile_row_pages(obj));
+                        chunk_size = roundup(chunk_size, tile_row_pages(obj));
 
                 memset(&view, 0, sizeof(view));
                 view.type = I915_GGTT_VIEW_PARTIAL;
@@ -2268,7 +2268,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
                         page = shmem_read_mapping_page(mapping, i);
                         if (IS_ERR(page)) {
                                 ret = PTR_ERR(page);
-                                goto err_pages;
+                                goto err_sg;
                         }
                 }
 #ifdef CONFIG_SWIOTLB
@@ -2311,8 +2311,9 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
 
         return 0;
 
-err_pages:
+err_sg:
         sg_mark_end(sg);
+err_pages:
         for_each_sgt_page(page, sgt_iter, st)
                 put_page(page);
         sg_free_table(st);
@@ -3543,8 +3544,22 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
         if (view->type == I915_GGTT_VIEW_NORMAL)
                 vma = i915_gem_object_ggtt_pin(obj, view, 0, alignment,
                                                PIN_MAPPABLE | PIN_NONBLOCK);
-        if (IS_ERR(vma))
-                vma = i915_gem_object_ggtt_pin(obj, view, 0, alignment, 0);
+        if (IS_ERR(vma)) {
+                struct drm_i915_private *i915 = to_i915(obj->base.dev);
+                unsigned int flags;
+
+                /* Valleyview is definitely limited to scanning out the first
+                 * 512MiB. Lets presume this behaviour was inherited from the
+                 * g4x display engine and that all earlier gen are similarly
+                 * limited. Testing suggests that it is a little more
+                 * complicated than this. For example, Cherryview appears quite
+                 * happy to scanout from anywhere within its global aperture.
+                 */
+                flags = 0;
+                if (HAS_GMCH_DISPLAY(i915))
+                        flags = PIN_MAPPABLE;
+                vma = i915_gem_object_ggtt_pin(obj, view, 0, alignment, flags);
+        }
         if (IS_ERR(vma))
                 goto err_unpin_display;
 
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 7adb4c77cc7f..a218c2e395e7 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1281,6 +1281,12 @@ i915_gem_validate_context(struct drm_device *dev, struct drm_file *file,
         return ctx;
 }
 
+static bool gpu_write_needs_clflush(struct drm_i915_gem_object *obj)
+{
+        return !(obj->cache_level == I915_CACHE_NONE ||
+                 obj->cache_level == I915_CACHE_WT);
+}
+
 void i915_vma_move_to_active(struct i915_vma *vma,
                              struct drm_i915_gem_request *req,
                              unsigned int flags)
@@ -1311,6 +1317,8 @@ void i915_vma_move_to_active(struct i915_vma *vma,
 
                 /* update for the implicit flush after a batch */
                 obj->base.write_domain &= ~I915_GEM_GPU_DOMAINS;
+                if (!obj->cache_dirty && gpu_write_needs_clflush(obj))
+                        obj->cache_dirty = true;
         }
 
         if (flags & EXEC_OBJECT_NEEDS_FENCE)
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 1f8af87c6294..cf2560708e03 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1143,7 +1143,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
         if (!child)
                 return;
 
-        aux_channel = child->raw[25];
+        aux_channel = child->common.aux_channel;
         ddc_pin = child->common.ddc_pin;
 
         is_dvi = child->common.device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;
@@ -1673,7 +1673,8 @@ bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port)
         return false;
 }
 
-bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv, enum port port)
+static bool child_dev_is_dp_dual_mode(const union child_device_config *p_child,
+                                      enum port port)
 {
         static const struct {
                 u16 dp, hdmi;
@@ -1687,22 +1688,35 @@ bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv, enum por
                 [PORT_D] = { DVO_PORT_DPD, DVO_PORT_HDMID, },
                 [PORT_E] = { DVO_PORT_DPE, DVO_PORT_HDMIE, },
         };
-        int i;
 
         if (port == PORT_A || port >= ARRAY_SIZE(port_mapping))
                 return false;
 
-        if (!dev_priv->vbt.child_dev_num)
+        if ((p_child->common.device_type & DEVICE_TYPE_DP_DUAL_MODE_BITS) !=
+            (DEVICE_TYPE_DP_DUAL_MODE & DEVICE_TYPE_DP_DUAL_MODE_BITS))
                 return false;
 
+        if (p_child->common.dvo_port == port_mapping[port].dp)
+                return true;
+
+        /* Only accept a HDMI dvo_port as DP++ if it has an AUX channel */
+        if (p_child->common.dvo_port == port_mapping[port].hdmi &&
+            p_child->common.aux_channel != 0)
+                return true;
+
+        return false;
+}
+
+bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv,
+                                     enum port port)
+{
+        int i;
+
         for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {
                 const union child_device_config *p_child =
                         &dev_priv->vbt.child_dev[i];
 
-                if ((p_child->common.dvo_port == port_mapping[port].dp ||
-                     p_child->common.dvo_port == port_mapping[port].hdmi) &&
-                    (p_child->common.device_type & DEVICE_TYPE_DP_DUAL_MODE_BITS) ==
-                    (DEVICE_TYPE_DP_DUAL_MODE & DEVICE_TYPE_DP_DUAL_MODE_BITS))
+                if (child_dev_is_dp_dual_mode(p_child, port))
                         return true;
         }
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0ad1879bfd9d..3cb70d73239b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10243,6 +10243,29 @@ static void bxt_modeset_commit_cdclk(struct drm_atomic_state *old_state)
         bxt_set_cdclk(to_i915(dev), req_cdclk);
 }
 
+static int bdw_adjust_min_pipe_pixel_rate(struct intel_crtc_state *crtc_state,
+                                          int pixel_rate)
+{
+        struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev);
+
+        /* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */
+        if (IS_BROADWELL(dev_priv) && crtc_state->ips_enabled)
+                pixel_rate = DIV_ROUND_UP(pixel_rate * 100, 95);
+
+        /* BSpec says "Do not use DisplayPort with CDCLK less than
+         * 432 MHz, audio enabled, port width x4, and link rate
+         * HBR2 (5.4 GHz), or else there may be audio corruption or
+         * screen corruption."
+         */
+        if (intel_crtc_has_dp_encoder(crtc_state) &&
+            crtc_state->has_audio &&
+            crtc_state->port_clock >= 540000 &&
+            crtc_state->lane_count == 4)
+                pixel_rate = max(432000, pixel_rate);
+
+        return pixel_rate;
+}
+
 /* compute the max rate for new configuration */
 static int ilk_max_pixel_rate(struct drm_atomic_state *state)
 {
@@ -10268,9 +10291,9 @@ static int ilk_max_pixel_rate(struct drm_atomic_state *state)
 
                 pixel_rate = ilk_pipe_pixel_rate(crtc_state);
 
-                /* pixel rate mustn't exceed 95% of cdclk with IPS on BDW */
-                if (IS_BROADWELL(dev_priv) && crtc_state->ips_enabled)
-                        pixel_rate = DIV_ROUND_UP(pixel_rate * 100, 95);
+                if (IS_BROADWELL(dev_priv) || IS_GEN9(dev_priv))
+                        pixel_rate = bdw_adjust_min_pipe_pixel_rate(crtc_state,
+                                                                    pixel_rate);
 
                 intel_state->min_pixclk[i] = pixel_rate;
         }
@@ -12237,7 +12260,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
         intel_crtc->reset_count = i915_reset_count(&dev_priv->gpu_error);
         if (i915_reset_in_progress_or_wedged(&dev_priv->gpu_error)) {
                 ret = -EIO;
-                goto cleanup;
+                goto unlock;
         }
 
         atomic_inc(&intel_crtc->unpin_work_count);
@@ -12329,6 +12352,7 @@ cleanup_unpin:
         intel_unpin_fb_obj(fb, crtc->primary->state->rotation);
 cleanup_pending:
         atomic_dec(&intel_crtc->unpin_work_count);
+unlock:
         mutex_unlock(&dev->struct_mutex);
 cleanup:
         crtc->primary->fb = old_fb;
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 3581b5a7f716..bf344d08356a 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4463,21 +4463,11 @@ static enum drm_connector_status
 intel_dp_detect(struct drm_connector *connector, bool force)
 {
         struct intel_dp *intel_dp = intel_attached_dp(connector);
-        struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
-        struct intel_encoder *intel_encoder = &intel_dig_port->base;
         enum drm_connector_status status = connector->status;
 
         DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
                       connector->base.id, connector->name);
 
-        if (intel_dp->is_mst) {
-                /* MST devices are disconnected from a monitor POV */
-                intel_dp_unset_edid(intel_dp);
-                if (intel_encoder->type != INTEL_OUTPUT_EDP)
-                        intel_encoder->type = INTEL_OUTPUT_DP;
-                return connector_status_disconnected;
-        }
-
         /* If full detect is not performed yet, do a full detect */
         if (!intel_dp->detect_done)
                 status = intel_dp_long_pulse(intel_dp->attached_connector);
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index f40a35f2913a..13c306173f27 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1799,6 +1799,50 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c
         intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
 }
 
+static u8 intel_hdmi_ddc_pin(struct drm_i915_private *dev_priv,
+                             enum port port)
+{
+        const struct ddi_vbt_port_info *info =
+                &dev_priv->vbt.ddi_port_info[port];
+        u8 ddc_pin;
+
+        if (info->alternate_ddc_pin) {
+                DRM_DEBUG_KMS("Using DDC pin 0x%x for port %c (VBT)\n",
+                              info->alternate_ddc_pin, port_name(port));
+                return info->alternate_ddc_pin;
+        }
+
+        switch (port) {
+        case PORT_B:
+                if (IS_BROXTON(dev_priv))
+                        ddc_pin = GMBUS_PIN_1_BXT;
+                else
+                        ddc_pin = GMBUS_PIN_DPB;
+                break;
+        case PORT_C:
+                if (IS_BROXTON(dev_priv))
+                        ddc_pin = GMBUS_PIN_2_BXT;
+                else
+                        ddc_pin = GMBUS_PIN_DPC;
+                break;
+        case PORT_D:
+                if (IS_CHERRYVIEW(dev_priv))
+                        ddc_pin = GMBUS_PIN_DPD_CHV;
+                else
+                        ddc_pin = GMBUS_PIN_DPD;
+                break;
+        default:
+                MISSING_CASE(port);
+                ddc_pin = GMBUS_PIN_DPB;
+                break;
+        }
+
+        DRM_DEBUG_KMS("Using DDC pin 0x%x for port %c (platform default)\n",
+                      ddc_pin, port_name(port));
+
+        return ddc_pin;
+}
+
 void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
                                struct intel_connector *intel_connector)
 {
@@ -1808,7 +1852,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
         struct drm_device *dev = intel_encoder->base.dev;
         struct drm_i915_private *dev_priv = to_i915(dev);
         enum port port = intel_dig_port->port;
-        uint8_t alternate_ddc_pin;
 
         DRM_DEBUG_KMS("Adding HDMI connector on port %c\n",
                       port_name(port));
@@ -1826,12 +1869,10 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
         connector->doublescan_allowed = 0;
         connector->stereo_allowed = 1;
 
+        intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port);
+
         switch (port) {
         case PORT_B:
-                if (IS_BROXTON(dev_priv))
-                        intel_hdmi->ddc_bus = GMBUS_PIN_1_BXT;
-                else
-                        intel_hdmi->ddc_bus = GMBUS_PIN_DPB;
                 /*
                  * On BXT A0/A1, sw needs to activate DDIA HPD logic and
                  * interrupts to check the external panel connection.
@@ -1842,46 +1883,17 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
                         intel_encoder->hpd_pin = HPD_PORT_B;
                 break;
         case PORT_C:
-                if (IS_BROXTON(dev_priv))
-                        intel_hdmi->ddc_bus = GMBUS_PIN_2_BXT;
-                else
-                        intel_hdmi->ddc_bus = GMBUS_PIN_DPC;
                 intel_encoder->hpd_pin = HPD_PORT_C;
                 break;
         case PORT_D:
-                if (WARN_ON(IS_BROXTON(dev_priv)))
-                        intel_hdmi->ddc_bus = GMBUS_PIN_DISABLED;
-                else if (IS_CHERRYVIEW(dev_priv))
-                        intel_hdmi->ddc_bus = GMBUS_PIN_DPD_CHV;
-                else
-                        intel_hdmi->ddc_bus = GMBUS_PIN_DPD;
                 intel_encoder->hpd_pin = HPD_PORT_D;
                 break;
         case PORT_E:
-                /* On SKL PORT E doesn't have seperate GMBUS pin
-                 *  We rely on VBT to set a proper alternate GMBUS pin. */
-                alternate_ddc_pin =
-                        dev_priv->vbt.ddi_port_info[PORT_E].alternate_ddc_pin;
-                switch (alternate_ddc_pin) {
-                case DDC_PIN_B:
-                        intel_hdmi->ddc_bus = GMBUS_PIN_DPB;
-                        break;
-                case DDC_PIN_C:
-                        intel_hdmi->ddc_bus = GMBUS_PIN_DPC;
-                        break;
-                case DDC_PIN_D:
-                        intel_hdmi->ddc_bus = GMBUS_PIN_DPD;
-                        break;
-                default:
-                        MISSING_CASE(alternate_ddc_pin);
-                }
                 intel_encoder->hpd_pin = HPD_PORT_E;
                 break;
-        case PORT_A:
-                intel_encoder->hpd_pin = HPD_PORT_A;
-                /* Internal port only for eDP. */
         default:
-                BUG();
+                MISSING_CASE(port);
+                return;
         }
 
         if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 6c11168facd6..a38c2fefe85a 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -1139,7 +1139,9 @@ static void vlv_display_power_well_deinit(struct drm_i915_private *dev_priv)
 
         intel_power_sequencer_reset(dev_priv);
 
-        intel_hpd_poll_init(dev_priv);
+        /* Prevent us from re-enabling polling on accident in late suspend */
+        if (!dev_priv->drm.dev->power.is_suspended)
+                intel_hpd_poll_init(dev_priv);
 }
 
 static void vlv_display_power_well_enable(struct drm_i915_private *dev_priv,
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 73a521fdf1bd..dbed12c484c9 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -358,7 +358,7 @@ vlv_update_plane(struct drm_plane *dplane,
         int plane = intel_plane->plane;
         u32 sprctl;
         u32 sprsurf_offset, linear_offset;
-        unsigned int rotation = dplane->state->rotation;
+        unsigned int rotation = plane_state->base.rotation;
         const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
         int crtc_x = plane_state->base.dst.x1;
         int crtc_y = plane_state->base.dst.y1;
diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
index 68db9621f1f0..8886cab19f98 100644
--- a/drivers/gpu/drm/i915/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
@@ -280,7 +280,8 @@ struct common_child_dev_config {
         u8 dp_support:1;
         u8 tmds_support:1;
         u8 support_reserved:5;
-        u8 not_common3[12];
+        u8 aux_channel;
+        u8 not_common3[11];
         u8 iboost_level;
 } __packed;
 
diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c
index 4e1ae3fc462d..6be515a9fb69 100644
--- a/drivers/gpu/drm/imx/ipuv3-crtc.c
+++ b/drivers/gpu/drm/imx/ipuv3-crtc.c
@@ -68,6 +68,12 @@ static void ipu_crtc_atomic_disable(struct drm_crtc *crtc,
 
         ipu_dc_disable_channel(ipu_crtc->dc);
         ipu_di_disable(ipu_crtc->di);
+        /*
+         * Planes must be disabled before DC clock is removed, as otherwise the
+         * attached IDMACs will be left in undefined state, possibly hanging
+         * the IPU or even system.
+         */
+        drm_atomic_helper_disable_planes_on_crtc(old_crtc_state, false);
         ipu_dc_disable(ipu);
 
         spin_lock_irq(&crtc->dev->event_lock);
@@ -77,9 +83,6 @@ static void ipu_crtc_atomic_disable(struct drm_crtc *crtc,
         }
         spin_unlock_irq(&crtc->dev->event_lock);
 
-        /* always disable planes on the CRTC */
-        drm_atomic_helper_disable_planes_on_crtc(old_crtc_state, true);
-
         drm_crtc_vblank_off(crtc);
 }
 
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 019b7ca392d7..c70310206ac5 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -80,6 +80,7 @@ static void mtk_ovl_enable_vblank(struct mtk_ddp_comp *comp,
                                                  ddp_comp);
 
         priv->crtc = crtc;
+        writel(0x0, comp->regs + DISP_REG_OVL_INTSTA);
         writel_relaxed(OVL_FME_CPL_INT, comp->regs + DISP_REG_OVL_INTEN);
 }
 
@@ -250,13 +251,6 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev)
         if (irq < 0)
                 return irq;
 
-        ret = devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler,
-                               IRQF_TRIGGER_NONE, dev_name(dev), priv);
-        if (ret < 0) {
-                dev_err(dev, "Failed to request irq %d: %d\n", irq, ret);
-                return ret;
-        }
-
         comp_id = mtk_ddp_comp_get_id(dev->of_node, MTK_DISP_OVL);
         if (comp_id < 0) {
                 dev_err(dev, "Failed to identify by alias: %d\n", comp_id);
@@ -272,6 +266,13 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, priv);
 
+        ret = devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler,
+                               IRQF_TRIGGER_NONE, dev_name(dev), priv);
+        if (ret < 0) {
+                dev_err(dev, "Failed to request irq %d: %d\n", irq, ret);
+                return ret;
+        }
+
         ret = component_add(dev, &mtk_disp_ovl_component_ops);
         if (ret)
                 dev_err(dev, "Failed to add component: %d\n", ret);
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index 0186e500d2a5..90fb831ef031 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -432,11 +432,16 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,
         unsigned long pll_rate;
         unsigned int factor;
 
+        /* let pll_rate can fix the valid range of tvdpll (1G~2GHz) */
         pix_rate = 1000UL * mode->clock;
-        if (mode->clock <= 74000)
+        if (mode->clock <= 27000)
+                factor = 16 * 3;
+        else if (mode->clock <= 84000)
                 factor = 8 * 3;
-        else
+        else if (mode->clock <= 167000)
                 factor = 4 * 3;
+        else
+                factor = 2 * 3;
         pll_rate = pix_rate * factor;
 
         dev_dbg(dpi->dev, "Want PLL %lu Hz, pixel clock %lu Hz\n",
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index df33b3ca6ffd..48cc01fd20c7 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -123,7 +123,7 @@ static void mtk_od_config(struct mtk_ddp_comp *comp, unsigned int w,
                           unsigned int bpc)
 {
         writel(w << 16 | h, comp->regs + DISP_OD_SIZE);
-        writel(OD_RELAYMODE, comp->regs + OD_RELAYMODE);
+        writel(OD_RELAYMODE, comp->regs + DISP_OD_CFG);
         mtk_dither_set(comp, bpc, DISP_OD_CFG);
 }
 
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index 28b2044ed9f2..eaa5a2240c0c 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -86,7 +86,7 @@
 
 #define DSI_PHY_TIMECON0        0x110
 #define LPX                             (0xff << 0)
-#define HS_PRPR                         (0xff << 8)
+#define HS_PREP                         (0xff << 8)
 #define HS_ZERO                         (0xff << 16)
 #define HS_TRAIL                        (0xff << 24)
 
@@ -102,10 +102,16 @@
 #define CLK_TRAIL                       (0xff << 24)
 
 #define DSI_PHY_TIMECON3        0x11c
-#define CLK_HS_PRPR                     (0xff << 0)
+#define CLK_HS_PREP                     (0xff << 0)
 #define CLK_HS_POST                     (0xff << 8)
 #define CLK_HS_EXIT                     (0xff << 16)
 
+#define T_LPX           5
+#define T_HS_PREP       6
+#define T_HS_TRAIL      8
+#define T_HS_EXIT       7
+#define T_HS_ZERO       10
+
 #define NS_TO_CYCLE(n, c)    ((n) / (c) + (((n) % (c)) ? 1 : 0))
 
 struct phy;
@@ -161,20 +167,18 @@ static void mtk_dsi_mask(struct mtk_dsi *dsi, u32 offset, u32 mask, u32 data)
 static void dsi_phy_timconfig(struct mtk_dsi *dsi)
 {
         u32 timcon0, timcon1, timcon2, timcon3;
-        unsigned int ui, cycle_time;
-        unsigned int lpx;
+        u32 ui, cycle_time;
 
         ui = 1000 / dsi->data_rate + 0x01;
         cycle_time = 8000 / dsi->data_rate + 0x01;
-        lpx = 5;
 
-        timcon0 = (8 << 24) | (0xa << 16) | (0x6 << 8) | lpx;
-        timcon1 = (7 << 24) | (5 * lpx << 16) | ((3 * lpx) / 2) << 8 |
-                  (4 * lpx);
+        timcon0 = T_LPX | T_HS_PREP << 8 | T_HS_ZERO << 16 | T_HS_TRAIL << 24;
+        timcon1 = 4 * T_LPX | (3 * T_LPX / 2) << 8 | 5 * T_LPX << 16 |
+                  T_HS_EXIT << 24;
         timcon2 = ((NS_TO_CYCLE(0x64, cycle_time) + 0xa) << 24) |
                   (NS_TO_CYCLE(0x150, cycle_time) << 16);
-        timcon3 = (2 * lpx) << 16 | NS_TO_CYCLE(80 + 52 * ui, cycle_time) << 8 |
-                   NS_TO_CYCLE(0x40, cycle_time);
+        timcon3 = NS_TO_CYCLE(0x40, cycle_time) | (2 * T_LPX) << 16 |
+                  NS_TO_CYCLE(80 + 52 * ui, cycle_time) << 8;
 
         writel(timcon0, dsi->regs + DSI_PHY_TIMECON0);
         writel(timcon1, dsi->regs + DSI_PHY_TIMECON1);
@@ -202,19 +206,47 @@ static int mtk_dsi_poweron(struct mtk_dsi *dsi)
 {
         struct device *dev = dsi->dev;
         int ret;
+        u64 pixel_clock, total_bits;
+        u32 htotal, htotal_bits, bit_per_pixel, overhead_cycles, overhead_bits;
 
         if (++dsi->refcount != 1)
                 return 0;
 
+        switch (dsi->format) {
+        case MIPI_DSI_FMT_RGB565:
+                bit_per_pixel = 16;
+                break;
+        case MIPI_DSI_FMT_RGB666_PACKED:
+                bit_per_pixel = 18;
+                break;
+        case MIPI_DSI_FMT_RGB666:
+        case MIPI_DSI_FMT_RGB888:
+        default:
+                bit_per_pixel = 24;
+                break;
+        }
+
         /**
-         * data_rate = (pixel_clock / 1000) * pixel_dipth * mipi_ratio;
-         * pixel_clock unit is Khz, data_rata unit is MHz, so need divide 1000.
-         * mipi_ratio is mipi clk coefficient for balance the pixel clk in mipi.
-         * we set mipi_ratio is 1.05.
+         * vm.pixelclock is in kHz, pixel_clock unit is Hz, so multiply by 1000
+         * htotal_time = htotal * byte_per_pixel / num_lanes
+         * overhead_time = lpx + hs_prepare + hs_zero + hs_trail + hs_exit
+         * mipi_ratio = (htotal_time + overhead_time) / htotal_time
+         * data_rate = pixel_clock * bit_per_pixel * mipi_ratio / num_lanes;
          */
-        dsi->data_rate = dsi->vm.pixelclock * 3 * 21 / (1 * 1000 * 10);
+        pixel_clock = dsi->vm.pixelclock * 1000;
+        htotal = dsi->vm.hactive + dsi->vm.hback_porch + dsi->vm.hfront_porch +
+                        dsi->vm.hsync_len;
+        htotal_bits = htotal * bit_per_pixel;
+
+        overhead_cycles = T_LPX + T_HS_PREP + T_HS_ZERO + T_HS_TRAIL +
+                        T_HS_EXIT;
+        overhead_bits = overhead_cycles * dsi->lanes * 8;
+        total_bits = htotal_bits + overhead_bits;
+
+        dsi->data_rate = DIV_ROUND_UP_ULL(pixel_clock * total_bits,
+                                          htotal * dsi->lanes);
 
-        ret = clk_set_rate(dsi->hs_clk, dsi->data_rate * 1000000);
+        ret = clk_set_rate(dsi->hs_clk, dsi->data_rate);
         if (ret < 0) {
                 dev_err(dev, "Failed to set data rate: %d\n", ret);
                 goto err_refcount;
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 71227deef21b..0e8c4d9af340 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1133,12 +1133,6 @@ static int mtk_hdmi_output_set_display_mode(struct mtk_hdmi *hdmi,
         phy_power_on(hdmi->phy);
         mtk_hdmi_aud_output_config(hdmi, mode);
 
-        mtk_hdmi_setup_audio_infoframe(hdmi);
-        mtk_hdmi_setup_avi_infoframe(hdmi, mode);
-        mtk_hdmi_setup_spd_infoframe(hdmi, "mediatek", "On-chip HDMI");
-        if (mode->flags & DRM_MODE_FLAG_3D_MASK)
-                mtk_hdmi_setup_vendor_specific_infoframe(hdmi, mode);
-
         mtk_hdmi_hw_vid_black(hdmi, false);
         mtk_hdmi_hw_aud_unmute(hdmi);
         mtk_hdmi_hw_send_av_unmute(hdmi);
@@ -1401,6 +1395,16 @@ static void mtk_hdmi_bridge_pre_enable(struct drm_bridge *bridge)
         hdmi->powered = true;
 }
 
+static void mtk_hdmi_send_infoframe(struct mtk_hdmi *hdmi,
+                                    struct drm_display_mode *mode)
+{
+        mtk_hdmi_setup_audio_infoframe(hdmi);
+        mtk_hdmi_setup_avi_infoframe(hdmi, mode);
+        mtk_hdmi_setup_spd_infoframe(hdmi, "mediatek", "On-chip HDMI");
+        if (mode->flags & DRM_MODE_FLAG_3D_MASK)
+                mtk_hdmi_setup_vendor_specific_infoframe(hdmi, mode);
+}
+
 static void mtk_hdmi_bridge_enable(struct drm_bridge *bridge)
 {
         struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
@@ -1409,6 +1413,7 @@ static void mtk_hdmi_bridge_enable(struct drm_bridge *bridge)
         clk_prepare_enable(hdmi->clk[MTK_HDMI_CLK_HDMI_PLL]);
         clk_prepare_enable(hdmi->clk[MTK_HDMI_CLK_HDMI_PIXEL]);
         phy_power_on(hdmi->phy);
+        mtk_hdmi_send_infoframe(hdmi, &hdmi->mode);
 
         hdmi->enabled = true;
 }
diff --git a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c b/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
index 8a24754b440f..51cb9cfb6646 100644
--- a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
+++ b/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c
@@ -265,6 +265,9 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,
         struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw);
         unsigned int pre_div;
         unsigned int div;
+        unsigned int pre_ibias;
+        unsigned int hdmi_ibias;
+        unsigned int imp_en;
 
         dev_dbg(hdmi_phy->dev, "%s: %lu Hz, parent: %lu Hz\n", __func__,
                 rate, parent_rate);
@@ -298,18 +301,31 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,
                           (0x1 << PLL_BR_SHIFT),
                           RG_HDMITX_PLL_BP | RG_HDMITX_PLL_BC |
                           RG_HDMITX_PLL_BR);
-        mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON3, RG_HDMITX_PRD_IMP_EN);
+        if (rate < 165000000) {
+                mtk_hdmi_phy_clear_bits(hdmi_phy, HDMI_CON3,
+                                        RG_HDMITX_PRD_IMP_EN);
+                pre_ibias = 0x3;
+                imp_en = 0x0;
+                hdmi_ibias = hdmi_phy->ibias;
+        } else {
+                mtk_hdmi_phy_set_bits(hdmi_phy, HDMI_CON3,
+                                      RG_HDMITX_PRD_IMP_EN);
+                pre_ibias = 0x6;
+                imp_en = 0xf;
+                hdmi_ibias = hdmi_phy->ibias_up;
+        }
         mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON4,
-                          (0x3 << PRD_IBIAS_CLK_SHIFT) |
-                          (0x3 << PRD_IBIAS_D2_SHIFT) |
-                          (0x3 << PRD_IBIAS_D1_SHIFT) |
-                          (0x3 << PRD_IBIAS_D0_SHIFT),
+                          (pre_ibias << PRD_IBIAS_CLK_SHIFT) |
+                          (pre_ibias << PRD_IBIAS_D2_SHIFT) |
+                          (pre_ibias << PRD_IBIAS_D1_SHIFT) |
+                          (pre_ibias << PRD_IBIAS_D0_SHIFT),
                           RG_HDMITX_PRD_IBIAS_CLK |
                           RG_HDMITX_PRD_IBIAS_D2 |
                           RG_HDMITX_PRD_IBIAS_D1 |
                           RG_HDMITX_PRD_IBIAS_D0);
         mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON3,
-                          (0x0 << DRV_IMP_EN_SHIFT), RG_HDMITX_DRV_IMP_EN);
+                          (imp_en << DRV_IMP_EN_SHIFT),
+                          RG_HDMITX_DRV_IMP_EN);
         mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON6,
                           (hdmi_phy->drv_imp_clk << DRV_IMP_CLK_SHIFT) |
                           (hdmi_phy->drv_imp_d2 << DRV_IMP_D2_SHIFT) |
@@ -318,12 +334,14 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,
                           RG_HDMITX_DRV_IMP_CLK | RG_HDMITX_DRV_IMP_D2 |
                           RG_HDMITX_DRV_IMP_D1 | RG_HDMITX_DRV_IMP_D0);
         mtk_hdmi_phy_mask(hdmi_phy, HDMI_CON5,
-                          (hdmi_phy->ibias << DRV_IBIAS_CLK_SHIFT) |
-                          (hdmi_phy->ibias << DRV_IBIAS_D2_SHIFT) |
-                          (hdmi_phy->ibias << DRV_IBIAS_D1_SHIFT) |
-                          (hdmi_phy->ibias << DRV_IBIAS_D0_SHIFT),
-                          RG_HDMITX_DRV_IBIAS_CLK | RG_HDMITX_DRV_IBIAS_D2 |
-                          RG_HDMITX_DRV_IBIAS_D1 | RG_HDMITX_DRV_IBIAS_D0);
+                          (hdmi_ibias << DRV_IBIAS_CLK_SHIFT) |
+                          (hdmi_ibias << DRV_IBIAS_D2_SHIFT) |
+                          (hdmi_ibias << DRV_IBIAS_D1_SHIFT) |
+                          (hdmi_ibias << DRV_IBIAS_D0_SHIFT),
+                          RG_HDMITX_DRV_IBIAS_CLK |
+                          RG_HDMITX_DRV_IBIAS_D2 |
+                          RG_HDMITX_DRV_IBIAS_D1 |
+                          RG_HDMITX_DRV_IBIAS_D0);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index f05ed0e1f3d6..6f240021705b 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -139,6 +139,7 @@ struct msm_dsi_host {
 
         u32 err_work_state;
         struct work_struct err_work;
+        struct work_struct hpd_work;
         struct workqueue_struct *workqueue;
 
         /* DSI 6G TX buffer*/
@@ -1294,6 +1295,14 @@ static void dsi_sw_reset_restore(struct msm_dsi_host *msm_host)
         wmb();  /* make sure dsi controller enabled again */
 }
 
+static void dsi_hpd_worker(struct work_struct *work)
+{
+        struct msm_dsi_host *msm_host =
+                container_of(work, struct msm_dsi_host, hpd_work);
+
+        drm_helper_hpd_irq_event(msm_host->dev);
+}
+
 static void dsi_err_worker(struct work_struct *work)
 {
         struct msm_dsi_host *msm_host =
@@ -1480,7 +1489,7 @@ static int dsi_host_attach(struct mipi_dsi_host *host,
 
         DBG("id=%d", msm_host->id);
         if (msm_host->dev)
-                drm_helper_hpd_irq_event(msm_host->dev);
+                queue_work(msm_host->workqueue, &msm_host->hpd_work);
 
         return 0;
 }
@@ -1494,7 +1503,7 @@ static int dsi_host_detach(struct mipi_dsi_host *host,
 
         DBG("id=%d", msm_host->id);
         if (msm_host->dev)
-                drm_helper_hpd_irq_event(msm_host->dev);
+                queue_work(msm_host->workqueue, &msm_host->hpd_work);
 
         return 0;
 }
@@ -1748,6 +1757,7 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi)
         /* setup workqueue */
         msm_host->workqueue = alloc_ordered_workqueue("dsi_drm_work", 0);
         INIT_WORK(&msm_host->err_work, dsi_err_worker);
+        INIT_WORK(&msm_host->hpd_work, dsi_hpd_worker);
 
         msm_dsi->host = &msm_host->base;
         msm_dsi->id = msm_host->id;
diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
index 598fdaff0a41..26e3a01a99c2 100644
--- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
+++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
@@ -521,6 +521,7 @@ static int pll_28nm_register(struct dsi_pll_28nm *pll_28nm)
                 .parent_names = (const char *[]){ "xo" },
                 .num_parents = 1,
                 .name = vco_name,
+                .flags = CLK_IGNORE_UNUSED,
                 .ops = &clk_ops_dsi_pll_28nm_vco,
         };
         struct device *dev = &pll_28nm->pdev->dev;
diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm_8960.c b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm_8960.c
index 38c90e1eb002..49008451085b 100644
--- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm_8960.c
+++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm_8960.c
@@ -412,6 +412,7 @@ static int pll_28nm_register(struct dsi_pll_28nm *pll_28nm)
         struct clk_init_data vco_init = {
                 .parent_names = (const char *[]){ "pxo" },
                 .num_parents = 1,
+                .flags = CLK_IGNORE_UNUSED,
                 .ops = &clk_ops_dsi_pll_28nm_vco,
         };
         struct device *dev = &pll_28nm->pdev->dev;
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c
index aa94a553794f..143eab46ba68 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c
@@ -702,6 +702,7 @@ static struct clk_init_data pll_init = {
         .ops = &hdmi_8996_pll_ops,
         .parent_names = hdmi_pll_parents,
         .num_parents = ARRAY_SIZE(hdmi_pll_parents),
+        .flags = CLK_IGNORE_UNUSED,
 };
 
 int msm_hdmi_pll_8996_init(struct platform_device *pdev)
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c b/drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c
index 92da69aa6187..99590758c68b 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c
@@ -424,6 +424,7 @@ static struct clk_init_data pll_init = {
         .ops = &hdmi_pll_ops,
         .parent_names = hdmi_pll_parents,
         .num_parents = ARRAY_SIZE(hdmi_pll_parents),
+        .flags = CLK_IGNORE_UNUSED,
 };
 
 int msm_hdmi_pll_8960_init(struct platform_device *pdev)
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
index ac9e4cde1380..8b4e3004f451 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
@@ -272,7 +272,7 @@ const struct mdp5_cfg_hw msm8x16_config = {
                 .count = 2,
                 .base = { 0x14000, 0x16000 },
                 .caps = MDP_PIPE_CAP_HFLIP | MDP_PIPE_CAP_VFLIP |
-                                MDP_PIPE_CAP_SCALE | MDP_PIPE_CAP_DECIMATION,
+                                MDP_PIPE_CAP_DECIMATION,
         },
         .pipe_dma = {
                 .count = 1,
@@ -282,7 +282,7 @@ const struct mdp5_cfg_hw msm8x16_config = {
         .lm = {
                 .count = 2, /* LM0 and LM3 */
                 .base = { 0x44000, 0x47000 },
-                .nb_stages = 5,
+                .nb_stages = 8,
                 .max_width = 2048,
                 .max_height = 0xFFFF,
         },
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
index fa2be7ce9468..c205c360e16d 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@ -223,12 +223,7 @@ static void blend_setup(struct drm_crtc *crtc)
                 plane_cnt++;
         }
 
-        /*
-        * If there is no base layer, enable border color.
-        * Although it's not possbile in current blend logic,
-        * put it here as a reminder.
-        */
-        if (!pstates[STAGE_BASE] && plane_cnt) {
+        if (!pstates[STAGE_BASE]) {
                 ctl_blend_flags |= MDP5_CTL_BLEND_OP_FLAG_BORDER_OUT;
                 DBG("Border Color is enabled");
         }
@@ -365,6 +360,15 @@ static int pstate_cmp(const void *a, const void *b)
         return pa->state->zpos - pb->state->zpos;
 }
 
+/* is there a helper for this? */
+static bool is_fullscreen(struct drm_crtc_state *cstate,
+                struct drm_plane_state *pstate)
+{
+        return (pstate->crtc_x <= 0) && (pstate->crtc_y <= 0) &&
+                ((pstate->crtc_x + pstate->crtc_w) >= cstate->mode.hdisplay) &&
+                ((pstate->crtc_y + pstate->crtc_h) >= cstate->mode.vdisplay);
+}
+
 static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,
                 struct drm_crtc_state *state)
 {
@@ -375,21 +379,11 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,
         struct plane_state pstates[STAGE_MAX + 1];
         const struct mdp5_cfg_hw *hw_cfg;
         const struct drm_plane_state *pstate;
-        int cnt = 0, i;
+        int cnt = 0, base = 0, i;
 
         DBG("%s: check", mdp5_crtc->name);
 
-        /* verify that there are not too many planes attached to crtc
-         * and that we don't have conflicting mixer stages:
-         */
-        hw_cfg = mdp5_cfg_get_hw_config(mdp5_kms->cfg);
         drm_atomic_crtc_state_for_each_plane_state(plane, pstate, state) {
-                if (cnt >= (hw_cfg->lm.nb_stages)) {
-                        dev_err(dev->dev, "too many planes!\n");
-                        return -EINVAL;
-                }
-
-
                 pstates[cnt].plane = plane;
                 pstates[cnt].state = to_mdp5_plane_state(pstate);
 
@@ -399,8 +393,24 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,
         /* assign a stage based on sorted zpos property */
         sort(pstates, cnt, sizeof(pstates[0]), pstate_cmp, NULL);
 
+        /* if the bottom-most layer is not fullscreen, we need to use
+         * it for solid-color:
+         */
+        if ((cnt > 0) && !is_fullscreen(state, &pstates[0].state->base))
+                base++;
+
+        /* verify that there are not too many planes attached to crtc
+         * and that we don't have conflicting mixer stages:
+         */
+        hw_cfg = mdp5_cfg_get_hw_config(mdp5_kms->cfg);
+
+        if ((cnt + base) >= hw_cfg->lm.nb_stages) {
+                dev_err(dev->dev, "too many planes!\n");
+                return -EINVAL;
+        }
+
         for (i = 0; i < cnt; i++) {
-                pstates[i].state->stage = STAGE_BASE + i;
+                pstates[i].state->stage = STAGE_BASE + i + base;
                 DBG("%s: assign pipe %s on stage=%d", mdp5_crtc->name,
                                 pipe2name(mdp5_plane_pipe(pstates[i].plane)),
                                 pstates[i].state->stage);
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
index 951c002b05df..83bf997dda03 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
@@ -292,8 +292,7 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane,
                 format = to_mdp_format(msm_framebuffer_format(state->fb));
                 if (MDP_FORMAT_IS_YUV(format) &&
                         !pipe_supports_yuv(mdp5_plane->caps)) {
-                        dev_err(plane->dev->dev,
-                                "Pipe doesn't support YUV\n");
+                        DBG("Pipe doesn't support YUV\n");
 
                         return -EINVAL;
                 }
@@ -301,8 +300,7 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane,
                 if (!(mdp5_plane->caps & MDP_PIPE_CAP_SCALE) &&
                         (((state->src_w >> 16) != state->crtc_w) ||
                         ((state->src_h >> 16) != state->crtc_h))) {
-                        dev_err(plane->dev->dev,
-                                "Pipe doesn't support scaling (%dx%d -> %dx%d)\n",
+                        DBG("Pipe doesn't support scaling (%dx%d -> %dx%d)\n",
                                 state->src_w >> 16, state->src_h >> 16,
                                 state->crtc_w, state->crtc_h);
 
@@ -313,8 +311,7 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane,
                 vflip = !!(state->rotation & DRM_REFLECT_Y);
                 if ((vflip && !(mdp5_plane->caps & MDP_PIPE_CAP_VFLIP)) ||
                         (hflip && !(mdp5_plane->caps & MDP_PIPE_CAP_HFLIP))) {
-                        dev_err(plane->dev->dev,
-                                "Pipe doesn't support flip\n");
+                        DBG("Pipe doesn't support flip\n");
 
                         return -EINVAL;
                 }
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index fb5c0b0a7594..46568fc80848 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -228,7 +228,7 @@ static int msm_drm_uninit(struct device *dev)
         flush_workqueue(priv->atomic_wq);
         destroy_workqueue(priv->atomic_wq);
 
-        if (kms)
+        if (kms && kms->funcs)
                 kms->funcs->destroy(kms);
 
         if (gpu) {
diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c
index 283d2841ba58..192b2d3a79cb 100644
--- a/drivers/gpu/drm/msm/msm_gem_shrinker.c
+++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c
@@ -163,6 +163,9 @@ void msm_gem_shrinker_init(struct drm_device *dev)
 void msm_gem_shrinker_cleanup(struct drm_device *dev)
 {
         struct msm_drm_private *priv = dev->dev_private;
-        WARN_ON(unregister_vmap_purge_notifier(&priv->vmap_notifier));
-        unregister_shrinker(&priv->shrinker);
+
+        if (priv->shrinker.nr_deferred) {
+                WARN_ON(unregister_vmap_purge_notifier(&priv->vmap_notifier));
+                unregister_shrinker(&priv->shrinker);
+        }
 }
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index 2fdcd04bc93f..0ae13cd2adda 100644
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -34,6 +34,7 @@ struct radeon_atpx {
 
 static struct radeon_atpx_priv {
         bool atpx_detected;
+        bool bridge_pm_usable;
         /* handle for device - and atpx */
         acpi_handle dhandle;
         struct radeon_atpx atpx;
@@ -203,7 +204,11 @@ static int radeon_atpx_validate(struct radeon_atpx *atpx)
         atpx->is_hybrid = false;
         if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {
                 printk("ATPX Hybrid Graphics\n");
-                atpx->functions.power_cntl = false;
+                /*
+                 * Disable legacy PM methods only when pcie port PM is usable,
+                 * otherwise the device might fail to power off or power on.
+                 */
+                atpx->functions.power_cntl = !radeon_atpx_priv.bridge_pm_usable;
                 atpx->is_hybrid = true;
         }
 
@@ -548,11 +553,16 @@ static bool radeon_atpx_detect(void)
         struct pci_dev *pdev = NULL;
         bool has_atpx = false;
         int vga_count = 0;
+        bool d3_supported = false;
+        struct pci_dev *parent_pdev;
 
         while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
                 vga_count++;
 
                 has_atpx |= (radeon_atpx_pci_probe_handle(pdev) == true);
+
+                parent_pdev = pci_upstream_bridge(pdev);
+                d3_supported |= parent_pdev && parent_pdev->bridge_d3;
         }
 
         /* some newer PX laptops mark the dGPU as a non-VGA display device */
@@ -560,6 +570,9 @@ static bool radeon_atpx_detect(void)
                 vga_count++;
 
                 has_atpx |= (radeon_atpx_pci_probe_handle(pdev) == true);
+
+                parent_pdev = pci_upstream_bridge(pdev);
+                d3_supported |= parent_pdev && parent_pdev->bridge_d3;
         }
 
         if (has_atpx && vga_count == 2) {
@@ -567,6 +580,7 @@ static bool radeon_atpx_detect(void)
                 printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n",
                        acpi_method_name);
                 radeon_atpx_priv.atpx_detected = true;
+                radeon_atpx_priv.bridge_pm_usable = d3_supported;
                 radeon_atpx_init();
                 return true;
         }
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index e18839d52e3e..27affbde058c 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -931,7 +931,7 @@ static void radeon_connector_unregister(struct drm_connector *connector)
 {
         struct radeon_connector *radeon_connector = to_radeon_connector(connector);
 
-        if (radeon_connector->ddc_bus->has_aux) {
+        if (radeon_connector->ddc_bus && radeon_connector->ddc_bus->has_aux) {
                 drm_dp_aux_unregister(&radeon_connector->ddc_bus->aux);
                 radeon_connector->ddc_bus->has_aux = false;
         }
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index eb92aef46e3c..621af069a3d2 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -104,6 +104,14 @@ static const char radeon_family_name[][16] = {
         "LAST",
 };
 
+#if defined(CONFIG_VGA_SWITCHEROO)
+bool radeon_has_atpx_dgpu_power_cntl(void);
+bool radeon_is_atpx_hybrid(void);
+#else
+static inline bool radeon_has_atpx_dgpu_power_cntl(void) { return false; }
+static inline bool radeon_is_atpx_hybrid(void) { return false; }
+#endif
+
 #define RADEON_PX_QUIRK_DISABLE_PX  (1 << 0)
 #define RADEON_PX_QUIRK_LONG_WAKEUP (1 << 1)
 
@@ -160,6 +168,11 @@ static void radeon_device_handle_px_quirks(struct radeon_device *rdev)
 
         if (rdev->px_quirk_flags & RADEON_PX_QUIRK_DISABLE_PX)
                 rdev->flags &= ~RADEON_IS_PX;
+
+        /* disable PX is the system doesn't support dGPU power control or hybrid gfx */
+        if (!radeon_is_atpx_hybrid() &&
+            !radeon_has_atpx_dgpu_power_cntl())
+                rdev->flags &= ~RADEON_IS_PX;
 }
 
 /**
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index 0da9862ad8ed..70e9fd59c5a2 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -142,9 +142,9 @@ static int sun4i_drv_bind(struct device *dev)
 
         /* Create our layers */
         drv->layers = sun4i_layers_init(drm);
-        if (!drv->layers) {
+        if (IS_ERR(drv->layers)) {
                 dev_err(drm->dev, "Couldn't create the planes\n");
-                ret = -EINVAL;
+                ret = PTR_ERR(drv->layers);
                 goto free_drm;
         }
 
diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
index c3ff10f559cc..d198ad7e5323 100644
--- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
+++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
@@ -152,15 +152,13 @@ static void sun4i_rgb_encoder_enable(struct drm_encoder *encoder)
 
         DRM_DEBUG_DRIVER("Enabling RGB output\n");
 
-        if (!IS_ERR(tcon->panel)) {
+        if (!IS_ERR(tcon->panel))
                 drm_panel_prepare(tcon->panel);
-                drm_panel_enable(tcon->panel);
-        }
-
-        /* encoder->bridge can be NULL; drm_bridge_enable checks for it */
-        drm_bridge_enable(encoder->bridge);
 
         sun4i_tcon_channel_enable(tcon, 0);
+
+        if (!IS_ERR(tcon->panel))
+                drm_panel_enable(tcon->panel);
 }
 
 static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder)
@@ -171,15 +169,13 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder)
 
         DRM_DEBUG_DRIVER("Disabling RGB output\n");
 
-        sun4i_tcon_channel_disable(tcon, 0);
+        if (!IS_ERR(tcon->panel))
+                drm_panel_disable(tcon->panel);
 
-        /* encoder->bridge can be NULL; drm_bridge_disable checks for it */
-        drm_bridge_disable(encoder->bridge);
+        sun4i_tcon_channel_disable(tcon, 0);
 
-        if (!IS_ERR(tcon->panel)) {
-                drm_panel_disable(tcon->panel);
+        if (!IS_ERR(tcon->panel))
                 drm_panel_unprepare(tcon->panel);
-        }
 }
 
 static void sun4i_rgb_encoder_mode_set(struct drm_encoder *encoder,
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 29f0207fa677..873f010d9616 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -98,17 +98,23 @@ success:
 static int udl_select_std_channel(struct udl_device *udl)
 {
         int ret;
-        u8 set_def_chn[] = {0x57, 0xCD, 0xDC, 0xA7,
-                            0x1C, 0x88, 0x5E, 0x15,
-                            0x60, 0xFE, 0xC6, 0x97,
-                            0x16, 0x3D, 0x47, 0xF2};
+        static const u8 set_def_chn[] = {0x57, 0xCD, 0xDC, 0xA7,
+                                         0x1C, 0x88, 0x5E, 0x15,
+                                         0x60, 0xFE, 0xC6, 0x97,
+                                         0x16, 0x3D, 0x47, 0xF2};
+        void *sendbuf;
+
+        sendbuf = kmemdup(set_def_chn, sizeof(set_def_chn), GFP_KERNEL);
+        if (!sendbuf)
+                return -ENOMEM;
 
         ret = usb_control_msg(udl->udev,
                               usb_sndctrlpipe(udl->udev, 0),
                               NR_USB_REQUEST_CHANNEL,
                               (USB_DIR_OUT | USB_TYPE_VENDOR), 0, 0,
-                              set_def_chn, sizeof(set_def_chn),
+                              sendbuf, sizeof(set_def_chn),
                               USB_CTRL_SET_TIMEOUT);
+        kfree(sendbuf);
         return ret < 0 ? ret : 0;
 }
 
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c
index 086d8a507157..60d30203a5fa 100644
--- a/drivers/hid/hid-cp2112.c
+++ b/drivers/hid/hid-cp2112.c
@@ -32,6 +32,11 @@
 #include <linux/usb/ch9.h>
 #include "hid-ids.h"
 
+#define CP2112_REPORT_MAX_LENGTH                64
+#define CP2112_GPIO_CONFIG_LENGTH               5
+#define CP2112_GPIO_GET_LENGTH                  2
+#define CP2112_GPIO_SET_LENGTH                  3
+
 enum {
         CP2112_GPIO_CONFIG              = 0x02,
         CP2112_GPIO_GET                 = 0x03,
@@ -161,6 +166,8 @@ struct cp2112_device {
         atomic_t read_avail;
         atomic_t xfer_avail;
         struct gpio_chip gc;
+        u8 *in_out_buffer;
+        spinlock_t lock;
 };
 
 static int gpio_push_pull = 0xFF;
@@ -171,62 +178,86 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
 {
         struct cp2112_device *dev = gpiochip_get_data(chip);
         struct hid_device *hdev = dev->hdev;
-        u8 buf[5];
+        u8 *buf = dev->in_out_buffer;
+        unsigned long flags;
         int ret;
 
+        spin_lock_irqsave(&dev->lock, flags);
+
         ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf,
-                                       sizeof(buf), HID_FEATURE_REPORT,
-                                       HID_REQ_GET_REPORT);
-        if (ret != sizeof(buf)) {
+                                 CP2112_GPIO_CONFIG_LENGTH, HID_FEATURE_REPORT,
+                                 HID_REQ_GET_REPORT);
+        if (ret != CP2112_GPIO_CONFIG_LENGTH) {
                 hid_err(hdev, "error requesting GPIO config: %d\n", ret);
-                return ret;
+                goto exit;
         }
 
         buf[1] &= ~(1 << offset);
         buf[2] = gpio_push_pull;
 
-        ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf, sizeof(buf),
-                                 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
+        ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf,
+                                 CP2112_GPIO_CONFIG_LENGTH, HID_FEATURE_REPORT,
+                                 HID_REQ_SET_REPORT);
         if (ret < 0) {
                 hid_err(hdev, "error setting GPIO config: %d\n", ret);
-                return ret;
+                goto exit;
         }
 
-        return 0;
+        ret = 0;
+
+exit:
+        spin_unlock_irqrestore(&dev->lock, flags);
+        return ret <= 0 ? ret : -EIO;
 }
 
 static void cp2112_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
         struct cp2112_device *dev = gpiochip_get_data(chip);
         struct hid_device *hdev = dev->hdev;
-        u8 buf[3];
+        u8 *buf = dev->in_out_buffer;
+        unsigned long flags;
         int ret;
 
+        spin_lock_irqsave(&dev->lock, flags);
+
         buf[0] = CP2112_GPIO_SET;
         buf[1] = value ? 0xff : 0;
         buf[2] = 1 << offset;
 
-        ret = hid_hw_raw_request(hdev, CP2112_GPIO_SET, buf, sizeof(buf),
-                                 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
+        ret = hid_hw_raw_request(hdev, CP2112_GPIO_SET, buf,
+                                 CP2112_GPIO_SET_LENGTH, HID_FEATURE_REPORT,
+                                 HID_REQ_SET_REPORT);
         if (ret < 0)
                 hid_err(hdev, "error setting GPIO values: %d\n", ret);
+
+        spin_unlock_irqrestore(&dev->lock, flags);
 }
 
 static int cp2112_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
         struct cp2112_device *dev = gpiochip_get_data(chip);
         struct hid_device *hdev = dev->hdev;
-        u8 buf[2];
+        u8 *buf = dev->in_out_buffer;
+        unsigned long flags;
         int ret;
 
-        ret = hid_hw_raw_request(hdev, CP2112_GPIO_GET, buf, sizeof(buf),
-                                       HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
-        if (ret != sizeof(buf)) {
+        spin_lock_irqsave(&dev->lock, flags);
+
+        ret = hid_hw_raw_request(hdev, CP2112_GPIO_GET, buf,
+                                 CP2112_GPIO_GET_LENGTH, HID_FEATURE_REPORT,
+                                 HID_REQ_GET_REPORT);
+        if (ret != CP2112_GPIO_GET_LENGTH) {
                 hid_err(hdev, "error requesting GPIO values: %d\n", ret);
-                return ret;
+                ret = ret < 0 ? ret : -EIO;
+                goto exit;
         }
 
-        return (buf[1] >> offset) & 1;
+        ret = (buf[1] >> offset) & 1;
+
+exit:
+        spin_unlock_irqrestore(&dev->lock, flags);
+
+        return ret;
 }
 
 static int cp2112_gpio_direction_output(struct gpio_chip *chip,
@@ -234,27 +265,33 @@ static int cp2112_gpio_direction_output(struct gpio_chip *chip,
 {
         struct cp2112_device *dev = gpiochip_get_data(chip);
         struct hid_device *hdev = dev->hdev;
-        u8 buf[5];
+        u8 *buf = dev->in_out_buffer;
+        unsigned long flags;
         int ret;
 
+        spin_lock_irqsave(&dev->lock, flags);
+
         ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf,
-                                       sizeof(buf), HID_FEATURE_REPORT,
-                                       HID_REQ_GET_REPORT);
-        if (ret != sizeof(buf)) {
+                                 CP2112_GPIO_CONFIG_LENGTH, HID_FEATURE_REPORT,
+                                 HID_REQ_GET_REPORT);
+        if (ret != CP2112_GPIO_CONFIG_LENGTH) {
                 hid_err(hdev, "error requesting GPIO config: %d\n", ret);
-                return ret;
+                goto fail;
         }
 
         buf[1] |= 1 << offset;
         buf[2] = gpio_push_pull;
 
-        ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf, sizeof(buf),
-                                 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
+        ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf,
+                                 CP2112_GPIO_CONFIG_LENGTH, HID_FEATURE_REPORT,
+                                 HID_REQ_SET_REPORT);
         if (ret < 0) {
                 hid_err(hdev, "error setting GPIO config: %d\n", ret);
-                return ret;
+                goto fail;
         }
 
+        spin_unlock_irqrestore(&dev->lock, flags);
+
         /*
          * Set gpio value when output direction is already set,
          * as specified in AN495, Rev. 0.2, cpt. 4.4
@@ -262,6 +299,10 @@ static int cp2112_gpio_direction_output(struct gpio_chip *chip,
         cp2112_gpio_set(chip, offset, value);
 
         return 0;
+
+fail:
+        spin_unlock_irqrestore(&dev->lock, flags);
+        return ret < 0 ? ret : -EIO;
 }
 
 static int cp2112_hid_get(struct hid_device *hdev, unsigned char report_number,
@@ -1007,6 +1048,17 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id)
         struct cp2112_smbus_config_report config;
         int ret;
 
+        dev = devm_kzalloc(&hdev->dev, sizeof(*dev), GFP_KERNEL);
+        if (!dev)
+                return -ENOMEM;
+
+        dev->in_out_buffer = devm_kzalloc(&hdev->dev, CP2112_REPORT_MAX_LENGTH,
+                                          GFP_KERNEL);
+        if (!dev->in_out_buffer)
+                return -ENOMEM;
+
+        spin_lock_init(&dev->lock);
+
         ret = hid_parse(hdev);
         if (ret) {
                 hid_err(hdev, "parse failed\n");
@@ -1063,12 +1115,6 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id)
                 goto err_power_normal;
         }
 
-        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-        if (!dev) {
-                ret = -ENOMEM;
-                goto err_power_normal;
-        }
-
         hid_set_drvdata(hdev, (void *)dev);
         dev->hdev               = hdev;
         dev->adap.owner         = THIS_MODULE;
@@ -1087,7 +1133,7 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
         if (ret) {
                 hid_err(hdev, "error registering i2c adapter\n");
-                goto err_free_dev;
+                goto err_power_normal;
         }
 
         hid_dbg(hdev, "adapter registered\n");
@@ -1123,8 +1169,6 @@ err_gpiochip_remove:
         gpiochip_remove(&dev->gc);
 err_free_i2c:
         i2c_del_adapter(&dev->adap);
-err_free_dev:
-        kfree(dev);
 err_power_normal:
         hid_hw_power(hdev, PM_HINT_NORMAL);
 err_hid_close:
@@ -1149,7 +1193,6 @@ static void cp2112_remove(struct hid_device *hdev)
          */
         hid_hw_close(hdev);
         hid_hw_stop(hdev);
-        kfree(dev);
 }
 
 static int cp2112_raw_event(struct hid_device *hdev, struct hid_report *report,
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 6cfb5cacc253..575aa65436d1 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -179,6 +179,7 @@
 #define USB_DEVICE_ID_ATEN_4PORTKVM     0x2205
 #define USB_DEVICE_ID_ATEN_4PORTKVMC    0x2208
 #define USB_DEVICE_ID_ATEN_CS682        0x2213
+#define USB_DEVICE_ID_ATEN_CS692        0x8021
 
 #define USB_VENDOR_ID_ATMEL             0x03eb
 #define USB_DEVICE_ID_ATMEL_MULTITOUCH  0x211c
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 76f644deb0a7..c5c5fbe9d605 100644
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -756,11 +756,16 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
         /* Setup wireless link with Logitech Wii wheel */
         if (hdev->product == USB_DEVICE_ID_LOGITECH_WII_WHEEL) {
-                unsigned char buf[] = { 0x00, 0xAF,  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+                const unsigned char cbuf[] = { 0x00, 0xAF,  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+                u8 *buf = kmemdup(cbuf, sizeof(cbuf), GFP_KERNEL);
 
-                ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
-                                        HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
+                if (!buf) {
+                        ret = -ENOMEM;
+                        goto err_free;
+                }
 
+                ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(cbuf),
+                                        HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
                 if (ret >= 0) {
                         /* insert a little delay of 10 jiffies ~ 40ms */
                         wait_queue_head_t wait;
@@ -772,9 +777,10 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)
                         buf[1] = 0xB2;
                         get_random_bytes(&buf[2], 2);
 
-                        ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
+                        ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(cbuf),
                                         HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
                 }
+                kfree(buf);
         }
 
         if (drv_data->quirks & LG_FF)
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index d6fa496d0ca2..20b40ad26325 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -493,7 +493,8 @@ static int magicmouse_input_configured(struct hid_device *hdev,
 static int magicmouse_probe(struct hid_device *hdev,
         const struct hid_device_id *id)
 {
-        __u8 feature[] = { 0xd7, 0x01 };
+        const u8 feature[] = { 0xd7, 0x01 };
+        u8 *buf;
         struct magicmouse_sc *msc;
         struct hid_report *report;
         int ret;
@@ -544,6 +545,12 @@ static int magicmouse_probe(struct hid_device *hdev,
         }
         report->size = 6;
 
+        buf = kmemdup(feature, sizeof(feature), GFP_KERNEL);
+        if (!buf) {
+                ret = -ENOMEM;
+                goto err_stop_hw;
+        }
+
         /*
          * Some devices repond with 'invalid report id' when feature
          * report switching it into multitouch mode is sent to it.
@@ -552,8 +559,9 @@ static int magicmouse_probe(struct hid_device *hdev,
          * but there seems to be no other way of switching the mode.
          * Thus the super-ugly hacky success check below.
          */
-        ret = hid_hw_raw_request(hdev, feature[0], feature, sizeof(feature),
+        ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(feature),
                                 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
+        kfree(buf);
         if (ret != -EIO && ret != sizeof(feature)) {
                 hid_err(hdev, "unable to request touch data (%d)\n", ret);
                 goto err_stop_hw;
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index 9cd2ca34a6be..be89bcbf6a71 100644
--- a/drivers/hid/hid-rmi.c
+++ b/drivers/hid/hid-rmi.c
@@ -188,10 +188,16 @@ static int rmi_set_page(struct hid_device *hdev, u8 page)
 static int rmi_set_mode(struct hid_device *hdev, u8 mode)
 {
         int ret;
-        u8 txbuf[2] = {RMI_SET_RMI_MODE_REPORT_ID, mode};
+        const u8 txbuf[2] = {RMI_SET_RMI_MODE_REPORT_ID, mode};
+        u8 *buf;
 
-        ret = hid_hw_raw_request(hdev, RMI_SET_RMI_MODE_REPORT_ID, txbuf,
+        buf = kmemdup(txbuf, sizeof(txbuf), GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        ret = hid_hw_raw_request(hdev, RMI_SET_RMI_MODE_REPORT_ID, buf,
                         sizeof(txbuf), HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
+        kfree(buf);
         if (ret < 0) {
                 dev_err(&hdev->dev, "unable to set rmi mode to %d (%d)\n", mode,
                         ret);
diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c
index 5614fee82347..3a84aaf1418b 100644
--- a/drivers/hid/hid-sensor-custom.c
+++ b/drivers/hid/hid-sensor-custom.c
@@ -292,11 +292,11 @@ static ssize_t show_value(struct device *dev, struct device_attribute *attr,
         bool input = false;
         int value = 0;
 
-        if (sscanf(attr->attr.name, "feature-%d-%x-%s", &index, &usage,
+        if (sscanf(attr->attr.name, "feature-%x-%x-%s", &index, &usage,
                    name) == 3) {
                 feature = true;
                 field_index = index + sensor_inst->input_field_count;
-        } else if (sscanf(attr->attr.name, "input-%d-%x-%s", &index, &usage,
+        } else if (sscanf(attr->attr.name, "input-%x-%x-%s", &index, &usage,
                    name) == 3) {
                 input = true;
                 field_index = index;
@@ -398,7 +398,7 @@ static ssize_t store_value(struct device *dev, struct device_attribute *attr,
         char name[HID_CUSTOM_NAME_LENGTH];
         int value;
 
-        if (sscanf(attr->attr.name, "feature-%d-%x-%s", &index, &usage,
+        if (sscanf(attr->attr.name, "feature-%x-%x-%s", &index, &usage,
                    name) == 3) {
                 field_index = index + sensor_inst->input_field_count;
         } else
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 658a607dc6d9..60875625cbdf 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -212,6 +212,7 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
         __s32 value;
         int ret = 0;
 
+        memset(buffer, 0, buffer_size);
         mutex_lock(&data->mutex);
         report = sensor_hub_report(report_id, hsdev->hdev, HID_FEATURE_REPORT);
         if (!report || (field_index >= report->maxfield)) {
@@ -251,6 +252,9 @@ int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
         struct sensor_hub_data *data = hid_get_drvdata(hsdev->hdev);
         int report_size;
         int ret = 0;
+        u8 *val_ptr;
+        int buffer_index = 0;
+        int i;
 
         mutex_lock(&data->mutex);
         report = sensor_hub_report(report_id, hsdev->hdev, HID_FEATURE_REPORT);
@@ -271,7 +275,17 @@ int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
                 goto done_proc;
         }
         ret = min(report_size, buffer_size);
-        memcpy(buffer, report->field[field_index]->value, ret);
+
+        val_ptr = (u8 *)report->field[field_index]->value;
+        for (i = 0; i < report->field[field_index]->report_count; ++i) {
+                if (buffer_index >= ret)
+                        break;
+
+                memcpy(&((u8 *)buffer)[buffer_index], val_ptr,
+                       report->field[field_index]->report_size / 8);
+                val_ptr += sizeof(__s32);
+                buffer_index += (report->field[field_index]->report_size / 8);
+        }
 
 done_proc:
         mutex_unlock(&data->mutex);
diff --git a/drivers/hid/intel-ish-hid/ipc/ipc.c b/drivers/hid/intel-ish-hid/ipc/ipc.c
index e2517c11e0ee..0c9ac4d5d850 100644
--- a/drivers/hid/intel-ish-hid/ipc/ipc.c
+++ b/drivers/hid/intel-ish-hid/ipc/ipc.c
@@ -638,6 +638,58 @@ eoi:
 }
 
 /**
+ * ish_disable_dma() - disable dma communication between host and ISHFW
+ * @dev: ishtp device pointer
+ *
+ * Clear the dma enable bit and wait for dma inactive.
+ *
+ * Return: 0 for success else error code.
+ */
+static int ish_disable_dma(struct ishtp_device *dev)
+{
+        unsigned int    dma_delay;
+
+        /* Clear the dma enable bit */
+        ish_reg_write(dev, IPC_REG_ISH_RMP2, 0);
+
+        /* wait for dma inactive */
+        for (dma_delay = 0; dma_delay < MAX_DMA_DELAY &&
+                _ish_read_fw_sts_reg(dev) & (IPC_ISH_IN_DMA);
+                dma_delay += 5)
+                mdelay(5);
+
+        if (dma_delay >= MAX_DMA_DELAY) {
+                dev_err(dev->devc,
+                        "Wait for DMA inactive timeout\n");
+                return  -EBUSY;
+        }
+
+        return 0;
+}
+
+/**
+ * ish_wakeup() - wakeup ishfw from waiting-for-host state
+ * @dev: ishtp device pointer
+ *
+ * Set the dma enable bit and send a void message to FW,
+ * it wil wakeup FW from waiting-for-host state.
+ */
+static void ish_wakeup(struct ishtp_device *dev)
+{
+        /* Set dma enable bit */
+        ish_reg_write(dev, IPC_REG_ISH_RMP2, IPC_RMP2_DMA_ENABLED);
+
+        /*
+         * Send 0 IPC message so that ISH FW wakes up if it was already
+         * asleep.
+         */
+        ish_reg_write(dev, IPC_REG_HOST2ISH_DRBL, IPC_DRBL_BUSY_BIT);
+
+        /* Flush writes to doorbell and REMAP2 */
+        ish_reg_read(dev, IPC_REG_ISH_HOST_FWSTS);
+}
+
+/**
  * _ish_hw_reset() - HW reset
  * @dev: ishtp device pointer
  *
@@ -649,7 +701,6 @@ static int _ish_hw_reset(struct ishtp_device *dev)
 {
         struct pci_dev *pdev = dev->pdev;
         int     rv;
-        unsigned int    dma_delay;
         uint16_t csr;
 
         if (!pdev)
@@ -664,15 +715,8 @@ static int _ish_hw_reset(struct ishtp_device *dev)
                 return  -EINVAL;
         }
 
-        /* Now trigger reset to FW */
-        ish_reg_write(dev, IPC_REG_ISH_RMP2, 0);
-
-        for (dma_delay = 0; dma_delay < MAX_DMA_DELAY &&
-                _ish_read_fw_sts_reg(dev) & (IPC_ISH_IN_DMA);
-                dma_delay += 5)
-                mdelay(5);
-
-        if (dma_delay >= MAX_DMA_DELAY) {
+        /* Disable dma communication between FW and host */
+        if (ish_disable_dma(dev)) {
                 dev_err(&pdev->dev,
                         "Can't reset - stuck with DMA in-progress\n");
                 return  -EBUSY;
@@ -690,16 +734,8 @@ static int _ish_hw_reset(struct ishtp_device *dev)
         csr |= PCI_D0;
         pci_write_config_word(pdev, pdev->pm_cap + PCI_PM_CTRL, csr);
 
-        ish_reg_write(dev, IPC_REG_ISH_RMP2, IPC_RMP2_DMA_ENABLED);
-
-        /*
-         * Send 0 IPC message so that ISH FW wakes up if it was already
-         * asleep
-         */
-        ish_reg_write(dev, IPC_REG_HOST2ISH_DRBL, IPC_DRBL_BUSY_BIT);
-
-        /* Flush writes to doorbell and REMAP2 */
-        ish_reg_read(dev, IPC_REG_ISH_HOST_FWSTS);
+        /* Now we can enable ISH DMA operation and wakeup ISHFW */
+        ish_wakeup(dev);
 
         return  0;
 }
@@ -758,16 +794,9 @@ static int _ish_ipc_reset(struct ishtp_device *dev)
 int ish_hw_start(struct ishtp_device *dev)
 {
         ish_set_host_rdy(dev);
-        /* After that we can enable ISH DMA operation */
-        ish_reg_write(dev, IPC_REG_ISH_RMP2, IPC_RMP2_DMA_ENABLED);
 
-        /*
-         * Send 0 IPC message so that ISH FW wakes up if it was already
-         * asleep
-         */
-        ish_reg_write(dev, IPC_REG_HOST2ISH_DRBL, IPC_DRBL_BUSY_BIT);
-        /* Flush write to doorbell */
-        ish_reg_read(dev, IPC_REG_ISH_HOST_FWSTS);
+        /* After that we can enable ISH DMA operation and wakeup ISHFW */
+        ish_wakeup(dev);
 
         set_host_ready(dev);
 
@@ -876,6 +905,21 @@ struct ishtp_device *ish_dev_init(struct pci_dev *pdev)
  */
 void    ish_device_disable(struct ishtp_device *dev)
 {
+        struct pci_dev *pdev = dev->pdev;
+
+        if (!pdev)
+                return;
+
+        /* Disable dma communication between FW and host */
+        if (ish_disable_dma(dev)) {
+                dev_err(&pdev->dev,
+                        "Can't reset - stuck with DMA in-progress\n");
+                return;
+        }
+
+        /* Put ISH to D3hot state for power saving */
+        pci_set_power_state(pdev, PCI_D3hot);
+
         dev->dev_state = ISHTP_DEV_DISABLED;
         ish_clr_host_rdy(dev);
 }
diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
index 42f0beeb09fd..20d647d2dd2c 100644
--- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
+++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
@@ -146,7 +146,7 @@ static int ish_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         pdev->dev_flags |= PCI_DEV_FLAGS_NO_D3;
 
         /* request and enable interrupt */
-        ret = request_irq(pdev->irq, ish_irq_handler, IRQF_NO_SUSPEND,
+        ret = request_irq(pdev->irq, ish_irq_handler, IRQF_SHARED,
                           KBUILD_MODNAME, dev);
         if (ret) {
                 dev_err(&pdev->dev, "ISH: request IRQ failure (%d)\n",
@@ -202,6 +202,7 @@ static void ish_remove(struct pci_dev *pdev)
         kfree(ishtp_dev);
 }
 
+#ifdef CONFIG_PM
 static struct device *ish_resume_device;
 
 /**
@@ -293,7 +294,6 @@ static int ish_resume(struct device *device)
         return 0;
 }
 
-#ifdef CONFIG_PM
 static const struct dev_pm_ops ish_pm_ops = {
         .suspend = ish_suspend,
         .resume = ish_resume,
@@ -301,7 +301,7 @@ static const struct dev_pm_ops ish_pm_ops = {
 #define ISHTP_ISH_PM_OPS        (&ish_pm_ops)
 #else
 #define ISHTP_ISH_PM_OPS        NULL
-#endif
+#endif /* CONFIG_PM */
 
 static struct pci_driver ish_driver = {
         .name = KBUILD_MODNAME,
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 354d49ea36dd..e6cfd323babc 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -63,6 +63,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS682, HID_QUIRK_NOGET },
+        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS692, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FIGHTERSTICK, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE, HID_QUIRK_NOGET },
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index a259e18d22d5..0276d2ef06ee 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -961,7 +961,7 @@ int vmbus_device_register(struct hv_device *child_device_obj)
 {
         int ret = 0;
 
-        dev_set_name(&child_device_obj->device, "vmbus-%pUl",
+        dev_set_name(&child_device_obj->device, "%pUl",
                      child_device_obj->channel->offermsg.offer.if_instance.b);
 
         child_device_obj->device.bus = &hv_bus;
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index adae6848ffb2..a74c075a30ec 100644
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -536,8 +536,10 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,
 
                 hwdev->groups = devm_kcalloc(dev, ngroups, sizeof(*groups),
                                              GFP_KERNEL);
-                if (!hwdev->groups)
-                        return ERR_PTR(-ENOMEM);
+                if (!hwdev->groups) {
+                        err = -ENOMEM;
+                        goto free_hwmon;
+                }
 
                 attrs = __hwmon_create_attrs(dev, drvdata, chip);
                 if (IS_ERR(attrs)) {
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index d223650a97e4..11edabf425ae 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -59,7 +59,6 @@ config I2C_CHARDEV
 
 config I2C_MUX
         tristate "I2C bus multiplexing support"
-        depends on HAS_IOMEM
         help
           Say Y here if you want the I2C core to support the ability to
           handle multiplexed I2C bus topologies, by presenting each
diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c
index 11e866d05368..b403fa5ecf49 100644
--- a/drivers/i2c/busses/i2c-designware-core.c
+++ b/drivers/i2c/busses/i2c-designware-core.c
@@ -91,9 +91,7 @@
                                          DW_IC_INTR_TX_ABRT | \
                                          DW_IC_INTR_STOP_DET)
 
-#define DW_IC_STATUS_ACTIVITY           0x1
-#define DW_IC_STATUS_TFE                BIT(2)
-#define DW_IC_STATUS_MST_ACTIVITY       BIT(5)
+#define DW_IC_STATUS_ACTIVITY   0x1
 
 #define DW_IC_SDA_HOLD_RX_SHIFT         16
 #define DW_IC_SDA_HOLD_RX_MASK          GENMASK(23, DW_IC_SDA_HOLD_RX_SHIFT)
@@ -478,25 +476,9 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)
 {
         struct i2c_msg *msgs = dev->msgs;
         u32 ic_tar = 0;
-        bool enabled;
 
-        enabled = dw_readl(dev, DW_IC_ENABLE_STATUS) & 1;
-
-        if (enabled) {
-                u32 ic_status;
-
-                /*
-                 * Only disable adapter if ic_tar and ic_con can't be
-                 * dynamically updated
-                 */
-                ic_status = dw_readl(dev, DW_IC_STATUS);
-                if (!dev->dynamic_tar_update_enabled ||
-                    (ic_status & DW_IC_STATUS_MST_ACTIVITY) ||
-                    !(ic_status & DW_IC_STATUS_TFE)) {
-                        __i2c_dw_enable_and_wait(dev, false);
-                        enabled = false;
-                }
-        }
+        /* Disable the adapter */
+        __i2c_dw_enable_and_wait(dev, false);
 
         /* if the slave address is ten bit address, enable 10BITADDR */
         if (dev->dynamic_tar_update_enabled) {
@@ -526,8 +508,8 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)
         /* enforce disabled interrupts (due to HW issues) */
         i2c_dw_disable_int(dev);
 
-        if (!enabled)
-                __i2c_dw_enable(dev, true);
+        /* Enable the adapter */
+        __i2c_dw_enable(dev, true);
 
         /* Clear and enable interrupts */
         dw_readl(dev, DW_IC_CLR_INTR);
@@ -611,7 +593,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev)
                         if (msgs[dev->msg_write_idx].flags & I2C_M_RD) {
 
                                 /* avoid rx buffer overrun */
-                                if (rx_limit - dev->rx_outstanding <= 0)
+                                if (dev->rx_outstanding >= dev->rx_fifo_depth)
                                         break;
 
                                 dw_writel(dev, cmd | 0x100, DW_IC_DATA_CMD);
@@ -708,8 +690,7 @@ static int i2c_dw_handle_tx_abort(struct dw_i2c_dev *dev)
 }
 
 /*
- * Prepare controller for a transaction and start transfer by calling
- * i2c_dw_xfer_init()
+ * Prepare controller for a transaction and call i2c_dw_xfer_msg
  */
 static int
 i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
@@ -752,13 +733,23 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
                 goto done;
         }
 
+        /*
+         * We must disable the adapter before returning and signaling the end
+         * of the current transfer. Otherwise the hardware might continue
+         * generating interrupts which in turn causes a race condition with
+         * the following transfer.  Needs some more investigation if the
+         * additional interrupts are a hardware bug or this driver doesn't
+         * handle them correctly yet.
+         */
+        __i2c_dw_enable(dev, false);
+
         if (dev->msg_err) {
                 ret = dev->msg_err;
                 goto done;
         }
 
         /* no error */
-        if (likely(!dev->cmd_err)) {
+        if (likely(!dev->cmd_err && !dev->status)) {
                 ret = num;
                 goto done;
         }
@@ -768,6 +759,11 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
                 ret = i2c_dw_handle_tx_abort(dev);
                 goto done;
         }
+
+        if (dev->status)
+                dev_err(dev->dev,
+                        "transfer terminated early - interrupt latency too high?\n");
+
         ret = -EIO;
 
 done:
@@ -888,19 +884,9 @@ static irqreturn_t i2c_dw_isr(int this_irq, void *dev_id)
          */
 
 tx_aborted:
-        if ((stat & (DW_IC_INTR_TX_ABRT | DW_IC_INTR_STOP_DET))
-                        || dev->msg_err) {
-                /*
-                 * We must disable interruts before returning and signaling
-                 * the end of the current transfer. Otherwise the hardware
-                 * might continue generating interrupts for non-existent
-                 * transfers.
-                 */
-                i2c_dw_disable_int(dev);
-                dw_readl(dev, DW_IC_CLR_INTR);
-
+        if ((stat & (DW_IC_INTR_TX_ABRT | DW_IC_INTR_STOP_DET)) || dev->msg_err)
                 complete(&dev->cmd_complete);
-        } else if (unlikely(dev->accessor_flags & ACCESS_INTR_MASK)) {
+        else if (unlikely(dev->accessor_flags & ACCESS_INTR_MASK)) {
                 /* workaround to trigger pending interrupt */
                 stat = dw_readl(dev, DW_IC_INTR_MASK);
                 i2c_dw_disable_int(dev);
diff --git a/drivers/i2c/busses/i2c-digicolor.c b/drivers/i2c/busses/i2c-digicolor.c
index 49f2084f7bb5..50813a24c541 100644
--- a/drivers/i2c/busses/i2c-digicolor.c
+++ b/drivers/i2c/busses/i2c-digicolor.c
@@ -347,7 +347,7 @@ static int dc_i2c_probe(struct platform_device *pdev)
 
         ret = i2c_add_adapter(&i2c->adap);
         if (ret < 0) {
-                clk_unprepare(i2c->clk);
+                clk_disable_unprepare(i2c->clk);
                 return ret;
         }
 
diff --git a/drivers/i2c/busses/i2c-octeon-core.c b/drivers/i2c/busses/i2c-octeon-core.c
index 419b54bfc7c7..5e63b17f935d 100644
--- a/drivers/i2c/busses/i2c-octeon-core.c
+++ b/drivers/i2c/busses/i2c-octeon-core.c
@@ -381,9 +381,7 @@ static int octeon_i2c_read(struct octeon_i2c *i2c, int target,
                 if (result)
                         return result;
 
-                data[i] = octeon_i2c_data_read(i2c, &result);
-                if (result)
-                        return result;
+                data[i] = octeon_i2c_data_read(i2c);
                 if (recv_len && i == 0) {
                         if (data[i] > I2C_SMBUS_BLOCK_MAX + 1)
                                 return -EPROTO;
diff --git a/drivers/i2c/busses/i2c-octeon-core.h b/drivers/i2c/busses/i2c-octeon-core.h
index 1db7c835a454..87151ea74acd 100644
--- a/drivers/i2c/busses/i2c-octeon-core.h
+++ b/drivers/i2c/busses/i2c-octeon-core.h
@@ -5,7 +5,6 @@
 #include <linux/i2c.h>
 #include <linux/i2c-smbus.h>
 #include <linux/io.h>
-#include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
 
@@ -145,9 +144,9 @@ static inline void octeon_i2c_reg_write(struct octeon_i2c *i2c, u64 eop_reg, u8
         u64 tmp;
 
         __raw_writeq(SW_TWSI_V | eop_reg | data, i2c->twsi_base + SW_TWSI(i2c));
-
-        readq_poll_timeout(i2c->twsi_base + SW_TWSI(i2c), tmp, tmp & SW_TWSI_V,
-                           I2C_OCTEON_EVENT_WAIT, i2c->adap.timeout);
+        do {
+                tmp = __raw_readq(i2c->twsi_base + SW_TWSI(i2c));
+        } while ((tmp & SW_TWSI_V) != 0);
 }
 
 #define octeon_i2c_ctl_write(i2c, val)                                  \
@@ -164,28 +163,24 @@ static inline void octeon_i2c_reg_write(struct octeon_i2c *i2c, u64 eop_reg, u8
  *
  * The I2C core registers are accessed indirectly via the SW_TWSI CSR.
  */
-static inline int octeon_i2c_reg_read(struct octeon_i2c *i2c, u64 eop_reg,
-                                      int *error)
+static inline u8 octeon_i2c_reg_read(struct octeon_i2c *i2c, u64 eop_reg)
 {
         u64 tmp;
-        int ret;
 
         __raw_writeq(SW_TWSI_V | eop_reg | SW_TWSI_R, i2c->twsi_base + SW_TWSI(i2c));
+        do {
+                tmp = __raw_readq(i2c->twsi_base + SW_TWSI(i2c));
+        } while ((tmp & SW_TWSI_V) != 0);
 
-        ret = readq_poll_timeout(i2c->twsi_base + SW_TWSI(i2c), tmp,
-                                 tmp & SW_TWSI_V, I2C_OCTEON_EVENT_WAIT,
-                                 i2c->adap.timeout);
-        if (error)
-                *error = ret;
         return tmp & 0xFF;
 }
 
 #define octeon_i2c_ctl_read(i2c)                                        \
-        octeon_i2c_reg_read(i2c, SW_TWSI_EOP_TWSI_CTL, NULL)
-#define octeon_i2c_data_read(i2c, error)                                \
-        octeon_i2c_reg_read(i2c, SW_TWSI_EOP_TWSI_DATA, error)
+        octeon_i2c_reg_read(i2c, SW_TWSI_EOP_TWSI_CTL)
+#define octeon_i2c_data_read(i2c)                                       \
+        octeon_i2c_reg_read(i2c, SW_TWSI_EOP_TWSI_DATA)
 #define octeon_i2c_stat_read(i2c)                                       \
-        octeon_i2c_reg_read(i2c, SW_TWSI_EOP_TWSI_STAT, NULL)
+        octeon_i2c_reg_read(i2c, SW_TWSI_EOP_TWSI_STAT)
 
 /**
  * octeon_i2c_read_int - read the TWSI_INT register
diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index e280c8ecc0b5..96de9ce5669b 100644
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -63,6 +63,7 @@ config I2C_MUX_PINCTRL
 
 config I2C_MUX_REG
         tristate "Register-based I2C multiplexer"
+        depends on HAS_IOMEM
         help
           If you say yes to this option, support will be included for a
           register based I2C multiplexer. This driver provides access to
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index b3893f6282ba..3e6fe1760d82 100644
--- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
@@ -69,10 +69,28 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne
                 goto err_with_revert;
         }
 
-        p = devm_pinctrl_get_select(adap->dev.parent, priv->bus_name);
+        /*
+         * Check if there are pinctrl states at all. Note: we cant' use
+         * devm_pinctrl_get_select() because we need to distinguish between
+         * the -ENODEV from devm_pinctrl_get() and pinctrl_lookup_state().
+         */
+        p = devm_pinctrl_get(adap->dev.parent);
         if (IS_ERR(p)) {
                 ret = PTR_ERR(p);
-                goto err_with_put;
+                /* continue if just no pinctrl states (e.g. i2c-gpio), otherwise exit */
+                if (ret != -ENODEV)
+                        goto err_with_put;
+        } else {
+                /* there are states. check and use them */
+                struct pinctrl_state *s = pinctrl_lookup_state(p, priv->bus_name);
+
+                if (IS_ERR(s)) {
+                        ret = PTR_ERR(s);
+                        goto err_with_put;
+                }
+                ret = pinctrl_select_state(p, s);
+                if (ret < 0)
+                        goto err_with_put;
         }
 
         priv->chan[new_chan].parent_adap = adap;
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index 1091346f2480..8bc3d36d2837 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -268,9 +268,9 @@ static int pca954x_probe(struct i2c_client *client,
                                 /* discard unconfigured channels */
                                 break;
                         idle_disconnect_pd = pdata->modes[num].deselect_on_exit;
-                        data->deselect |= (idle_disconnect_pd
-                                           || idle_disconnect_dt) << num;
                 }
+                data->deselect |= (idle_disconnect_pd ||
+                                   idle_disconnect_dt) << num;
 
                 ret = i2c_mux_add_adapter(muxc, force, num, class);
 
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index da3fb069ec5c..ce69048c88e9 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -743,8 +743,8 @@ static int st_accel_read_raw(struct iio_dev *indio_dev,
 
                 return IIO_VAL_INT;
         case IIO_CHAN_INFO_SCALE:
-                *val = 0;
-                *val2 = adata->current_fullscale->gain;
+                *val = adata->current_fullscale->gain / 1000000;
+                *val2 = adata->current_fullscale->gain % 1000000;
                 return IIO_VAL_INT_PLUS_MICRO;
         case IIO_CHAN_INFO_SAMP_FREQ:
                 *val = adata->odr;
@@ -763,9 +763,13 @@ static int st_accel_write_raw(struct iio_dev *indio_dev,
         int err;
 
         switch (mask) {
-        case IIO_CHAN_INFO_SCALE:
-                err = st_sensors_set_fullscale_by_gain(indio_dev, val2);
+        case IIO_CHAN_INFO_SCALE: {
+                int gain;
+
+                gain = val * 1000000 + val2;
+                err = st_sensors_set_fullscale_by_gain(indio_dev, gain);
                 break;
+        }
         case IIO_CHAN_INFO_SAMP_FREQ:
                 if (val2)
                         return -EINVAL;
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
index dc33c1dd5191..b5beea53d6f6 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
@@ -30,26 +30,26 @@ static struct {
         u32 usage_id;
         int unit; /* 0 for default others from HID sensor spec */
         int scale_val0; /* scale, whole number */
-        int scale_val1; /* scale, fraction in micros */
+        int scale_val1; /* scale, fraction in nanos */
 } unit_conversion[] = {
-        {HID_USAGE_SENSOR_ACCEL_3D, 0, 9, 806650},
+        {HID_USAGE_SENSOR_ACCEL_3D, 0, 9, 806650000},
         {HID_USAGE_SENSOR_ACCEL_3D,
                 HID_USAGE_SENSOR_UNITS_METERS_PER_SEC_SQRD, 1, 0},
         {HID_USAGE_SENSOR_ACCEL_3D,
-                HID_USAGE_SENSOR_UNITS_G, 9, 806650},
+                HID_USAGE_SENSOR_UNITS_G, 9, 806650000},
 
-        {HID_USAGE_SENSOR_GYRO_3D, 0, 0, 17453},
+        {HID_USAGE_SENSOR_GYRO_3D, 0, 0, 17453293},
         {HID_USAGE_SENSOR_GYRO_3D,
                 HID_USAGE_SENSOR_UNITS_RADIANS_PER_SECOND, 1, 0},
         {HID_USAGE_SENSOR_GYRO_3D,
-                HID_USAGE_SENSOR_UNITS_DEGREES_PER_SECOND, 0, 17453},
+                HID_USAGE_SENSOR_UNITS_DEGREES_PER_SECOND, 0, 17453293},
 
-        {HID_USAGE_SENSOR_COMPASS_3D, 0, 0, 1000},
+        {HID_USAGE_SENSOR_COMPASS_3D, 0, 0, 1000000},
         {HID_USAGE_SENSOR_COMPASS_3D, HID_USAGE_SENSOR_UNITS_GAUSS, 1, 0},
 
-        {HID_USAGE_SENSOR_INCLINOMETER_3D, 0, 0, 17453},
+        {HID_USAGE_SENSOR_INCLINOMETER_3D, 0, 0, 17453293},
         {HID_USAGE_SENSOR_INCLINOMETER_3D,
-                HID_USAGE_SENSOR_UNITS_DEGREES, 0, 17453},
+                HID_USAGE_SENSOR_UNITS_DEGREES, 0, 17453293},
         {HID_USAGE_SENSOR_INCLINOMETER_3D,
                 HID_USAGE_SENSOR_UNITS_RADIANS, 1, 0},
 
@@ -57,7 +57,7 @@ static struct {
         {HID_USAGE_SENSOR_ALS, HID_USAGE_SENSOR_UNITS_LUX, 1, 0},
 
         {HID_USAGE_SENSOR_PRESSURE, 0, 100, 0},
-        {HID_USAGE_SENSOR_PRESSURE, HID_USAGE_SENSOR_UNITS_PASCAL, 0, 1000},
+        {HID_USAGE_SENSOR_PRESSURE, HID_USAGE_SENSOR_UNITS_PASCAL, 0, 1000000},
 };
 
 static int pow_10(unsigned power)
@@ -266,15 +266,15 @@ EXPORT_SYMBOL(hid_sensor_write_raw_hyst_value);
 /*
  * This fuction applies the unit exponent to the scale.
  * For example:
- * 9.806650 ->exp:2-> val0[980]val1[665000]
- * 9.000806 ->exp:2-> val0[900]val1[80600]
- * 0.174535 ->exp:2-> val0[17]val1[453500]
- * 1.001745 ->exp:0-> val0[1]val1[1745]
- * 1.001745 ->exp:2-> val0[100]val1[174500]
- * 1.001745 ->exp:4-> val0[10017]val1[450000]
- * 9.806650 ->exp:-2-> val0[0]val1[98066]
+ * 9.806650000 ->exp:2-> val0[980]val1[665000000]
+ * 9.000806000 ->exp:2-> val0[900]val1[80600000]
+ * 0.174535293 ->exp:2-> val0[17]val1[453529300]
+ * 1.001745329 ->exp:0-> val0[1]val1[1745329]
+ * 1.001745329 ->exp:2-> val0[100]val1[174532900]
+ * 1.001745329 ->exp:4-> val0[10017]val1[453290000]
+ * 9.806650000 ->exp:-2-> val0[0]val1[98066500]
  */
-static void adjust_exponent_micro(int *val0, int *val1, int scale0,
+static void adjust_exponent_nano(int *val0, int *val1, int scale0,
                                   int scale1, int exp)
 {
         int i;
@@ -285,32 +285,32 @@ static void adjust_exponent_micro(int *val0, int *val1, int scale0,
         if (exp > 0) {
                 *val0 = scale0 * pow_10(exp);
                 res = 0;
-                if (exp > 6) {
+                if (exp > 9) {
                         *val1 = 0;
                         return;
                 }
                 for (i = 0; i < exp; ++i) {
-                        x = scale1 / pow_10(5 - i);
+                        x = scale1 / pow_10(8 - i);
                         res += (pow_10(exp - 1 - i) * x);
-                        scale1 = scale1 % pow_10(5 - i);
+                        scale1 = scale1 % pow_10(8 - i);
                 }
                 *val0 += res;
                         *val1 = scale1 * pow_10(exp);
         } else if (exp < 0) {
                 exp = abs(exp);
-                if (exp > 6) {
+                if (exp > 9) {
                         *val0 = *val1 = 0;
                         return;
                 }
                 *val0 = scale0 / pow_10(exp);
                 rem = scale0 % pow_10(exp);
                 res = 0;
-                for (i = 0; i < (6 - exp); ++i) {
-                        x = scale1 / pow_10(5 - i);
-                        res += (pow_10(5 - exp - i) * x);
-                        scale1 = scale1 % pow_10(5 - i);
+                for (i = 0; i < (9 - exp); ++i) {
+                        x = scale1 / pow_10(8 - i);
+                        res += (pow_10(8 - exp - i) * x);
+                        scale1 = scale1 % pow_10(8 - i);
                 }
-                *val1 = rem * pow_10(6 - exp) + res;
+                *val1 = rem * pow_10(9 - exp) + res;
         } else {
                 *val0 = scale0;
                 *val1 = scale1;
@@ -332,14 +332,14 @@ int hid_sensor_format_scale(u32 usage_id,
                         unit_conversion[i].unit == attr_info->units) {
                         exp  = hid_sensor_convert_exponent(
                                                 attr_info->unit_expo);
-                        adjust_exponent_micro(val0, val1,
+                        adjust_exponent_nano(val0, val1,
                                         unit_conversion[i].scale_val0,
                                         unit_conversion[i].scale_val1, exp);
                         break;
                 }
         }
 
-        return IIO_VAL_INT_PLUS_MICRO;
+        return IIO_VAL_INT_PLUS_NANO;
 }
 EXPORT_SYMBOL(hid_sensor_format_scale);
 
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index 285a64a589d7..975a1f19f747 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -612,7 +612,7 @@ EXPORT_SYMBOL(st_sensors_sysfs_sampling_frequency_avail);
 ssize_t st_sensors_sysfs_scale_avail(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
-        int i, len = 0;
+        int i, len = 0, q, r;
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct st_sensor_data *sdata = iio_priv(indio_dev);
 
@@ -621,8 +621,10 @@ ssize_t st_sensors_sysfs_scale_avail(struct device *dev,
                 if (sdata->sensor_settings->fs.fs_avl[i].num == 0)
                         break;
 
-                len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
-                                sdata->sensor_settings->fs.fs_avl[i].gain);
+                q = sdata->sensor_settings->fs.fs_avl[i].gain / 1000000;
+                r = sdata->sensor_settings->fs.fs_avl[i].gain % 1000000;
+
+                len += scnprintf(buf + len, PAGE_SIZE - len, "%u.%06u ", q, r);
         }
         mutex_unlock(&indio_dev->mlock);
         buf[len - 1] = '\n';
diff --git a/drivers/iio/orientation/hid-sensor-rotation.c b/drivers/iio/orientation/hid-sensor-rotation.c
index b98b9d94d184..a97e802ca523 100644
--- a/drivers/iio/orientation/hid-sensor-rotation.c
+++ b/drivers/iio/orientation/hid-sensor-rotation.c
@@ -335,6 +335,7 @@ static struct platform_driver hid_dev_rot_platform_driver = {
         .id_table = hid_dev_rot_ids,
         .driver = {
                 .name   = KBUILD_MODNAME,
+                .pm     = &hid_sensor_pm_ops,
         },
         .probe          = hid_dev_rot_probe,
         .remove         = hid_dev_rot_remove,
diff --git a/drivers/iio/temperature/maxim_thermocouple.c b/drivers/iio/temperature/maxim_thermocouple.c
index 066161a4bccd..f962f31a5eb2 100644
--- a/drivers/iio/temperature/maxim_thermocouple.c
+++ b/drivers/iio/temperature/maxim_thermocouple.c
@@ -136,6 +136,8 @@ static int maxim_thermocouple_read(struct maxim_thermocouple_data *data,
                 ret = spi_read(data->spi, (void *)&buf32, storage_bytes);
                 *val = be32_to_cpu(buf32);
                 break;
+        default:
+                ret = -EINVAL;
         }
 
         if (ret)
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index b136d3acc5bd..0f58f46dbad7 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -699,13 +699,16 @@ EXPORT_SYMBOL(rdma_addr_cancel);
 struct resolve_cb_context {
         struct rdma_dev_addr *addr;
         struct completion comp;
+        int status;
 };
 
 static void resolve_cb(int status, struct sockaddr *src_addr,
              struct rdma_dev_addr *addr, void *context)
 {
-        memcpy(((struct resolve_cb_context *)context)->addr, addr, sizeof(struct
-                                rdma_dev_addr));
+        if (!status)
+                memcpy(((struct resolve_cb_context *)context)->addr,
+                       addr, sizeof(struct rdma_dev_addr));
+        ((struct resolve_cb_context *)context)->status = status;
         complete(&((struct resolve_cb_context *)context)->comp);
 }
 
@@ -743,6 +746,10 @@ int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid,
 
         wait_for_completion(&ctx.comp);
 
+        ret = ctx.status;
+        if (ret)
+                return ret;
+
         memcpy(dmac, dev_addr.dst_dev_addr, ETH_ALEN);
         dev = dev_get_by_index(&init_net, dev_addr.bound_dev_if);
         if (!dev)
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index c99525512b34..71c7c4c328ef 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -80,6 +80,8 @@ static struct ib_cm {
         __be32 random_id_operand;
         struct list_head timewait_list;
         struct workqueue_struct *wq;
+        /* Sync on cm change port state */
+        spinlock_t state_lock;
 } cm;
 
 /* Counter indexes ordered by attribute ID */
@@ -161,6 +163,8 @@ struct cm_port {
         struct ib_mad_agent *mad_agent;
         struct kobject port_obj;
         u8 port_num;
+        struct list_head cm_priv_prim_list;
+        struct list_head cm_priv_altr_list;
         struct cm_counter_group counter_group[CM_COUNTER_GROUPS];
 };
 
@@ -241,6 +245,12 @@ struct cm_id_private {
         u8 service_timeout;
         u8 target_ack_delay;
 
+        struct list_head prim_list;
+        struct list_head altr_list;
+        /* Indicates that the send port mad is registered and av is set */
+        int prim_send_port_not_ready;
+        int altr_send_port_not_ready;
+
         struct list_head work_list;
         atomic_t work_count;
 };
@@ -259,20 +269,47 @@ static int cm_alloc_msg(struct cm_id_private *cm_id_priv,
         struct ib_mad_agent *mad_agent;
         struct ib_mad_send_buf *m;
         struct ib_ah *ah;
+        struct cm_av *av;
+        unsigned long flags, flags2;
+        int ret = 0;
 
+        /* don't let the port to be released till the agent is down */
+        spin_lock_irqsave(&cm.state_lock, flags2);
+        spin_lock_irqsave(&cm.lock, flags);
+        if (!cm_id_priv->prim_send_port_not_ready)
+                av = &cm_id_priv->av;
+        else if (!cm_id_priv->altr_send_port_not_ready &&
+                 (cm_id_priv->alt_av.port))
+                av = &cm_id_priv->alt_av;
+        else {
+                pr_info("%s: not valid CM id\n", __func__);
+                ret = -ENODEV;
+                spin_unlock_irqrestore(&cm.lock, flags);
+                goto out;
+        }
+        spin_unlock_irqrestore(&cm.lock, flags);
+        /* Make sure the port haven't released the mad yet */
         mad_agent = cm_id_priv->av.port->mad_agent;
-        ah = ib_create_ah(mad_agent->qp->pd, &cm_id_priv->av.ah_attr);
-        if (IS_ERR(ah))
-                return PTR_ERR(ah);
+        if (!mad_agent) {
+                pr_info("%s: not a valid MAD agent\n", __func__);
+                ret = -ENODEV;
+                goto out;
+        }
+        ah = ib_create_ah(mad_agent->qp->pd, &av->ah_attr);
+        if (IS_ERR(ah)) {
+                ret = PTR_ERR(ah);
+                goto out;
+        }
 
         m = ib_create_send_mad(mad_agent, cm_id_priv->id.remote_cm_qpn,
-                               cm_id_priv->av.pkey_index,
+                               av->pkey_index,
                                0, IB_MGMT_MAD_HDR, IB_MGMT_MAD_DATA,
                                GFP_ATOMIC,
                                IB_MGMT_BASE_VERSION);
         if (IS_ERR(m)) {
                 ib_destroy_ah(ah);
-                return PTR_ERR(m);
+                ret = PTR_ERR(m);
+                goto out;
         }
 
         /* Timeout set by caller if response is expected. */
@@ -282,7 +319,10 @@ static int cm_alloc_msg(struct cm_id_private *cm_id_priv,
         atomic_inc(&cm_id_priv->refcount);
         m->context[0] = cm_id_priv;
         *msg = m;
-        return 0;
+
+out:
+        spin_unlock_irqrestore(&cm.state_lock, flags2);
+        return ret;
 }
 
 static int cm_alloc_response_msg(struct cm_port *port,
@@ -352,7 +392,8 @@ static void cm_init_av_for_response(struct cm_port *port, struct ib_wc *wc,
                            grh, &av->ah_attr);
 }
 
-static int cm_init_av_by_path(struct ib_sa_path_rec *path, struct cm_av *av)
+static int cm_init_av_by_path(struct ib_sa_path_rec *path, struct cm_av *av,
+                              struct cm_id_private *cm_id_priv)
 {
         struct cm_device *cm_dev;
         struct cm_port *port = NULL;
@@ -387,7 +428,17 @@ static int cm_init_av_by_path(struct ib_sa_path_rec *path, struct cm_av *av)
                              &av->ah_attr);
         av->timeout = path->packet_life_time + 1;
 
-        return 0;
+        spin_lock_irqsave(&cm.lock, flags);
+        if (&cm_id_priv->av == av)
+                list_add_tail(&cm_id_priv->prim_list, &port->cm_priv_prim_list);
+        else if (&cm_id_priv->alt_av == av)
+                list_add_tail(&cm_id_priv->altr_list, &port->cm_priv_altr_list);
+        else
+                ret = -EINVAL;
+
+        spin_unlock_irqrestore(&cm.lock, flags);
+
+        return ret;
 }
 
 static int cm_alloc_id(struct cm_id_private *cm_id_priv)
@@ -677,6 +728,8 @@ struct ib_cm_id *ib_create_cm_id(struct ib_device *device,
         spin_lock_init(&cm_id_priv->lock);
         init_completion(&cm_id_priv->comp);
         INIT_LIST_HEAD(&cm_id_priv->work_list);
+        INIT_LIST_HEAD(&cm_id_priv->prim_list);
+        INIT_LIST_HEAD(&cm_id_priv->altr_list);
         atomic_set(&cm_id_priv->work_count, -1);
         atomic_set(&cm_id_priv->refcount, 1);
         return &cm_id_priv->id;
@@ -892,6 +945,15 @@ retest:
                 break;
         }
 
+        spin_lock_irq(&cm.lock);
+        if (!list_empty(&cm_id_priv->altr_list) &&
+            (!cm_id_priv->altr_send_port_not_ready))
+                list_del(&cm_id_priv->altr_list);
+        if (!list_empty(&cm_id_priv->prim_list) &&
+            (!cm_id_priv->prim_send_port_not_ready))
+                list_del(&cm_id_priv->prim_list);
+        spin_unlock_irq(&cm.lock);
+
         cm_free_id(cm_id->local_id);
         cm_deref_id(cm_id_priv);
         wait_for_completion(&cm_id_priv->comp);
@@ -1192,12 +1254,13 @@ int ib_send_cm_req(struct ib_cm_id *cm_id,
                 goto out;
         }
 
-        ret = cm_init_av_by_path(param->primary_path, &cm_id_priv->av);
+        ret = cm_init_av_by_path(param->primary_path, &cm_id_priv->av,
+                                 cm_id_priv);
         if (ret)
                 goto error1;
         if (param->alternate_path) {
                 ret = cm_init_av_by_path(param->alternate_path,
-                                         &cm_id_priv->alt_av);
+                                         &cm_id_priv->alt_av, cm_id_priv);
                 if (ret)
                         goto error1;
         }
@@ -1653,7 +1716,8 @@ static int cm_req_handler(struct cm_work *work)
                         dev_put(gid_attr.ndev);
                 }
                 work->path[0].gid_type = gid_attr.gid_type;
-                ret = cm_init_av_by_path(&work->path[0], &cm_id_priv->av);
+                ret = cm_init_av_by_path(&work->path[0], &cm_id_priv->av,
+                                         cm_id_priv);
         }
         if (ret) {
                 int err = ib_get_cached_gid(work->port->cm_dev->ib_device,
@@ -1672,7 +1736,8 @@ static int cm_req_handler(struct cm_work *work)
                 goto rejected;
         }
         if (req_msg->alt_local_lid) {
-                ret = cm_init_av_by_path(&work->path[1], &cm_id_priv->alt_av);
+                ret = cm_init_av_by_path(&work->path[1], &cm_id_priv->alt_av,
+                                         cm_id_priv);
                 if (ret) {
                         ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_ALT_GID,
                                        &work->path[0].sgid,
@@ -2727,7 +2792,8 @@ int ib_send_cm_lap(struct ib_cm_id *cm_id,
                 goto out;
         }
 
-        ret = cm_init_av_by_path(alternate_path, &cm_id_priv->alt_av);
+        ret = cm_init_av_by_path(alternate_path, &cm_id_priv->alt_av,
+                                 cm_id_priv);
         if (ret)
                 goto out;
         cm_id_priv->alt_av.timeout =
@@ -2839,7 +2905,8 @@ static int cm_lap_handler(struct cm_work *work)
         cm_init_av_for_response(work->port, work->mad_recv_wc->wc,
                                 work->mad_recv_wc->recv_buf.grh,
                                 &cm_id_priv->av);
-        cm_init_av_by_path(param->alternate_path, &cm_id_priv->alt_av);
+        cm_init_av_by_path(param->alternate_path, &cm_id_priv->alt_av,
+                           cm_id_priv);
         ret = atomic_inc_and_test(&cm_id_priv->work_count);
         if (!ret)
                 list_add_tail(&work->list, &cm_id_priv->work_list);
@@ -3031,7 +3098,7 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id,
                 return -EINVAL;
 
         cm_id_priv = container_of(cm_id, struct cm_id_private, id);
-        ret = cm_init_av_by_path(param->path, &cm_id_priv->av);
+        ret = cm_init_av_by_path(param->path, &cm_id_priv->av, cm_id_priv);
         if (ret)
                 goto out;
 
@@ -3468,7 +3535,9 @@ out:
 static int cm_migrate(struct ib_cm_id *cm_id)
 {
         struct cm_id_private *cm_id_priv;
+        struct cm_av tmp_av;
         unsigned long flags;
+        int tmp_send_port_not_ready;
         int ret = 0;
 
         cm_id_priv = container_of(cm_id, struct cm_id_private, id);
@@ -3477,7 +3546,14 @@ static int cm_migrate(struct ib_cm_id *cm_id)
             (cm_id->lap_state == IB_CM_LAP_UNINIT ||
              cm_id->lap_state == IB_CM_LAP_IDLE)) {
                 cm_id->lap_state = IB_CM_LAP_IDLE;
+                /* Swap address vector */
+                tmp_av = cm_id_priv->av;
                 cm_id_priv->av = cm_id_priv->alt_av;
+                cm_id_priv->alt_av = tmp_av;
+                /* Swap port send ready state */
+                tmp_send_port_not_ready = cm_id_priv->prim_send_port_not_ready;
+                cm_id_priv->prim_send_port_not_ready = cm_id_priv->altr_send_port_not_ready;
+                cm_id_priv->altr_send_port_not_ready = tmp_send_port_not_ready;
         } else
                 ret = -EINVAL;
         spin_unlock_irqrestore(&cm_id_priv->lock, flags);
@@ -3888,6 +3964,9 @@ static void cm_add_one(struct ib_device *ib_device)
                 port->cm_dev = cm_dev;
                 port->port_num = i;
 
+                INIT_LIST_HEAD(&port->cm_priv_prim_list);
+                INIT_LIST_HEAD(&port->cm_priv_altr_list);
+
                 ret = cm_create_port_fs(port);
                 if (ret)
                         goto error1;
@@ -3945,6 +4024,8 @@ static void cm_remove_one(struct ib_device *ib_device, void *client_data)
 {
         struct cm_device *cm_dev = client_data;
         struct cm_port *port;
+        struct cm_id_private *cm_id_priv;
+        struct ib_mad_agent *cur_mad_agent;
         struct ib_port_modify port_modify = {
                 .clr_port_cap_mask = IB_PORT_CM_SUP
         };
@@ -3968,15 +4049,27 @@ static void cm_remove_one(struct ib_device *ib_device, void *client_data)
 
                 port = cm_dev->port[i-1];
                 ib_modify_port(ib_device, port->port_num, 0, &port_modify);
+                /* Mark all the cm_id's as not valid */
+                spin_lock_irq(&cm.lock);
+                list_for_each_entry(cm_id_priv, &port->cm_priv_altr_list, altr_list)
+                        cm_id_priv->altr_send_port_not_ready = 1;
+                list_for_each_entry(cm_id_priv, &port->cm_priv_prim_list, prim_list)
+                        cm_id_priv->prim_send_port_not_ready = 1;
+                spin_unlock_irq(&cm.lock);
                 /*
                  * We flush the queue here after the going_down set, this
                  * verify that no new works will be queued in the recv handler,
                  * after that we can call the unregister_mad_agent
                  */
                 flush_workqueue(cm.wq);
-                ib_unregister_mad_agent(port->mad_agent);
+                spin_lock_irq(&cm.state_lock);
+                cur_mad_agent = port->mad_agent;
+                port->mad_agent = NULL;
+                spin_unlock_irq(&cm.state_lock);
+                ib_unregister_mad_agent(cur_mad_agent);
                 cm_remove_port_fs(port);
         }
+
         device_unregister(cm_dev->device);
         kfree(cm_dev);
 }
@@ -3989,6 +4082,7 @@ static int __init ib_cm_init(void)
         INIT_LIST_HEAD(&cm.device_list);
         rwlock_init(&cm.device_lock);
         spin_lock_init(&cm.lock);
+        spin_lock_init(&cm.state_lock);
         cm.listen_service_table = RB_ROOT;
         cm.listen_service_id = be64_to_cpu(IB_CM_ASSIGN_SERVICE_ID);
         cm.remote_id_table = RB_ROOT;
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 36bf50ebb187..2a6fc47a1dfb 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1094,47 +1094,47 @@ static void cma_save_ib_info(struct sockaddr *src_addr,
         }
 }
 
-static void cma_save_ip4_info(struct sockaddr *src_addr,
-                              struct sockaddr *dst_addr,
+static void cma_save_ip4_info(struct sockaddr_in *src_addr,
+                              struct sockaddr_in *dst_addr,
                               struct cma_hdr *hdr,
                               __be16 local_port)
 {
-        struct sockaddr_in *ip4;
-
         if (src_addr) {
-                ip4 = (struct sockaddr_in *)src_addr;
-                ip4->sin_family = AF_INET;
-                ip4->sin_addr.s_addr = hdr->dst_addr.ip4.addr;
-                ip4->sin_port = local_port;
+                *src_addr = (struct sockaddr_in) {
+                        .sin_family = AF_INET,
+                        .sin_addr.s_addr = hdr->dst_addr.ip4.addr,
+                        .sin_port = local_port,
+                };
         }
 
         if (dst_addr) {
-                ip4 = (struct sockaddr_in *)dst_addr;
-                ip4->sin_family = AF_INET;
-                ip4->sin_addr.s_addr = hdr->src_addr.ip4.addr;
-                ip4->sin_port = hdr->port;
+                *dst_addr = (struct sockaddr_in) {
+                        .sin_family = AF_INET,
+                        .sin_addr.s_addr = hdr->src_addr.ip4.addr,
+                        .sin_port = hdr->port,
+                };
         }
 }
 
-static void cma_save_ip6_info(struct sockaddr *src_addr,
-                              struct sockaddr *dst_addr,
+static void cma_save_ip6_info(struct sockaddr_in6 *src_addr,
+                              struct sockaddr_in6 *dst_addr,
                               struct cma_hdr *hdr,
                               __be16 local_port)
 {
-        struct sockaddr_in6 *ip6;
-
         if (src_addr) {
-                ip6 = (struct sockaddr_in6 *)src_addr;
-                ip6->sin6_family = AF_INET6;
-                ip6->sin6_addr = hdr->dst_addr.ip6;
-                ip6->sin6_port = local_port;
+                *src_addr = (struct sockaddr_in6) {
+                        .sin6_family = AF_INET6,
+                        .sin6_addr = hdr->dst_addr.ip6,
+                        .sin6_port = local_port,
+                };
         }
 
         if (dst_addr) {
-                ip6 = (struct sockaddr_in6 *)dst_addr;
-                ip6->sin6_family = AF_INET6;
-                ip6->sin6_addr = hdr->src_addr.ip6;
-                ip6->sin6_port = hdr->port;
+                *dst_addr = (struct sockaddr_in6) {
+                        .sin6_family = AF_INET6,
+                        .sin6_addr = hdr->src_addr.ip6,
+                        .sin6_port = hdr->port,
+                };
         }
 }
 
@@ -1159,10 +1159,12 @@ static int cma_save_ip_info(struct sockaddr *src_addr,
 
         switch (cma_get_ip_ver(hdr)) {
         case 4:
-                cma_save_ip4_info(src_addr, dst_addr, hdr, port);
+                cma_save_ip4_info((struct sockaddr_in *)src_addr,
+                                  (struct sockaddr_in *)dst_addr, hdr, port);
                 break;
         case 6:
-                cma_save_ip6_info(src_addr, dst_addr, hdr, port);
+                cma_save_ip6_info((struct sockaddr_in6 *)src_addr,
+                                  (struct sockaddr_in6 *)dst_addr, hdr, port);
                 break;
         default:
                 return -EAFNOSUPPORT;
@@ -2436,6 +2438,18 @@ static int iboe_tos_to_sl(struct net_device *ndev, int tos)
         return 0;
 }
 
+static enum ib_gid_type cma_route_gid_type(enum rdma_network_type network_type,
+                                           unsigned long supported_gids,
+                                           enum ib_gid_type default_gid)
+{
+        if ((network_type == RDMA_NETWORK_IPV4 ||
+             network_type == RDMA_NETWORK_IPV6) &&
+            test_bit(IB_GID_TYPE_ROCE_UDP_ENCAP, &supported_gids))
+                return IB_GID_TYPE_ROCE_UDP_ENCAP;
+
+        return default_gid;
+}
+
 static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
 {
         struct rdma_route *route = &id_priv->id.route;
@@ -2461,6 +2475,8 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
         route->num_paths = 1;
 
         if (addr->dev_addr.bound_dev_if) {
+                unsigned long supported_gids;
+
                 ndev = dev_get_by_index(&init_net, addr->dev_addr.bound_dev_if);
                 if (!ndev) {
                         ret = -ENODEV;
@@ -2484,7 +2500,12 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
 
                 route->path_rec->net = &init_net;
                 route->path_rec->ifindex = ndev->ifindex;
-                route->path_rec->gid_type = id_priv->gid_type;
+                supported_gids = roce_gid_type_mask_support(id_priv->id.device,
+                                                            id_priv->id.port_num);
+                route->path_rec->gid_type =
+                        cma_route_gid_type(addr->dev_addr.network,
+                                           supported_gids,
+                                           id_priv->gid_type);
         }
         if (!ndev) {
                 ret = -ENODEV;
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 224ad274ea0b..84b4eff90395 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -175,7 +175,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
 
         cur_base = addr & PAGE_MASK;
 
-        if (npages == 0) {
+        if (npages == 0 || npages > UINT_MAX) {
                 ret = -EINVAL;
                 goto out;
         }
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 0012fa58c105..44b1104eb168 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -262,12 +262,9 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file,
                         container_of(uobj, struct ib_uqp_object, uevent.uobject);
 
                 idr_remove_uobj(&ib_uverbs_qp_idr, uobj);
-                if (qp != qp->real_qp) {
-                        ib_close_qp(qp);
-                } else {
+                if (qp == qp->real_qp)
                         ib_uverbs_detach_umcast(qp, uqp);
-                        ib_destroy_qp(qp);
-                }
+                ib_destroy_qp(qp);
                 ib_uverbs_release_uevent(file, &uqp->uevent);
                 kfree(uqp);
         }
diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index 867b8cf82be8..19c6477af19f 100644
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -666,18 +666,6 @@ skip_cqe:
         return ret;
 }
 
-static void invalidate_mr(struct c4iw_dev *rhp, u32 rkey)
-{
-        struct c4iw_mr *mhp;
-        unsigned long flags;
-
-        spin_lock_irqsave(&rhp->lock, flags);
-        mhp = get_mhp(rhp, rkey >> 8);
-        if (mhp)
-                mhp->attr.state = 0;
-        spin_unlock_irqrestore(&rhp->lock, flags);
-}
-
 /*
  * Get one cq entry from c4iw and map it to openib.
  *
@@ -733,7 +721,7 @@ static int c4iw_poll_cq_one(struct c4iw_cq *chp, struct ib_wc *wc)
                     CQE_OPCODE(&cqe) == FW_RI_SEND_WITH_SE_INV) {
                         wc->ex.invalidate_rkey = CQE_WRID_STAG(&cqe);
                         wc->wc_flags |= IB_WC_WITH_INVALIDATE;
-                        invalidate_mr(qhp->rhp, wc->ex.invalidate_rkey);
+                        c4iw_invalidate_mr(qhp->rhp, wc->ex.invalidate_rkey);
                 }
         } else {
                 switch (CQE_OPCODE(&cqe)) {
@@ -762,7 +750,8 @@ static int c4iw_poll_cq_one(struct c4iw_cq *chp, struct ib_wc *wc)
 
                         /* Invalidate the MR if the fastreg failed */
                         if (CQE_STATUS(&cqe) != T4_ERR_SUCCESS)
-                                invalidate_mr(qhp->rhp, CQE_WRID_FR_STAG(&cqe));
+                                c4iw_invalidate_mr(qhp->rhp,
+                                                   CQE_WRID_FR_STAG(&cqe));
                         break;
                 default:
                         printk(KERN_ERR MOD "Unexpected opcode %d "
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
index 7e7f79e55006..4788e1a46fde 100644
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -999,6 +999,6 @@ extern int db_coalescing_threshold;
 extern int use_dsgl;
 void c4iw_drain_rq(struct ib_qp *qp);
 void c4iw_drain_sq(struct ib_qp *qp);
-
+void c4iw_invalidate_mr(struct c4iw_dev *rhp, u32 rkey);
 
 #endif
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index 80e27749420a..410408f886c1 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -770,3 +770,15 @@ int c4iw_dereg_mr(struct ib_mr *ib_mr)
         kfree(mhp);
         return 0;
 }
+
+void c4iw_invalidate_mr(struct c4iw_dev *rhp, u32 rkey)
+{
+        struct c4iw_mr *mhp;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rhp->lock, flags);
+        mhp = get_mhp(rhp, rkey >> 8);
+        if (mhp)
+                mhp->attr.state = 0;
+        spin_unlock_irqrestore(&rhp->lock, flags);
+}
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index f57deba6717c..b7ac97b27c88 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -706,12 +706,8 @@ static int build_memreg(struct t4_sq *sq, union t4_wr *wqe,
         return 0;
 }
 
-static int build_inv_stag(struct c4iw_dev *dev, union t4_wr *wqe,
-                          struct ib_send_wr *wr, u8 *len16)
+static int build_inv_stag(union t4_wr *wqe, struct ib_send_wr *wr, u8 *len16)
 {
-        struct c4iw_mr *mhp = get_mhp(dev, wr->ex.invalidate_rkey >> 8);
-
-        mhp->attr.state = 0;
         wqe->inv.stag_inv = cpu_to_be32(wr->ex.invalidate_rkey);
         wqe->inv.r2 = 0;
         *len16 = DIV_ROUND_UP(sizeof wqe->inv, 16);
@@ -797,11 +793,13 @@ int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
         spin_lock_irqsave(&qhp->lock, flag);
         if (t4_wq_in_error(&qhp->wq)) {
                 spin_unlock_irqrestore(&qhp->lock, flag);
+                *bad_wr = wr;
                 return -EINVAL;
         }
         num_wrs = t4_sq_avail(&qhp->wq);
         if (num_wrs == 0) {
                 spin_unlock_irqrestore(&qhp->lock, flag);
+                *bad_wr = wr;
                 return -ENOMEM;
         }
         while (wr) {
@@ -840,10 +838,13 @@ int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                 case IB_WR_RDMA_READ_WITH_INV:
                         fw_opcode = FW_RI_RDMA_READ_WR;
                         swsqe->opcode = FW_RI_READ_REQ;
-                        if (wr->opcode == IB_WR_RDMA_READ_WITH_INV)
+                        if (wr->opcode == IB_WR_RDMA_READ_WITH_INV) {
+                                c4iw_invalidate_mr(qhp->rhp,
+                                                   wr->sg_list[0].lkey);
                                 fw_flags = FW_RI_RDMA_READ_INVALIDATE;
-                        else
+                        } else {
                                 fw_flags = 0;
+                        }
                         err = build_rdma_read(wqe, wr, &len16);
                         if (err)
                                 break;
@@ -876,7 +877,8 @@ int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                                 fw_flags |= FW_RI_LOCAL_FENCE_FLAG;
                         fw_opcode = FW_RI_INV_LSTAG_WR;
                         swsqe->opcode = FW_RI_LOCAL_INV;
-                        err = build_inv_stag(qhp->rhp, wqe, wr, &len16);
+                        err = build_inv_stag(wqe, wr, &len16);
+                        c4iw_invalidate_mr(qhp->rhp, wr->ex.invalidate_rkey);
                         break;
                 default:
                         PDBG("%s post of type=%d TBD!\n", __func__,
@@ -934,11 +936,13 @@ int c4iw_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
         spin_lock_irqsave(&qhp->lock, flag);
         if (t4_wq_in_error(&qhp->wq)) {
                 spin_unlock_irqrestore(&qhp->lock, flag);
+                *bad_wr = wr;
                 return -EINVAL;
         }
         num_wrs = t4_rq_avail(&qhp->wq);
         if (num_wrs == 0) {
                 spin_unlock_irqrestore(&qhp->lock, flag);
+                *bad_wr = wr;
                 return -ENOMEM;
         }
         while (wr) {
diff --git a/drivers/infiniband/hw/hfi1/affinity.c b/drivers/infiniband/hw/hfi1/affinity.c
index a26a9a0bfc41..67ea85a56945 100644
--- a/drivers/infiniband/hw/hfi1/affinity.c
+++ b/drivers/infiniband/hw/hfi1/affinity.c
@@ -775,75 +775,3 @@ void hfi1_put_proc_affinity(int cpu)
         }
         mutex_unlock(&affinity->lock);
 }
-
-int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf,
-                           size_t count)
-{
-        struct hfi1_affinity_node *entry;
-        cpumask_var_t mask;
-        int ret, i;
-
-        mutex_lock(&node_affinity.lock);
-        entry = node_affinity_lookup(dd->node);
-
-        if (!entry) {
-                ret = -EINVAL;
-                goto unlock;
-        }
-
-        ret = zalloc_cpumask_var(&mask, GFP_KERNEL);
-        if (!ret) {
-                ret = -ENOMEM;
-                goto unlock;
-        }
-
-        ret = cpulist_parse(buf, mask);
-        if (ret)
-                goto out;
-
-        if (!cpumask_subset(mask, cpu_online_mask) || cpumask_empty(mask)) {
-                dd_dev_warn(dd, "Invalid CPU mask\n");
-                ret = -EINVAL;
-                goto out;
-        }
-
-        /* reset the SDMA interrupt affinity details */
-        init_cpu_mask_set(&entry->def_intr);
-        cpumask_copy(&entry->def_intr.mask, mask);
-
-        /* Reassign the affinity for each SDMA interrupt. */
-        for (i = 0; i < dd->num_msix_entries; i++) {
-                struct hfi1_msix_entry *msix;
-
-                msix = &dd->msix_entries[i];
-                if (msix->type != IRQ_SDMA)
-                        continue;
-
-                ret = get_irq_affinity(dd, msix);
-
-                if (ret)
-                        break;
-        }
-out:
-        free_cpumask_var(mask);
-unlock:
-        mutex_unlock(&node_affinity.lock);
-        return ret ? ret : strnlen(buf, PAGE_SIZE);
-}
-
-int hfi1_get_sdma_affinity(struct hfi1_devdata *dd, char *buf)
-{
-        struct hfi1_affinity_node *entry;
-
-        mutex_lock(&node_affinity.lock);
-        entry = node_affinity_lookup(dd->node);
-
-        if (!entry) {
-                mutex_unlock(&node_affinity.lock);
-                return -EINVAL;
-        }
-
-        cpumap_print_to_pagebuf(true, buf, &entry->def_intr.mask);
-        mutex_unlock(&node_affinity.lock);
-        return strnlen(buf, PAGE_SIZE);
-}
diff --git a/drivers/infiniband/hw/hfi1/affinity.h b/drivers/infiniband/hw/hfi1/affinity.h
index b89ea3c0ee1a..42e63316afd1 100644
--- a/drivers/infiniband/hw/hfi1/affinity.h
+++ b/drivers/infiniband/hw/hfi1/affinity.h
@@ -102,10 +102,6 @@ int hfi1_get_proc_affinity(int);
 /* Release a CPU used by a user process. */
 void hfi1_put_proc_affinity(int);
 
-int hfi1_get_sdma_affinity(struct hfi1_devdata *dd, char *buf);
-int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf,
-                           size_t count);
-
 struct hfi1_affinity_node {
         int node;
         struct cpu_mask_set def_intr;
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index 9bf5f23544d4..24d0820873cf 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -6301,19 +6301,8 @@ void set_up_vl15(struct hfi1_devdata *dd, u8 vau, u16 vl15buf)
         /* leave shared count at zero for both global and VL15 */
         write_global_credit(dd, vau, vl15buf, 0);
 
-        /* We may need some credits for another VL when sending packets
-         * with the snoop interface. Dividing it down the middle for VL15
-         * and VL0 should suffice.
-         */
-        if (unlikely(dd->hfi1_snoop.mode_flag == HFI1_PORT_SNOOP_MODE)) {
-                write_csr(dd, SEND_CM_CREDIT_VL15, (u64)(vl15buf >> 1)
-                    << SEND_CM_CREDIT_VL15_DEDICATED_LIMIT_VL_SHIFT);
-                write_csr(dd, SEND_CM_CREDIT_VL, (u64)(vl15buf >> 1)
-                    << SEND_CM_CREDIT_VL_DEDICATED_LIMIT_VL_SHIFT);
-        } else {
-                write_csr(dd, SEND_CM_CREDIT_VL15, (u64)vl15buf
-                        << SEND_CM_CREDIT_VL15_DEDICATED_LIMIT_VL_SHIFT);
-        }
+        write_csr(dd, SEND_CM_CREDIT_VL15, (u64)vl15buf
+                  << SEND_CM_CREDIT_VL15_DEDICATED_LIMIT_VL_SHIFT);
 }
 
 /*
@@ -9915,9 +9904,6 @@ static void set_lidlmc(struct hfi1_pportdata *ppd)
         u32 mask = ~((1U << ppd->lmc) - 1);
         u64 c1 = read_csr(ppd->dd, DCC_CFG_PORT_CONFIG1);
 
-        if (dd->hfi1_snoop.mode_flag)
-                dd_dev_info(dd, "Set lid/lmc while snooping");
-
         c1 &= ~(DCC_CFG_PORT_CONFIG1_TARGET_DLID_SMASK
                 | DCC_CFG_PORT_CONFIG1_DLID_MASK_SMASK);
         c1 |= ((ppd->lid & DCC_CFG_PORT_CONFIG1_TARGET_DLID_MASK)
@@ -12112,7 +12098,7 @@ static void update_synth_timer(unsigned long opaque)
         mod_timer(&dd->synth_stats_timer, jiffies + HZ * SYNTH_CNT_TIME);
 }
 
-#define C_MAX_NAME 13 /* 12 chars + one for /0 */
+#define C_MAX_NAME 16 /* 15 chars + one for /0 */
 static int init_cntrs(struct hfi1_devdata *dd)
 {
         int i, rcv_ctxts, j;
@@ -14463,7 +14449,7 @@ struct hfi1_devdata *hfi1_init_dd(struct pci_dev *pdev,
          * Any error printing is already done by the init code.
          * On return, we have the chip mapped.
          */
-        ret = hfi1_pcie_ddinit(dd, pdev, ent);
+        ret = hfi1_pcie_ddinit(dd, pdev);
         if (ret < 0)
                 goto bail_free;
 
@@ -14691,6 +14677,11 @@ struct hfi1_devdata *hfi1_init_dd(struct pci_dev *pdev,
         if (ret)
                 goto bail_free_cntrs;
 
+        init_completion(&dd->user_comp);
+
+        /* The user refcount starts with one to inidicate an active device */
+        atomic_set(&dd->user_refcount, 1);
+
         goto bail;
 
 bail_free_rcverr:
diff --git a/drivers/infiniband/hw/hfi1/chip.h b/drivers/infiniband/hw/hfi1/chip.h
index 92345259a8f4..043fd21dc5f3 100644
--- a/drivers/infiniband/hw/hfi1/chip.h
+++ b/drivers/infiniband/hw/hfi1/chip.h
@@ -320,6 +320,9 @@
 /* DC_DC8051_CFG_MODE.GENERAL bits */
 #define DISABLE_SELF_GUID_CHECK 0x2
 
+/* Bad L2 frame error code */
+#define BAD_L2_ERR      0x6
+
 /*
  * Eager buffer minimum and maximum sizes supported by the hardware.
  * All power-of-two sizes in between are supported as well.
diff --git a/drivers/infiniband/hw/hfi1/driver.c b/drivers/infiniband/hw/hfi1/driver.c
index 6563e4d38b80..c5efff29c147 100644
--- a/drivers/infiniband/hw/hfi1/driver.c
+++ b/drivers/infiniband/hw/hfi1/driver.c
@@ -599,7 +599,6 @@ static void __prescan_rxq(struct hfi1_packet *packet)
                                          dd->rhf_offset;
                 struct rvt_qp *qp;
                 struct ib_header *hdr;
-                struct ib_other_headers *ohdr;
                 struct rvt_dev_info *rdi = &dd->verbs_dev.rdi;
                 u64 rhf = rhf_to_cpu(rhf_addr);
                 u32 etype = rhf_rcv_type(rhf), qpn, bth1;
@@ -615,18 +614,21 @@ static void __prescan_rxq(struct hfi1_packet *packet)
                 if (etype != RHF_RCV_TYPE_IB)
                         goto next;
 
-                hdr = hfi1_get_msgheader(dd, rhf_addr);
+                packet->hdr = hfi1_get_msgheader(dd, rhf_addr);
+                hdr = packet->hdr;
 
                 lnh = be16_to_cpu(hdr->lrh[0]) & 3;
 
-                if (lnh == HFI1_LRH_BTH)
-                        ohdr = &hdr->u.oth;
-                else if (lnh == HFI1_LRH_GRH)
-                        ohdr = &hdr->u.l.oth;
-                else
+                if (lnh == HFI1_LRH_BTH) {
+                        packet->ohdr = &hdr->u.oth;
+                } else if (lnh == HFI1_LRH_GRH) {
+                        packet->ohdr = &hdr->u.l.oth;
+                        packet->rcv_flags |= HFI1_HAS_GRH;
+                } else {
                         goto next; /* just in case */
+                }
 
-                bth1 = be32_to_cpu(ohdr->bth[1]);
+                bth1 = be32_to_cpu(packet->ohdr->bth[1]);
                 is_ecn = !!(bth1 & (HFI1_FECN_SMASK | HFI1_BECN_SMASK));
 
                 if (!is_ecn)
@@ -646,7 +648,7 @@ static void __prescan_rxq(struct hfi1_packet *packet)
 
                 /* turn off BECN, FECN */
                 bth1 &= ~(HFI1_FECN_SMASK | HFI1_BECN_SMASK);
-                ohdr->bth[1] = cpu_to_be32(bth1);
+                packet->ohdr->bth[1] = cpu_to_be32(bth1);
 next:
                 update_ps_mdata(&mdata, rcd);
         }
@@ -1360,12 +1362,25 @@ int process_receive_ib(struct hfi1_packet *packet)
 
 int process_receive_bypass(struct hfi1_packet *packet)
 {
+        struct hfi1_devdata *dd = packet->rcd->dd;
+
         if (unlikely(rhf_err_flags(packet->rhf)))
                 handle_eflags(packet);
 
-        dd_dev_err(packet->rcd->dd,
+        dd_dev_err(dd,
                    "Bypass packets are not supported in normal operation. Dropping\n");
-        incr_cntr64(&packet->rcd->dd->sw_rcv_bypass_packet_errors);
+        incr_cntr64(&dd->sw_rcv_bypass_packet_errors);
+        if (!(dd->err_info_rcvport.status_and_code & OPA_EI_STATUS_SMASK)) {
+                u64 *flits = packet->ebuf;
+
+                if (flits && !(packet->rhf & RHF_LEN_ERR)) {
+                        dd->err_info_rcvport.packet_flit1 = flits[0];
+                        dd->err_info_rcvport.packet_flit2 =
+                                packet->tlen > sizeof(flits[0]) ? flits[1] : 0;
+                }
+                dd->err_info_rcvport.status_and_code |=
+                        (OPA_EI_STATUS_SMASK | BAD_L2_ERR);
+        }
         return RHF_RCV_CONTINUE;
 }
 
diff --git a/drivers/infiniband/hw/hfi1/file_ops.c b/drivers/infiniband/hw/hfi1/file_ops.c
index 677efa0e8cd6..bd786b7bd30b 100644
--- a/drivers/infiniband/hw/hfi1/file_ops.c
+++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@ -172,6 +172,9 @@ static int hfi1_file_open(struct inode *inode, struct file *fp)
                                                struct hfi1_devdata,
                                                user_cdev);
 
+        if (!atomic_inc_not_zero(&dd->user_refcount))
+                return -ENXIO;
+
         /* Just take a ref now. Not all opens result in a context assign */
         kobject_get(&dd->kobj);
 
@@ -183,11 +186,17 @@ static int hfi1_file_open(struct inode *inode, struct file *fp)
                 fd->rec_cpu_num = -1; /* no cpu affinity by default */
                 fd->mm = current->mm;
                 atomic_inc(&fd->mm->mm_count);
-        }
+                fp->private_data = fd;
+        } else {
+                fp->private_data = NULL;
+
+                if (atomic_dec_and_test(&dd->user_refcount))
+                        complete(&dd->user_comp);
 
-        fp->private_data = fd;
+                return -ENOMEM;
+        }
 
-        return fd ? 0 : -ENOMEM;
+        return 0;
 }
 
 static long hfi1_file_ioctl(struct file *fp, unsigned int cmd,
@@ -798,6 +807,10 @@ static int hfi1_file_close(struct inode *inode, struct file *fp)
 done:
         mmdrop(fdata->mm);
         kobject_put(&dd->kobj);
+
+        if (atomic_dec_and_test(&dd->user_refcount))
+                complete(&dd->user_comp);
+
         kfree(fdata);
         return 0;
 }
diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h
index 7eef11b316ff..cc87fd4e534b 100644
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@ -367,26 +367,6 @@ struct hfi1_packet {
         u8 etype;
 };
 
-/*
- * Private data for snoop/capture support.
- */
-struct hfi1_snoop_data {
-        int mode_flag;
-        struct cdev cdev;
-        struct device *class_dev;
-        /* protect snoop data */
-        spinlock_t snoop_lock;
-        struct list_head queue;
-        wait_queue_head_t waitq;
-        void *filter_value;
-        int (*filter_callback)(void *hdr, void *data, void *value);
-        u64 dcc_cfg; /* saved value of DCC Cfg register */
-};
-
-/* snoop mode_flag values */
-#define HFI1_PORT_SNOOP_MODE     1U
-#define HFI1_PORT_CAPTURE_MODE   2U
-
 struct rvt_sge_state;
 
 /*
@@ -613,8 +593,6 @@ struct hfi1_pportdata {
         struct mutex hls_lock;
         u32 host_link_state;
 
-        spinlock_t            sdma_alllock ____cacheline_aligned_in_smp;
-
         u32 lstate;     /* logical link state */
 
         /* these are the "32 bit" regs */
@@ -1104,8 +1082,6 @@ struct hfi1_devdata {
         char *portcntrnames;
         size_t portcntrnameslen;
 
-        struct hfi1_snoop_data hfi1_snoop;
-
         struct err_info_rcvport err_info_rcvport;
         struct err_info_constraint err_info_rcv_constraint;
         struct err_info_constraint err_info_xmit_constraint;
@@ -1141,8 +1117,8 @@ struct hfi1_devdata {
         rhf_rcv_function_ptr normal_rhf_rcv_functions[8];
 
         /*
-         * Handlers for outgoing data so that snoop/capture does not
-         * have to have its hooks in the send path
+         * Capability to have different send engines simply by changing a
+         * pointer value.
          */
         send_routine process_pio_send;
         send_routine process_dma_send;
@@ -1174,6 +1150,10 @@ struct hfi1_devdata {
         spinlock_t aspm_lock;
         /* Number of verbs contexts which have disabled ASPM */
         atomic_t aspm_disabled_cnt;
+        /* Keeps track of user space clients */
+        atomic_t user_refcount;
+        /* Used to wait for outstanding user space clients before dev removal */
+        struct completion user_comp;
 
         struct hfi1_affinity *affinity;
         struct rhashtable sdma_rht;
@@ -1221,8 +1201,6 @@ struct hfi1_devdata *hfi1_lookup(int unit);
 extern u32 hfi1_cpulist_count;
 extern unsigned long *hfi1_cpulist;
 
-extern unsigned int snoop_drop_send;
-extern unsigned int snoop_force_capture;
 int hfi1_init(struct hfi1_devdata *, int);
 int hfi1_count_units(int *npresentp, int *nupp);
 int hfi1_count_active_units(void);
@@ -1557,13 +1535,6 @@ void set_up_vl15(struct hfi1_devdata *dd, u8 vau, u16 vl15buf);
 void reset_link_credits(struct hfi1_devdata *dd);
 void assign_remote_cm_au_table(struct hfi1_devdata *dd, u8 vcu);
 
-int snoop_recv_handler(struct hfi1_packet *packet);
-int snoop_send_dma_handler(struct rvt_qp *qp, struct hfi1_pkt_state *ps,
-                           u64 pbc);
-int snoop_send_pio_handler(struct rvt_qp *qp, struct hfi1_pkt_state *ps,
-                           u64 pbc);
-void snoop_inline_pio_send(struct hfi1_devdata *dd, struct pio_buf *pbuf,
-                           u64 pbc, const void *from, size_t count);
 int set_buffer_control(struct hfi1_pportdata *ppd, struct buffer_control *bc);
 
 static inline struct hfi1_devdata *dd_from_ppd(struct hfi1_pportdata *ppd)
@@ -1763,8 +1734,7 @@ int qsfp_dump(struct hfi1_pportdata *ppd, char *buf, int len);
 
 int hfi1_pcie_init(struct pci_dev *, const struct pci_device_id *);
 void hfi1_pcie_cleanup(struct pci_dev *);
-int hfi1_pcie_ddinit(struct hfi1_devdata *, struct pci_dev *,
-                     const struct pci_device_id *);
+int hfi1_pcie_ddinit(struct hfi1_devdata *, struct pci_dev *);
 void hfi1_pcie_ddcleanup(struct hfi1_devdata *);
 void hfi1_pcie_flr(struct hfi1_devdata *);
 int pcie_speeds(struct hfi1_devdata *);
@@ -1799,8 +1769,6 @@ int kdeth_process_expected(struct hfi1_packet *packet);
 int kdeth_process_eager(struct hfi1_packet *packet);
 int process_receive_invalid(struct hfi1_packet *packet);
 
-extern rhf_rcv_function_ptr snoop_rhf_rcv_functions[8];
-
 void update_sge(struct rvt_sge_state *ss, u32 length);
 
 /* global module parameter variables */
@@ -1827,9 +1795,6 @@ extern struct mutex hfi1_mutex;
 #define DRIVER_NAME             "hfi1"
 #define HFI1_USER_MINOR_BASE     0
 #define HFI1_TRACE_MINOR         127
-#define HFI1_DIAGPKT_MINOR       128
-#define HFI1_DIAG_MINOR_BASE     129
-#define HFI1_SNOOP_CAPTURE_BASE  200
 #define HFI1_NMINORS             255
 
 #define PCI_VENDOR_ID_INTEL 0x8086
@@ -1848,7 +1813,13 @@ extern struct mutex hfi1_mutex;
 static inline u64 hfi1_pkt_default_send_ctxt_mask(struct hfi1_devdata *dd,
                                                   u16 ctxt_type)
 {
-        u64 base_sc_integrity =
+        u64 base_sc_integrity;
+
+        /* No integrity checks if HFI1_CAP_NO_INTEGRITY is set */
+        if (HFI1_CAP_IS_KSET(NO_INTEGRITY))
+                return 0;
+
+        base_sc_integrity =
         SEND_CTXT_CHECK_ENABLE_DISALLOW_BYPASS_BAD_PKT_LEN_SMASK
         | SEND_CTXT_CHECK_ENABLE_DISALLOW_PBC_STATIC_RATE_CONTROL_SMASK
         | SEND_CTXT_CHECK_ENABLE_DISALLOW_TOO_LONG_BYPASS_PACKETS_SMASK
@@ -1863,7 +1834,6 @@ static inline u64 hfi1_pkt_default_send_ctxt_mask(struct hfi1_devdata *dd,
         | SEND_CTXT_CHECK_ENABLE_CHECK_VL_MAPPING_SMASK
         | SEND_CTXT_CHECK_ENABLE_CHECK_OPCODE_SMASK
         | SEND_CTXT_CHECK_ENABLE_CHECK_SLID_SMASK
-        | SEND_CTXT_CHECK_ENABLE_CHECK_JOB_KEY_SMASK
         | SEND_CTXT_CHECK_ENABLE_CHECK_VL_SMASK
         | SEND_CTXT_CHECK_ENABLE_CHECK_ENABLE_SMASK;
 
@@ -1872,18 +1842,23 @@ static inline u64 hfi1_pkt_default_send_ctxt_mask(struct hfi1_devdata *dd,
         else
                 base_sc_integrity |= HFI1_PKT_KERNEL_SC_INTEGRITY;
 
-        if (is_ax(dd))
-                /* turn off send-side job key checks - A0 */
-                return base_sc_integrity &
-                       ~SEND_CTXT_CHECK_ENABLE_CHECK_JOB_KEY_SMASK;
+        /* turn on send-side job key checks if !A0 */
+        if (!is_ax(dd))
+                base_sc_integrity |= SEND_CTXT_CHECK_ENABLE_CHECK_JOB_KEY_SMASK;
+
         return base_sc_integrity;
 }
 
 static inline u64 hfi1_pkt_base_sdma_integrity(struct hfi1_devdata *dd)
 {
-        u64 base_sdma_integrity =
+        u64 base_sdma_integrity;
+
+        /* No integrity checks if HFI1_CAP_NO_INTEGRITY is set */
+        if (HFI1_CAP_IS_KSET(NO_INTEGRITY))
+                return 0;
+
+        base_sdma_integrity =
         SEND_DMA_CHECK_ENABLE_DISALLOW_BYPASS_BAD_PKT_LEN_SMASK
-        | SEND_DMA_CHECK_ENABLE_DISALLOW_PBC_STATIC_RATE_CONTROL_SMASK
         | SEND_DMA_CHECK_ENABLE_DISALLOW_TOO_LONG_BYPASS_PACKETS_SMASK
         | SEND_DMA_CHECK_ENABLE_DISALLOW_TOO_LONG_IB_PACKETS_SMASK
         | SEND_DMA_CHECK_ENABLE_DISALLOW_BAD_PKT_LEN_SMASK
@@ -1895,14 +1870,18 @@ static inline u64 hfi1_pkt_base_sdma_integrity(struct hfi1_devdata *dd)
         | SEND_DMA_CHECK_ENABLE_CHECK_VL_MAPPING_SMASK
         | SEND_DMA_CHECK_ENABLE_CHECK_OPCODE_SMASK
         | SEND_DMA_CHECK_ENABLE_CHECK_SLID_SMASK
-        | SEND_DMA_CHECK_ENABLE_CHECK_JOB_KEY_SMASK
         | SEND_DMA_CHECK_ENABLE_CHECK_VL_SMASK
         | SEND_DMA_CHECK_ENABLE_CHECK_ENABLE_SMASK;
 
-        if (is_ax(dd))
-                /* turn off send-side job key checks - A0 */
-                return base_sdma_integrity &
-                       ~SEND_DMA_CHECK_ENABLE_CHECK_JOB_KEY_SMASK;
+        if (!HFI1_CAP_IS_KSET(STATIC_RATE_CTRL))
+                base_sdma_integrity |=
+                SEND_DMA_CHECK_ENABLE_DISALLOW_PBC_STATIC_RATE_CONTROL_SMASK;
+
+        /* turn on send-side job key checks if !A0 */
+        if (!is_ax(dd))
+                base_sdma_integrity |=
+                        SEND_DMA_CHECK_ENABLE_CHECK_JOB_KEY_SMASK;
+
         return base_sdma_integrity;
 }
 
diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c
index 60db61536fed..e3b5bc93bc70 100644
--- a/drivers/infiniband/hw/hfi1/init.c
+++ b/drivers/infiniband/hw/hfi1/init.c
@@ -144,6 +144,8 @@ int hfi1_create_ctxts(struct hfi1_devdata *dd)
                 struct hfi1_ctxtdata *rcd;
 
                 ppd = dd->pport + (i % dd->num_pports);
+
+                /* dd->rcd[i] gets assigned inside the callee */
                 rcd = hfi1_create_ctxtdata(ppd, i, dd->node);
                 if (!rcd) {
                         dd_dev_err(dd,
@@ -169,8 +171,6 @@ int hfi1_create_ctxts(struct hfi1_devdata *dd)
                 if (!rcd->sc) {
                         dd_dev_err(dd,
                                    "Unable to allocate kernel send context, failing\n");
-                        dd->rcd[rcd->ctxt] = NULL;
-                        hfi1_free_ctxtdata(dd, rcd);
                         goto nomem;
                 }
 
@@ -178,9 +178,6 @@ int hfi1_create_ctxts(struct hfi1_devdata *dd)
                 if (ret < 0) {
                         dd_dev_err(dd,
                                    "Failed to setup kernel receive context, failing\n");
-                        sc_free(rcd->sc);
-                        dd->rcd[rcd->ctxt] = NULL;
-                        hfi1_free_ctxtdata(dd, rcd);
                         ret = -EFAULT;
                         goto bail;
                 }
@@ -196,6 +193,10 @@ int hfi1_create_ctxts(struct hfi1_devdata *dd)
 nomem:
         ret = -ENOMEM;
 bail:
+        if (dd->rcd) {
+                for (i = 0; i < dd->num_rcv_contexts; ++i)
+                        hfi1_free_ctxtdata(dd, dd->rcd[i]);
+        }
         kfree(dd->rcd);
         dd->rcd = NULL;
         return ret;
@@ -216,7 +217,7 @@ struct hfi1_ctxtdata *hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, u32 ctxt,
             dd->num_rcv_contexts - dd->first_user_ctxt)
                 kctxt_ngroups = (dd->rcv_entries.nctxt_extra -
                                  (dd->num_rcv_contexts - dd->first_user_ctxt));
-        rcd = kzalloc(sizeof(*rcd), GFP_KERNEL);
+        rcd = kzalloc_node(sizeof(*rcd), GFP_KERNEL, numa);
         if (rcd) {
                 u32 rcvtids, max_entries;
 
@@ -261,13 +262,6 @@ struct hfi1_ctxtdata *hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, u32 ctxt,
                 }
                 rcd->eager_base = base * dd->rcv_entries.group_size;
 
-                /* Validate and initialize Rcv Hdr Q variables */
-                if (rcvhdrcnt % HDRQ_INCREMENT) {
-                        dd_dev_err(dd,
-                                   "ctxt%u: header queue count %d must be divisible by %lu\n",
-                                   rcd->ctxt, rcvhdrcnt, HDRQ_INCREMENT);
-                        goto bail;
-                }
                 rcd->rcvhdrq_cnt = rcvhdrcnt;
                 rcd->rcvhdrqentsize = hfi1_hdrq_entsize;
                 /*
@@ -506,7 +500,6 @@ void hfi1_init_pportdata(struct pci_dev *pdev, struct hfi1_pportdata *ppd,
         INIT_WORK(&ppd->qsfp_info.qsfp_work, qsfp_event);
 
         mutex_init(&ppd->hls_lock);
-        spin_lock_init(&ppd->sdma_alllock);
         spin_lock_init(&ppd->qsfp_info.qsfp_lock);
 
         ppd->qsfp_info.ppd = ppd;
@@ -1399,28 +1392,43 @@ static void postinit_cleanup(struct hfi1_devdata *dd)
         hfi1_free_devdata(dd);
 }
 
+static int init_validate_rcvhdrcnt(struct device *dev, uint thecnt)
+{
+        if (thecnt <= HFI1_MIN_HDRQ_EGRBUF_CNT) {
+                hfi1_early_err(dev, "Receive header queue count too small\n");
+                return -EINVAL;
+        }
+
+        if (thecnt > HFI1_MAX_HDRQ_EGRBUF_CNT) {
+                hfi1_early_err(dev,
+                               "Receive header queue count cannot be greater than %u\n",
+                               HFI1_MAX_HDRQ_EGRBUF_CNT);
+                return -EINVAL;
+        }
+
+        if (thecnt % HDRQ_INCREMENT) {
+                hfi1_early_err(dev, "Receive header queue count %d must be divisible by %lu\n",
+                               thecnt, HDRQ_INCREMENT);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         int ret = 0, j, pidx, initfail;
-        struct hfi1_devdata *dd = ERR_PTR(-EINVAL);
+        struct hfi1_devdata *dd;
         struct hfi1_pportdata *ppd;
 
         /* First, lock the non-writable module parameters */
         HFI1_CAP_LOCK();
 
         /* Validate some global module parameters */
-        if (rcvhdrcnt <= HFI1_MIN_HDRQ_EGRBUF_CNT) {
-                hfi1_early_err(&pdev->dev, "Header queue  count too small\n");
-                ret = -EINVAL;
-                goto bail;
-        }
-        if (rcvhdrcnt > HFI1_MAX_HDRQ_EGRBUF_CNT) {
-                hfi1_early_err(&pdev->dev,
-                               "Receive header queue count cannot be greater than %u\n",
-                               HFI1_MAX_HDRQ_EGRBUF_CNT);
-                ret = -EINVAL;
+        ret = init_validate_rcvhdrcnt(&pdev->dev, rcvhdrcnt);
+        if (ret)
                 goto bail;
-        }
+
         /* use the encoding function as a sanitization check */
         if (!encode_rcv_header_entry_size(hfi1_hdrq_entsize)) {
                 hfi1_early_err(&pdev->dev, "Invalid HdrQ Entry size %u\n",
@@ -1461,26 +1469,25 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (ret)
                 goto bail;
 
-        /*
-         * Do device-specific initialization, function table setup, dd
-         * allocation, etc.
-         */
-        switch (ent->device) {
-        case PCI_DEVICE_ID_INTEL0:
-        case PCI_DEVICE_ID_INTEL1:
-                dd = hfi1_init_dd(pdev, ent);
-                break;
-        default:
+        if (!(ent->device == PCI_DEVICE_ID_INTEL0 ||
+              ent->device == PCI_DEVICE_ID_INTEL1)) {
                 hfi1_early_err(&pdev->dev,
                                "Failing on unknown Intel deviceid 0x%x\n",
                                ent->device);
                 ret = -ENODEV;
+                goto clean_bail;
         }
 
-        if (IS_ERR(dd))
+        /*
+         * Do device-specific initialization, function table setup, dd
+         * allocation, etc.
+         */
+        dd = hfi1_init_dd(pdev, ent);
+
+        if (IS_ERR(dd)) {
                 ret = PTR_ERR(dd);
-        if (ret)
                 goto clean_bail; /* error already printed */
+        }
 
         ret = create_workqueues(dd);
         if (ret)
@@ -1538,12 +1545,31 @@ bail:
         return ret;
 }
 
+static void wait_for_clients(struct hfi1_devdata *dd)
+{
+        /*
+         * Remove the device init value and complete the device if there is
+         * no clients or wait for active clients to finish.
+         */
+        if (atomic_dec_and_test(&dd->user_refcount))
+                complete(&dd->user_comp);
+
+        wait_for_completion(&dd->user_comp);
+}
+
 static void remove_one(struct pci_dev *pdev)
 {
         struct hfi1_devdata *dd = pci_get_drvdata(pdev);
 
         /* close debugfs files before ib unregister */
         hfi1_dbg_ibdev_exit(&dd->verbs_dev);
+
+        /* remove the /dev hfi1 interface */
+        hfi1_device_remove(dd);
+
+        /* wait for existing user space clients to finish */
+        wait_for_clients(dd);
+
         /* unregister from IB core */
         hfi1_unregister_ib_device(dd);
 
@@ -1558,8 +1584,6 @@ static void remove_one(struct pci_dev *pdev)
         /* wait until all of our (qsfp) queue_work() calls complete */
         flush_workqueue(ib_wq);
 
-        hfi1_device_remove(dd);
-
         postinit_cleanup(dd);
 }
 
diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c
index 89c68da1c273..4ac8f330c5cb 100644
--- a/drivers/infiniband/hw/hfi1/pcie.c
+++ b/drivers/infiniband/hw/hfi1/pcie.c
@@ -157,8 +157,7 @@ void hfi1_pcie_cleanup(struct pci_dev *pdev)
  * fields required to re-initialize after a chip reset, or for
  * various other purposes
  */
-int hfi1_pcie_ddinit(struct hfi1_devdata *dd, struct pci_dev *pdev,
-                     const struct pci_device_id *ent)
+int hfi1_pcie_ddinit(struct hfi1_devdata *dd, struct pci_dev *pdev)
 {
         unsigned long len;
         resource_size_t addr;
diff --git a/drivers/infiniband/hw/hfi1/pio.c b/drivers/infiniband/hw/hfi1/pio.c
index 50a3a36d9363..d89b8745d4c1 100644
--- a/drivers/infiniband/hw/hfi1/pio.c
+++ b/drivers/infiniband/hw/hfi1/pio.c
@@ -668,19 +668,12 @@ void sc_set_cr_threshold(struct send_context *sc, u32 new_threshold)
 void set_pio_integrity(struct send_context *sc)
 {
         struct hfi1_devdata *dd = sc->dd;
-        u64 reg = 0;
         u32 hw_context = sc->hw_context;
         int type = sc->type;
 
-        /*
-         * No integrity checks if HFI1_CAP_NO_INTEGRITY is set, or if
-         * we're snooping.
-         */
-        if (likely(!HFI1_CAP_IS_KSET(NO_INTEGRITY)) &&
-            dd->hfi1_snoop.mode_flag != HFI1_PORT_SNOOP_MODE)
-                reg = hfi1_pkt_default_send_ctxt_mask(dd, type);
-
-        write_kctxt_csr(dd, hw_context, SC(CHECK_ENABLE), reg);
+        write_kctxt_csr(dd, hw_context,
+                        SC(CHECK_ENABLE),
+                        hfi1_pkt_default_send_ctxt_mask(dd, type));
 }
 
 static u32 get_buffers_allocated(struct send_context *sc)
diff --git a/drivers/infiniband/hw/hfi1/rc.c b/drivers/infiniband/hw/hfi1/rc.c
index 8bc5013f39a1..83198a8a8797 100644
--- a/drivers/infiniband/hw/hfi1/rc.c
+++ b/drivers/infiniband/hw/hfi1/rc.c
@@ -89,7 +89,7 @@ void hfi1_add_rnr_timer(struct rvt_qp *qp, u32 to)
 
         lockdep_assert_held(&qp->s_lock);
         qp->s_flags |= RVT_S_WAIT_RNR;
-        qp->s_timer.expires = jiffies + usecs_to_jiffies(to);
+        priv->s_rnr_timer.expires = jiffies + usecs_to_jiffies(to);
         add_timer(&priv->s_rnr_timer);
 }
 
diff --git a/drivers/infiniband/hw/hfi1/sdma.c b/drivers/infiniband/hw/hfi1/sdma.c
index fd39bcaa062d..9cbe52d21077 100644
--- a/drivers/infiniband/hw/hfi1/sdma.c
+++ b/drivers/infiniband/hw/hfi1/sdma.c
@@ -2009,11 +2009,6 @@ static void sdma_hw_start_up(struct sdma_engine *sde)
         write_sde_csr(sde, SD(ENG_ERR_CLEAR), reg);
 }
 
-#define CLEAR_STATIC_RATE_CONTROL_SMASK(r) \
-(r &= ~SEND_DMA_CHECK_ENABLE_DISALLOW_PBC_STATIC_RATE_CONTROL_SMASK)
-
-#define SET_STATIC_RATE_CONTROL_SMASK(r) \
-(r |= SEND_DMA_CHECK_ENABLE_DISALLOW_PBC_STATIC_RATE_CONTROL_SMASK)
 /*
  * set_sdma_integrity
  *
@@ -2022,19 +2017,9 @@ static void sdma_hw_start_up(struct sdma_engine *sde)
 static void set_sdma_integrity(struct sdma_engine *sde)
 {
         struct hfi1_devdata *dd = sde->dd;
-        u64 reg;
-
-        if (unlikely(HFI1_CAP_IS_KSET(NO_INTEGRITY)))
-                return;
-
-        reg = hfi1_pkt_base_sdma_integrity(dd);
-
-        if (HFI1_CAP_IS_KSET(STATIC_RATE_CTRL))
-                CLEAR_STATIC_RATE_CONTROL_SMASK(reg);
-        else
-                SET_STATIC_RATE_CONTROL_SMASK(reg);
 
-        write_sde_csr(sde, SD(CHECK_ENABLE), reg);
+        write_sde_csr(sde, SD(CHECK_ENABLE),
+                      hfi1_pkt_base_sdma_integrity(dd));
 }
 
 static void init_sdma_regs(
diff --git a/drivers/infiniband/hw/hfi1/sysfs.c b/drivers/infiniband/hw/hfi1/sysfs.c
index edba22461a9c..919a5474e651 100644
--- a/drivers/infiniband/hw/hfi1/sysfs.c
+++ b/drivers/infiniband/hw/hfi1/sysfs.c
@@ -49,7 +49,6 @@
 #include "hfi.h"
 #include "mad.h"
 #include "trace.h"
-#include "affinity.h"
 
 /*
  * Start of per-port congestion control structures and support code
@@ -623,27 +622,6 @@ static ssize_t show_tempsense(struct device *device,
         return ret;
 }
 
-static ssize_t show_sdma_affinity(struct device *device,
-                                  struct device_attribute *attr, char *buf)
-{
-        struct hfi1_ibdev *dev =
-                container_of(device, struct hfi1_ibdev, rdi.ibdev.dev);
-        struct hfi1_devdata *dd = dd_from_dev(dev);
-
-        return hfi1_get_sdma_affinity(dd, buf);
-}
-
-static ssize_t store_sdma_affinity(struct device *device,
-                                   struct device_attribute *attr,
-                                   const char *buf, size_t count)
-{
-        struct hfi1_ibdev *dev =
-                container_of(device, struct hfi1_ibdev, rdi.ibdev.dev);
-        struct hfi1_devdata *dd = dd_from_dev(dev);
-
-        return hfi1_set_sdma_affinity(dd, buf, count);
-}
-
 /*
  * end of per-unit (or driver, in some cases, but replicated
  * per unit) functions
@@ -658,8 +636,6 @@ static DEVICE_ATTR(serial, S_IRUGO, show_serial, NULL);
 static DEVICE_ATTR(boardversion, S_IRUGO, show_boardversion, NULL);
 static DEVICE_ATTR(tempsense, S_IRUGO, show_tempsense, NULL);
 static DEVICE_ATTR(chip_reset, S_IWUSR, NULL, store_chip_reset);
-static DEVICE_ATTR(sdma_affinity, S_IWUSR | S_IRUGO, show_sdma_affinity,
-                   store_sdma_affinity);
 
 static struct device_attribute *hfi1_attributes[] = {
         &dev_attr_hw_rev,
@@ -670,7 +646,6 @@ static struct device_attribute *hfi1_attributes[] = {
         &dev_attr_boardversion,
         &dev_attr_tempsense,
         &dev_attr_chip_reset,
-        &dev_attr_sdma_affinity,
 };
 
 int hfi1_create_port_files(struct ib_device *ibdev, u8 port_num,
diff --git a/drivers/infiniband/hw/hfi1/trace_rx.h b/drivers/infiniband/hw/hfi1/trace_rx.h
index 11e02b228922..f77e59fb43fe 100644
--- a/drivers/infiniband/hw/hfi1/trace_rx.h
+++ b/drivers/infiniband/hw/hfi1/trace_rx.h
@@ -253,66 +253,6 @@ TRACE_EVENT(hfi1_mmu_invalidate,
                       )
             );
 
-#define SNOOP_PRN \
-        "slid %.4x dlid %.4x qpn 0x%.6x opcode 0x%.2x,%s " \
-        "svc lvl %d pkey 0x%.4x [header = %d bytes] [data = %d bytes]"
-
-TRACE_EVENT(snoop_capture,
-            TP_PROTO(struct hfi1_devdata *dd,
-                     int hdr_len,
-                     struct ib_header *hdr,
-                     int data_len,
-                     void *data),
-            TP_ARGS(dd, hdr_len, hdr, data_len, data),
-            TP_STRUCT__entry(
-                             DD_DEV_ENTRY(dd)
-                             __field(u16, slid)
-                             __field(u16, dlid)
-                             __field(u32, qpn)
-                             __field(u8, opcode)
-                             __field(u8, sl)
-                             __field(u16, pkey)
-                             __field(u32, hdr_len)
-                             __field(u32, data_len)
-                             __field(u8, lnh)
-                             __dynamic_array(u8, raw_hdr, hdr_len)
-                             __dynamic_array(u8, raw_pkt, data_len)
-                             ),
-            TP_fast_assign(
-                struct ib_other_headers *ohdr;
-
-                __entry->lnh = (u8)(be16_to_cpu(hdr->lrh[0]) & 3);
-                if (__entry->lnh == HFI1_LRH_BTH)
-                ohdr = &hdr->u.oth;
-                else
-                ohdr = &hdr->u.l.oth;
-                DD_DEV_ASSIGN(dd);
-                __entry->slid = be16_to_cpu(hdr->lrh[3]);
-                __entry->dlid = be16_to_cpu(hdr->lrh[1]);
-                __entry->qpn = be32_to_cpu(ohdr->bth[1]) & RVT_QPN_MASK;
-                __entry->opcode = (be32_to_cpu(ohdr->bth[0]) >> 24) & 0xff;
-                __entry->sl = (u8)(be16_to_cpu(hdr->lrh[0]) >> 4) & 0xf;
-                __entry->pkey = be32_to_cpu(ohdr->bth[0]) & 0xffff;
-                __entry->hdr_len = hdr_len;
-                __entry->data_len = data_len;
-                memcpy(__get_dynamic_array(raw_hdr), hdr, hdr_len);
-                memcpy(__get_dynamic_array(raw_pkt), data, data_len);
-                ),
-            TP_printk(
-                "[%s] " SNOOP_PRN,
-                __get_str(dev),
-                __entry->slid,
-                __entry->dlid,
-                __entry->qpn,
-                __entry->opcode,
-                show_ib_opcode(__entry->opcode),
-                __entry->sl,
-                __entry->pkey,
-                __entry->hdr_len,
-                __entry->data_len
-                )
-);
-
 #endif /* __HFI1_TRACE_RX_H */
 
 #undef TRACE_INCLUDE_PATH
diff --git a/drivers/infiniband/hw/hfi1/user_sdma.c b/drivers/infiniband/hw/hfi1/user_sdma.c
index a761f804111e..77697d690f3e 100644
--- a/drivers/infiniband/hw/hfi1/user_sdma.c
+++ b/drivers/infiniband/hw/hfi1/user_sdma.c
@@ -1144,7 +1144,7 @@ static int pin_vector_pages(struct user_sdma_request *req,
         rb_node = hfi1_mmu_rb_extract(pq->handler,
                                       (unsigned long)iovec->iov.iov_base,
                                       iovec->iov.iov_len);
-        if (rb_node && !IS_ERR(rb_node))
+        if (rb_node)
                 node = container_of(rb_node, struct sdma_mmu_node, rb);
         else
                 rb_node = NULL;
diff --git a/drivers/infiniband/hw/mlx4/ah.c b/drivers/infiniband/hw/mlx4/ah.c
index 5fc623362731..b9bf0759f10a 100644
--- a/drivers/infiniband/hw/mlx4/ah.c
+++ b/drivers/infiniband/hw/mlx4/ah.c
@@ -102,7 +102,10 @@ static struct ib_ah *create_iboe_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr
         if (vlan_tag < 0x1000)
                 vlan_tag |= (ah_attr->sl & 7) << 13;
         ah->av.eth.port_pd = cpu_to_be32(to_mpd(pd)->pdn | (ah_attr->port_num << 24));
-        ah->av.eth.gid_index = mlx4_ib_gid_index_to_real_index(ibdev, ah_attr->port_num, ah_attr->grh.sgid_index);
+        ret = mlx4_ib_gid_index_to_real_index(ibdev, ah_attr->port_num, ah_attr->grh.sgid_index);
+        if (ret < 0)
+                return ERR_PTR(ret);
+        ah->av.eth.gid_index = ret;
         ah->av.eth.vlan = cpu_to_be16(vlan_tag);
         ah->av.eth.hop_limit = ah_attr->grh.hop_limit;
         if (ah_attr->static_rate) {
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index 1ea686b9e0f9..6a0fec357dae 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -253,11 +253,14 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev,
         if (context)
                 if (ib_copy_to_udata(udata, &cq->mcq.cqn, sizeof (__u32))) {
                         err = -EFAULT;
-                        goto err_dbmap;
+                        goto err_cq_free;
                 }
 
         return &cq->ibcq;
 
+err_cq_free:
+        mlx4_cq_free(dev->dev, &cq->mcq);
+
 err_dbmap:
         if (context)
                 mlx4_ib_db_unmap_user(to_mucontext(context), &cq->db);
diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index 79d017baf6f4..fcd04b881ec1 100644
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -932,8 +932,7 @@ struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev,
                 if (err)
                         goto err_create;
         } else {
-                /* for now choose 64 bytes till we have a proper interface */
-                cqe_size = 64;
+                cqe_size = cache_line_size() == 128 ? 128 : 64;
                 err = create_cq_kernel(dev, cq, entries, cqe_size, &cqb,
                                        &index, &inlen);
                 if (err)
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 63036c731626..32b09f059c84 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2311,14 +2311,14 @@ static void mlx5_ib_event(struct mlx5_core_dev *dev, void *context,
 {
         struct mlx5_ib_dev *ibdev = (struct mlx5_ib_dev *)context;
         struct ib_event ibev;
-
+        bool fatal = false;
         u8 port = 0;
 
         switch (event) {
         case MLX5_DEV_EVENT_SYS_ERROR:
-                ibdev->ib_active = false;
                 ibev.event = IB_EVENT_DEVICE_FATAL;
                 mlx5_ib_handle_internal_error(ibdev);
+                fatal = true;
                 break;
 
         case MLX5_DEV_EVENT_PORT_UP:
@@ -2370,6 +2370,9 @@ static void mlx5_ib_event(struct mlx5_core_dev *dev, void *context,
 
         if (ibdev->ib_active)
                 ib_dispatch_event(&ibev);
+
+        if (fatal)
+                ibdev->ib_active = false;
 }
 
 static void get_ext_port_caps(struct mlx5_ib_dev *dev)
@@ -3115,7 +3118,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
         }
         err = init_node_data(dev);
         if (err)
-                goto err_dealloc;
+                goto err_free_port;
 
         mutex_init(&dev->flow_db.lock);
         mutex_init(&dev->cap_mask_mutex);
@@ -3125,7 +3128,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
         if (ll == IB_LINK_LAYER_ETHERNET) {
                 err = mlx5_enable_roce(dev);
                 if (err)
-                        goto err_dealloc;
+                        goto err_free_port;
         }
 
         err = create_dev_resources(&dev->devr);
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index dcdcd195fe53..7d689903c87c 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -626,6 +626,8 @@ struct mlx5_ib_dev {
         struct mlx5_ib_resources        devr;
         struct mlx5_mr_cache            cache;
         struct timer_list               delay_timer;
+        /* Prevents soft lock on massive reg MRs */
+        struct mutex                    slow_path_mutex;
         int                             fill_delay;
 #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
         struct ib_odp_caps      odp_caps;
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index d4ad672b905b..4e9012463c37 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -610,6 +610,7 @@ int mlx5_mr_cache_init(struct mlx5_ib_dev *dev)
         int err;
         int i;
 
+        mutex_init(&dev->slow_path_mutex);
         cache->wq = alloc_ordered_workqueue("mkey_cache", WQ_MEM_RECLAIM);
         if (!cache->wq) {
                 mlx5_ib_warn(dev, "failed to create work queue\n");
@@ -1182,9 +1183,12 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
                 goto error;
         }
 
-        if (!mr)
+        if (!mr) {
+                mutex_lock(&dev->slow_path_mutex);
                 mr = reg_create(NULL, pd, virt_addr, length, umem, ncont,
                                 page_shift, access_flags);
+                mutex_unlock(&dev->slow_path_mutex);
+        }
 
         if (IS_ERR(mr)) {
                 err = PTR_ERR(mr);
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 7ce97daf26c6..d1e921816bfe 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -2051,8 +2051,8 @@ struct ib_qp *mlx5_ib_create_qp(struct ib_pd *pd,
 
                 mlx5_ib_dbg(dev, "ib qpnum 0x%x, mlx qpn 0x%x, rcqn 0x%x, scqn 0x%x\n",
                             qp->ibqp.qp_num, qp->trans_qp.base.mqp.qpn,
-                            to_mcq(init_attr->recv_cq)->mcq.cqn,
-                            to_mcq(init_attr->send_cq)->mcq.cqn);
+                            init_attr->recv_cq ? to_mcq(init_attr->recv_cq)->mcq.cqn : -1,
+                            init_attr->send_cq ? to_mcq(init_attr->send_cq)->mcq.cqn : -1);
 
                 qp->trans_qp.xrcdn = xrcdn;
 
@@ -4814,6 +4814,14 @@ struct ib_rwq_ind_table *mlx5_ib_create_rwq_ind_table(struct ib_device *device,
                                  udata->inlen))
                 return ERR_PTR(-EOPNOTSUPP);
 
+        if (init_attr->log_ind_tbl_size >
+            MLX5_CAP_GEN(dev->mdev, log_max_rqt_size)) {
+                mlx5_ib_dbg(dev, "log_ind_tbl_size = %d is bigger than supported = %d\n",
+                            init_attr->log_ind_tbl_size,
+                            MLX5_CAP_GEN(dev->mdev, log_max_rqt_size));
+                return ERR_PTR(-EINVAL);
+        }
+
         min_resp_len = offsetof(typeof(resp), reserved) + sizeof(resp.reserved);
         if (udata->outlen && udata->outlen < min_resp_len)
                 return ERR_PTR(-EINVAL);
diff --git a/drivers/infiniband/sw/rdmavt/dma.c b/drivers/infiniband/sw/rdmavt/dma.c
index 01f71caa3ac4..f2cefb0d9180 100644
--- a/drivers/infiniband/sw/rdmavt/dma.c
+++ b/drivers/infiniband/sw/rdmavt/dma.c
@@ -90,9 +90,6 @@ static u64 rvt_dma_map_page(struct ib_device *dev, struct page *page,
         if (WARN_ON(!valid_dma_direction(direction)))
                 return BAD_DMA_ADDRESS;
 
-        if (offset + size > PAGE_SIZE)
-                return BAD_DMA_ADDRESS;
-
         addr = (u64)page_address(page);
         if (addr)
                 addr += offset;
diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index b8258e4f0aea..ffff5a54cb34 100644
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -243,10 +243,8 @@ static struct socket *rxe_setup_udp_tunnel(struct net *net, __be16 port,
 {
         int err;
         struct socket *sock;
-        struct udp_port_cfg udp_cfg;
-        struct udp_tunnel_sock_cfg tnl_cfg;
-
-        memset(&udp_cfg, 0, sizeof(udp_cfg));
+        struct udp_port_cfg udp_cfg = {0};
+        struct udp_tunnel_sock_cfg tnl_cfg = {0};
 
         if (ipv6) {
                 udp_cfg.family = AF_INET6;
@@ -264,10 +262,8 @@ static struct socket *rxe_setup_udp_tunnel(struct net *net, __be16 port,
                 return ERR_PTR(err);
         }
 
-        tnl_cfg.sk_user_data = NULL;
         tnl_cfg.encap_type = 1;
         tnl_cfg.encap_rcv = rxe_udp_encap_recv;
-        tnl_cfg.encap_destroy = NULL;
 
         /* Setup UDP tunnel */
         setup_udp_tunnel_sock(net, sock, &tnl_cfg);
diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c
index b8036cfbce04..c3e60e4bde6e 100644
--- a/drivers/infiniband/sw/rxe/rxe_qp.c
+++ b/drivers/infiniband/sw/rxe/rxe_qp.c
@@ -522,6 +522,7 @@ static void rxe_qp_reset(struct rxe_qp *qp)
         if (qp->sq.queue) {
                 __rxe_do_task(&qp->comp.task);
                 __rxe_do_task(&qp->req.task);
+                rxe_queue_reset(qp->sq.queue);
         }
 
         /* cleanup attributes */
@@ -573,6 +574,7 @@ void rxe_qp_error(struct rxe_qp *qp)
 {
         qp->req.state = QP_STATE_ERROR;
         qp->resp.state = QP_STATE_ERROR;
+        qp->attr.qp_state = IB_QPS_ERR;
 
         /* drain work and packet queues */
         rxe_run_task(&qp->resp.task, 1);
diff --git a/drivers/infiniband/sw/rxe/rxe_queue.c b/drivers/infiniband/sw/rxe/rxe_queue.c
index 08274254eb88..d14bf496d62d 100644
--- a/drivers/infiniband/sw/rxe/rxe_queue.c
+++ b/drivers/infiniband/sw/rxe/rxe_queue.c
@@ -84,6 +84,15 @@ err1:
         return -EINVAL;
 }
 
+inline void rxe_queue_reset(struct rxe_queue *q)
+{
+        /* queue is comprised from header and the memory
+         * of the actual queue. See "struct rxe_queue_buf" in rxe_queue.h
+         * reset only the queue itself and not the management header
+         */
+        memset(q->buf->data, 0, q->buf_size - sizeof(struct rxe_queue_buf));
+}
+
 struct rxe_queue *rxe_queue_init(struct rxe_dev *rxe,
                                  int *num_elem,
                                  unsigned int elem_size)
diff --git a/drivers/infiniband/sw/rxe/rxe_queue.h b/drivers/infiniband/sw/rxe/rxe_queue.h
index 239fd609c31e..8c8641c87817 100644
--- a/drivers/infiniband/sw/rxe/rxe_queue.h
+++ b/drivers/infiniband/sw/rxe/rxe_queue.h
@@ -84,6 +84,8 @@ int do_mmap_info(struct rxe_dev *rxe,
                  size_t buf_size,
                  struct rxe_mmap_info **ip_p);
 
+void rxe_queue_reset(struct rxe_queue *q);
+
 struct rxe_queue *rxe_queue_init(struct rxe_dev *rxe,
                                  int *num_elem,
                                  unsigned int elem_size);
diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c
index 832846b73ea0..22bd9630dcd9 100644
--- a/drivers/infiniband/sw/rxe/rxe_req.c
+++ b/drivers/infiniband/sw/rxe/rxe_req.c
@@ -696,7 +696,8 @@ next_wqe:
                                                        qp->req.wqe_index);
                         wqe->state = wqe_state_done;
                         wqe->status = IB_WC_SUCCESS;
-                        goto complete;
+                        __rxe_do_task(&qp->comp.task);
+                        return 0;
                 }
                 payload = mtu;
         }
@@ -745,13 +746,17 @@ err:
         wqe->status = IB_WC_LOC_PROT_ERR;
         wqe->state = wqe_state_error;
 
-complete:
-        if (qp_type(qp) != IB_QPT_RC) {
-                while (rxe_completer(qp) == 0)
-                        ;
-        }
-
-        return 0;
+        /*
+         * IBA Spec. Section 10.7.3.1 SIGNALED COMPLETIONS
+         * ---------8<---------8<-------------
+         * ...Note that if a completion error occurs, a Work Completion
+         * will always be generated, even if the signaling
+         * indicator requests an Unsignaled Completion.
+         * ---------8<---------8<-------------
+         */
+        wqe->wr.send_flags |= IB_SEND_SIGNALED;
+        __rxe_do_task(&qp->comp.task);
+        return -EAGAIN;
 
 exit:
         return -EAGAIN;
diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
index 982936334537..07ec465f1095 100644
--- a/drivers/input/misc/arizona-haptics.c
+++ b/drivers/input/misc/arizona-haptics.c
@@ -37,6 +37,8 @@ static void arizona_haptics_work(struct work_struct *work)
                                                        struct arizona_haptics,
                                                        work);
         struct arizona *arizona = haptics->arizona;
+        struct snd_soc_component *component =
+                snd_soc_dapm_to_component(arizona->dapm);
         int ret;
 
         if (!haptics->arizona->dapm) {
@@ -66,7 +68,7 @@ static void arizona_haptics_work(struct work_struct *work)
                         return;
                 }
 
-                ret = snd_soc_dapm_enable_pin(arizona->dapm, "HAPTICS");
+                ret = snd_soc_component_enable_pin(component, "HAPTICS");
                 if (ret != 0) {
                         dev_err(arizona->dev, "Failed to start HAPTICS: %d\n",
                                 ret);
@@ -81,7 +83,7 @@ static void arizona_haptics_work(struct work_struct *work)
                 }
         } else {
                 /* This disable sequence will be a noop if already enabled */
-                ret = snd_soc_dapm_disable_pin(arizona->dapm, "HAPTICS");
+                ret = snd_soc_component_disable_pin(component, "HAPTICS");
                 if (ret != 0) {
                         dev_err(arizona->dev, "Failed to disable HAPTICS: %d\n",
                                 ret);
@@ -140,11 +142,14 @@ static int arizona_haptics_play(struct input_dev *input, void *data,
 static void arizona_haptics_close(struct input_dev *input)
 {
         struct arizona_haptics *haptics = input_get_drvdata(input);
+        struct snd_soc_component *component;
 
         cancel_work_sync(&haptics->work);
 
-        if (haptics->arizona->dapm)
-                snd_soc_dapm_disable_pin(haptics->arizona->dapm, "HAPTICS");
+        if (haptics->arizona->dapm) {
+                component = snd_soc_dapm_to_component(haptics->arizona->dapm);
+                snd_soc_component_disable_pin(component, "HAPTICS");
+        }
 }
 
 static int arizona_haptics_probe(struct platform_device *pdev)
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index fb4b185dea96..bee267424972 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -1115,10 +1115,6 @@ static int psmouse_extensions(struct psmouse *psmouse,
                 if (psmouse_try_protocol(psmouse, PSMOUSE_TOUCHKIT_PS2,
                                          &max_proto, set_properties, true))
                         return PSMOUSE_TOUCHKIT_PS2;
-
-                if (psmouse_try_protocol(psmouse, PSMOUSE_BYD,
-                                         &max_proto, set_properties, true))
-                        return PSMOUSE_BYD;
         }
 
         /*
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index 15c01c3cd540..e6f9b2d745ca 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -2636,17 +2636,26 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
         /* And we're up. Go go go! */
         of_iommu_set_ops(dev->of_node, &arm_smmu_ops);
 #ifdef CONFIG_PCI
-        pci_request_acs();
-        ret = bus_set_iommu(&pci_bus_type, &arm_smmu_ops);
-        if (ret)
-                return ret;
+        if (pci_bus_type.iommu_ops != &arm_smmu_ops) {
+                pci_request_acs();
+                ret = bus_set_iommu(&pci_bus_type, &arm_smmu_ops);
+                if (ret)
+                        return ret;
+        }
 #endif
 #ifdef CONFIG_ARM_AMBA
-        ret = bus_set_iommu(&amba_bustype, &arm_smmu_ops);
-        if (ret)
-                return ret;
+        if (amba_bustype.iommu_ops != &arm_smmu_ops) {
+                ret = bus_set_iommu(&amba_bustype, &arm_smmu_ops);
+                if (ret)
+                        return ret;
+        }
 #endif
-        return bus_set_iommu(&platform_bus_type, &arm_smmu_ops);
+        if (platform_bus_type.iommu_ops != &arm_smmu_ops) {
+                ret = bus_set_iommu(&platform_bus_type, &arm_smmu_ops);
+                if (ret)
+                        return ret;
+        }
+        return 0;
 }
 
 static int arm_smmu_device_remove(struct platform_device *pdev)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index c841eb7a1a74..8f7281444551 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -324,8 +324,10 @@ struct arm_smmu_master_cfg {
 #define INVALID_SMENDX                  -1
 #define __fwspec_cfg(fw) ((struct arm_smmu_master_cfg *)fw->iommu_priv)
 #define fwspec_smmu(fw)  (__fwspec_cfg(fw)->smmu)
+#define fwspec_smendx(fw, i) \
+        (i >= fw->num_ids ? INVALID_SMENDX : __fwspec_cfg(fw)->smendx[i])
 #define for_each_cfg_sme(fw, i, idx) \
-        for (i = 0; idx = __fwspec_cfg(fw)->smendx[i], i < fw->num_ids; ++i)
+        for (i = 0; idx = fwspec_smendx(fw, i), i < fw->num_ids; ++i)
 
 struct arm_smmu_device {
         struct device                   *dev;
@@ -1228,6 +1230,16 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
                 return -ENXIO;
         }
 
+        /*
+         * FIXME: The arch/arm DMA API code tries to attach devices to its own
+         * domains between of_xlate() and add_device() - we have no way to cope
+         * with that, so until ARM gets converted to rely on groups and default
+         * domains, just say no (but more politely than by dereferencing NULL).
+         * This should be at least a WARN_ON once that's sorted.
+         */
+        if (!fwspec->iommu_priv)
+                return -ENODEV;
+
         smmu = fwspec_smmu(fwspec);
         /* Ensure that the domain is finalised */
         ret = arm_smmu_init_domain_context(domain, smmu);
@@ -1390,7 +1402,7 @@ static int arm_smmu_add_device(struct device *dev)
                 fwspec = dev->iommu_fwspec;
                 if (ret)
                         goto out_free;
-        } else if (fwspec) {
+        } else if (fwspec && fwspec->ops == &arm_smmu_ops) {
                 smmu = arm_smmu_get_by_node(to_of_node(fwspec->iommu_fwnode));
         } else {
                 return -ENODEV;
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 58470f5ced04..8c53748a769d 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -338,7 +338,9 @@ static int dmar_pci_bus_notifier(struct notifier_block *nb,
         struct pci_dev *pdev = to_pci_dev(data);
         struct dmar_pci_notify_info *info;
 
-        /* Only care about add/remove events for physical functions */
+        /* Only care about add/remove events for physical functions.
+         * For VFs we actually do the lookup based on the corresponding
+         * PF in device_to_iommu() anyway. */
         if (pdev->is_virtfn)
                 return NOTIFY_DONE;
         if (action != BUS_NOTIFY_ADD_DEVICE &&
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index a4407eabf0e6..d8376c2d18b3 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -892,7 +892,13 @@ static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devf
                 return NULL;
 
         if (dev_is_pci(dev)) {
+                struct pci_dev *pf_pdev;
+
                 pdev = to_pci_dev(dev);
+                /* VFs aren't listed in scope tables; we need to look up
+                 * the PF instead to find the IOMMU. */
+                pf_pdev = pci_physfn(pdev);
+                dev = &pf_pdev->dev;
                 segment = pci_domain_nr(pdev->bus);
         } else if (has_acpi_companion(dev))
                 dev = &ACPI_COMPANION(dev)->dev;
@@ -905,6 +911,13 @@ static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devf
                 for_each_active_dev_scope(drhd->devices,
                                           drhd->devices_cnt, i, tmp) {
                         if (tmp == dev) {
+                                /* For a VF use its original BDF# not that of the PF
+                                 * which we used for the IOMMU lookup. Strictly speaking
+                                 * we could do this for all PCI devices; we only need to
+                                 * get the BDF# from the scope table for ACPI matches. */
+                                if (pdev->is_virtfn)
+                                        goto got_pdev;
+
                                 *bus = drhd->devices[i].bus;
                                 *devfn = drhd->devices[i].devfn;
                                 goto out;
@@ -1711,6 +1724,7 @@ static void disable_dmar_iommu(struct intel_iommu *iommu)
         if (!iommu->domains || !iommu->domain_ids)
                 return;
 
+again:
         spin_lock_irqsave(&device_domain_lock, flags);
         list_for_each_entry_safe(info, tmp, &device_domain_list, global) {
                 struct dmar_domain *domain;
@@ -1723,10 +1737,19 @@ static void disable_dmar_iommu(struct intel_iommu *iommu)
 
                 domain = info->domain;
 
-                dmar_remove_one_dev_info(domain, info->dev);
+                __dmar_remove_one_dev_info(info);
 
-                if (!domain_type_is_vm_or_si(domain))
+                if (!domain_type_is_vm_or_si(domain)) {
+                        /*
+                         * The domain_exit() function  can't be called under
+                         * device_domain_lock, as it takes this lock itself.
+                         * So release the lock here and re-run the loop
+                         * afterwards.
+                         */
+                        spin_unlock_irqrestore(&device_domain_lock, flags);
                         domain_exit(domain);
+                        goto again;
+                }
         }
         spin_unlock_irqrestore(&device_domain_lock, flags);
 
diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c
index 8ebb3530afa7..cb72e0011310 100644
--- a/drivers/iommu/intel-svm.c
+++ b/drivers/iommu/intel-svm.c
@@ -39,10 +39,18 @@ int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu)
         struct page *pages;
         int order;
 
-        order = ecap_pss(iommu->ecap) + 7 - PAGE_SHIFT;
-        if (order < 0)
-                order = 0;
-
+        /* Start at 2 because it's defined as 2^(1+PSS) */
+        iommu->pasid_max = 2 << ecap_pss(iommu->ecap);
+
+        /* Eventually I'm promised we will get a multi-level PASID table
+         * and it won't have to be physically contiguous. Until then,
+         * limit the size because 8MiB contiguous allocations can be hard
+         * to come by. The limit of 0x20000, which is 1MiB for each of
+         * the PASID and PASID-state tables, is somewhat arbitrary. */
+        if (iommu->pasid_max > 0x20000)
+                iommu->pasid_max = 0x20000;
+
+        order = get_order(sizeof(struct pasid_entry) * iommu->pasid_max);
         pages = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);
         if (!pages) {
                 pr_warn("IOMMU: %s: Failed to allocate PASID table\n",
@@ -53,6 +61,8 @@ int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu)
         pr_info("%s: Allocated order %d PASID table.\n", iommu->name, order);
 
         if (ecap_dis(iommu->ecap)) {
+                /* Just making it explicit... */
+                BUILD_BUG_ON(sizeof(struct pasid_entry) != sizeof(struct pasid_state_entry));
                 pages = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);
                 if (pages)
                         iommu->pasid_state_table = page_address(pages);
@@ -68,11 +78,7 @@ int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu)
 
 int intel_svm_free_pasid_tables(struct intel_iommu *iommu)
 {
-        int order;
-
-        order = ecap_pss(iommu->ecap) + 7 - PAGE_SHIFT;
-        if (order < 0)
-                order = 0;
+        int order = get_order(sizeof(struct pasid_entry) * iommu->pasid_max);
 
         if (iommu->pasid_table) {
                 free_pages((unsigned long)iommu->pasid_table, order);
@@ -371,8 +377,8 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_
                 }
                 svm->iommu = iommu;
 
-                if (pasid_max > 2 << ecap_pss(iommu->ecap))
-                        pasid_max = 2 << ecap_pss(iommu->ecap);
+                if (pasid_max > iommu->pasid_max)
+                        pasid_max = iommu->pasid_max;
 
                 /* Do not use PASID 0 in caching mode (virtualised IOMMU) */
                 ret = idr_alloc(&iommu->pasid_idr, svm,
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index d1f8ab915b15..b90776ef56ec 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -755,8 +755,10 @@ static int __init ser_gigaset_init(void)
         driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
                                     GIGASET_MODULENAME, GIGASET_DEVNAME,
                                     &ops, THIS_MODULE);
-        if (!driver)
+        if (!driver) {
+                rc = -ENOMEM;
                 goto error;
+        }
 
         rc = tty_register_ldisc(N_GIGASET_M101, &gigaset_ldisc);
         if (rc != 0) {
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index 9600cd771f1a..e034ed847ff3 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -1499,6 +1499,7 @@ hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 printk(KERN_INFO
                        "HFC-4S/8S: failed to request address space at 0x%04x\n",
                        hw->iobase);
+                err = -EBUSY;
                 goto out;
         }
 
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c
index 08c87fadca8c..1f32688c312d 100644
--- a/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@ -65,6 +65,7 @@
 #include <linux/mailbox_controller.h>
 #include <linux/mailbox_client.h>
 #include <linux/io-64-nonatomic-lo-hi.h>
+#include <acpi/pcc.h>
 
 #include "mailbox.h"
 
@@ -267,6 +268,8 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
         if (chan->txdone_method == TXDONE_BY_POLL && cl->knows_txdone)
                 chan->txdone_method |= TXDONE_BY_ACK;
 
+        spin_unlock_irqrestore(&chan->lock, flags);
+
         if (pcc_doorbell_irq[subspace_id] > 0) {
                 int rc;
 
@@ -275,12 +278,11 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
                 if (unlikely(rc)) {
                         dev_err(dev, "failed to register PCC interrupt %d\n",
                                 pcc_doorbell_irq[subspace_id]);
+                        pcc_mbox_free_channel(chan);
                         chan = ERR_PTR(rc);
                 }
         }
 
-        spin_unlock_irqrestore(&chan->lock, flags);
-
         return chan;
 }
 EXPORT_SYMBOL_GPL(pcc_mbox_request_channel);
@@ -304,20 +306,19 @@ void pcc_mbox_free_channel(struct mbox_chan *chan)
                 return;
         }
 
+        if (pcc_doorbell_irq[id] > 0)
+                devm_free_irq(chan->mbox->dev, pcc_doorbell_irq[id], chan);
+
         spin_lock_irqsave(&chan->lock, flags);
         chan->cl = NULL;
         chan->active_req = NULL;
         if (chan->txdone_method == (TXDONE_BY_POLL | TXDONE_BY_ACK))
                 chan->txdone_method = TXDONE_BY_POLL;
 
-        if (pcc_doorbell_irq[id] > 0)
-                devm_free_irq(chan->mbox->dev, pcc_doorbell_irq[id], chan);
-
         spin_unlock_irqrestore(&chan->lock, flags);
 }
 EXPORT_SYMBOL_GPL(pcc_mbox_free_channel);
 
-
 /**
  * pcc_send_data - Called from Mailbox Controller code. Used
  *              here only to ring the channel doorbell. The PCC client
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index 012225587c25..b71b747ee0ba 100644
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -513,6 +513,11 @@ config DVB_AS102_FE
         depends on DVB_CORE
         default DVB_AS102
 
+config DVB_GP8PSK_FE
+        tristate
+        depends on DVB_CORE
+        default DVB_USB_GP8PSK
+
 comment "DVB-C (cable) frontends"
         depends on DVB_CORE
 
diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile
index e90165ad361b..93921a4eaa27 100644
--- a/drivers/media/dvb-frontends/Makefile
+++ b/drivers/media/dvb-frontends/Makefile
@@ -121,6 +121,7 @@ obj-$(CONFIG_DVB_RTL2832_SDR) += rtl2832_sdr.o
 obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o
 obj-$(CONFIG_DVB_AF9033) += af9033.o
 obj-$(CONFIG_DVB_AS102_FE) += as102_fe.o
+obj-$(CONFIG_DVB_GP8PSK_FE) += gp8psk-fe.o
 obj-$(CONFIG_DVB_TC90522) += tc90522.o
 obj-$(CONFIG_DVB_HORUS3A) += horus3a.o
 obj-$(CONFIG_DVB_ASCOT2E) += ascot2e.o
diff --git a/drivers/media/usb/dvb-usb/gp8psk-fe.c b/drivers/media/dvb-frontends/gp8psk-fe.c
index db6eb79cde07..93f59bfea092 100644
--- a/drivers/media/usb/dvb-usb/gp8psk-fe.c
+++ b/drivers/media/dvb-frontends/gp8psk-fe.c
@@ -1,5 +1,5 @@
-/* DVB USB compliant Linux driver for the
- *  - GENPIX 8pks/qpsk/DCII USB2.0 DVB-S module
+/*
+ * Frontend driver for the GENPIX 8pks/qpsk/DCII USB2.0 DVB-S module
  *
  * Copyright (C) 2006,2007 Alan Nisota (alannisota@gmail.com)
  * Copyright (C) 2006,2007 Genpix Electronics (genpix@genpix-electronics.com)
@@ -8,17 +8,31 @@
  *
  * This module is based off the vp7045 and vp702x modules
  *
- *      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.
- *
- * see Documentation/dvb/README.dvb-usb for more information
+ * 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.
  */
-#include "gp8psk.h"
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include "gp8psk-fe.h"
+#include "dvb_frontend.h"
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
+
+#define dprintk(fmt, arg...) do {                                       \
+        if (debug)                                                      \
+                printk(KERN_DEBUG pr_fmt("%s: " fmt),                   \
+                       __func__, ##arg);                                \
+} while (0)
 
 struct gp8psk_fe_state {
         struct dvb_frontend fe;
-        struct dvb_usb_device *d;
+        void *priv;
+        const struct gp8psk_fe_ops *ops;
+        bool is_rev1;
         u8 lock;
         u16 snr;
         unsigned long next_status_check;
@@ -29,22 +43,24 @@ static int gp8psk_tuned_to_DCII(struct dvb_frontend *fe)
 {
         struct gp8psk_fe_state *st = fe->demodulator_priv;
         u8 status;
-        gp8psk_usb_in_op(st->d, GET_8PSK_CONFIG, 0, 0, &status, 1);
+
+        st->ops->in(st->priv, GET_8PSK_CONFIG, 0, 0, &status, 1);
         return status & bmDCtuned;
 }
 
 static int gp8psk_set_tuner_mode(struct dvb_frontend *fe, int mode)
 {
-        struct gp8psk_fe_state *state = fe->demodulator_priv;
-        return gp8psk_usb_out_op(state->d, SET_8PSK_CONFIG, mode, 0, NULL, 0);
+        struct gp8psk_fe_state *st = fe->demodulator_priv;
+
+        return st->ops->out(st->priv, SET_8PSK_CONFIG, mode, 0, NULL, 0);
 }
 
 static int gp8psk_fe_update_status(struct gp8psk_fe_state *st)
 {
         u8 buf[6];
         if (time_after(jiffies,st->next_status_check)) {
-                gp8psk_usb_in_op(st->d, GET_SIGNAL_LOCK, 0,0,&st->lock,1);
-                gp8psk_usb_in_op(st->d, GET_SIGNAL_STRENGTH, 0,0,buf,6);
+                st->ops->in(st->priv, GET_SIGNAL_LOCK, 0, 0, &st->lock, 1);
+                st->ops->in(st->priv, GET_SIGNAL_STRENGTH, 0, 0, buf, 6);
                 st->snr = (buf[1]) << 8 | buf[0];
                 st->next_status_check = jiffies + (st->status_check_interval*HZ)/1000;
         }
@@ -116,13 +132,12 @@ static int gp8psk_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_front
 
 static int gp8psk_fe_set_frontend(struct dvb_frontend *fe)
 {
-        struct gp8psk_fe_state *state = fe->demodulator_priv;
+        struct gp8psk_fe_state *st = fe->demodulator_priv;
         struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         u8 cmd[10];
         u32 freq = c->frequency * 1000;
-        int gp_product_id = le16_to_cpu(state->d->udev->descriptor.idProduct);
 
-        deb_fe("%s()\n", __func__);
+        dprintk("%s()\n", __func__);
 
         cmd[4] = freq         & 0xff;
         cmd[5] = (freq >> 8)  & 0xff;
@@ -136,21 +151,21 @@ static int gp8psk_fe_set_frontend(struct dvb_frontend *fe)
         switch (c->delivery_system) {
         case SYS_DVBS:
                 if (c->modulation != QPSK) {
-                        deb_fe("%s: unsupported modulation selected (%d)\n",
+                        dprintk("%s: unsupported modulation selected (%d)\n",
                                 __func__, c->modulation);
                         return -EOPNOTSUPP;
                 }
                 c->fec_inner = FEC_AUTO;
                 break;
         case SYS_DVBS2: /* kept for backwards compatibility */
-                deb_fe("%s: DVB-S2 delivery system selected\n", __func__);
+                dprintk("%s: DVB-S2 delivery system selected\n", __func__);
                 break;
         case SYS_TURBO:
-                deb_fe("%s: Turbo-FEC delivery system selected\n", __func__);
+                dprintk("%s: Turbo-FEC delivery system selected\n", __func__);
                 break;
 
         default:
-                deb_fe("%s: unsupported delivery system selected (%d)\n",
+                dprintk("%s: unsupported delivery system selected (%d)\n",
                         __func__, c->delivery_system);
                 return -EOPNOTSUPP;
         }
@@ -161,9 +176,9 @@ static int gp8psk_fe_set_frontend(struct dvb_frontend *fe)
         cmd[3] = (c->symbol_rate >> 24) & 0xff;
         switch (c->modulation) {
         case QPSK:
-                if (gp_product_id == USB_PID_GENPIX_8PSK_REV_1_WARM)
+                if (st->is_rev1)
                         if (gp8psk_tuned_to_DCII(fe))
-                                gp8psk_bcm4500_reload(state->d);
+                                st->ops->reload(st->priv);
                 switch (c->fec_inner) {
                 case FEC_1_2:
                         cmd[9] = 0; break;
@@ -207,18 +222,18 @@ static int gp8psk_fe_set_frontend(struct dvb_frontend *fe)
                 cmd[9] = 0;
                 break;
         default: /* Unknown modulation */
-                deb_fe("%s: unsupported modulation selected (%d)\n",
+                dprintk("%s: unsupported modulation selected (%d)\n",
                         __func__, c->modulation);
                 return -EOPNOTSUPP;
         }
 
-        if (gp_product_id == USB_PID_GENPIX_8PSK_REV_1_WARM)
+        if (st->is_rev1)
                 gp8psk_set_tuner_mode(fe, 0);
-        gp8psk_usb_out_op(state->d, TUNE_8PSK, 0, 0, cmd, 10);
+        st->ops->out(st->priv, TUNE_8PSK, 0, 0, cmd, 10);
 
-        state->lock = 0;
-        state->next_status_check = jiffies;
-        state->status_check_interval = 200;
+        st->lock = 0;
+        st->next_status_check = jiffies;
+        st->status_check_interval = 200;
 
         return 0;
 }
@@ -228,9 +243,9 @@ static int gp8psk_fe_send_diseqc_msg (struct dvb_frontend* fe,
 {
         struct gp8psk_fe_state *st = fe->demodulator_priv;
 
-        deb_fe("%s\n",__func__);
+        dprintk("%s\n", __func__);
 
-        if (gp8psk_usb_out_op(st->d,SEND_DISEQC_COMMAND, m->msg[0], 0,
+        if (st->ops->out(st->priv, SEND_DISEQC_COMMAND, m->msg[0], 0,
                         m->msg, m->msg_len)) {
                 return -EINVAL;
         }
@@ -243,12 +258,12 @@ static int gp8psk_fe_send_diseqc_burst(struct dvb_frontend *fe,
         struct gp8psk_fe_state *st = fe->demodulator_priv;
         u8 cmd;
 
-        deb_fe("%s\n",__func__);
+        dprintk("%s\n", __func__);
 
         /* These commands are certainly wrong */
         cmd = (burst == SEC_MINI_A) ? 0x00 : 0x01;
 
-        if (gp8psk_usb_out_op(st->d,SEND_DISEQC_COMMAND, cmd, 0,
+        if (st->ops->out(st->priv, SEND_DISEQC_COMMAND, cmd, 0,
                         &cmd, 0)) {
                 return -EINVAL;
         }
@@ -258,10 +273,10 @@ static int gp8psk_fe_send_diseqc_burst(struct dvb_frontend *fe,
 static int gp8psk_fe_set_tone(struct dvb_frontend *fe,
                               enum fe_sec_tone_mode tone)
 {
-        struct gp8psk_fe_state* state = fe->demodulator_priv;
+        struct gp8psk_fe_state *st = fe->demodulator_priv;
 
-        if (gp8psk_usb_out_op(state->d,SET_22KHZ_TONE,
-                 (tone == SEC_TONE_ON), 0, NULL, 0)) {
+        if (st->ops->out(st->priv, SET_22KHZ_TONE,
+                         (tone == SEC_TONE_ON), 0, NULL, 0)) {
                 return -EINVAL;
         }
         return 0;
@@ -270,9 +285,9 @@ static int gp8psk_fe_set_tone(struct dvb_frontend *fe,
 static int gp8psk_fe_set_voltage(struct dvb_frontend *fe,
                                  enum fe_sec_voltage voltage)
 {
-        struct gp8psk_fe_state* state = fe->demodulator_priv;
+        struct gp8psk_fe_state *st = fe->demodulator_priv;
 
-        if (gp8psk_usb_out_op(state->d,SET_LNB_VOLTAGE,
+        if (st->ops->out(st->priv, SET_LNB_VOLTAGE,
                          voltage == SEC_VOLTAGE_18, 0, NULL, 0)) {
                 return -EINVAL;
         }
@@ -281,52 +296,60 @@ static int gp8psk_fe_set_voltage(struct dvb_frontend *fe,
 
 static int gp8psk_fe_enable_high_lnb_voltage(struct dvb_frontend* fe, long onoff)
 {
-        struct gp8psk_fe_state* state = fe->demodulator_priv;
-        return gp8psk_usb_out_op(state->d, USE_EXTRA_VOLT, onoff, 0,NULL,0);
+        struct gp8psk_fe_state *st = fe->demodulator_priv;
+
+        return st->ops->out(st->priv, USE_EXTRA_VOLT, onoff, 0, NULL, 0);
 }
 
 static int gp8psk_fe_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long sw_cmd)
 {
-        struct gp8psk_fe_state* state = fe->demodulator_priv;
+        struct gp8psk_fe_state *st = fe->demodulator_priv;
         u8 cmd = sw_cmd & 0x7f;
 
-        if (gp8psk_usb_out_op(state->d,SET_DN_SWITCH, cmd, 0,
-                        NULL, 0)) {
+        if (st->ops->out(st->priv, SET_DN_SWITCH, cmd, 0, NULL, 0))
                 return -EINVAL;
-        }
-        if (gp8psk_usb_out_op(state->d,SET_LNB_VOLTAGE, !!(sw_cmd & 0x80),
-                        0, NULL, 0)) {
+
+        if (st->ops->out(st->priv, SET_LNB_VOLTAGE, !!(sw_cmd & 0x80),
+                        0, NULL, 0))
                 return -EINVAL;
-        }
 
         return 0;
 }
 
 static void gp8psk_fe_release(struct dvb_frontend* fe)
 {
-        struct gp8psk_fe_state *state = fe->demodulator_priv;
-        kfree(state);
+        struct gp8psk_fe_state *st = fe->demodulator_priv;
+
+        kfree(st);
 }
 
 static struct dvb_frontend_ops gp8psk_fe_ops;
 
-struct dvb_frontend * gp8psk_fe_attach(struct dvb_usb_device *d)
+struct dvb_frontend *gp8psk_fe_attach(const struct gp8psk_fe_ops *ops,
+                                      void *priv, bool is_rev1)
 {
-        struct gp8psk_fe_state *s = kzalloc(sizeof(struct gp8psk_fe_state), GFP_KERNEL);
-        if (s == NULL)
-                goto error;
-
-        s->d = d;
-        memcpy(&s->fe.ops, &gp8psk_fe_ops, sizeof(struct dvb_frontend_ops));
-        s->fe.demodulator_priv = s;
-
-        goto success;
-error:
-        return NULL;
-success:
-        return &s->fe;
-}
+        struct gp8psk_fe_state *st;
 
+        if (!ops || !ops->in || !ops->out || !ops->reload) {
+                pr_err("Error! gp8psk-fe ops not defined.\n");
+                return NULL;
+        }
+
+        st = kzalloc(sizeof(struct gp8psk_fe_state), GFP_KERNEL);
+        if (!st)
+                return NULL;
+
+        memcpy(&st->fe.ops, &gp8psk_fe_ops, sizeof(struct dvb_frontend_ops));
+        st->fe.demodulator_priv = st;
+        st->ops = ops;
+        st->priv = priv;
+        st->is_rev1 = is_rev1;
+
+        pr_info("Frontend %sattached\n", is_rev1 ? "revision 1 " : "");
+
+        return &st->fe;
+}
+EXPORT_SYMBOL_GPL(gp8psk_fe_attach);
 
 static struct dvb_frontend_ops gp8psk_fe_ops = {
         .delsys = { SYS_DVBS },
@@ -370,3 +393,8 @@ static struct dvb_frontend_ops gp8psk_fe_ops = {
         .dishnetwork_send_legacy_command = gp8psk_fe_send_legacy_dish_cmd,
         .enable_high_lnb_voltage = gp8psk_fe_enable_high_lnb_voltage
 };
+
+MODULE_AUTHOR("Alan Nisota <alannisota@gamil.com>");
+MODULE_DESCRIPTION("Frontend Driver for Genpix DVB-S");
+MODULE_VERSION("1.1");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/gp8psk-fe.h b/drivers/media/dvb-frontends/gp8psk-fe.h
new file mode 100644
index 000000000000..6c7944b1ecd6
--- /dev/null
+++ b/drivers/media/dvb-frontends/gp8psk-fe.h
@@ -0,0 +1,82 @@
+/*
+ * gp8psk_fe driver
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef GP8PSK_FE_H
+#define GP8PSK_FE_H
+
+#include <linux/types.h>
+
+/* gp8psk commands */
+
+#define GET_8PSK_CONFIG                 0x80    /* in */
+#define SET_8PSK_CONFIG                 0x81
+#define I2C_WRITE                       0x83
+#define I2C_READ                        0x84
+#define ARM_TRANSFER                    0x85
+#define TUNE_8PSK                       0x86
+#define GET_SIGNAL_STRENGTH             0x87    /* in */
+#define LOAD_BCM4500                    0x88
+#define BOOT_8PSK                       0x89    /* in */
+#define START_INTERSIL                  0x8A    /* in */
+#define SET_LNB_VOLTAGE                 0x8B
+#define SET_22KHZ_TONE                  0x8C
+#define SEND_DISEQC_COMMAND             0x8D
+#define SET_DVB_MODE                    0x8E
+#define SET_DN_SWITCH                   0x8F
+#define GET_SIGNAL_LOCK                 0x90    /* in */
+#define GET_FW_VERS                     0x92
+#define GET_SERIAL_NUMBER               0x93    /* in */
+#define USE_EXTRA_VOLT                  0x94
+#define GET_FPGA_VERS                   0x95
+#define CW3K_INIT                       0x9d
+
+/* PSK_configuration bits */
+#define bm8pskStarted                   0x01
+#define bm8pskFW_Loaded                 0x02
+#define bmIntersilOn                    0x04
+#define bmDVBmode                       0x08
+#define bm22kHz                         0x10
+#define bmSEL18V                        0x20
+#define bmDCtuned                       0x40
+#define bmArmed                         0x80
+
+/* Satellite modulation modes */
+#define ADV_MOD_DVB_QPSK 0     /* DVB-S QPSK */
+#define ADV_MOD_TURBO_QPSK 1   /* Turbo QPSK */
+#define ADV_MOD_TURBO_8PSK 2   /* Turbo 8PSK (also used for Trellis 8PSK) */
+#define ADV_MOD_TURBO_16QAM 3  /* Turbo 16QAM (also used for Trellis 8PSK) */
+
+#define ADV_MOD_DCII_C_QPSK 4  /* Digicipher II Combo */
+#define ADV_MOD_DCII_I_QPSK 5  /* Digicipher II I-stream */
+#define ADV_MOD_DCII_Q_QPSK 6  /* Digicipher II Q-stream */
+#define ADV_MOD_DCII_C_OQPSK 7 /* Digicipher II offset QPSK */
+#define ADV_MOD_DSS_QPSK 8     /* DSS (DIRECTV) QPSK */
+#define ADV_MOD_DVB_BPSK 9     /* DVB-S BPSK */
+
+/* firmware revision id's */
+#define GP8PSK_FW_REV1                  0x020604
+#define GP8PSK_FW_REV2                  0x020704
+#define GP8PSK_FW_VERS(_fw_vers) \
+        ((_fw_vers)[2]<<0x10 | (_fw_vers)[1]<<0x08 | (_fw_vers)[0])
+
+struct gp8psk_fe_ops {
+        int (*in)(void *priv, u8 req, u16 value, u16 index, u8 *b, int blen);
+        int (*out)(void *priv, u8 req, u16 value, u16 index, u8 *b, int blen);
+        int (*reload)(void *priv);
+};
+
+struct dvb_frontend *gp8psk_fe_attach(const struct gp8psk_fe_ops *ops,
+                                      void *priv, bool is_rev1);
+
+#endif
diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c
index f95a6bc839d5..cede3975d04b 100644
--- a/drivers/media/i2c/ir-kbd-i2c.c
+++ b/drivers/media/i2c/ir-kbd-i2c.c
@@ -118,7 +118,7 @@ static int get_key_haup_common(struct IR_i2c *ir, enum rc_type *protocol,
                         *protocol = RC_TYPE_RC6_MCE;
                         dev &= 0x7f;
                         dprintk(1, "ir hauppauge (rc6-mce): t%d vendor=%d dev=%d code=%d\n",
-                                                toggle, vendor, dev, code);
+                                                *ptoggle, vendor, dev, code);
                 } else {
                         *ptoggle = 0;
                         *protocol = RC_TYPE_RC6_6A_32;
diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c
index 317ef63ee789..8d96a22647b3 100644
--- a/drivers/media/tuners/tuner-xc2028.c
+++ b/drivers/media/tuners/tuner-xc2028.c
@@ -281,6 +281,14 @@ static void free_firmware(struct xc2028_data *priv)
         int i;
         tuner_dbg("%s called\n", __func__);
 
+        /* free allocated f/w string */
+        if (priv->fname != firmware_name)
+                kfree(priv->fname);
+        priv->fname = NULL;
+
+        priv->state = XC2028_NO_FIRMWARE;
+        memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
+
         if (!priv->firm)
                 return;
 
@@ -291,9 +299,6 @@ static void free_firmware(struct xc2028_data *priv)
 
         priv->firm = NULL;
         priv->firm_size = 0;
-        priv->state = XC2028_NO_FIRMWARE;
-
-        memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
 }
 
 static int load_all_firmwares(struct dvb_frontend *fe,
@@ -884,9 +889,8 @@ read_not_reliable:
         return 0;
 
 fail:
-        priv->state = XC2028_NO_FIRMWARE;
+        free_firmware(priv);
 
-        memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
         if (retry_count < 8) {
                 msleep(50);
                 retry_count++;
@@ -1332,11 +1336,8 @@ static int xc2028_dvb_release(struct dvb_frontend *fe)
         mutex_lock(&xc2028_list_mutex);
 
         /* only perform final cleanup if this is the last instance */
-        if (hybrid_tuner_report_instance_count(priv) == 1) {
+        if (hybrid_tuner_report_instance_count(priv) == 1)
                 free_firmware(priv);
-                kfree(priv->ctrl.fname);
-                priv->ctrl.fname = NULL;
-        }
 
         if (priv)
                 hybrid_tuner_release_state(priv);
@@ -1399,19 +1400,8 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
 
         /*
          * Copy the config data.
-         * For the firmware name, keep a local copy of the string,
-         * in order to avoid troubles during device release.
          */
-        kfree(priv->ctrl.fname);
-        priv->ctrl.fname = NULL;
         memcpy(&priv->ctrl, p, sizeof(priv->ctrl));
-        if (p->fname) {
-                priv->ctrl.fname = kstrdup(p->fname, GFP_KERNEL);
-                if (priv->ctrl.fname == NULL) {
-                        rc = -ENOMEM;
-                        goto unlock;
-                }
-        }
 
         /*
          * If firmware name changed, frees firmware. As free_firmware will
@@ -1426,10 +1416,15 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
 
         if (priv->state == XC2028_NO_FIRMWARE) {
                 if (!firmware_name[0])
-                        priv->fname = priv->ctrl.fname;
+                        priv->fname = kstrdup(p->fname, GFP_KERNEL);
                 else
                         priv->fname = firmware_name;
 
+                if (!priv->fname) {
+                        rc = -ENOMEM;
+                        goto unlock;
+                }
+
                 rc = request_firmware_nowait(THIS_MODULE, 1,
                                              priv->fname,
                                              priv->i2c_props.adap->dev.parent,
diff --git a/drivers/media/usb/dvb-usb/Makefile b/drivers/media/usb/dvb-usb/Makefile
index 2a7b5a963acf..3b3f32b426d1 100644
--- a/drivers/media/usb/dvb-usb/Makefile
+++ b/drivers/media/usb/dvb-usb/Makefile
@@ -8,7 +8,7 @@ obj-$(CONFIG_DVB_USB_VP7045) += dvb-usb-vp7045.o
 dvb-usb-vp702x-objs := vp702x.o vp702x-fe.o
 obj-$(CONFIG_DVB_USB_VP702X) += dvb-usb-vp702x.o
 
-dvb-usb-gp8psk-objs := gp8psk.o gp8psk-fe.o
+dvb-usb-gp8psk-objs := gp8psk.o
 obj-$(CONFIG_DVB_USB_GP8PSK) += dvb-usb-gp8psk.o
 
 dvb-usb-dtt200u-objs := dtt200u.o dtt200u-fe.o
diff --git a/drivers/media/usb/dvb-usb/af9005.c b/drivers/media/usb/dvb-usb/af9005.c
index b257780fb380..7853261906b1 100644
--- a/drivers/media/usb/dvb-usb/af9005.c
+++ b/drivers/media/usb/dvb-usb/af9005.c
@@ -53,7 +53,6 @@ struct af9005_device_state {
         u8 sequence;
         int led_state;
         unsigned char data[256];
-        struct mutex data_mutex;
 };
 
 static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,
@@ -72,7 +71,7 @@ static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,
                 return -EINVAL;
         }
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
         st->data[0] = 14;               /* rest of buffer length low */
         st->data[1] = 0;                /* rest of buffer length high */
 
@@ -140,7 +139,7 @@ static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,
                         values[i] = st->data[8 + i];
 
 ret:
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
         return ret;
 
 }
@@ -481,7 +480,7 @@ int af9005_send_command(struct dvb_usb_device *d, u8 command, u8 * wbuf,
         }
         packet_len = wlen + 5;
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
 
         st->data[0] = (u8) (packet_len & 0xff);
         st->data[1] = (u8) ((packet_len & 0xff00) >> 8);
@@ -512,7 +511,7 @@ int af9005_send_command(struct dvb_usb_device *d, u8 command, u8 * wbuf,
                         rbuf[i] = st->data[i + 7];
         }
 
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
         return ret;
 }
 
@@ -523,7 +522,7 @@ int af9005_read_eeprom(struct dvb_usb_device *d, u8 address, u8 * values,
         u8 seq;
         int ret, i;
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
 
         memset(st->data, 0, sizeof(st->data));
 
@@ -559,7 +558,7 @@ int af9005_read_eeprom(struct dvb_usb_device *d, u8 address, u8 * values,
                 for (i = 0; i < len; i++)
                         values[i] = st->data[6 + i];
         }
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
 
         return ret;
 }
@@ -847,7 +846,7 @@ static int af9005_rc_query(struct dvb_usb_device *d, u32 * event, int *state)
                 return 0;
         }
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
 
         /* deb_info("rc_query\n"); */
         st->data[0] = 3;                /* rest of packet length low */
@@ -890,7 +889,7 @@ static int af9005_rc_query(struct dvb_usb_device *d, u32 * event, int *state)
         }
 
 ret:
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
         return ret;
 }
 
@@ -1004,20 +1003,8 @@ static struct dvb_usb_device_properties af9005_properties;
 static int af9005_usb_probe(struct usb_interface *intf,
                             const struct usb_device_id *id)
 {
-        struct dvb_usb_device *d;
-        struct af9005_device_state *st;
-        int ret;
-
-        ret = dvb_usb_device_init(intf, &af9005_properties,
-                                  THIS_MODULE, &d, adapter_nr);
-
-        if (ret < 0)
-                return ret;
-
-        st = d->priv;
-        mutex_init(&st->data_mutex);
-
-        return 0;
+        return dvb_usb_device_init(intf, &af9005_properties,
+                                  THIS_MODULE, NULL, adapter_nr);
 }
 
 enum af9005_usb_table_entry {
diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
index 8ac825413d5a..290275bc7fde 100644
--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
@@ -42,7 +42,6 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 struct cinergyt2_state {
         u8 rc_counter;
         unsigned char data[64];
-        struct mutex data_mutex;
 };
 
 /* We are missing a release hook with usb_device data */
@@ -56,12 +55,12 @@ static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
         struct cinergyt2_state *st = d->priv;
         int ret;
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
         st->data[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
         st->data[1] = enable ? 1 : 0;
 
         ret = dvb_usb_generic_rw(d, st->data, 2, st->data, 64, 0);
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
 
         return ret;
 }
@@ -71,12 +70,12 @@ static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
         struct cinergyt2_state *st = d->priv;
         int ret;
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
         st->data[0] = CINERGYT2_EP1_SLEEP_MODE;
         st->data[1] = enable ? 0 : 1;
 
         ret = dvb_usb_generic_rw(d, st->data, 2, st->data, 3, 0);
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
 
         return ret;
 }
@@ -89,7 +88,7 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
 
         adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
         st->data[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
 
         ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 3, 0);
@@ -97,7 +96,7 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
                 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
                         "state info\n");
         }
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
 
         /* Copy this pointer as we are gonna need it in the release phase */
         cinergyt2_usb_device = adap->dev;
@@ -166,7 +165,7 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 
         *state = REMOTE_NO_KEY_PRESSED;
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
         st->data[0] = CINERGYT2_EP1_GET_RC_EVENTS;
 
         ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 5, 0);
@@ -202,29 +201,17 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
         }
 
 ret:
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
         return ret;
 }
 
 static int cinergyt2_usb_probe(struct usb_interface *intf,
                                 const struct usb_device_id *id)
 {
-        struct dvb_usb_device *d;
-        struct cinergyt2_state *st;
-        int ret;
-
-        ret = dvb_usb_device_init(intf, &cinergyt2_properties,
-                                  THIS_MODULE, &d, adapter_nr);
-        if (ret < 0)
-                return ret;
-
-        st = d->priv;
-        mutex_init(&st->data_mutex);
-
-        return 0;
+        return dvb_usb_device_init(intf, &cinergyt2_properties,
+                                   THIS_MODULE, NULL, adapter_nr);
 }
 
-
 static struct usb_device_id cinergyt2_usb_table[] = {
         { USB_DEVICE(USB_VID_TERRATEC, 0x0038) },
         { 0 }
diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
index 39772812269d..243403081fa5 100644
--- a/drivers/media/usb/dvb-usb/cxusb.c
+++ b/drivers/media/usb/dvb-usb/cxusb.c
@@ -68,7 +68,7 @@ static int cxusb_ctrl_msg(struct dvb_usb_device *d,
 
         wo = (rbuf == NULL || rlen == 0); /* write-only */
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
         st->data[0] = cmd;
         memcpy(&st->data[1], wbuf, wlen);
         if (wo)
@@ -77,7 +77,7 @@ static int cxusb_ctrl_msg(struct dvb_usb_device *d,
                 ret = dvb_usb_generic_rw(d, st->data, 1 + wlen,
                                          rbuf, rlen, 0);
 
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
         return ret;
 }
 
@@ -1461,43 +1461,36 @@ static struct dvb_usb_device_properties cxusb_mygica_t230_properties;
 static int cxusb_probe(struct usb_interface *intf,
                        const struct usb_device_id *id)
 {
-        struct dvb_usb_device *d;
-        struct cxusb_state *st;
-
         if (0 == dvb_usb_device_init(intf, &cxusb_medion_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_bluebird_lgh064f_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_bluebird_dee1601_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_bluebird_lgz201_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_bluebird_dtt7579_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_bluebird_dualdig4_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_bluebird_nano2_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf,
                                 &cxusb_bluebird_nano2_needsfirmware_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_aver_a868r_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf,
                                      &cxusb_bluebird_dualdig4_rev2_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_d680_dmb_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_mygica_d689_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_mygica_t230_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
-            0) {
-                st = d->priv;
-                mutex_init(&st->data_mutex);
-
+                                     THIS_MODULE, NULL, adapter_nr) ||
+            0)
                 return 0;
-        }
 
         return -EINVAL;
 }
diff --git a/drivers/media/usb/dvb-usb/cxusb.h b/drivers/media/usb/dvb-usb/cxusb.h
index 9f3ee0e47d5c..18acda19527a 100644
--- a/drivers/media/usb/dvb-usb/cxusb.h
+++ b/drivers/media/usb/dvb-usb/cxusb.h
@@ -37,7 +37,6 @@ struct cxusb_state {
         struct i2c_client *i2c_client_tuner;
 
         unsigned char data[MAX_XFER_SIZE];
-        struct mutex data_mutex;
 };
 
 #endif
diff --git a/drivers/media/usb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c
index 92d5408684ac..47ce9d5de4c6 100644
--- a/drivers/media/usb/dvb-usb/dib0700_core.c
+++ b/drivers/media/usb/dvb-usb/dib0700_core.c
@@ -704,7 +704,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
         struct dvb_usb_device *d = purb->context;
         struct dib0700_rc_response *poll_reply;
         enum rc_type protocol;
-        u32 uninitialized_var(keycode);
+        u32 keycode;
         u8 toggle;
 
         deb_info("%s()\n", __func__);
@@ -745,7 +745,8 @@ static void dib0700_rc_urb_completion(struct urb *purb)
                     poll_reply->nec.data       == 0x00 &&
                     poll_reply->nec.not_data   == 0xff) {
                         poll_reply->data_state = 2;
-                        break;
+                        rc_repeat(d->rc_dev);
+                        goto resubmit;
                 }
 
                 if ((poll_reply->nec.data ^ poll_reply->nec.not_data) != 0xff) {
diff --git a/drivers/media/usb/dvb-usb/dtt200u.c b/drivers/media/usb/dvb-usb/dtt200u.c
index f88572c7ae7c..fcbff7fb0c4e 100644
--- a/drivers/media/usb/dvb-usb/dtt200u.c
+++ b/drivers/media/usb/dvb-usb/dtt200u.c
@@ -22,7 +22,6 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 struct dtt200u_state {
         unsigned char data[80];
-        struct mutex data_mutex;
 };
 
 static int dtt200u_power_ctrl(struct dvb_usb_device *d, int onoff)
@@ -30,23 +29,24 @@ static int dtt200u_power_ctrl(struct dvb_usb_device *d, int onoff)
         struct dtt200u_state *st = d->priv;
         int ret = 0;
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
 
         st->data[0] = SET_INIT;
 
         if (onoff)
                 ret = dvb_usb_generic_write(d, st->data, 2);
 
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
         return ret;
 }
 
 static int dtt200u_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 {
-        struct dtt200u_state *st = adap->dev->priv;
+        struct dvb_usb_device *d = adap->dev;
+        struct dtt200u_state *st = d->priv;
         int ret;
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
         st->data[0] = SET_STREAMING;
         st->data[1] = onoff;
 
@@ -61,26 +61,27 @@ static int dtt200u_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
         ret = dvb_usb_generic_write(adap->dev, st->data, 1);
 
 ret:
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
 
         return ret;
 }
 
 static int dtt200u_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, int onoff)
 {
-        struct dtt200u_state *st = adap->dev->priv;
+        struct dvb_usb_device *d = adap->dev;
+        struct dtt200u_state *st = d->priv;
         int ret;
 
         pid = onoff ? pid : 0;
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
         st->data[0] = SET_PID_FILTER;
         st->data[1] = index;
         st->data[2] = pid & 0xff;
         st->data[3] = (pid >> 8) & 0x1f;
 
         ret = dvb_usb_generic_write(adap->dev, st->data, 4);
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
 
         return ret;
 }
@@ -91,7 +92,7 @@ static int dtt200u_rc_query(struct dvb_usb_device *d)
         u32 scancode;
         int ret;
 
-        mutex_lock(&st->data_mutex);
+        mutex_lock(&d->data_mutex);
         st->data[0] = GET_RC_CODE;
 
         ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 5, 0);
@@ -126,7 +127,7 @@ static int dtt200u_rc_query(struct dvb_usb_device *d)
                 deb_info("st->data: %*ph\n", 5, st->data);
 
 ret:
-        mutex_unlock(&st->data_mutex);
+        mutex_unlock(&d->data_mutex);
         return ret;
 }
 
@@ -145,24 +146,17 @@ static struct dvb_usb_device_properties wt220u_miglia_properties;
 static int dtt200u_usb_probe(struct usb_interface *intf,
                 const struct usb_device_id *id)
 {
-        struct dvb_usb_device *d;
-        struct dtt200u_state *st;
-
         if (0 == dvb_usb_device_init(intf, &dtt200u_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &wt220u_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &wt220u_fc_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &wt220u_zl0353_properties,
-                                     THIS_MODULE, &d, adapter_nr) ||
+                                     THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &wt220u_miglia_properties,
-                                     THIS_MODULE, &d, adapter_nr)) {
-                st = d->priv;
-                mutex_init(&st->data_mutex);
-
+                                     THIS_MODULE, NULL, adapter_nr))
                 return 0;
-        }
 
         return -ENODEV;
 }
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c
index 3896ba9a4179..84308569e7dc 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c
@@ -142,6 +142,7 @@ static int dvb_usb_init(struct dvb_usb_device *d, short *adapter_nums)
 {
         int ret = 0;
 
+        mutex_init(&d->data_mutex);
         mutex_init(&d->usb_mutex);
         mutex_init(&d->i2c_mutex);
 
diff --git a/drivers/media/usb/dvb-usb/dvb-usb.h b/drivers/media/usb/dvb-usb/dvb-usb.h
index 639c4678c65b..107255b08b2b 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb.h
+++ b/drivers/media/usb/dvb-usb/dvb-usb.h
@@ -404,8 +404,12 @@ struct dvb_usb_adapter {
  *  Powered is in/decremented for each call to modify the state.
  * @udev: pointer to the device's struct usb_device.
  *
- * @usb_mutex: semaphore of USB control messages (reading needs two messages)
- * @i2c_mutex: semaphore for i2c-transfers
+ * @data_mutex: mutex to protect the data structure used to store URB data
+ * @usb_mutex: mutex of USB control messages (reading needs two messages).
+ *      Please notice that this mutex is used internally at the generic
+ *      URB control functions. So, drivers using dvb_usb_generic_rw() and
+ *      derivated functions should not lock it internally.
+ * @i2c_mutex: mutex for i2c-transfers
  *
  * @i2c_adap: device's i2c_adapter if it uses I2CoverUSB
  *
@@ -433,6 +437,7 @@ struct dvb_usb_device {
         int powered;
 
         /* locking */
+        struct mutex data_mutex;
         struct mutex usb_mutex;
 
         /* i2c */
diff --git a/drivers/media/usb/dvb-usb/gp8psk.c b/drivers/media/usb/dvb-usb/gp8psk.c
index adfd76491451..993bb7a72985 100644
--- a/drivers/media/usb/dvb-usb/gp8psk.c
+++ b/drivers/media/usb/dvb-usb/gp8psk.c
@@ -15,6 +15,7 @@
  * see Documentation/dvb/README.dvb-usb for more information
  */
 #include "gp8psk.h"
+#include "gp8psk-fe.h"
 
 /* debug */
 static char bcm4500_firmware[] = "dvb-usb-gp8psk-02.fw";
@@ -28,34 +29,8 @@ struct gp8psk_state {
         unsigned char data[80];
 };
 
-static int gp8psk_get_fw_version(struct dvb_usb_device *d, u8 *fw_vers)
-{
-        return (gp8psk_usb_in_op(d, GET_FW_VERS, 0, 0, fw_vers, 6));
-}
-
-static int gp8psk_get_fpga_version(struct dvb_usb_device *d, u8 *fpga_vers)
-{
-        return (gp8psk_usb_in_op(d, GET_FPGA_VERS, 0, 0, fpga_vers, 1));
-}
-
-static void gp8psk_info(struct dvb_usb_device *d)
-{
-        u8 fpga_vers, fw_vers[6];
-
-        if (!gp8psk_get_fw_version(d, fw_vers))
-                info("FW Version = %i.%02i.%i (0x%x)  Build %4i/%02i/%02i",
-                fw_vers[2], fw_vers[1], fw_vers[0], GP8PSK_FW_VERS(fw_vers),
-                2000 + fw_vers[5], fw_vers[4], fw_vers[3]);
-        else
-                info("failed to get FW version");
-
-        if (!gp8psk_get_fpga_version(d, &fpga_vers))
-                info("FPGA Version = %i", fpga_vers);
-        else
-                info("failed to get FPGA version");
-}
-
-int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen)
+static int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value,
+                            u16 index, u8 *b, int blen)
 {
         struct gp8psk_state *st = d->priv;
         int ret = 0,try = 0;
@@ -67,7 +42,6 @@ int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8
                 return ret;
 
         while (ret >= 0 && ret != blen && try < 3) {
-                memcpy(st->data, b, blen);
                 ret = usb_control_msg(d->udev,
                         usb_rcvctrlpipe(d->udev,0),
                         req,
@@ -81,8 +55,10 @@ int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8
         if (ret < 0 || ret != blen) {
                 warn("usb in %d operation failed.", req);
                 ret = -EIO;
-        } else
+        } else {
                 ret = 0;
+                memcpy(b, st->data, blen);
+        }
 
         deb_xfer("in: req. %x, val: %x, ind: %x, buffer: ",req,value,index);
         debug_dump(b,blen,deb_xfer);
@@ -92,7 +68,7 @@ int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8
         return ret;
 }
 
-int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,
+static int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,
                              u16 index, u8 *b, int blen)
 {
         struct gp8psk_state *st = d->priv;
@@ -123,6 +99,34 @@ int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,
         return ret;
 }
 
+
+static int gp8psk_get_fw_version(struct dvb_usb_device *d, u8 *fw_vers)
+{
+        return gp8psk_usb_in_op(d, GET_FW_VERS, 0, 0, fw_vers, 6);
+}
+
+static int gp8psk_get_fpga_version(struct dvb_usb_device *d, u8 *fpga_vers)
+{
+        return gp8psk_usb_in_op(d, GET_FPGA_VERS, 0, 0, fpga_vers, 1);
+}
+
+static void gp8psk_info(struct dvb_usb_device *d)
+{
+        u8 fpga_vers, fw_vers[6];
+
+        if (!gp8psk_get_fw_version(d, fw_vers))
+                info("FW Version = %i.%02i.%i (0x%x)  Build %4i/%02i/%02i",
+                fw_vers[2], fw_vers[1], fw_vers[0], GP8PSK_FW_VERS(fw_vers),
+                2000 + fw_vers[5], fw_vers[4], fw_vers[3]);
+        else
+                info("failed to get FW version");
+
+        if (!gp8psk_get_fpga_version(d, &fpga_vers))
+                info("FPGA Version = %i", fpga_vers);
+        else
+                info("failed to get FPGA version");
+}
+
 static int gp8psk_load_bcm4500fw(struct dvb_usb_device *d)
 {
         int ret;
@@ -225,10 +229,13 @@ static int gp8psk_power_ctrl(struct dvb_usb_device *d, int onoff)
         return 0;
 }
 
-int gp8psk_bcm4500_reload(struct dvb_usb_device *d)
+static int gp8psk_bcm4500_reload(struct dvb_usb_device *d)
 {
         u8 buf;
         int gp_product_id = le16_to_cpu(d->udev->descriptor.idProduct);
+
+        deb_xfer("reloading firmware\n");
+
         /* Turn off 8psk power */
         if (gp8psk_usb_in_op(d, BOOT_8PSK, 0, 0, &buf, 1))
                 return -EINVAL;
@@ -247,9 +254,47 @@ static int gp8psk_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
         return gp8psk_usb_out_op(adap->dev, ARM_TRANSFER, onoff, 0 , NULL, 0);
 }
 
+/* Callbacks for gp8psk-fe.c */
+
+static int gp8psk_fe_in(void *priv, u8 req, u16 value,
+                            u16 index, u8 *b, int blen)
+{
+        struct dvb_usb_device *d = priv;
+
+        return gp8psk_usb_in_op(d, req, value, index, b, blen);
+}
+
+static int gp8psk_fe_out(void *priv, u8 req, u16 value,
+                            u16 index, u8 *b, int blen)
+{
+        struct dvb_usb_device *d = priv;
+
+        return gp8psk_usb_out_op(d, req, value, index, b, blen);
+}
+
+static int gp8psk_fe_reload(void *priv)
+{
+        struct dvb_usb_device *d = priv;
+
+        return gp8psk_bcm4500_reload(d);
+}
+
+const struct gp8psk_fe_ops gp8psk_fe_ops = {
+        .in = gp8psk_fe_in,
+        .out = gp8psk_fe_out,
+        .reload = gp8psk_fe_reload,
+};
+
 static int gp8psk_frontend_attach(struct dvb_usb_adapter *adap)
 {
-        adap->fe_adap[0].fe = gp8psk_fe_attach(adap->dev);
+        struct dvb_usb_device *d = adap->dev;
+        int id = le16_to_cpu(d->udev->descriptor.idProduct);
+        int is_rev1;
+
+        is_rev1 = (id == USB_PID_GENPIX_8PSK_REV_1_WARM) ? true : false;
+
+        adap->fe_adap[0].fe = dvb_attach(gp8psk_fe_attach,
+                                         &gp8psk_fe_ops, d, is_rev1);
         return 0;
 }
 
diff --git a/drivers/media/usb/dvb-usb/gp8psk.h b/drivers/media/usb/dvb-usb/gp8psk.h
index ed32b9da4843..d8975b866dee 100644
--- a/drivers/media/usb/dvb-usb/gp8psk.h
+++ b/drivers/media/usb/dvb-usb/gp8psk.h
@@ -24,58 +24,6 @@ extern int dvb_usb_gp8psk_debug;
 #define deb_info(args...) dprintk(dvb_usb_gp8psk_debug,0x01,args)
 #define deb_xfer(args...) dprintk(dvb_usb_gp8psk_debug,0x02,args)
 #define deb_rc(args...)   dprintk(dvb_usb_gp8psk_debug,0x04,args)
-#define deb_fe(args...)   dprintk(dvb_usb_gp8psk_debug,0x08,args)
-
-/* Twinhan Vendor requests */
-#define TH_COMMAND_IN                     0xC0
-#define TH_COMMAND_OUT                    0xC1
-
-/* gp8psk commands */
-
-#define GET_8PSK_CONFIG                 0x80    /* in */
-#define SET_8PSK_CONFIG                 0x81
-#define I2C_WRITE                       0x83
-#define I2C_READ                        0x84
-#define ARM_TRANSFER                    0x85
-#define TUNE_8PSK                       0x86
-#define GET_SIGNAL_STRENGTH             0x87    /* in */
-#define LOAD_BCM4500                    0x88
-#define BOOT_8PSK                       0x89    /* in */
-#define START_INTERSIL                  0x8A    /* in */
-#define SET_LNB_VOLTAGE                 0x8B
-#define SET_22KHZ_TONE                  0x8C
-#define SEND_DISEQC_COMMAND             0x8D
-#define SET_DVB_MODE                    0x8E
-#define SET_DN_SWITCH                   0x8F
-#define GET_SIGNAL_LOCK                 0x90    /* in */
-#define GET_FW_VERS                     0x92
-#define GET_SERIAL_NUMBER               0x93    /* in */
-#define USE_EXTRA_VOLT                  0x94
-#define GET_FPGA_VERS                   0x95
-#define CW3K_INIT                       0x9d
-
-/* PSK_configuration bits */
-#define bm8pskStarted                   0x01
-#define bm8pskFW_Loaded                 0x02
-#define bmIntersilOn                    0x04
-#define bmDVBmode                       0x08
-#define bm22kHz                         0x10
-#define bmSEL18V                        0x20
-#define bmDCtuned                       0x40
-#define bmArmed                         0x80
-
-/* Satellite modulation modes */
-#define ADV_MOD_DVB_QPSK 0     /* DVB-S QPSK */
-#define ADV_MOD_TURBO_QPSK 1   /* Turbo QPSK */
-#define ADV_MOD_TURBO_8PSK 2   /* Turbo 8PSK (also used for Trellis 8PSK) */
-#define ADV_MOD_TURBO_16QAM 3  /* Turbo 16QAM (also used for Trellis 8PSK) */
-
-#define ADV_MOD_DCII_C_QPSK 4  /* Digicipher II Combo */
-#define ADV_MOD_DCII_I_QPSK 5  /* Digicipher II I-stream */
-#define ADV_MOD_DCII_Q_QPSK 6  /* Digicipher II Q-stream */
-#define ADV_MOD_DCII_C_OQPSK 7 /* Digicipher II offset QPSK */
-#define ADV_MOD_DSS_QPSK 8     /* DSS (DIRECTV) QPSK */
-#define ADV_MOD_DVB_BPSK 9     /* DVB-S BPSK */
 
 #define GET_USB_SPEED                     0x07
 
@@ -86,15 +34,4 @@ extern int dvb_usb_gp8psk_debug;
 #define PRODUCT_STRING_READ               0x0D
 #define FW_BCD_VERSION_READ               0x14
 
-/* firmware revision id's */
-#define GP8PSK_FW_REV1                  0x020604
-#define GP8PSK_FW_REV2                  0x020704
-#define GP8PSK_FW_VERS(_fw_vers)        ((_fw_vers)[2]<<0x10 | (_fw_vers)[1]<<0x08 | (_fw_vers)[0])
-
-extern struct dvb_frontend * gp8psk_fe_attach(struct dvb_usb_device *d);
-extern int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen);
-extern int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,
-                             u16 index, u8 *b, int blen);
-extern int gp8psk_bcm4500_reload(struct dvb_usb_device *d);
-
 #endif
diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c
index 3228fd182a99..9ff243970e93 100644
--- a/drivers/mfd/intel-lpss-pci.c
+++ b/drivers/mfd/intel-lpss-pci.c
@@ -123,19 +123,6 @@ static const struct intel_lpss_platform_info apl_i2c_info = {
         .properties = apl_i2c_properties,
 };
 
-static const struct intel_lpss_platform_info kbl_info = {
-        .clk_rate = 120000000,
-};
-
-static const struct intel_lpss_platform_info kbl_uart_info = {
-        .clk_rate = 120000000,
-        .clk_con_id = "baudclk",
-};
-
-static const struct intel_lpss_platform_info kbl_i2c_info = {
-        .clk_rate = 133000000,
-};
-
 static const struct pci_device_id intel_lpss_pci_ids[] = {
         /* BXT A-Step */
         { PCI_VDEVICE(INTEL, 0x0aac), (kernel_ulong_t)&bxt_i2c_info },
@@ -207,15 +194,15 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
         { PCI_VDEVICE(INTEL, 0xa161), (kernel_ulong_t)&spt_i2c_info },
         { PCI_VDEVICE(INTEL, 0xa166), (kernel_ulong_t)&spt_uart_info },
         /* KBL-H */
-        { PCI_VDEVICE(INTEL, 0xa2a7), (kernel_ulong_t)&kbl_uart_info },
-        { PCI_VDEVICE(INTEL, 0xa2a8), (kernel_ulong_t)&kbl_uart_info },
-        { PCI_VDEVICE(INTEL, 0xa2a9), (kernel_ulong_t)&kbl_info },
-        { PCI_VDEVICE(INTEL, 0xa2aa), (kernel_ulong_t)&kbl_info },
-        { PCI_VDEVICE(INTEL, 0xa2e0), (kernel_ulong_t)&kbl_i2c_info },
-        { PCI_VDEVICE(INTEL, 0xa2e1), (kernel_ulong_t)&kbl_i2c_info },
-        { PCI_VDEVICE(INTEL, 0xa2e2), (kernel_ulong_t)&kbl_i2c_info },
-        { PCI_VDEVICE(INTEL, 0xa2e3), (kernel_ulong_t)&kbl_i2c_info },
-        { PCI_VDEVICE(INTEL, 0xa2e6), (kernel_ulong_t)&kbl_uart_info },
+        { PCI_VDEVICE(INTEL, 0xa2a7), (kernel_ulong_t)&spt_uart_info },
+        { PCI_VDEVICE(INTEL, 0xa2a8), (kernel_ulong_t)&spt_uart_info },
+        { PCI_VDEVICE(INTEL, 0xa2a9), (kernel_ulong_t)&spt_info },
+        { PCI_VDEVICE(INTEL, 0xa2aa), (kernel_ulong_t)&spt_info },
+        { PCI_VDEVICE(INTEL, 0xa2e0), (kernel_ulong_t)&spt_i2c_info },
+        { PCI_VDEVICE(INTEL, 0xa2e1), (kernel_ulong_t)&spt_i2c_info },
+        { PCI_VDEVICE(INTEL, 0xa2e2), (kernel_ulong_t)&spt_i2c_info },
+        { PCI_VDEVICE(INTEL, 0xa2e3), (kernel_ulong_t)&spt_i2c_info },
+        { PCI_VDEVICE(INTEL, 0xa2e6), (kernel_ulong_t)&spt_uart_info },
         { }
 };
 MODULE_DEVICE_TABLE(pci, intel_lpss_pci_ids);
diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
index 41b113875d64..70c646b0097d 100644
--- a/drivers/mfd/intel-lpss.c
+++ b/drivers/mfd/intel-lpss.c
@@ -502,9 +502,6 @@ int intel_lpss_suspend(struct device *dev)
         for (i = 0; i < LPSS_PRIV_REG_COUNT; i++)
                 lpss->priv_ctx[i] = readl(lpss->priv + i * 4);
 
-        /* Put the device into reset state */
-        writel(0, lpss->priv + LPSS_PRIV_RESETS);
-
         return 0;
 }
 EXPORT_SYMBOL_GPL(intel_lpss_suspend);
diff --git a/drivers/mfd/intel_soc_pmic_bxtwc.c b/drivers/mfd/intel_soc_pmic_bxtwc.c
index 43e54b7e908f..f9a8c5203873 100644
--- a/drivers/mfd/intel_soc_pmic_bxtwc.c
+++ b/drivers/mfd/intel_soc_pmic_bxtwc.c
@@ -86,6 +86,7 @@ enum bxtwc_irqs_level2 {
         BXTWC_THRM2_IRQ,
         BXTWC_BCU_IRQ,
         BXTWC_ADC_IRQ,
+        BXTWC_USBC_IRQ,
         BXTWC_CHGR0_IRQ,
         BXTWC_CHGR1_IRQ,
         BXTWC_GPIO0_IRQ,
@@ -111,7 +112,8 @@ static const struct regmap_irq bxtwc_regmap_irqs_level2[] = {
         REGMAP_IRQ_REG(BXTWC_THRM2_IRQ, 2, 0xff),
         REGMAP_IRQ_REG(BXTWC_BCU_IRQ, 3, 0x1f),
         REGMAP_IRQ_REG(BXTWC_ADC_IRQ, 4, 0xff),
-        REGMAP_IRQ_REG(BXTWC_CHGR0_IRQ, 5, 0x3f),
+        REGMAP_IRQ_REG(BXTWC_USBC_IRQ, 5, BIT(5)),
+        REGMAP_IRQ_REG(BXTWC_CHGR0_IRQ, 5, 0x1f),
         REGMAP_IRQ_REG(BXTWC_CHGR1_IRQ, 6, 0x1f),
         REGMAP_IRQ_REG(BXTWC_GPIO0_IRQ, 7, 0xff),
         REGMAP_IRQ_REG(BXTWC_GPIO1_IRQ, 8, 0x3f),
@@ -146,7 +148,7 @@ static struct resource adc_resources[] = {
 };
 
 static struct resource usbc_resources[] = {
-        DEFINE_RES_IRQ_NAMED(BXTWC_CHGR0_IRQ, "USBC"),
+        DEFINE_RES_IRQ(BXTWC_USBC_IRQ),
 };
 
 static struct resource charger_resources[] = {
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 3ac486a597f3..c57e407020f1 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -399,6 +399,8 @@ int mfd_clone_cell(const char *cell, const char **clones, size_t n_clones)
                                         clones[i]);
         }
 
+        put_device(dev);
+
         return 0;
 }
 EXPORT_SYMBOL(mfd_clone_cell);
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index cfdae8a3d779..b0c7bcdaf5df 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -851,6 +851,8 @@ static int stmpe_reset(struct stmpe *stmpe)
         if (ret < 0)
                 return ret;
 
+        msleep(10);
+
         timeout = jiffies + msecs_to_jiffies(100);
         while (time_before(jiffies, timeout)) {
                 ret = __stmpe_reg_read(stmpe, stmpe->regs[STMPE_IDX_SYS_CTRL]);
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index 2f2225e845ef..b93fe4c4957a 100644
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -73,8 +73,10 @@ static struct syscon *of_syscon_register(struct device_node *np)
         /* Parse the device's DT node for an endianness specification */
         if (of_property_read_bool(np, "big-endian"))
                 syscon_config.val_format_endian = REGMAP_ENDIAN_BIG;
-         else if (of_property_read_bool(np, "little-endian"))
+        else if (of_property_read_bool(np, "little-endian"))
                 syscon_config.val_format_endian = REGMAP_ENDIAN_LITTLE;
+        else if (of_property_read_bool(np, "native-endian"))
+                syscon_config.val_format_endian = REGMAP_ENDIAN_NATIVE;
 
         /*
          * search for reg-io-width property in DT. If it is not provided,
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 7eec619a6023..8588dbad3301 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -393,8 +393,13 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                 BUG();
                 goto err;
         }
-                
-        ret = devm_regulator_bulk_get(wm8994->dev, wm8994->num_supplies,
+
+        /*
+         * Can't use devres helper here as some of the supplies are provided by
+         * wm8994->dev's children (regulators) and those regulators are
+         * unregistered by the devres core before the supplies are freed.
+         */
+        ret = regulator_bulk_get(wm8994->dev, wm8994->num_supplies,
                                  wm8994->supplies);
         if (ret != 0) {
                 dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret);
@@ -405,7 +410,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                                     wm8994->supplies);
         if (ret != 0) {
                 dev_err(wm8994->dev, "Failed to enable supplies: %d\n", ret);
-                goto err;
+                goto err_regulator_free;
         }
 
         ret = wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET);
@@ -596,6 +601,8 @@ err_irq:
 err_enable:
         regulator_bulk_disable(wm8994->num_supplies,
                                wm8994->supplies);
+err_regulator_free:
+        regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);
 err:
         mfd_remove_devices(wm8994->dev);
         return ret;
@@ -604,10 +611,11 @@ err:
 static void wm8994_device_exit(struct wm8994 *wm8994)
 {
         pm_runtime_disable(wm8994->dev);
-        mfd_remove_devices(wm8994->dev);
         wm8994_irq_exit(wm8994);
         regulator_bulk_disable(wm8994->num_supplies,
                                wm8994->supplies);
+        regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);
+        mfd_remove_devices(wm8994->dev);
 }
 
 static const struct of_device_id wm8994_of_match[] = {
diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c
index e9e6ea3ab73c..75b9d4ac8b1e 100644
--- a/drivers/misc/mei/bus-fixup.c
+++ b/drivers/misc/mei/bus-fixup.c
@@ -178,7 +178,7 @@ static int mei_nfc_if_version(struct mei_cl *cl,
 
         ret = 0;
         bytes_recv = __mei_cl_recv(cl, (u8 *)reply, if_version_length);
-        if (bytes_recv < 0 || bytes_recv < sizeof(struct mei_nfc_reply)) {
+        if (bytes_recv < if_version_length) {
                 dev_err(bus->dev, "Could not read IF version\n");
                 ret = -EIO;
                 goto err;
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index 5a8dc5a76e0d..3678220964fe 100644
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -2347,7 +2347,7 @@ static int mmc_test_ongoing_transfer(struct mmc_test_card *test,
         struct mmc_test_req *rq = mmc_test_req_alloc();
         struct mmc_host *host = test->card->host;
         struct mmc_test_area *t = &test->area;
-        struct mmc_async_req areq;
+        struct mmc_test_async_req test_areq = { .test = test };
         struct mmc_request *mrq;
         unsigned long timeout;
         bool expired = false;
@@ -2363,8 +2363,8 @@ static int mmc_test_ongoing_transfer(struct mmc_test_card *test,
                 mrq->sbc = &rq->sbc;
         mrq->cap_cmd_during_tfr = true;
 
-        areq.mrq = mrq;
-        areq.err_check = mmc_test_check_result_async;
+        test_areq.areq.mrq = mrq;
+        test_areq.areq.err_check = mmc_test_check_result_async;
 
         mmc_test_prepare_mrq(test, mrq, t->sg, t->sg_len, dev_addr, t->blocks,
                              512, write);
@@ -2378,7 +2378,7 @@ static int mmc_test_ongoing_transfer(struct mmc_test_card *test,
 
         /* Start ongoing data request */
         if (use_areq) {
-                mmc_start_req(host, &areq, &ret);
+                mmc_start_req(host, &test_areq.areq, &ret);
                 if (ret)
                         goto out_free;
         } else {
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 39fc5b2b96c5..df19777068a6 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -26,6 +26,8 @@
 #include "mmc_ops.h"
 #include "sd_ops.h"
 
+#define DEFAULT_CMD6_TIMEOUT_MS 500
+
 static const unsigned int tran_exp[] = {
         10000,          100000,         1000000,        10000000,
         0,              0,              0,              0
@@ -571,6 +573,7 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd)
                 card->erased_byte = 0x0;
 
         /* eMMC v4.5 or later */
+        card->ext_csd.generic_cmd6_time = DEFAULT_CMD6_TIMEOUT_MS;
         if (card->ext_csd.rev >= 6) {
                 card->ext_csd.feature_support |= MMC_DISCARD_FEATURE;
 
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 4fcbc4012ed0..df478ae72e23 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1058,6 +1058,7 @@ static int dw_mci_submit_data_dma(struct dw_mci *host, struct mmc_data *data)
         spin_unlock_irqrestore(&host->irq_lock, irqflags);
 
         if (host->dma_ops->start(host, sg_len)) {
+                host->dma_ops->stop(host);
                 /* We can't do DMA, try PIO for this one */
                 dev_dbg(host->dev,
                         "%s: fall back to PIO mode for current transfer\n",
@@ -2940,7 +2941,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
                 return ERR_PTR(-ENOMEM);
 
         /* find reset controller when exist */
-        pdata->rstc = devm_reset_control_get_optional(dev, NULL);
+        pdata->rstc = devm_reset_control_get_optional(dev, "reset");
         if (IS_ERR(pdata->rstc)) {
                 if (PTR_ERR(pdata->rstc) == -EPROBE_DEFER)
                         return ERR_PTR(-EPROBE_DEFER);
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index d839147e591d..44ecebd1ea8c 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -661,13 +661,13 @@ static int mxs_mmc_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, mmc);
 
+        spin_lock_init(&host->lock);
+
         ret = devm_request_irq(&pdev->dev, irq_err, mxs_mmc_irq_handler, 0,
                                dev_name(&pdev->dev), host);
         if (ret)
                 goto out_free_dma;
 
-        spin_lock_init(&host->lock);
-
         ret = mmc_add_host(mmc);
         if (ret)
                 goto out_free_dma;
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index fb71c866eacc..1bb11e4a9fe5 100644
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -66,6 +66,20 @@ static u32 esdhc_readl_fixup(struct sdhci_host *host,
                         return ret;
                 }
         }
+        /*
+         * The DAT[3:0] line signal levels and the CMD line signal level are
+         * not compatible with standard SDHC register. The line signal levels
+         * DAT[7:0] are at bits 31:24 and the command line signal level is at
+         * bit 23. All other bits are the same as in the standard SDHC
+         * register.
+         */
+        if (spec_reg == SDHCI_PRESENT_STATE) {
+                ret = value & 0x000fffff;
+                ret |= (value >> 4) & SDHCI_DATA_LVL_MASK;
+                ret |= (value << 1) & SDHCI_CMD_LVL;
+                return ret;
+        }
+
         ret = value;
         return ret;
 }
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 71654b90227f..42ef3ebb1d8c 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2086,6 +2086,10 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
 
                 if (!host->tuning_done) {
                         pr_info(DRIVER_NAME ": Timeout waiting for Buffer Read Ready interrupt during tuning procedure, falling back to fixed sampling clock\n");
+
+                        sdhci_do_reset(host, SDHCI_RESET_CMD);
+                        sdhci_do_reset(host, SDHCI_RESET_DATA);
+
                         ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
                         ctrl &= ~SDHCI_CTRL_TUNED_CLK;
                         ctrl &= ~SDHCI_CTRL_EXEC_TUNING;
@@ -2286,10 +2290,8 @@ static bool sdhci_request_done(struct sdhci_host *host)
 
         for (i = 0; i < SDHCI_MAX_MRQS; i++) {
                 mrq = host->mrqs_done[i];
-                if (mrq) {
-                        host->mrqs_done[i] = NULL;
+                if (mrq)
                         break;
-                }
         }
 
         if (!mrq) {
@@ -2320,6 +2322,17 @@ static bool sdhci_request_done(struct sdhci_host *host)
          * upon error conditions.
          */
         if (sdhci_needs_reset(host, mrq)) {
+                /*
+                 * Do not finish until command and data lines are available for
+                 * reset. Note there can only be one other mrq, so it cannot
+                 * also be in mrqs_done, otherwise host->cmd and host->data_cmd
+                 * would both be null.
+                 */
+                if (host->cmd || host->data_cmd) {
+                        spin_unlock_irqrestore(&host->lock, flags);
+                        return true;
+                }
+
                 /* Some controllers need this kick or reset won't work here */
                 if (host->quirks & SDHCI_QUIRK_CLOCK_BEFORE_RESET)
                         /* This is to force an update */
@@ -2327,10 +2340,8 @@ static bool sdhci_request_done(struct sdhci_host *host)
 
                 /* Spec says we should do both at the same time, but Ricoh
                    controllers do not like that. */
-                if (!host->cmd)
-                        sdhci_do_reset(host, SDHCI_RESET_CMD);
-                if (!host->data_cmd)
-                        sdhci_do_reset(host, SDHCI_RESET_DATA);
+                sdhci_do_reset(host, SDHCI_RESET_CMD);
+                sdhci_do_reset(host, SDHCI_RESET_DATA);
 
                 host->pending_reset = false;
         }
@@ -2338,6 +2349,8 @@ static bool sdhci_request_done(struct sdhci_host *host)
         if (!sdhci_has_requests(host))
                 sdhci_led_deactivate(host);
 
+        host->mrqs_done[i] = NULL;
+
         mmiowb();
         spin_unlock_irqrestore(&host->lock, flags);
 
@@ -2512,9 +2525,6 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
         if (!host->data) {
                 struct mmc_command *data_cmd = host->data_cmd;
 
-                if (data_cmd)
-                        host->data_cmd = NULL;
-
                 /*
                  * The "data complete" interrupt is also used to
                  * indicate that a busy state has ended. See comment
@@ -2522,11 +2532,13 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
                  */
                 if (data_cmd && (data_cmd->flags & MMC_RSP_BUSY)) {
                         if (intmask & SDHCI_INT_DATA_TIMEOUT) {
+                                host->data_cmd = NULL;
                                 data_cmd->error = -ETIMEDOUT;
                                 sdhci_finish_mrq(host, data_cmd->mrq);
                                 return;
                         }
                         if (intmask & SDHCI_INT_DATA_END) {
+                                host->data_cmd = NULL;
                                 /*
                                  * Some cards handle busy-end interrupt
                                  * before the command completed, so make
@@ -2912,6 +2924,10 @@ int sdhci_runtime_resume_host(struct sdhci_host *host)
                 spin_unlock_irqrestore(&host->lock, flags);
         }
 
+        if ((mmc->caps2 & MMC_CAP2_HS400_ES) &&
+            mmc->ops->hs400_enhanced_strobe)
+                mmc->ops->hs400_enhanced_strobe(mmc, &mmc->ios);
+
         spin_lock_irqsave(&host->lock, flags);
 
         host->runtime_suspended = false;
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 766df17fb7eb..2570455b219a 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -73,6 +73,7 @@
 #define  SDHCI_DATA_LVL_MASK    0x00F00000
 #define   SDHCI_DATA_LVL_SHIFT  20
 #define   SDHCI_DATA_0_LVL_MASK 0x00100000
+#define  SDHCI_CMD_LVL          0x01000000
 
 #define SDHCI_HOST_CONTROL      0x28
 #define  SDHCI_CTRL_LED         0x01
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index 3eb7430dffbf..f8ff25c8ee2e 100644
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -142,6 +142,9 @@ struct plx_pci_card {
 #define CTI_PCI_VENDOR_ID               0x12c4
 #define CTI_PCI_DEVICE_ID_CRG001        0x0900
 
+#define MOXA_PCI_VENDOR_ID              0x1393
+#define MOXA_PCI_DEVICE_ID              0x0100
+
 static void plx_pci_reset_common(struct pci_dev *pdev);
 static void plx9056_pci_reset_common(struct pci_dev *pdev);
 static void plx_pci_reset_marathon_pci(struct pci_dev *pdev);
@@ -258,6 +261,14 @@ static struct plx_pci_card_info plx_pci_card_info_elcus = {
         /* based on PLX9030 */
 };
 
+static struct plx_pci_card_info plx_pci_card_info_moxa = {
+        "MOXA", 2,
+        PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
+        {0, 0x00, 0x00}, { {0, 0x00, 0x80}, {1, 0x00, 0x80} },
+        &plx_pci_reset_common
+         /* based on PLX9052 */
+};
+
 static const struct pci_device_id plx_pci_tbl[] = {
         {
                 /* Adlink PCI-7841/cPCI-7841 */
@@ -357,6 +368,13 @@ static const struct pci_device_id plx_pci_tbl[] = {
                 0, 0,
                 (kernel_ulong_t)&plx_pci_card_info_elcus
         },
+        {
+                /* moxa */
+                MOXA_PCI_VENDOR_ID, MOXA_PCI_DEVICE_ID,
+                PCI_ANY_ID, PCI_ANY_ID,
+                0, 0,
+                (kernel_ulong_t)&plx_pci_card_info_moxa
+        },
         { 0,}
 };
 MODULE_DEVICE_TABLE(pci, plx_pci_tbl);
diff --git a/drivers/net/can/usb/peak_usb/pcan_ucan.h b/drivers/net/can/usb/peak_usb/pcan_ucan.h
index e8fc4952c6b0..2147678f0225 100644
--- a/drivers/net/can/usb/peak_usb/pcan_ucan.h
+++ b/drivers/net/can/usb/peak_usb/pcan_ucan.h
@@ -43,11 +43,22 @@ struct __packed pucan_command {
         u16     args[3];
 };
 
+#define PUCAN_TSLOW_BRP_BITS            10
+#define PUCAN_TSLOW_TSGEG1_BITS         8
+#define PUCAN_TSLOW_TSGEG2_BITS         7
+#define PUCAN_TSLOW_SJW_BITS            7
+
+#define PUCAN_TSLOW_BRP_MASK            ((1 << PUCAN_TSLOW_BRP_BITS) - 1)
+#define PUCAN_TSLOW_TSEG1_MASK          ((1 << PUCAN_TSLOW_TSGEG1_BITS) - 1)
+#define PUCAN_TSLOW_TSEG2_MASK          ((1 << PUCAN_TSLOW_TSGEG2_BITS) - 1)
+#define PUCAN_TSLOW_SJW_MASK            ((1 << PUCAN_TSLOW_SJW_BITS) - 1)
+
 /* uCAN TIMING_SLOW command fields */
-#define PUCAN_TSLOW_SJW_T(s, t)         (((s) & 0xf) | ((!!(t)) << 7))
-#define PUCAN_TSLOW_TSEG2(t)            ((t) & 0xf)
-#define PUCAN_TSLOW_TSEG1(t)            ((t) & 0x3f)
-#define PUCAN_TSLOW_BRP(b)              ((b) & 0x3ff)
+#define PUCAN_TSLOW_SJW_T(s, t)         (((s) & PUCAN_TSLOW_SJW_MASK) | \
+                                                                ((!!(t)) << 7))
+#define PUCAN_TSLOW_TSEG2(t)            ((t) & PUCAN_TSLOW_TSEG2_MASK)
+#define PUCAN_TSLOW_TSEG1(t)            ((t) & PUCAN_TSLOW_TSEG1_MASK)
+#define PUCAN_TSLOW_BRP(b)              ((b) & PUCAN_TSLOW_BRP_MASK)
 
 struct __packed pucan_timing_slow {
         __le16  opcode_channel;
@@ -60,11 +71,21 @@ struct __packed pucan_timing_slow {
         __le16  brp;            /* BaudRate Prescaler */
 };
 
+#define PUCAN_TFAST_BRP_BITS            10
+#define PUCAN_TFAST_TSGEG1_BITS         5
+#define PUCAN_TFAST_TSGEG2_BITS         4
+#define PUCAN_TFAST_SJW_BITS            4
+
+#define PUCAN_TFAST_BRP_MASK            ((1 << PUCAN_TFAST_BRP_BITS) - 1)
+#define PUCAN_TFAST_TSEG1_MASK          ((1 << PUCAN_TFAST_TSGEG1_BITS) - 1)
+#define PUCAN_TFAST_TSEG2_MASK          ((1 << PUCAN_TFAST_TSGEG2_BITS) - 1)
+#define PUCAN_TFAST_SJW_MASK            ((1 << PUCAN_TFAST_SJW_BITS) - 1)
+
 /* uCAN TIMING_FAST command fields */
-#define PUCAN_TFAST_SJW(s)              ((s) & 0x3)
-#define PUCAN_TFAST_TSEG2(t)            ((t) & 0x7)
-#define PUCAN_TFAST_TSEG1(t)            ((t) & 0xf)
-#define PUCAN_TFAST_BRP(b)              ((b) & 0x3ff)
+#define PUCAN_TFAST_SJW(s)              ((s) & PUCAN_TFAST_SJW_MASK)
+#define PUCAN_TFAST_TSEG2(t)            ((t) & PUCAN_TFAST_TSEG2_MASK)
+#define PUCAN_TFAST_TSEG1(t)            ((t) & PUCAN_TFAST_TSEG1_MASK)
+#define PUCAN_TFAST_BRP(b)              ((b) & PUCAN_TFAST_BRP_MASK)
 
 struct __packed pucan_timing_fast {
         __le16  opcode_channel;
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
index c06382cdfdfe..0b0302af3bd2 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
@@ -39,6 +39,7 @@ static struct usb_device_id peak_usb_table[] = {
         {USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBPRO_PRODUCT_ID)},
         {USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBFD_PRODUCT_ID)},
         {USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBPROFD_PRODUCT_ID)},
+        {USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBX6_PRODUCT_ID)},
         {} /* Terminating entry */
 };
 
@@ -50,6 +51,7 @@ static const struct peak_usb_adapter *const peak_usb_adapters_list[] = {
         &pcan_usb_pro,
         &pcan_usb_fd,
         &pcan_usb_pro_fd,
+        &pcan_usb_x6,
 };
 
 /*
@@ -868,23 +870,25 @@ lbl_free_candev:
 static void peak_usb_disconnect(struct usb_interface *intf)
 {
         struct peak_usb_device *dev;
+        struct peak_usb_device *dev_prev_siblings;
 
         /* unregister as many netdev devices as siblings */
-        for (dev = usb_get_intfdata(intf); dev; dev = dev->prev_siblings) {
+        for (dev = usb_get_intfdata(intf); dev; dev = dev_prev_siblings) {
                 struct net_device *netdev = dev->netdev;
                 char name[IFNAMSIZ];
 
+                dev_prev_siblings = dev->prev_siblings;
                 dev->state &= ~PCAN_USB_STATE_CONNECTED;
                 strncpy(name, netdev->name, IFNAMSIZ);
 
                 unregister_netdev(netdev);
-                free_candev(netdev);
 
                 kfree(dev->cmd_buf);
                 dev->next_siblings = NULL;
                 if (dev->adapter->dev_free)
                         dev->adapter->dev_free(dev);
 
+                free_candev(netdev);
                 dev_info(&intf->dev, "%s removed\n", name);
         }
 
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.h b/drivers/net/can/usb/peak_usb/pcan_usb_core.h
index 506fe506c9d3..3cbfb069893d 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.h
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.h
@@ -27,6 +27,7 @@
 #define PCAN_USBPRO_PRODUCT_ID          0x000d
 #define PCAN_USBPROFD_PRODUCT_ID        0x0011
 #define PCAN_USBFD_PRODUCT_ID           0x0012
+#define PCAN_USBX6_PRODUCT_ID           0x0014
 
 #define PCAN_USB_DRIVER_NAME            "peak_usb"
 
@@ -90,6 +91,7 @@ extern const struct peak_usb_adapter pcan_usb;
 extern const struct peak_usb_adapter pcan_usb_pro;
 extern const struct peak_usb_adapter pcan_usb_fd;
 extern const struct peak_usb_adapter pcan_usb_pro_fd;
+extern const struct peak_usb_adapter pcan_usb_x6;
 
 struct peak_time_ref {
         struct timeval tv_host_0, tv_host;
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
index ce44a033f63b..304732550f0a 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
@@ -993,24 +993,24 @@ static void pcan_usb_fd_free(struct peak_usb_device *dev)
 static const struct can_bittiming_const pcan_usb_fd_const = {
         .name = "pcan_usb_fd",
         .tseg1_min = 1,
-        .tseg1_max = 64,
+        .tseg1_max = (1 << PUCAN_TSLOW_TSGEG1_BITS),
         .tseg2_min = 1,
-        .tseg2_max = 16,
-        .sjw_max = 16,
+        .tseg2_max = (1 << PUCAN_TSLOW_TSGEG2_BITS),
+        .sjw_max = (1 << PUCAN_TSLOW_SJW_BITS),
         .brp_min = 1,
-        .brp_max = 1024,
+        .brp_max = (1 << PUCAN_TSLOW_BRP_BITS),
         .brp_inc = 1,
 };
 
 static const struct can_bittiming_const pcan_usb_fd_data_const = {
         .name = "pcan_usb_fd",
         .tseg1_min = 1,
-        .tseg1_max = 16,
+        .tseg1_max = (1 << PUCAN_TFAST_TSGEG1_BITS),
         .tseg2_min = 1,
-        .tseg2_max = 8,
-        .sjw_max = 4,
+        .tseg2_max = (1 << PUCAN_TFAST_TSGEG2_BITS),
+        .sjw_max = (1 << PUCAN_TFAST_SJW_BITS),
         .brp_min = 1,
-        .brp_max = 1024,
+        .brp_max = (1 << PUCAN_TFAST_BRP_BITS),
         .brp_inc = 1,
 };
 
@@ -1065,24 +1065,24 @@ const struct peak_usb_adapter pcan_usb_fd = {
 static const struct can_bittiming_const pcan_usb_pro_fd_const = {
         .name = "pcan_usb_pro_fd",
         .tseg1_min = 1,
-        .tseg1_max = 64,
+        .tseg1_max = (1 << PUCAN_TSLOW_TSGEG1_BITS),
         .tseg2_min = 1,
-        .tseg2_max = 16,
-        .sjw_max = 16,
+        .tseg2_max = (1 << PUCAN_TSLOW_TSGEG2_BITS),
+        .sjw_max = (1 << PUCAN_TSLOW_SJW_BITS),
         .brp_min = 1,
-        .brp_max = 1024,
+        .brp_max = (1 << PUCAN_TSLOW_BRP_BITS),
         .brp_inc = 1,
 };
 
 static const struct can_bittiming_const pcan_usb_pro_fd_data_const = {
         .name = "pcan_usb_pro_fd",
         .tseg1_min = 1,
-        .tseg1_max = 16,
+        .tseg1_max = (1 << PUCAN_TFAST_TSGEG1_BITS),
         .tseg2_min = 1,
-        .tseg2_max = 8,
-        .sjw_max = 4,
+        .tseg2_max = (1 << PUCAN_TFAST_TSGEG2_BITS),
+        .sjw_max = (1 << PUCAN_TFAST_SJW_BITS),
         .brp_min = 1,
-        .brp_max = 1024,
+        .brp_max = (1 << PUCAN_TFAST_BRP_BITS),
         .brp_inc = 1,
 };
 
@@ -1132,3 +1132,75 @@ const struct peak_usb_adapter pcan_usb_pro_fd = {
 
         .do_get_berr_counter = pcan_usb_fd_get_berr_counter,
 };
+
+/* describes the PCAN-USB X6 adapter */
+static const struct can_bittiming_const pcan_usb_x6_const = {
+        .name = "pcan_usb_x6",
+        .tseg1_min = 1,
+        .tseg1_max = (1 << PUCAN_TSLOW_TSGEG1_BITS),
+        .tseg2_min = 1,
+        .tseg2_max = (1 << PUCAN_TSLOW_TSGEG2_BITS),
+        .sjw_max = (1 << PUCAN_TSLOW_SJW_BITS),
+        .brp_min = 1,
+        .brp_max = (1 << PUCAN_TSLOW_BRP_BITS),
+        .brp_inc = 1,
+};
+
+static const struct can_bittiming_const pcan_usb_x6_data_const = {
+        .name = "pcan_usb_x6",
+        .tseg1_min = 1,
+        .tseg1_max = (1 << PUCAN_TFAST_TSGEG1_BITS),
+        .tseg2_min = 1,
+        .tseg2_max = (1 << PUCAN_TFAST_TSGEG2_BITS),
+        .sjw_max = (1 << PUCAN_TFAST_SJW_BITS),
+        .brp_min = 1,
+        .brp_max = (1 << PUCAN_TFAST_BRP_BITS),
+        .brp_inc = 1,
+};
+
+const struct peak_usb_adapter pcan_usb_x6 = {
+        .name = "PCAN-USB X6",
+        .device_id = PCAN_USBX6_PRODUCT_ID,
+        .ctrl_count = PCAN_USBPROFD_CHANNEL_COUNT,
+        .ctrlmode_supported = CAN_CTRLMODE_FD |
+                        CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
+        .clock = {
+                .freq = PCAN_UFD_CRYSTAL_HZ,
+        },
+        .bittiming_const = &pcan_usb_x6_const,
+        .data_bittiming_const = &pcan_usb_x6_data_const,
+
+        /* size of device private data */
+        .sizeof_dev_private = sizeof(struct pcan_usb_fd_device),
+
+        /* timestamps usage */
+        .ts_used_bits = 32,
+        .ts_period = 1000000, /* calibration period in ts. */
+        .us_per_ts_scale = 1, /* us = (ts * scale) >> shift */
+        .us_per_ts_shift = 0,
+
+        /* give here messages in/out endpoints */
+        .ep_msg_in = PCAN_USBPRO_EP_MSGIN,
+        .ep_msg_out = {PCAN_USBPRO_EP_MSGOUT_0, PCAN_USBPRO_EP_MSGOUT_1},
+
+        /* size of rx/tx usb buffers */
+        .rx_buffer_size = PCAN_UFD_RX_BUFFER_SIZE,
+        .tx_buffer_size = PCAN_UFD_TX_BUFFER_SIZE,
+
+        /* device callbacks */
+        .intf_probe = pcan_usb_pro_probe,       /* same as PCAN-USB Pro */
+        .dev_init = pcan_usb_fd_init,
+
+        .dev_exit = pcan_usb_fd_exit,
+        .dev_free = pcan_usb_fd_free,
+        .dev_set_bus = pcan_usb_fd_set_bus,
+        .dev_set_bittiming = pcan_usb_fd_set_bittiming_slow,
+        .dev_set_data_bittiming = pcan_usb_fd_set_bittiming_fast,
+        .dev_decode_buf = pcan_usb_fd_decode_buf,
+        .dev_start = pcan_usb_fd_start,
+        .dev_stop = pcan_usb_fd_stop,
+        .dev_restart_async = pcan_usb_fd_restart_async,
+        .dev_encode_msg = pcan_usb_fd_encode_msg,
+
+        .do_get_berr_counter = pcan_usb_fd_get_berr_counter,
+};
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 7717b19dc806..947adda3397d 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -962,9 +962,10 @@ static void b53_vlan_add(struct dsa_switch *ds, int port,
 
                 vl->members |= BIT(port) | BIT(cpu_port);
                 if (untagged)
-                        vl->untag |= BIT(port) | BIT(cpu_port);
+                        vl->untag |= BIT(port);
                 else
-                        vl->untag &= ~(BIT(port) | BIT(cpu_port));
+                        vl->untag &= ~BIT(port);
+                vl->untag &= ~BIT(cpu_port);
 
                 b53_set_vlan_entry(dev, vid, vl);
                 b53_fast_age_vlan(dev, vid);
@@ -973,8 +974,6 @@ static void b53_vlan_add(struct dsa_switch *ds, int port,
         if (pvid) {
                 b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port),
                             vlan->vid_end);
-                b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(cpu_port),
-                            vlan->vid_end);
                 b53_fast_age_vlan(dev, vid);
         }
 }
@@ -984,7 +983,6 @@ static int b53_vlan_del(struct dsa_switch *ds, int port,
 {
         struct b53_device *dev = ds->priv;
         bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;
-        unsigned int cpu_port = dev->cpu_port;
         struct b53_vlan *vl;
         u16 vid;
         u16 pvid;
@@ -997,8 +995,6 @@ static int b53_vlan_del(struct dsa_switch *ds, int port,
                 b53_get_vlan_entry(dev, vid, vl);
 
                 vl->members &= ~BIT(port);
-                if ((vl->members & BIT(cpu_port)) == BIT(cpu_port))
-                        vl->members = 0;
 
                 if (pvid == vid) {
                         if (is5325(dev) || is5365(dev))
@@ -1007,18 +1003,14 @@ static int b53_vlan_del(struct dsa_switch *ds, int port,
                                 pvid = 0;
                 }
 
-                if (untagged) {
+                if (untagged)
                         vl->untag &= ~(BIT(port));
-                        if ((vl->untag & BIT(cpu_port)) == BIT(cpu_port))
-                                vl->untag = 0;
-                }
 
                 b53_set_vlan_entry(dev, vid, vl);
                 b53_fast_age_vlan(dev, vid);
         }
 
         b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), pvid);
-        b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(cpu_port), pvid);
         b53_fast_age_vlan(dev, pvid);
 
         return 0;
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index e3ee27ce13dd..9ec33b51a0ed 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -588,6 +588,7 @@ static void bcm_sf2_sw_adjust_link(struct dsa_switch *ds, int port,
                                    struct phy_device *phydev)
 {
         struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
+        struct ethtool_eee *p = &priv->port_sts[port].eee;
         u32 id_mode_dis = 0, port_mode;
         const char *str = NULL;
         u32 reg;
@@ -662,6 +663,9 @@ force_link:
                 reg |= DUPLX_MODE;
 
         core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(port));
+
+        if (!phydev->is_pseudo_fixed_link)
+                p->eee_enabled = bcm_sf2_eee_init(ds, port, phydev);
 }
 
 static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port,
diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
index bda31f308cc2..a0eee7218695 100644
--- a/drivers/net/ethernet/altera/altera_tse_main.c
+++ b/drivers/net/ethernet/altera/altera_tse_main.c
@@ -400,12 +400,6 @@ static int tse_rx(struct altera_tse_private *priv, int limit)
 
                 skb_put(skb, pktlength);
 
-                /* make cache consistent with receive packet buffer */
-                dma_sync_single_for_cpu(priv->device,
-                                        priv->rx_ring[entry].dma_addr,
-                                        priv->rx_ring[entry].len,
-                                        DMA_FROM_DEVICE);
-
                 dma_unmap_single(priv->device, priv->rx_ring[entry].dma_addr,
                                  priv->rx_ring[entry].len, DMA_FROM_DEVICE);
 
@@ -469,7 +463,6 @@ static int tse_tx_complete(struct altera_tse_private *priv)
 
         if (unlikely(netif_queue_stopped(priv->dev) &&
                      tse_tx_avail(priv) > TSE_TX_THRESH(priv))) {
-                netif_tx_lock(priv->dev);
                 if (netif_queue_stopped(priv->dev) &&
                     tse_tx_avail(priv) > TSE_TX_THRESH(priv)) {
                         if (netif_msg_tx_done(priv))
@@ -477,7 +470,6 @@ static int tse_tx_complete(struct altera_tse_private *priv)
                                            __func__);
                         netif_wake_queue(priv->dev);
                 }
-                netif_tx_unlock(priv->dev);
         }
 
         spin_unlock(&priv->tx_lock);
@@ -592,10 +584,6 @@ static int tse_start_xmit(struct sk_buff *skb, struct net_device *dev)
         buffer->dma_addr = dma_addr;
         buffer->len = nopaged_len;
 
-        /* Push data out of the cache hierarchy into main memory */
-        dma_sync_single_for_device(priv->device, buffer->dma_addr,
-                                   buffer->len, DMA_TO_DEVICE);
-
         priv->dmaops->tx_buffer(priv, buffer);
 
         skb_tx_timestamp(skb);
@@ -819,6 +807,8 @@ static int init_phy(struct net_device *dev)
 
         if (!phydev) {
                 netdev_err(dev, "Could not find the PHY\n");
+                if (fixed_link)
+                        of_phy_deregister_fixed_link(priv->device->of_node);
                 return -ENODEV;
         }
 
@@ -1545,10 +1535,15 @@ err_free_netdev:
 static int altera_tse_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
+        struct altera_tse_private *priv = netdev_priv(ndev);
 
-        if (ndev->phydev)
+        if (ndev->phydev) {
                 phy_disconnect(ndev->phydev);
 
+                if (of_phy_is_fixed_link(priv->device->of_node))
+                        of_phy_deregister_fixed_link(priv->device->of_node);
+        }
+
         platform_set_drvdata(pdev, NULL);
         altera_tse_mdio_destroy(ndev);
         unregister_netdev(ndev);
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
index 9de078819aa6..4f7635178200 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
@@ -829,7 +829,7 @@ static int xgbe_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int xgbe_suspend(struct device *dev)
 {
         struct net_device *netdev = dev_get_drvdata(dev);
@@ -874,7 +874,7 @@ static int xgbe_resume(struct device *dev)
 
         return ret;
 }
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_SLEEP */
 
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id xgbe_acpi_match[] = {
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index c481f104a8fe..5390ae89136c 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -204,17 +204,6 @@ static u32 xgene_enet_ring_len(struct xgene_enet_desc_ring *ring)
         return num_msgs;
 }
 
-static void xgene_enet_setup_coalescing(struct xgene_enet_desc_ring *ring)
-{
-        u32 data = 0x7777;
-
-        xgene_enet_ring_wr32(ring, CSR_PBM_COAL, 0x8e);
-        xgene_enet_ring_wr32(ring, CSR_PBM_CTICK1, data);
-        xgene_enet_ring_wr32(ring, CSR_PBM_CTICK2, data << 16);
-        xgene_enet_ring_wr32(ring, CSR_THRESHOLD0_SET1, 0x40);
-        xgene_enet_ring_wr32(ring, CSR_THRESHOLD1_SET1, 0x80);
-}
-
 void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring,
                             struct xgene_enet_pdata *pdata,
                             enum xgene_enet_err_code status)
@@ -929,5 +918,4 @@ struct xgene_ring_ops xgene_ring1_ops = {
         .clear = xgene_enet_clear_ring,
         .wr_cmd = xgene_enet_wr_cmd,
         .len = xgene_enet_ring_len,
-        .coalesce = xgene_enet_setup_coalescing,
 };
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
index 8456337a237d..06e598c8bc16 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
@@ -55,8 +55,10 @@ enum xgene_enet_rm {
 #define PREFETCH_BUF_EN         BIT(21)
 #define CSR_RING_ID_BUF         0x000c
 #define CSR_PBM_COAL            0x0014
+#define CSR_PBM_CTICK0          0x0018
 #define CSR_PBM_CTICK1          0x001c
 #define CSR_PBM_CTICK2          0x0020
+#define CSR_PBM_CTICK3          0x0024
 #define CSR_THRESHOLD0_SET1     0x0030
 #define CSR_THRESHOLD1_SET1     0x0034
 #define CSR_RING_NE_INT_MODE    0x017c
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 429f18fc5503..8158d4698734 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -1188,7 +1188,8 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev)
                 tx_ring->dst_ring_num = xgene_enet_dst_ring_num(cp_ring);
         }
 
-        pdata->ring_ops->coalesce(pdata->tx_ring[0]);
+        if (pdata->ring_ops->coalesce)
+                pdata->ring_ops->coalesce(pdata->tx_ring[0]);
         pdata->tx_qcnt_hi = pdata->tx_ring[0]->slots - 128;
 
         return 0;
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c
index 2b76732add5d..af51dd5844ce 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c
@@ -30,7 +30,7 @@ static void xgene_enet_ring_init(struct xgene_enet_desc_ring *ring)
                 ring_cfg[0] |= SET_VAL(X2_INTLINE, ring->id & RING_BUFNUM_MASK);
                 ring_cfg[3] |= SET_BIT(X2_DEQINTEN);
         }
-        ring_cfg[0] |= SET_VAL(X2_CFGCRID, 1);
+        ring_cfg[0] |= SET_VAL(X2_CFGCRID, 2);
 
         addr >>= 8;
         ring_cfg[2] |= QCOHERENT | SET_VAL(RINGADDRL, addr);
@@ -192,13 +192,15 @@ static u32 xgene_enet_ring_len(struct xgene_enet_desc_ring *ring)
 
 static void xgene_enet_setup_coalescing(struct xgene_enet_desc_ring *ring)
 {
-        u32 data = 0x7777;
+        u32 data = 0x77777777;
 
         xgene_enet_ring_wr32(ring, CSR_PBM_COAL, 0x8e);
+        xgene_enet_ring_wr32(ring, CSR_PBM_CTICK0, data);
         xgene_enet_ring_wr32(ring, CSR_PBM_CTICK1, data);
-        xgene_enet_ring_wr32(ring, CSR_PBM_CTICK2, data << 16);
-        xgene_enet_ring_wr32(ring, CSR_THRESHOLD0_SET1, 0x40);
-        xgene_enet_ring_wr32(ring, CSR_THRESHOLD1_SET1, 0x80);
+        xgene_enet_ring_wr32(ring, CSR_PBM_CTICK2, data);
+        xgene_enet_ring_wr32(ring, CSR_PBM_CTICK3, data);
+        xgene_enet_ring_wr32(ring, CSR_THRESHOLD0_SET1, 0x08);
+        xgene_enet_ring_wr32(ring, CSR_THRESHOLD1_SET1, 0x10);
 }
 
 struct xgene_ring_ops xgene_ring2_ops = {
diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c
index b0da9693f28a..be865b4dada2 100644
--- a/drivers/net/ethernet/arc/emac_main.c
+++ b/drivers/net/ethernet/arc/emac_main.c
@@ -460,7 +460,7 @@ static void arc_emac_set_rx_mode(struct net_device *ndev)
                 if (ndev->flags & IFF_ALLMULTI) {
                         arc_reg_set(priv, R_LAFL, ~0);
                         arc_reg_set(priv, R_LAFH, ~0);
-                } else {
+                } else if (ndev->flags & IFF_MULTICAST) {
                         struct netdev_hw_addr *ha;
                         unsigned int filter[2] = { 0, 0 };
                         int bit;
@@ -472,6 +472,9 @@ static void arc_emac_set_rx_mode(struct net_device *ndev)
 
                         arc_reg_set(priv, R_LAFL, filter[0]);
                         arc_reg_set(priv, R_LAFH, filter[1]);
+                } else {
+                        arc_reg_set(priv, R_LAFL, 0);
+                        arc_reg_set(priv, R_LAFH, 0);
                 }
         }
 }
@@ -764,8 +767,6 @@ int arc_emac_probe(struct net_device *ndev, int interface)
         ndev->netdev_ops = &arc_emac_netdev_ops;
         ndev->ethtool_ops = &arc_emac_ethtool_ops;
         ndev->watchdog_timeo = TX_TIMEOUT;
-        /* FIXME :: no multicast support yet */
-        ndev->flags &= ~IFF_MULTICAST;
 
         priv = netdev_priv(ndev);
         priv->dev = dev;
diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c
index 00c38bf151e6..e078d8da978c 100644
--- a/drivers/net/ethernet/aurora/nb8800.c
+++ b/drivers/net/ethernet/aurora/nb8800.c
@@ -1466,12 +1466,12 @@ static int nb8800_probe(struct platform_device *pdev)
 
         ret = nb8800_hw_init(dev);
         if (ret)
-                goto err_free_bus;
+                goto err_deregister_fixed_link;
 
         if (ops && ops->init) {
                 ret = ops->init(dev);
                 if (ret)
-                        goto err_free_bus;
+                        goto err_deregister_fixed_link;
         }
 
         dev->netdev_ops = &nb8800_netdev_ops;
@@ -1504,6 +1504,9 @@ static int nb8800_probe(struct platform_device *pdev)
 
 err_free_dma:
         nb8800_dma_free(dev);
+err_deregister_fixed_link:
+        if (of_phy_is_fixed_link(pdev->dev.of_node))
+                of_phy_deregister_fixed_link(pdev->dev.of_node);
 err_free_bus:
         of_node_put(priv->phy_node);
         mdiobus_unregister(bus);
@@ -1521,6 +1524,8 @@ static int nb8800_remove(struct platform_device *pdev)
         struct nb8800_priv *priv = netdev_priv(ndev);
 
         unregister_netdev(ndev);
+        if (of_phy_is_fixed_link(pdev->dev.of_node))
+                of_phy_deregister_fixed_link(pdev->dev.of_node);
         of_node_put(priv->phy_node);
 
         mdiobus_unregister(priv->mii_bus);
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index c3354b9941d1..25d1eb4933d0 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1755,13 +1755,13 @@ static int bcm_sysport_probe(struct platform_device *pdev)
         if (priv->irq0 <= 0 || priv->irq1 <= 0) {
                 dev_err(&pdev->dev, "invalid interrupts\n");
                 ret = -EINVAL;
-                goto err;
+                goto err_free_netdev;
         }
 
         priv->base = devm_ioremap_resource(&pdev->dev, r);
         if (IS_ERR(priv->base)) {
                 ret = PTR_ERR(priv->base);
-                goto err;
+                goto err_free_netdev;
         }
 
         priv->netdev = dev;
@@ -1779,7 +1779,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)
                 ret = of_phy_register_fixed_link(dn);
                 if (ret) {
                         dev_err(&pdev->dev, "failed to register fixed PHY\n");
-                        goto err;
+                        goto err_free_netdev;
                 }
 
                 priv->phy_dn = dn;
@@ -1821,7 +1821,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)
         ret = register_netdev(dev);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register net_device\n");
-                goto err;
+                goto err_deregister_fixed_link;
         }
 
         priv->rev = topctrl_readl(priv, REV_CNTL) & REV_MASK;
@@ -1832,7 +1832,11 @@ static int bcm_sysport_probe(struct platform_device *pdev)
                  priv->base, priv->irq0, priv->irq1, txq, rxq);
 
         return 0;
-err:
+
+err_deregister_fixed_link:
+        if (of_phy_is_fixed_link(dn))
+                of_phy_deregister_fixed_link(dn);
+err_free_netdev:
         free_netdev(dev);
         return ret;
 }
@@ -1840,11 +1844,14 @@ err:
 static int bcm_sysport_remove(struct platform_device *pdev)
 {
         struct net_device *dev = dev_get_drvdata(&pdev->dev);
+        struct device_node *dn = pdev->dev.of_node;
 
         /* Not much to do, ndo_close has been called
          * and we use managed allocations
          */
         unregister_netdev(dev);
+        if (of_phy_is_fixed_link(dn))
+                of_phy_deregister_fixed_link(dn);
         free_netdev(dev);
         dev_set_drvdata(&pdev->dev, NULL);
 
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index 31ca204b38d2..49f4cafe5438 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -307,6 +307,10 @@ static void bgmac_dma_rx_enable(struct bgmac *bgmac,
         u32 ctl;
 
         ctl = bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_CTL);
+
+        /* preserve ONLY bits 16-17 from current hardware value */
+        ctl &= BGMAC_DMA_RX_ADDREXT_MASK;
+
         if (bgmac->feature_flags & BGMAC_FEAT_RX_MASK_SETUP) {
                 ctl &= ~BGMAC_DMA_RX_BL_MASK;
                 ctl |= BGMAC_DMA_RX_BL_128 << BGMAC_DMA_RX_BL_SHIFT;
@@ -317,7 +321,6 @@ static void bgmac_dma_rx_enable(struct bgmac *bgmac,
                 ctl &= ~BGMAC_DMA_RX_PT_MASK;
                 ctl |= BGMAC_DMA_RX_PT_1 << BGMAC_DMA_RX_PT_SHIFT;
         }
-        ctl &= BGMAC_DMA_RX_ADDREXT_MASK;
         ctl |= BGMAC_DMA_RX_ENABLE;
         ctl |= BGMAC_DMA_RX_PARITY_DISABLE;
         ctl |= BGMAC_DMA_RX_OVERFLOW_CONT;
@@ -1046,9 +1049,9 @@ static void bgmac_enable(struct bgmac *bgmac)
 
         mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
                 BGMAC_DS_MM_SHIFT;
-        if (!(bgmac->feature_flags & BGMAC_FEAT_CLKCTLST) || mode != 0)
+        if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST || mode != 0)
                 bgmac_set(bgmac, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
-        if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST && mode == 2)
+        if (!(bgmac->feature_flags & BGMAC_FEAT_CLKCTLST) && mode == 2)
                 bgmac_cco_ctl_maskset(bgmac, 1, ~0,
                                       BGMAC_CHIPCTL_1_RXC_DLL_BYPASS);
 
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index b3791b394715..1f7034d739b0 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -49,6 +49,7 @@
 #include <linux/firmware.h>
 #include <linux/log2.h>
 #include <linux/aer.h>
+#include <linux/crash_dump.h>
 
 #if IS_ENABLED(CONFIG_CNIC)
 #define BCM_CNIC 1
@@ -4764,15 +4765,16 @@ bnx2_setup_msix_tbl(struct bnx2 *bp)
         BNX2_WR(bp, BNX2_PCI_GRC_WINDOW3_ADDR, BNX2_MSIX_PBA_ADDR);
 }
 
-static int
-bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
+static void
+bnx2_wait_dma_complete(struct bnx2 *bp)
 {
         u32 val;
-        int i, rc = 0;
-        u8 old_port;
+        int i;
 
-        /* Wait for the current PCI transaction to complete before
-         * issuing a reset. */
+        /*
+         * Wait for the current PCI transaction to complete before
+         * issuing a reset.
+         */
         if ((BNX2_CHIP(bp) == BNX2_CHIP_5706) ||
             (BNX2_CHIP(bp) == BNX2_CHIP_5708)) {
                 BNX2_WR(bp, BNX2_MISC_ENABLE_CLR_BITS,
@@ -4796,6 +4798,21 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
                 }
         }
 
+        return;
+}
+
+
+static int
+bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
+{
+        u32 val;
+        int i, rc = 0;
+        u8 old_port;
+
+        /* Wait for the current PCI transaction to complete before
+         * issuing a reset. */
+        bnx2_wait_dma_complete(bp);
+
         /* Wait for the firmware to tell us it is ok to issue a reset. */
         bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT0 | reset_code, 1, 1);
 
@@ -6361,6 +6378,10 @@ bnx2_open(struct net_device *dev)
         struct bnx2 *bp = netdev_priv(dev);
         int rc;
 
+        rc = bnx2_request_firmware(bp);
+        if (rc < 0)
+                goto out;
+
         netif_carrier_off(dev);
 
         bnx2_disable_int(bp);
@@ -6429,6 +6450,7 @@ open_err:
         bnx2_free_irq(bp);
         bnx2_free_mem(bp);
         bnx2_del_napi(bp);
+        bnx2_release_firmware(bp);
         goto out;
 }
 
@@ -8575,12 +8597,15 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         pci_set_drvdata(pdev, dev);
 
-        rc = bnx2_request_firmware(bp);
-        if (rc < 0)
-                goto error;
-
+        /*
+         * In-flight DMA from 1st kernel could continue going in kdump kernel.
+         * New io-page table has been created before bnx2 does reset at open stage.
+         * We have to wait for the in-flight DMA to complete to avoid it look up
+         * into the newly created io-page table.
+         */
+        if (is_kdump_kernel())
+                bnx2_wait_dma_complete(bp);
 
-        bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_RESET);
         memcpy(dev->dev_addr, bp->mac_addr, ETH_ALEN);
 
         dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG |
@@ -8613,7 +8638,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         return 0;
 
 error:
-        bnx2_release_firmware(bp);
         pci_iounmap(pdev, bp->regview);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 85a7800bfc12..5f19427c7b27 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -1872,8 +1872,16 @@ static void bnx2x_get_ringparam(struct net_device *dev,
 
         ering->rx_max_pending = MAX_RX_AVAIL;
 
+        /* If size isn't already set, we give an estimation of the number
+         * of buffers we'll have. We're neglecting some possible conditions
+         * [we couldn't know for certain at this point if number of queues
+         * might shrink] but the number would be correct for the likely
+         * scenario.
+         */
         if (bp->rx_ring_size)
                 ering->rx_pending = bp->rx_ring_size;
+        else if (BNX2X_NUM_RX_QUEUES(bp))
+                ering->rx_pending = MAX_RX_AVAIL / BNX2X_NUM_RX_QUEUES(bp);
         else
                 ering->rx_pending = MAX_RX_AVAIL;
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 0cee4c0283f9..4febe60eadc2 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -10138,7 +10138,7 @@ static void __bnx2x_add_udp_port(struct bnx2x *bp, u16 port,
 {
         struct bnx2x_udp_tunnel *udp_port = &bp->udp_tunnel_ports[type];
 
-        if (!netif_running(bp->dev) || !IS_PF(bp))
+        if (!netif_running(bp->dev) || !IS_PF(bp) || CHIP_IS_E1x(bp))
                 return;
 
         if (udp_port->count && udp_port->dst_port == port) {
@@ -10163,7 +10163,7 @@ static void __bnx2x_del_udp_port(struct bnx2x *bp, u16 port,
 {
         struct bnx2x_udp_tunnel *udp_port = &bp->udp_tunnel_ports[type];
 
-        if (!IS_PF(bp))
+        if (!IS_PF(bp) || CHIP_IS_E1x(bp))
                 return;
 
         if (!udp_port->count || udp_port->dst_port != port) {
@@ -13505,6 +13505,7 @@ static int bnx2x_init_firmware(struct bnx2x *bp)
 
         /* Initialize the pointers to the init arrays */
         /* Blob */
+        rc = -ENOMEM;
         BNX2X_ALLOC_AND_SET(init_data, request_firmware_exit, be32_to_cpu_n);
 
         /* Opcodes */
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index a9f9f3738022..f08a20b921e7 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1811,6 +1811,9 @@ static int bnxt_busy_poll(struct napi_struct *napi)
         if (atomic_read(&bp->intr_sem) != 0)
                 return LL_FLUSH_FAILED;
 
+        if (!bp->link_info.link_up)
+                return LL_FLUSH_FAILED;
+
         if (!bnxt_lock_poll(bnapi))
                 return LL_FLUSH_BUSY;
 
@@ -3210,11 +3213,17 @@ static int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, __be16 port,
                 goto err_out;
         }
 
-        if (tunnel_type & TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN)
+        switch (tunnel_type) {
+        case TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN:
                 bp->vxlan_fw_dst_port_id = resp->tunnel_dst_port_id;
-
-        else if (tunnel_type & TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_GENEVE)
+                break;
+        case TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_GENEVE:
                 bp->nge_fw_dst_port_id = resp->tunnel_dst_port_id;
+                break;
+        default:
+                break;
+        }
+
 err_out:
         mutex_unlock(&bp->hwrm_cmd_lock);
         return rc;
@@ -4111,7 +4120,7 @@ static int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp)
                 bp->grp_info[i].fw_stats_ctx = cpr->hw_stats_ctx_id;
         }
         mutex_unlock(&bp->hwrm_cmd_lock);
-        return 0;
+        return rc;
 }
 
 static int bnxt_hwrm_func_qcfg(struct bnxt *bp)
@@ -4934,6 +4943,10 @@ static void bnxt_del_napi(struct bnxt *bp)
                 napi_hash_del(&bnapi->napi);
                 netif_napi_del(&bnapi->napi);
         }
+        /* We called napi_hash_del() before netif_napi_del(), we need
+         * to respect an RCU grace period before freeing napi structures.
+         */
+        synchronize_net();
 }
 
 static void bnxt_init_napi(struct bnxt *bp)
@@ -6309,6 +6322,7 @@ static int bnxt_setup_tc(struct net_device *dev, u32 handle, __be16 proto,
                          struct tc_to_netdev *ntc)
 {
         struct bnxt *bp = netdev_priv(dev);
+        bool sh = false;
         u8 tc;
 
         if (ntc->type != TC_SETUP_MQPRIO)
@@ -6325,12 +6339,11 @@ static int bnxt_setup_tc(struct net_device *dev, u32 handle, __be16 proto,
         if (netdev_get_num_tc(dev) == tc)
                 return 0;
 
+        if (bp->flags & BNXT_FLAG_SHARED_RINGS)
+                sh = true;
+
         if (tc) {
                 int max_rx_rings, max_tx_rings, rc;
-                bool sh = false;
-
-                if (bp->flags & BNXT_FLAG_SHARED_RINGS)
-                        sh = true;
 
                 rc = bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings, sh);
                 if (rc || bp->tx_nr_rings_per_tc * tc > max_tx_rings)
@@ -6348,7 +6361,8 @@ static int bnxt_setup_tc(struct net_device *dev, u32 handle, __be16 proto,
                 bp->tx_nr_rings = bp->tx_nr_rings_per_tc;
                 netdev_reset_tc(dev);
         }
-        bp->cp_nr_rings = max_t(int, bp->tx_nr_rings, bp->rx_nr_rings);
+        bp->cp_nr_rings = sh ? max_t(int, bp->tx_nr_rings, bp->rx_nr_rings) :
+                               bp->tx_nr_rings + bp->rx_nr_rings;
         bp->num_stat_ctxs = bp->cp_nr_rings;
 
         if (netif_running(bp->dev))
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index ec6cd18842c3..60e2af8678bd 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -774,8 +774,8 @@ static int bnxt_vf_set_link(struct bnxt *bp, struct bnxt_vf_info *vf)
 
                 if (vf->flags & BNXT_VF_LINK_UP) {
                         /* if physical link is down, force link up on VF */
-                        if (phy_qcfg_resp.link ==
-                            PORT_PHY_QCFG_RESP_LINK_NO_LINK) {
+                        if (phy_qcfg_resp.link !=
+                            PORT_PHY_QCFG_RESP_LINK_LINK) {
                                 phy_qcfg_resp.link =
                                         PORT_PHY_QCFG_RESP_LINK_LINK;
                                 phy_qcfg_resp.link_speed = cpu_to_le16(
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 4464bc5db934..a4e60e56c14f 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1172,6 +1172,7 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,
                                           struct bcmgenet_tx_ring *ring)
 {
         struct bcmgenet_priv *priv = netdev_priv(dev);
+        struct device *kdev = &priv->pdev->dev;
         struct enet_cb *tx_cb_ptr;
         struct netdev_queue *txq;
         unsigned int pkts_compl = 0;
@@ -1199,13 +1200,13 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,
                 if (tx_cb_ptr->skb) {
                         pkts_compl++;
                         bytes_compl += GENET_CB(tx_cb_ptr->skb)->bytes_sent;
-                        dma_unmap_single(&dev->dev,
+                        dma_unmap_single(kdev,
                                          dma_unmap_addr(tx_cb_ptr, dma_addr),
                                          dma_unmap_len(tx_cb_ptr, dma_len),
                                          DMA_TO_DEVICE);
                         bcmgenet_free_cb(tx_cb_ptr);
                 } else if (dma_unmap_addr(tx_cb_ptr, dma_addr)) {
-                        dma_unmap_page(&dev->dev,
+                        dma_unmap_page(kdev,
                                        dma_unmap_addr(tx_cb_ptr, dma_addr),
                                        dma_unmap_len(tx_cb_ptr, dma_len),
                                        DMA_TO_DEVICE);
@@ -1775,6 +1776,7 @@ static int bcmgenet_alloc_rx_buffers(struct bcmgenet_priv *priv,
 
 static void bcmgenet_free_rx_buffers(struct bcmgenet_priv *priv)
 {
+        struct device *kdev = &priv->pdev->dev;
         struct enet_cb *cb;
         int i;
 
@@ -1782,7 +1784,7 @@ static void bcmgenet_free_rx_buffers(struct bcmgenet_priv *priv)
                 cb = &priv->rx_cbs[i];
 
                 if (dma_unmap_addr(cb, dma_addr)) {
-                        dma_unmap_single(&priv->dev->dev,
+                        dma_unmap_single(kdev,
                                          dma_unmap_addr(cb, dma_addr),
                                          priv->rx_buf_len, DMA_FROM_DEVICE);
                         dma_unmap_addr_set(cb, dma_addr, 0);
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index 457c3bc8cfff..e87607621e62 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -542,8 +542,10 @@ static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv)
         /* Make sure we initialize MoCA PHYs with a link down */
         if (phy_mode == PHY_INTERFACE_MODE_MOCA) {
                 phydev = of_phy_find_device(dn);
-                if (phydev)
+                if (phydev) {
                         phydev->link = 0;
+                        put_device(&phydev->mdio.dev);
+                }
         }
 
         return 0;
@@ -625,6 +627,7 @@ static int bcmgenet_mii_bus_init(struct bcmgenet_priv *priv)
 int bcmgenet_mii_init(struct net_device *dev)
 {
         struct bcmgenet_priv *priv = netdev_priv(dev);
+        struct device_node *dn = priv->pdev->dev.of_node;
         int ret;
 
         ret = bcmgenet_mii_alloc(priv);
@@ -638,6 +641,8 @@ int bcmgenet_mii_init(struct net_device *dev)
         return 0;
 
 out:
+        if (of_phy_is_fixed_link(dn))
+                of_phy_deregister_fixed_link(dn);
         of_node_put(priv->phy_dn);
         mdiobus_unregister(priv->mii_bus);
         mdiobus_free(priv->mii_bus);
@@ -647,7 +652,10 @@ out:
 void bcmgenet_mii_exit(struct net_device *dev)
 {
         struct bcmgenet_priv *priv = netdev_priv(dev);
+        struct device_node *dn = priv->pdev->dev.of_node;
 
+        if (of_phy_is_fixed_link(dn))
+                of_phy_deregister_fixed_link(dn);
         of_node_put(priv->phy_dn);
         mdiobus_unregister(priv->mii_bus);
         mdiobus_free(priv->mii_bus);
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index f9df4b5ae90e..f42f672b0e7e 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -177,6 +177,7 @@ bnad_txcmpl_process(struct bnad *bnad, struct bna_tcb *tcb)
                 return 0;
 
         hw_cons = *(tcb->hw_consumer_index);
+        rmb();
         cons = tcb->consumer_index;
         q_depth = tcb->q_depth;
 
@@ -3094,7 +3095,7 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
         BNA_QE_INDX_INC(prod, q_depth);
         tcb->producer_index = prod;
 
-        smp_mb();
+        wmb();
 
         if (unlikely(!test_bit(BNAD_TXQ_TX_STARTED, &tcb->flags)))
                 return NETDEV_TX_OK;
@@ -3102,7 +3103,6 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
         skb_tx_timestamp(skb);
 
         bna_txq_prod_indx_doorbell(tcb);
-        smp_mb();
 
         return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index b32444a3ed79..ec09fcece711 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -975,6 +975,7 @@ static inline void macb_init_rx_ring(struct macb *bp)
                 addr += bp->rx_buffer_size;
         }
         bp->rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP);
+        bp->rx_tail = 0;
 }
 
 static int macb_rx(struct macb *bp, int budget)
@@ -1156,6 +1157,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
                 if (status & MACB_BIT(RXUBR)) {
                         ctrl = macb_readl(bp, NCR);
                         macb_writel(bp, NCR, ctrl & ~MACB_BIT(RE));
+                        wmb();
                         macb_writel(bp, NCR, ctrl | MACB_BIT(RE));
 
                         if (bp->caps & MACB_CAPS_ISR_CLEAR_ON_WRITE)
@@ -1616,8 +1618,6 @@ static void macb_init_rings(struct macb *bp)
         bp->queues[0].tx_head = 0;
         bp->queues[0].tx_tail = 0;
         bp->queues[0].tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);
-
-        bp->rx_tail = 0;
 }
 
 static void macb_reset_hw(struct macb *bp)
@@ -2673,6 +2673,12 @@ static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 lp->skb_length = skb->len;
                 lp->skb_physaddr = dma_map_single(NULL, skb->data, skb->len,
                                                         DMA_TO_DEVICE);
+                if (dma_mapping_error(NULL, lp->skb_physaddr)) {
+                        dev_kfree_skb_any(skb);
+                        dev->stats.tx_dropped++;
+                        netdev_err(dev, "%s: DMA mapping error\n", __func__);
+                        return NETDEV_TX_OK;
+                }
 
                 /* Set address of the data in the Transmit Address register */
                 macb_writel(lp, TAR, lp->skb_physaddr);
@@ -2764,6 +2770,7 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id)
         if (intstatus & MACB_BIT(RXUBR)) {
                 ctl = macb_readl(lp, NCR);
                 macb_writel(lp, NCR, ctl & ~MACB_BIT(RE));
+                wmb();
                 macb_writel(lp, NCR, ctl | MACB_BIT(RE));
         }
 
diff --git a/drivers/net/ethernet/cavium/thunder/nic.h b/drivers/net/ethernet/cavium/thunder/nic.h
index 30426109711c..86bd93ce2ea3 100644
--- a/drivers/net/ethernet/cavium/thunder/nic.h
+++ b/drivers/net/ethernet/cavium/thunder/nic.h
@@ -47,7 +47,7 @@
 
 /* Min/Max packet size */
 #define NIC_HW_MIN_FRS                  64
-#define NIC_HW_MAX_FRS                  9200 /* 9216 max packet including FCS */
+#define NIC_HW_MAX_FRS                  9190 /* Excluding L2 header and FCS */
 
 /* Max pkinds */
 #define NIC_MAX_PKIND                   16
@@ -178,11 +178,11 @@ enum tx_stats_reg_offset {
 
 struct nicvf_hw_stats {
         u64 rx_bytes;
+        u64 rx_frames;
         u64 rx_ucast_frames;
         u64 rx_bcast_frames;
         u64 rx_mcast_frames;
-        u64 rx_fcs_errors;
-        u64 rx_l2_errors;
+        u64 rx_drops;
         u64 rx_drop_red;
         u64 rx_drop_red_bytes;
         u64 rx_drop_overrun;
@@ -191,6 +191,19 @@ struct nicvf_hw_stats {
         u64 rx_drop_mcast;
         u64 rx_drop_l3_bcast;
         u64 rx_drop_l3_mcast;
+        u64 rx_fcs_errors;
+        u64 rx_l2_errors;
+
+        u64 tx_bytes;
+        u64 tx_frames;
+        u64 tx_ucast_frames;
+        u64 tx_bcast_frames;
+        u64 tx_mcast_frames;
+        u64 tx_drops;
+};
+
+struct nicvf_drv_stats {
+        /* CQE Rx errs */
         u64 rx_bgx_truncated_pkts;
         u64 rx_jabber_errs;
         u64 rx_fcs_errs;
@@ -216,34 +229,30 @@ struct nicvf_hw_stats {
         u64 rx_l4_pclp;
         u64 rx_truncated_pkts;
 
-        u64 tx_bytes_ok;
-        u64 tx_ucast_frames_ok;
-        u64 tx_bcast_frames_ok;
-        u64 tx_mcast_frames_ok;
-        u64 tx_drops;
-};
-
-struct nicvf_drv_stats {
-        /* Rx */
-        u64 rx_frames_ok;
-        u64 rx_frames_64;
-        u64 rx_frames_127;
-        u64 rx_frames_255;
-        u64 rx_frames_511;
-        u64 rx_frames_1023;
-        u64 rx_frames_1518;
-        u64 rx_frames_jumbo;
-        u64 rx_drops;
-
+        /* CQE Tx errs */
+        u64 tx_desc_fault;
+        u64 tx_hdr_cons_err;
+        u64 tx_subdesc_err;
+        u64 tx_max_size_exceeded;
+        u64 tx_imm_size_oflow;
+        u64 tx_data_seq_err;
+        u64 tx_mem_seq_err;
+        u64 tx_lock_viol;
+        u64 tx_data_fault;
+        u64 tx_tstmp_conflict;
+        u64 tx_tstmp_timeout;
+        u64 tx_mem_fault;
+        u64 tx_csum_overlap;
+        u64 tx_csum_overflow;
+
+        /* driver debug stats */
         u64 rcv_buffer_alloc_failures;
-
-        /* Tx */
-        u64 tx_frames_ok;
-        u64 tx_drops;
         u64 tx_tso;
         u64 tx_timeout;
         u64 txq_stop;
         u64 txq_wake;
+
+        struct u64_stats_sync   syncp;
 };
 
 struct nicvf {
@@ -282,7 +291,6 @@ struct nicvf {
 
         u8                      node;
         u8                      cpi_alg;
-        u16                     mtu;
         bool                    link_up;
         u8                      duplex;
         u32                     speed;
@@ -298,7 +306,7 @@ struct nicvf {
 
         /* Stats */
         struct nicvf_hw_stats   hw_stats;
-        struct nicvf_drv_stats  drv_stats;
+        struct nicvf_drv_stats  __percpu *drv_stats;
         struct bgx_stats        bgx_stats;
 
         /* MSI-X  */
diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c
index 2bbf4cbf08b2..6677b96e1f3f 100644
--- a/drivers/net/ethernet/cavium/thunder/nic_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nic_main.c
@@ -11,6 +11,7 @@
 #include <linux/pci.h>
 #include <linux/etherdevice.h>
 #include <linux/of.h>
+#include <linux/if_vlan.h>
 
 #include "nic_reg.h"
 #include "nic.h"
@@ -260,18 +261,31 @@ static void nic_get_bgx_stats(struct nicpf *nic, struct bgx_stats_msg *bgx)
 /* Update hardware min/max frame size */
 static int nic_update_hw_frs(struct nicpf *nic, int new_frs, int vf)
 {
-        if ((new_frs > NIC_HW_MAX_FRS) || (new_frs < NIC_HW_MIN_FRS)) {
-                dev_err(&nic->pdev->dev,
-                        "Invalid MTU setting from VF%d rejected, should be between %d and %d\n",
-                           vf, NIC_HW_MIN_FRS, NIC_HW_MAX_FRS);
+        int bgx, lmac, lmac_cnt;
+        u64 lmac_credits;
+
+        if ((new_frs > NIC_HW_MAX_FRS) || (new_frs < NIC_HW_MIN_FRS))
                 return 1;
-        }
-        new_frs += ETH_HLEN;
-        if (new_frs <= nic->pkind.maxlen)
-                return 0;
 
-        nic->pkind.maxlen = new_frs;
-        nic_reg_write(nic, NIC_PF_PKIND_0_15_CFG, *(u64 *)&nic->pkind);
+        bgx = NIC_GET_BGX_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]);
+        lmac = NIC_GET_LMAC_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vf]);
+        lmac += bgx * MAX_LMAC_PER_BGX;
+
+        new_frs += VLAN_ETH_HLEN + ETH_FCS_LEN + 4;
+
+        /* Update corresponding LMAC credits */
+        lmac_cnt = bgx_get_lmac_count(nic->node, bgx);
+        lmac_credits = nic_reg_read(nic, NIC_PF_LMAC_0_7_CREDIT + (lmac * 8));
+        lmac_credits &= ~(0xFFFFFULL << 12);
+        lmac_credits |= (((((48 * 1024) / lmac_cnt) - new_frs) / 16) << 12);
+        nic_reg_write(nic, NIC_PF_LMAC_0_7_CREDIT + (lmac * 8), lmac_credits);
+
+        /* Enforce MTU in HW
+         * This config is supported only from 88xx pass 2.0 onwards.
+         */
+        if (!pass1_silicon(nic->pdev))
+                nic_reg_write(nic,
+                              NIC_PF_LMAC_0_7_CFG2 + (lmac * 8), new_frs);
         return 0;
 }
 
@@ -464,7 +478,7 @@ static int nic_init_hw(struct nicpf *nic)
 
         /* PKIND configuration */
         nic->pkind.minlen = 0;
-        nic->pkind.maxlen = NIC_HW_MAX_FRS + ETH_HLEN;
+        nic->pkind.maxlen = NIC_HW_MAX_FRS + VLAN_ETH_HLEN + ETH_FCS_LEN + 4;
         nic->pkind.lenerr_en = 1;
         nic->pkind.rx_hdr = 0;
         nic->pkind.hdr_sl = 0;
@@ -837,6 +851,7 @@ static int nic_reset_stat_counters(struct nicpf *nic,
                         nic_reg_write(nic, reg_addr, 0);
                 }
         }
+
         return 0;
 }
 
diff --git a/drivers/net/ethernet/cavium/thunder/nic_reg.h b/drivers/net/ethernet/cavium/thunder/nic_reg.h
index edf779f5a227..80d46337cf29 100644
--- a/drivers/net/ethernet/cavium/thunder/nic_reg.h
+++ b/drivers/net/ethernet/cavium/thunder/nic_reg.h
@@ -106,6 +106,7 @@
 #define   NIC_PF_MPI_0_2047_CFG                 (0x210000)
 #define   NIC_PF_RSSI_0_4097_RQ                 (0x220000)
 #define   NIC_PF_LMAC_0_7_CFG                   (0x240000)
+#define   NIC_PF_LMAC_0_7_CFG2                  (0x240100)
 #define   NIC_PF_LMAC_0_7_SW_XOFF               (0x242000)
 #define   NIC_PF_LMAC_0_7_CREDIT                (0x244000)
 #define   NIC_PF_CHAN_0_255_TX_CFG              (0x400000)
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c
index ad4fddb55421..432bf6be57cb 100644
--- a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c
@@ -36,11 +36,11 @@ struct nicvf_stat {
 
 static const struct nicvf_stat nicvf_hw_stats[] = {
         NICVF_HW_STAT(rx_bytes),
+        NICVF_HW_STAT(rx_frames),
         NICVF_HW_STAT(rx_ucast_frames),
         NICVF_HW_STAT(rx_bcast_frames),
         NICVF_HW_STAT(rx_mcast_frames),
-        NICVF_HW_STAT(rx_fcs_errors),
-        NICVF_HW_STAT(rx_l2_errors),
+        NICVF_HW_STAT(rx_drops),
         NICVF_HW_STAT(rx_drop_red),
         NICVF_HW_STAT(rx_drop_red_bytes),
         NICVF_HW_STAT(rx_drop_overrun),
@@ -49,50 +49,59 @@ static const struct nicvf_stat nicvf_hw_stats[] = {
         NICVF_HW_STAT(rx_drop_mcast),
         NICVF_HW_STAT(rx_drop_l3_bcast),
         NICVF_HW_STAT(rx_drop_l3_mcast),
-        NICVF_HW_STAT(rx_bgx_truncated_pkts),
-        NICVF_HW_STAT(rx_jabber_errs),
-        NICVF_HW_STAT(rx_fcs_errs),
-        NICVF_HW_STAT(rx_bgx_errs),
-        NICVF_HW_STAT(rx_prel2_errs),
-        NICVF_HW_STAT(rx_l2_hdr_malformed),
-        NICVF_HW_STAT(rx_oversize),
-        NICVF_HW_STAT(rx_undersize),
-        NICVF_HW_STAT(rx_l2_len_mismatch),
-        NICVF_HW_STAT(rx_l2_pclp),
-        NICVF_HW_STAT(rx_ip_ver_errs),
-        NICVF_HW_STAT(rx_ip_csum_errs),
-        NICVF_HW_STAT(rx_ip_hdr_malformed),
-        NICVF_HW_STAT(rx_ip_payload_malformed),
-        NICVF_HW_STAT(rx_ip_ttl_errs),
-        NICVF_HW_STAT(rx_l3_pclp),
-        NICVF_HW_STAT(rx_l4_malformed),
-        NICVF_HW_STAT(rx_l4_csum_errs),
-        NICVF_HW_STAT(rx_udp_len_errs),
-        NICVF_HW_STAT(rx_l4_port_errs),
-        NICVF_HW_STAT(rx_tcp_flag_errs),
-        NICVF_HW_STAT(rx_tcp_offset_errs),
-        NICVF_HW_STAT(rx_l4_pclp),
-        NICVF_HW_STAT(rx_truncated_pkts),
-        NICVF_HW_STAT(tx_bytes_ok),
-        NICVF_HW_STAT(tx_ucast_frames_ok),
-        NICVF_HW_STAT(tx_bcast_frames_ok),
-        NICVF_HW_STAT(tx_mcast_frames_ok),
+        NICVF_HW_STAT(rx_fcs_errors),
+        NICVF_HW_STAT(rx_l2_errors),
+        NICVF_HW_STAT(tx_bytes),
+        NICVF_HW_STAT(tx_frames),
+        NICVF_HW_STAT(tx_ucast_frames),
+        NICVF_HW_STAT(tx_bcast_frames),
+        NICVF_HW_STAT(tx_mcast_frames),
+        NICVF_HW_STAT(tx_drops),
 };
 
 static const struct nicvf_stat nicvf_drv_stats[] = {
-        NICVF_DRV_STAT(rx_frames_ok),
-        NICVF_DRV_STAT(rx_frames_64),
-        NICVF_DRV_STAT(rx_frames_127),
-        NICVF_DRV_STAT(rx_frames_255),
-        NICVF_DRV_STAT(rx_frames_511),
-        NICVF_DRV_STAT(rx_frames_1023),
-        NICVF_DRV_STAT(rx_frames_1518),
-        NICVF_DRV_STAT(rx_frames_jumbo),
-        NICVF_DRV_STAT(rx_drops),
+        NICVF_DRV_STAT(rx_bgx_truncated_pkts),
+        NICVF_DRV_STAT(rx_jabber_errs),
+        NICVF_DRV_STAT(rx_fcs_errs),
+        NICVF_DRV_STAT(rx_bgx_errs),
+        NICVF_DRV_STAT(rx_prel2_errs),
+        NICVF_DRV_STAT(rx_l2_hdr_malformed),
+        NICVF_DRV_STAT(rx_oversize),
+        NICVF_DRV_STAT(rx_undersize),
+        NICVF_DRV_STAT(rx_l2_len_mismatch),
+        NICVF_DRV_STAT(rx_l2_pclp),
+        NICVF_DRV_STAT(rx_ip_ver_errs),
+        NICVF_DRV_STAT(rx_ip_csum_errs),
+        NICVF_DRV_STAT(rx_ip_hdr_malformed),
+        NICVF_DRV_STAT(rx_ip_payload_malformed),
+        NICVF_DRV_STAT(rx_ip_ttl_errs),
+        NICVF_DRV_STAT(rx_l3_pclp),
+        NICVF_DRV_STAT(rx_l4_malformed),
+        NICVF_DRV_STAT(rx_l4_csum_errs),
+        NICVF_DRV_STAT(rx_udp_len_errs),
+        NICVF_DRV_STAT(rx_l4_port_errs),
+        NICVF_DRV_STAT(rx_tcp_flag_errs),
+        NICVF_DRV_STAT(rx_tcp_offset_errs),
+        NICVF_DRV_STAT(rx_l4_pclp),
+        NICVF_DRV_STAT(rx_truncated_pkts),
+
+        NICVF_DRV_STAT(tx_desc_fault),
+        NICVF_DRV_STAT(tx_hdr_cons_err),
+        NICVF_DRV_STAT(tx_subdesc_err),
+        NICVF_DRV_STAT(tx_max_size_exceeded),
+        NICVF_DRV_STAT(tx_imm_size_oflow),
+        NICVF_DRV_STAT(tx_data_seq_err),
+        NICVF_DRV_STAT(tx_mem_seq_err),
+        NICVF_DRV_STAT(tx_lock_viol),
+        NICVF_DRV_STAT(tx_data_fault),
+        NICVF_DRV_STAT(tx_tstmp_conflict),
+        NICVF_DRV_STAT(tx_tstmp_timeout),
+        NICVF_DRV_STAT(tx_mem_fault),
+        NICVF_DRV_STAT(tx_csum_overlap),
+        NICVF_DRV_STAT(tx_csum_overflow),
+
         NICVF_DRV_STAT(rcv_buffer_alloc_failures),
-        NICVF_DRV_STAT(tx_frames_ok),
         NICVF_DRV_STAT(tx_tso),
-        NICVF_DRV_STAT(tx_drops),
         NICVF_DRV_STAT(tx_timeout),
         NICVF_DRV_STAT(txq_stop),
         NICVF_DRV_STAT(txq_wake),
@@ -278,8 +287,8 @@ static void nicvf_get_ethtool_stats(struct net_device *netdev,
                                     struct ethtool_stats *stats, u64 *data)
 {
         struct nicvf *nic = netdev_priv(netdev);
-        int stat;
-        int sqs;
+        int stat, tmp_stats;
+        int sqs, cpu;
 
         nicvf_update_stats(nic);
 
@@ -289,9 +298,13 @@ static void nicvf_get_ethtool_stats(struct net_device *netdev,
         for (stat = 0; stat < nicvf_n_hw_stats; stat++)
                 *(data++) = ((u64 *)&nic->hw_stats)
                                 [nicvf_hw_stats[stat].index];
-        for (stat = 0; stat < nicvf_n_drv_stats; stat++)
-                *(data++) = ((u64 *)&nic->drv_stats)
-                                [nicvf_drv_stats[stat].index];
+        for (stat = 0; stat < nicvf_n_drv_stats; stat++) {
+                tmp_stats = 0;
+                for_each_possible_cpu(cpu)
+                        tmp_stats += ((u64 *)per_cpu_ptr(nic->drv_stats, cpu))
+                                     [nicvf_drv_stats[stat].index];
+                *(data++) = tmp_stats;
+        }
 
         nicvf_get_qset_stats(nic, stats, &data);
 
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
index 45a13f718863..8a37012c9c89 100644
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -69,25 +69,6 @@ static inline u8 nicvf_netdev_qidx(struct nicvf *nic, u8 qidx)
                 return qidx;
 }
 
-static inline void nicvf_set_rx_frame_cnt(struct nicvf *nic,
-                                          struct sk_buff *skb)
-{
-        if (skb->len <= 64)
-                nic->drv_stats.rx_frames_64++;
-        else if (skb->len <= 127)
-                nic->drv_stats.rx_frames_127++;
-        else if (skb->len <= 255)
-                nic->drv_stats.rx_frames_255++;
-        else if (skb->len <= 511)
-                nic->drv_stats.rx_frames_511++;
-        else if (skb->len <= 1023)
-                nic->drv_stats.rx_frames_1023++;
-        else if (skb->len <= 1518)
-                nic->drv_stats.rx_frames_1518++;
-        else
-                nic->drv_stats.rx_frames_jumbo++;
-}
-
 /* The Cavium ThunderX network controller can *only* be found in SoCs
  * containing the ThunderX ARM64 CPU implementation.  All accesses to the device
  * registers on this platform are implicitly strongly ordered with respect
@@ -492,9 +473,6 @@ int nicvf_set_real_num_queues(struct net_device *netdev,
 static int nicvf_init_resources(struct nicvf *nic)
 {
         int err;
-        union nic_mbx mbx = {};
-
-        mbx.msg.msg = NIC_MBOX_MSG_CFG_DONE;
 
         /* Enable Qset */
         nicvf_qset_config(nic, true);
@@ -507,14 +485,10 @@ static int nicvf_init_resources(struct nicvf *nic)
                 return err;
         }
 
-        /* Send VF config done msg to PF */
-        nicvf_write_to_mbx(nic, &mbx);
-
         return 0;
 }
 
 static void nicvf_snd_pkt_handler(struct net_device *netdev,
-                                  struct cmp_queue *cq,
                                   struct cqe_send_t *cqe_tx,
                                   int cqe_type, int budget,
                                   unsigned int *tx_pkts, unsigned int *tx_bytes)
@@ -536,7 +510,7 @@ static void nicvf_snd_pkt_handler(struct net_device *netdev,
                    __func__, cqe_tx->sq_qs, cqe_tx->sq_idx,
                    cqe_tx->sqe_ptr, hdr->subdesc_cnt);
 
-        nicvf_check_cqe_tx_errs(nic, cq, cqe_tx);
+        nicvf_check_cqe_tx_errs(nic, cqe_tx);
         skb = (struct sk_buff *)sq->skbuff[cqe_tx->sqe_ptr];
         if (skb) {
                 /* Check for dummy descriptor used for HW TSO offload on 88xx */
@@ -630,8 +604,6 @@ static void nicvf_rcv_pkt_handler(struct net_device *netdev,
                 return;
         }
 
-        nicvf_set_rx_frame_cnt(nic, skb);
-
         nicvf_set_rxhash(netdev, cqe_rx, skb);
 
         skb_record_rx_queue(skb, rq_idx);
@@ -703,7 +675,7 @@ loop:
                         work_done++;
                 break;
                 case CQE_TYPE_SEND:
-                        nicvf_snd_pkt_handler(netdev, cq,
+                        nicvf_snd_pkt_handler(netdev,
                                               (void *)cq_desc, CQE_TYPE_SEND,
                                               budget, &tx_pkts, &tx_bytes);
                         tx_done++;
@@ -740,7 +712,7 @@ done:
                 nic = nic->pnicvf;
                 if (netif_tx_queue_stopped(txq) && netif_carrier_ok(netdev)) {
                         netif_tx_start_queue(txq);
-                        nic->drv_stats.txq_wake++;
+                        this_cpu_inc(nic->drv_stats->txq_wake);
                         if (netif_msg_tx_err(nic))
                                 netdev_warn(netdev,
                                             "%s: Transmit queue wakeup SQ%d\n",
@@ -1084,7 +1056,7 @@ static netdev_tx_t nicvf_xmit(struct sk_buff *skb, struct net_device *netdev)
 
         if (!netif_tx_queue_stopped(txq) && !nicvf_sq_append_skb(nic, skb)) {
                 netif_tx_stop_queue(txq);
-                nic->drv_stats.txq_stop++;
+                this_cpu_inc(nic->drv_stats->txq_stop);
                 if (netif_msg_tx_err(nic))
                         netdev_warn(netdev,
                                     "%s: Transmit ring full, stopping SQ%d\n",
@@ -1189,14 +1161,24 @@ int nicvf_stop(struct net_device *netdev)
         return 0;
 }
 
+static int nicvf_update_hw_max_frs(struct nicvf *nic, int mtu)
+{
+        union nic_mbx mbx = {};
+
+        mbx.frs.msg = NIC_MBOX_MSG_SET_MAX_FRS;
+        mbx.frs.max_frs = mtu;
+        mbx.frs.vf_id = nic->vf_id;
+
+        return nicvf_send_msg_to_pf(nic, &mbx);
+}
+
 int nicvf_open(struct net_device *netdev)
 {
-        int err, qidx;
+        int cpu, err, qidx;
         struct nicvf *nic = netdev_priv(netdev);
         struct queue_set *qs = nic->qs;
         struct nicvf_cq_poll *cq_poll = NULL;
-
-        nic->mtu = netdev->mtu;
+        union nic_mbx mbx = {};
 
         netif_carrier_off(netdev);
 
@@ -1248,9 +1230,17 @@ int nicvf_open(struct net_device *netdev)
         if (nic->sqs_mode)
                 nicvf_get_primary_vf_struct(nic);
 
-        /* Configure receive side scaling */
-        if (!nic->sqs_mode)
+        /* Configure receive side scaling and MTU */
+        if (!nic->sqs_mode) {
                 nicvf_rss_init(nic);
+                if (nicvf_update_hw_max_frs(nic, netdev->mtu))
+                        goto cleanup;
+
+                /* Clear percpu stats */
+                for_each_possible_cpu(cpu)
+                        memset(per_cpu_ptr(nic->drv_stats, cpu), 0,
+                               sizeof(struct nicvf_drv_stats));
+        }
 
         err = nicvf_register_interrupts(nic);
         if (err)
@@ -1276,8 +1266,9 @@ int nicvf_open(struct net_device *netdev)
         for (qidx = 0; qidx < qs->rbdr_cnt; qidx++)
                 nicvf_enable_intr(nic, NICVF_INTR_RBDR, qidx);
 
-        nic->drv_stats.txq_stop = 0;
-        nic->drv_stats.txq_wake = 0;
+        /* Send VF config done msg to PF */
+        mbx.msg.msg = NIC_MBOX_MSG_CFG_DONE;
+        nicvf_write_to_mbx(nic, &mbx);
 
         return 0;
 cleanup:
@@ -1297,17 +1288,6 @@ napi_del:
         return err;
 }
 
-static int nicvf_update_hw_max_frs(struct nicvf *nic, int mtu)
-{
-        union nic_mbx mbx = {};
-
-        mbx.frs.msg = NIC_MBOX_MSG_SET_MAX_FRS;
-        mbx.frs.max_frs = mtu;
-        mbx.frs.vf_id = nic->vf_id;
-
-        return nicvf_send_msg_to_pf(nic, &mbx);
-}
-
 static int nicvf_change_mtu(struct net_device *netdev, int new_mtu)
 {
         struct nicvf *nic = netdev_priv(netdev);
@@ -1318,10 +1298,13 @@ static int nicvf_change_mtu(struct net_device *netdev, int new_mtu)
         if (new_mtu < NIC_HW_MIN_FRS)
                 return -EINVAL;
 
+        netdev->mtu = new_mtu;
+
+        if (!netif_running(netdev))
+                return 0;
+
         if (nicvf_update_hw_max_frs(nic, new_mtu))
                 return -EINVAL;
-        netdev->mtu = new_mtu;
-        nic->mtu = new_mtu;
 
         return 0;
 }
@@ -1379,9 +1362,10 @@ void nicvf_update_lmac_stats(struct nicvf *nic)
 
 void nicvf_update_stats(struct nicvf *nic)
 {
-        int qidx;
+        int qidx, cpu;
+        u64 tmp_stats = 0;
         struct nicvf_hw_stats *stats = &nic->hw_stats;
-        struct nicvf_drv_stats *drv_stats = &nic->drv_stats;
+        struct nicvf_drv_stats *drv_stats;
         struct queue_set *qs = nic->qs;
 
 #define GET_RX_STATS(reg) \
@@ -1404,21 +1388,33 @@ void nicvf_update_stats(struct nicvf *nic)
         stats->rx_drop_l3_bcast = GET_RX_STATS(RX_DRP_L3BCAST);
         stats->rx_drop_l3_mcast = GET_RX_STATS(RX_DRP_L3MCAST);
 
-        stats->tx_bytes_ok = GET_TX_STATS(TX_OCTS);
-        stats->tx_ucast_frames_ok = GET_TX_STATS(TX_UCAST);
-        stats->tx_bcast_frames_ok = GET_TX_STATS(TX_BCAST);
-        stats->tx_mcast_frames_ok = GET_TX_STATS(TX_MCAST);
+        stats->tx_bytes = GET_TX_STATS(TX_OCTS);
+        stats->tx_ucast_frames = GET_TX_STATS(TX_UCAST);
+        stats->tx_bcast_frames = GET_TX_STATS(TX_BCAST);
+        stats->tx_mcast_frames = GET_TX_STATS(TX_MCAST);
         stats->tx_drops = GET_TX_STATS(TX_DROP);
 
-        drv_stats->tx_frames_ok = stats->tx_ucast_frames_ok +
-                                  stats->tx_bcast_frames_ok +
-                                  stats->tx_mcast_frames_ok;
-        drv_stats->rx_frames_ok = stats->rx_ucast_frames +
-                                  stats->rx_bcast_frames +
-                                  stats->rx_mcast_frames;
-        drv_stats->rx_drops = stats->rx_drop_red +
-                              stats->rx_drop_overrun;
-        drv_stats->tx_drops = stats->tx_drops;
+        /* On T88 pass 2.0, the dummy SQE added for TSO notification
+         * via CQE has 'dont_send' set. Hence HW drops the pkt pointed
+         * pointed by dummy SQE and results in tx_drops counter being
+         * incremented. Subtracting it from tx_tso counter will give
+         * exact tx_drops counter.
+         */
+        if (nic->t88 && nic->hw_tso) {
+                for_each_possible_cpu(cpu) {
+                        drv_stats = per_cpu_ptr(nic->drv_stats, cpu);
+                        tmp_stats += drv_stats->tx_tso;
+                }
+                stats->tx_drops = tmp_stats - stats->tx_drops;
+        }
+        stats->tx_frames = stats->tx_ucast_frames +
+                           stats->tx_bcast_frames +
+                           stats->tx_mcast_frames;
+        stats->rx_frames = stats->rx_ucast_frames +
+                           stats->rx_bcast_frames +
+                           stats->rx_mcast_frames;
+        stats->rx_drops = stats->rx_drop_red +
+                          stats->rx_drop_overrun;
 
         /* Update RQ and SQ stats */
         for (qidx = 0; qidx < qs->rq_cnt; qidx++)
@@ -1432,18 +1428,17 @@ static struct rtnl_link_stats64 *nicvf_get_stats64(struct net_device *netdev,
 {
         struct nicvf *nic = netdev_priv(netdev);
         struct nicvf_hw_stats *hw_stats = &nic->hw_stats;
-        struct nicvf_drv_stats *drv_stats = &nic->drv_stats;
 
         nicvf_update_stats(nic);
 
         stats->rx_bytes = hw_stats->rx_bytes;
-        stats->rx_packets = drv_stats->rx_frames_ok;
-        stats->rx_dropped = drv_stats->rx_drops;
+        stats->rx_packets = hw_stats->rx_frames;
+        stats->rx_dropped = hw_stats->rx_drops;
         stats->multicast = hw_stats->rx_mcast_frames;
 
-        stats->tx_bytes = hw_stats->tx_bytes_ok;
-        stats->tx_packets = drv_stats->tx_frames_ok;
-        stats->tx_dropped = drv_stats->tx_drops;
+        stats->tx_bytes = hw_stats->tx_bytes;
+        stats->tx_packets = hw_stats->tx_frames;
+        stats->tx_dropped = hw_stats->tx_drops;
 
         return stats;
 }
@@ -1456,7 +1451,7 @@ static void nicvf_tx_timeout(struct net_device *dev)
                 netdev_warn(dev, "%s: Transmit timed out, resetting\n",
                             dev->name);
 
-        nic->drv_stats.tx_timeout++;
+        this_cpu_inc(nic->drv_stats->tx_timeout);
         schedule_work(&nic->reset_task);
 }
 
@@ -1590,6 +1585,12 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_free_netdev;
         }
 
+        nic->drv_stats = netdev_alloc_pcpu_stats(struct nicvf_drv_stats);
+        if (!nic->drv_stats) {
+                err = -ENOMEM;
+                goto err_free_netdev;
+        }
+
         err = nicvf_set_qset_resources(nic);
         if (err)
                 goto err_free_netdev;
@@ -1648,6 +1649,8 @@ err_unregister_interrupts:
         nicvf_unregister_interrupts(nic);
 err_free_netdev:
         pci_set_drvdata(pdev, NULL);
+        if (nic->drv_stats)
+                free_percpu(nic->drv_stats);
         free_netdev(netdev);
 err_release_regions:
         pci_release_regions(pdev);
@@ -1675,6 +1678,8 @@ static void nicvf_remove(struct pci_dev *pdev)
                 unregister_netdev(pnetdev);
         nicvf_unregister_interrupts(nic);
         pci_set_drvdata(pdev, NULL);
+        if (nic->drv_stats)
+                free_percpu(nic->drv_stats);
         free_netdev(netdev);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
index a4fc50155881..747ef0882976 100644
--- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
@@ -104,7 +104,8 @@ static inline int nicvf_alloc_rcv_buffer(struct nicvf *nic, gfp_t gfp,
                 nic->rb_page = alloc_pages(gfp | __GFP_COMP | __GFP_NOWARN,
                                            order);
                 if (!nic->rb_page) {
-                        nic->drv_stats.rcv_buffer_alloc_failures++;
+                        this_cpu_inc(nic->pnicvf->drv_stats->
+                                     rcv_buffer_alloc_failures);
                         return -ENOMEM;
                 }
                 nic->rb_page_offset = 0;
@@ -270,7 +271,8 @@ refill:
                               rbdr_idx, new_rb);
 next_rbdr:
         /* Re-enable RBDR interrupts only if buffer allocation is success */
-        if (!nic->rb_alloc_fail && rbdr->enable)
+        if (!nic->rb_alloc_fail && rbdr->enable &&
+            netif_running(nic->pnicvf->netdev))
                 nicvf_enable_intr(nic, NICVF_INTR_RBDR, rbdr_idx);
 
         if (rbdr_idx)
@@ -361,6 +363,8 @@ static int nicvf_init_snd_queue(struct nicvf *nic,
 
 static void nicvf_free_snd_queue(struct nicvf *nic, struct snd_queue *sq)
 {
+        struct sk_buff *skb;
+
         if (!sq)
                 return;
         if (!sq->dmem.base)
@@ -371,6 +375,15 @@ static void nicvf_free_snd_queue(struct nicvf *nic, struct snd_queue *sq)
                                   sq->dmem.q_len * TSO_HEADER_SIZE,
                                   sq->tso_hdrs, sq->tso_hdrs_phys);
 
+        /* Free pending skbs in the queue */
+        smp_rmb();
+        while (sq->head != sq->tail) {
+                skb = (struct sk_buff *)sq->skbuff[sq->head];
+                if (skb)
+                        dev_kfree_skb_any(skb);
+                sq->head++;
+                sq->head &= (sq->dmem.q_len - 1);
+        }
         kfree(sq->skbuff);
         nicvf_free_q_desc_mem(nic, &sq->dmem);
 }
@@ -483,9 +496,12 @@ static void nicvf_reset_rcv_queue_stats(struct nicvf *nic)
 {
         union nic_mbx mbx = {};
 
-        /* Reset all RXQ's stats */
+        /* Reset all RQ/SQ and VF stats */
         mbx.reset_stat.msg = NIC_MBOX_MSG_RESET_STAT_COUNTER;
+        mbx.reset_stat.rx_stat_mask = 0x3FFF;
+        mbx.reset_stat.tx_stat_mask = 0x1F;
         mbx.reset_stat.rq_stat_mask = 0xFFFF;
+        mbx.reset_stat.sq_stat_mask = 0xFFFF;
         nicvf_send_msg_to_pf(nic, &mbx);
 }
 
@@ -538,9 +554,12 @@ static void nicvf_rcv_queue_config(struct nicvf *nic, struct queue_set *qs,
         mbx.rq.cfg = (1ULL << 62) | (RQ_CQ_DROP << 8);
         nicvf_send_msg_to_pf(nic, &mbx);
 
-        nicvf_queue_reg_write(nic, NIC_QSET_RQ_GEN_CFG, 0, 0x00);
-        if (!nic->sqs_mode)
+        if (!nic->sqs_mode && (qidx == 0)) {
+                /* Enable checking L3/L4 length and TCP/UDP checksums */
+                nicvf_queue_reg_write(nic, NIC_QSET_RQ_GEN_CFG, 0,
+                                      (BIT(24) | BIT(23) | BIT(21)));
                 nicvf_config_vlan_stripping(nic, nic->netdev->features);
+        }
 
         /* Enable Receive queue */
         memset(&rq_cfg, 0, sizeof(struct rq_cfg));
@@ -1029,7 +1048,7 @@ nicvf_sq_add_hdr_subdesc(struct nicvf *nic, struct snd_queue *sq, int qentry,
                 hdr->tso_max_paysize = skb_shinfo(skb)->gso_size;
                 /* For non-tunneled pkts, point this to L2 ethertype */
                 hdr->inner_l3_offset = skb_network_offset(skb) - 2;
-                nic->drv_stats.tx_tso++;
+                this_cpu_inc(nic->pnicvf->drv_stats->tx_tso);
         }
 }
 
@@ -1161,7 +1180,7 @@ static int nicvf_sq_append_tso(struct nicvf *nic, struct snd_queue *sq,
 
         nicvf_sq_doorbell(nic, skb, sq_num, desc_cnt);
 
-        nic->drv_stats.tx_tso++;
+        this_cpu_inc(nic->pnicvf->drv_stats->tx_tso);
         return 1;
 }
 
@@ -1422,8 +1441,6 @@ void nicvf_update_sq_stats(struct nicvf *nic, int sq_idx)
 /* Check for errors in the receive cmp.queue entry */
 int nicvf_check_cqe_rx_errs(struct nicvf *nic, struct cqe_rx_t *cqe_rx)
 {
-        struct nicvf_hw_stats *stats = &nic->hw_stats;
-
         if (!cqe_rx->err_level && !cqe_rx->err_opcode)
                 return 0;
 
@@ -1435,76 +1452,76 @@ int nicvf_check_cqe_rx_errs(struct nicvf *nic, struct cqe_rx_t *cqe_rx)
 
         switch (cqe_rx->err_opcode) {
         case CQ_RX_ERROP_RE_PARTIAL:
-                stats->rx_bgx_truncated_pkts++;
+                this_cpu_inc(nic->drv_stats->rx_bgx_truncated_pkts);
                 break;
         case CQ_RX_ERROP_RE_JABBER:
-                stats->rx_jabber_errs++;
+                this_cpu_inc(nic->drv_stats->rx_jabber_errs);
                 break;
         case CQ_RX_ERROP_RE_FCS:
-                stats->rx_fcs_errs++;
+                this_cpu_inc(nic->drv_stats->rx_fcs_errs);
                 break;
         case CQ_RX_ERROP_RE_RX_CTL:
-                stats->rx_bgx_errs++;
+                this_cpu_inc(nic->drv_stats->rx_bgx_errs);
                 break;
         case CQ_RX_ERROP_PREL2_ERR:
-                stats->rx_prel2_errs++;
+                this_cpu_inc(nic->drv_stats->rx_prel2_errs);
                 break;
         case CQ_RX_ERROP_L2_MAL:
-                stats->rx_l2_hdr_malformed++;
+                this_cpu_inc(nic->drv_stats->rx_l2_hdr_malformed);
                 break;
         case CQ_RX_ERROP_L2_OVERSIZE:
-                stats->rx_oversize++;
+                this_cpu_inc(nic->drv_stats->rx_oversize);
                 break;
         case CQ_RX_ERROP_L2_UNDERSIZE:
-                stats->rx_undersize++;
+                this_cpu_inc(nic->drv_stats->rx_undersize);
                 break;
         case CQ_RX_ERROP_L2_LENMISM:
-                stats->rx_l2_len_mismatch++;
+                this_cpu_inc(nic->drv_stats->rx_l2_len_mismatch);
                 break;
         case CQ_RX_ERROP_L2_PCLP:
-                stats->rx_l2_pclp++;
+                this_cpu_inc(nic->drv_stats->rx_l2_pclp);
                 break;
         case CQ_RX_ERROP_IP_NOT:
-                stats->rx_ip_ver_errs++;
+                this_cpu_inc(nic->drv_stats->rx_ip_ver_errs);
                 break;
         case CQ_RX_ERROP_IP_CSUM_ERR:
-                stats->rx_ip_csum_errs++;
+                this_cpu_inc(nic->drv_stats->rx_ip_csum_errs);
                 break;
         case CQ_RX_ERROP_IP_MAL:
-                stats->rx_ip_hdr_malformed++;
+                this_cpu_inc(nic->drv_stats->rx_ip_hdr_malformed);
                 break;
         case CQ_RX_ERROP_IP_MALD:
-                stats->rx_ip_payload_malformed++;
+                this_cpu_inc(nic->drv_stats->rx_ip_payload_malformed);
                 break;
         case CQ_RX_ERROP_IP_HOP:
-                stats->rx_ip_ttl_errs++;
+                this_cpu_inc(nic->drv_stats->rx_ip_ttl_errs);
                 break;
         case CQ_RX_ERROP_L3_PCLP:
-                stats->rx_l3_pclp++;
+                this_cpu_inc(nic->drv_stats->rx_l3_pclp);
                 break;
         case CQ_RX_ERROP_L4_MAL:
-                stats->rx_l4_malformed++;
+                this_cpu_inc(nic->drv_stats->rx_l4_malformed);
                 break;
         case CQ_RX_ERROP_L4_CHK:
-                stats->rx_l4_csum_errs++;
+                this_cpu_inc(nic->drv_stats->rx_l4_csum_errs);
                 break;
         case CQ_RX_ERROP_UDP_LEN:
-                stats->rx_udp_len_errs++;
+                this_cpu_inc(nic->drv_stats->rx_udp_len_errs);
                 break;
         case CQ_RX_ERROP_L4_PORT:
-                stats->rx_l4_port_errs++;
+                this_cpu_inc(nic->drv_stats->rx_l4_port_errs);
                 break;
         case CQ_RX_ERROP_TCP_FLAG:
-                stats->rx_tcp_flag_errs++;
+                this_cpu_inc(nic->drv_stats->rx_tcp_flag_errs);
                 break;
         case CQ_RX_ERROP_TCP_OFFSET:
-                stats->rx_tcp_offset_errs++;
+                this_cpu_inc(nic->drv_stats->rx_tcp_offset_errs);
                 break;
         case CQ_RX_ERROP_L4_PCLP:
-                stats->rx_l4_pclp++;
+                this_cpu_inc(nic->drv_stats->rx_l4_pclp);
                 break;
         case CQ_RX_ERROP_RBDR_TRUNC:
-                stats->rx_truncated_pkts++;
+                this_cpu_inc(nic->drv_stats->rx_truncated_pkts);
                 break;
         }
 
@@ -1512,53 +1529,52 @@ int nicvf_check_cqe_rx_errs(struct nicvf *nic, struct cqe_rx_t *cqe_rx)
 }
 
 /* Check for errors in the send cmp.queue entry */
-int nicvf_check_cqe_tx_errs(struct nicvf *nic,
-                            struct cmp_queue *cq, struct cqe_send_t *cqe_tx)
+int nicvf_check_cqe_tx_errs(struct nicvf *nic, struct cqe_send_t *cqe_tx)
 {
-        struct cmp_queue_stats *stats = &cq->stats;
-
         switch (cqe_tx->send_status) {
         case CQ_TX_ERROP_GOOD:
-                stats->tx.good++;
                 return 0;
         case CQ_TX_ERROP_DESC_FAULT:
-                stats->tx.desc_fault++;
+                this_cpu_inc(nic->drv_stats->tx_desc_fault);
                 break;
         case CQ_TX_ERROP_HDR_CONS_ERR:
-                stats->tx.hdr_cons_err++;
+                this_cpu_inc(nic->drv_stats->tx_hdr_cons_err);
                 break;
         case CQ_TX_ERROP_SUBDC_ERR:
-                stats->tx.subdesc_err++;
+                this_cpu_inc(nic->drv_stats->tx_subdesc_err);
+                break;
+        case CQ_TX_ERROP_MAX_SIZE_VIOL:
+                this_cpu_inc(nic->drv_stats->tx_max_size_exceeded);
                 break;
         case CQ_TX_ERROP_IMM_SIZE_OFLOW:
-                stats->tx.imm_size_oflow++;
+                this_cpu_inc(nic->drv_stats->tx_imm_size_oflow);
                 break;
         case CQ_TX_ERROP_DATA_SEQUENCE_ERR:
-                stats->tx.data_seq_err++;
+                this_cpu_inc(nic->drv_stats->tx_data_seq_err);
                 break;
         case CQ_TX_ERROP_MEM_SEQUENCE_ERR:
-                stats->tx.mem_seq_err++;
+                this_cpu_inc(nic->drv_stats->tx_mem_seq_err);
                 break;
         case CQ_TX_ERROP_LOCK_VIOL:
-                stats->tx.lock_viol++;
+                this_cpu_inc(nic->drv_stats->tx_lock_viol);
                 break;
         case CQ_TX_ERROP_DATA_FAULT:
-                stats->tx.data_fault++;
+                this_cpu_inc(nic->drv_stats->tx_data_fault);
                 break;
         case CQ_TX_ERROP_TSTMP_CONFLICT:
-                stats->tx.tstmp_conflict++;
+                this_cpu_inc(nic->drv_stats->tx_tstmp_conflict);
                 break;
         case CQ_TX_ERROP_TSTMP_TIMEOUT:
-                stats->tx.tstmp_timeout++;
+                this_cpu_inc(nic->drv_stats->tx_tstmp_timeout);
                 break;
         case CQ_TX_ERROP_MEM_FAULT:
-                stats->tx.mem_fault++;
+                this_cpu_inc(nic->drv_stats->tx_mem_fault);
                 break;
         case CQ_TX_ERROP_CK_OVERLAP:
-                stats->tx.csum_overlap++;
+                this_cpu_inc(nic->drv_stats->tx_csum_overlap);
                 break;
         case CQ_TX_ERROP_CK_OFLOW:
-                stats->tx.csum_overflow++;
+                this_cpu_inc(nic->drv_stats->tx_csum_overflow);
                 break;
         }
 
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.h b/drivers/net/ethernet/cavium/thunder/nicvf_queues.h
index 869f3386028b..2e3c940c1093 100644
--- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.h
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.h
@@ -158,6 +158,7 @@ enum CQ_TX_ERROP_E {
         CQ_TX_ERROP_DESC_FAULT = 0x10,
         CQ_TX_ERROP_HDR_CONS_ERR = 0x11,
         CQ_TX_ERROP_SUBDC_ERR = 0x12,
+        CQ_TX_ERROP_MAX_SIZE_VIOL = 0x13,
         CQ_TX_ERROP_IMM_SIZE_OFLOW = 0x80,
         CQ_TX_ERROP_DATA_SEQUENCE_ERR = 0x81,
         CQ_TX_ERROP_MEM_SEQUENCE_ERR = 0x82,
@@ -171,25 +172,6 @@ enum CQ_TX_ERROP_E {
         CQ_TX_ERROP_ENUM_LAST = 0x8a,
 };
 
-struct cmp_queue_stats {
-        struct tx_stats {
-                u64 good;
-                u64 desc_fault;
-                u64 hdr_cons_err;
-                u64 subdesc_err;
-                u64 imm_size_oflow;
-                u64 data_seq_err;
-                u64 mem_seq_err;
-                u64 lock_viol;
-                u64 data_fault;
-                u64 tstmp_conflict;
-                u64 tstmp_timeout;
-                u64 mem_fault;
-                u64 csum_overlap;
-                u64 csum_overflow;
-        } tx;
-} ____cacheline_aligned_in_smp;
-
 enum RQ_SQ_STATS {
         RQ_SQ_STATS_OCTS,
         RQ_SQ_STATS_PKTS,
@@ -241,7 +223,6 @@ struct cmp_queue {
         spinlock_t      lock;  /* lock to serialize processing CQEs */
         void            *desc;
         struct q_desc_mem   dmem;
-        struct cmp_queue_stats  stats;
         int             irq;
 } ____cacheline_aligned_in_smp;
 
@@ -336,6 +317,5 @@ u64  nicvf_queue_reg_read(struct nicvf *nic,
 void nicvf_update_rq_stats(struct nicvf *nic, int rq_idx);
 void nicvf_update_sq_stats(struct nicvf *nic, int sq_idx);
 int nicvf_check_cqe_rx_errs(struct nicvf *nic, struct cqe_rx_t *cqe_rx);
-int nicvf_check_cqe_tx_errs(struct nicvf *nic,
-                            struct cmp_queue *cq, struct cqe_send_t *cqe_tx);
+int nicvf_check_cqe_tx_errs(struct nicvf *nic, struct cqe_send_t *cqe_tx);
 #endif /* NICVF_QUEUES_H */
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index 8bbaedbb7b94..050e21fbb147 100644
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -1242,8 +1242,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         pci_read_config_word(pdev, PCI_DEVICE_ID, &sdevid);
         if (sdevid != PCI_DEVICE_ID_THUNDER_RGX) {
-                bgx->bgx_id =
-                    (pci_resource_start(pdev, PCI_CFG_REG_BAR_NUM) >> 24) & 1;
+                bgx->bgx_id = (pci_resource_start(pdev,
+                        PCI_CFG_REG_BAR_NUM) >> 24) & BGX_ID_MASK;
                 bgx->bgx_id += nic_get_node_id(pdev) * MAX_BGX_PER_NODE;
                 bgx->max_lmac = MAX_LMAC_PER_BGX;
                 bgx_vnic[bgx->bgx_id] = bgx;
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
index d59c71e4a000..01cc7c859131 100644
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
@@ -28,6 +28,8 @@
 #define    MAX_DMAC_PER_LMAC                    8
 #define    MAX_FRAME_SIZE                       9216
 
+#define    BGX_ID_MASK                          0x3
+
 #define    MAX_DMAC_PER_LMAC_TNS_BYPASS_MODE    2
 
 /* Registers */
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 57eb4e1345cb..19dc9e25aa72 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -4931,6 +4931,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
          */
         for_each_port(adapter, i) {
                 pi = adap2pinfo(adapter, i);
+                adapter->port[i]->dev_port = pi->lport;
                 netif_set_real_num_tx_queues(adapter->port[i], pi->nqsets);
                 netif_set_real_num_rx_queues(adapter->port[i], pi->nqsets);
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index 1e74fd6085df..e19a0ca8e5dd 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -2951,7 +2951,6 @@ void free_rspq_fl(struct adapter *adap, struct sge_rspq *rq,
                    rq->cntxt_id, fl_id, 0xffff);
         dma_free_coherent(adap->pdev_dev, (rq->size + 1) * rq->iqe_len,
                           rq->desc, rq->phys_addr);
-        napi_hash_del(&rq->napi);
         netif_napi_del(&rq->napi);
         rq->netdev = NULL;
         rq->cntxt_id = rq->abs_id = 0;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 20dec85da63d..e8139514d32c 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -7851,7 +7851,6 @@ int t4_port_init(struct adapter *adap, int mbox, int pf, int vf)
                         return ret;
 
                 memcpy(adap->port[i]->dev_addr, addr, ETH_ALEN);
-                adap->port[i]->dev_port = j;
                 j++;
         }
         return 0;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h b/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
index 50812a1d67bd..ecf3ccc257bc 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
@@ -168,6 +168,7 @@ CH_PCI_DEVICE_ID_TABLE_DEFINE_BEGIN
         CH_PCI_ID_TABLE_FENTRY(0x509a), /* Custom T520-CR */
         CH_PCI_ID_TABLE_FENTRY(0x509b), /* Custom T540-CR LOM */
         CH_PCI_ID_TABLE_FENTRY(0x509c), /* Custom T520-CR*/
+        CH_PCI_ID_TABLE_FENTRY(0x509d), /* Custom T540-CR*/
 
         /* T6 adapters:
          */
@@ -178,9 +179,9 @@ CH_PCI_DEVICE_ID_TABLE_DEFINE_BEGIN
         CH_PCI_ID_TABLE_FENTRY(0x6005),
         CH_PCI_ID_TABLE_FENTRY(0x6006),
         CH_PCI_ID_TABLE_FENTRY(0x6007),
+        CH_PCI_ID_TABLE_FENTRY(0x6008),
         CH_PCI_ID_TABLE_FENTRY(0x6009),
         CH_PCI_ID_TABLE_FENTRY(0x600d),
-        CH_PCI_ID_TABLE_FENTRY(0x6010),
         CH_PCI_ID_TABLE_FENTRY(0x6011),
         CH_PCI_ID_TABLE_FENTRY(0x6014),
         CH_PCI_ID_TABLE_FENTRY(0x6015),
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 100b2cc064a3..a37481c04a87 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -2969,6 +2969,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
 
                 netdev->netdev_ops = &cxgb4vf_netdev_ops;
                 netdev->ethtool_ops = &cxgb4vf_ethtool_ops;
+                netdev->dev_port = pi->port_id;
 
                 /*
                  * Initialize the hardware/software state for the port.
diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
index de9f7c97d916..9a161e981529 100644
--- a/drivers/net/ethernet/cirrus/ep93xx_eth.c
+++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c
@@ -468,6 +468,9 @@ static void ep93xx_free_buffers(struct ep93xx_priv *ep)
         struct device *dev = ep->dev->dev.parent;
         int i;
 
+        if (!ep->descs)
+                return;
+
         for (i = 0; i < RX_QUEUE_ENTRIES; i++) {
                 dma_addr_t d;
 
@@ -490,6 +493,7 @@ static void ep93xx_free_buffers(struct ep93xx_priv *ep)
 
         dma_free_coherent(dev, sizeof(struct ep93xx_descs), ep->descs,
                                                         ep->descs_dma_addr);
+        ep->descs = NULL;
 }
 
 static int ep93xx_alloc_buffers(struct ep93xx_priv *ep)
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 1fb5d7239254..0e74529a4209 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -90,7 +90,8 @@ static struct be_cmd_priv_map cmd_priv_map[] = {
         {
                 OPCODE_COMMON_SET_HSW_CONFIG,
                 CMD_SUBSYSTEM_COMMON,
-                BE_PRIV_DEVCFG | BE_PRIV_VHADM
+                BE_PRIV_DEVCFG | BE_PRIV_VHADM |
+                BE_PRIV_DEVSEC
         },
         {
                 OPCODE_COMMON_GET_EXT_FAT_CAPABILITIES,
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index cece8a08edca..93aa2939142a 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2813,7 +2813,6 @@ static void be_evt_queues_destroy(struct be_adapter *adapter)
                 if (eqo->q.created) {
                         be_eq_clean(eqo);
                         be_cmd_q_destroy(adapter, &eqo->q, QTYPE_EQ);
-                        napi_hash_del(&eqo->napi);
                         netif_napi_del(&eqo->napi);
                         free_cpumask_var(eqo->affinity_mask);
                 }
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index c865135f3cb9..5ea740b4cf14 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -574,6 +574,8 @@ struct fec_enet_private {
         unsigned int reload_period;
         int pps_enable;
         unsigned int next_counter;
+
+        u64 ethtool_stats[0];
 };
 
 void fec_ptp_init(struct platform_device *pdev);
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 5aa9d4ded214..12aef1b15356 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -2313,14 +2313,26 @@ static const struct fec_stat {
         { "IEEE_rx_octets_ok", IEEE_R_OCTETS_OK },
 };
 
-static void fec_enet_get_ethtool_stats(struct net_device *dev,
-        struct ethtool_stats *stats, u64 *data)
+#define FEC_STATS_SIZE          (ARRAY_SIZE(fec_stats) * sizeof(u64))
+
+static void fec_enet_update_ethtool_stats(struct net_device *dev)
 {
         struct fec_enet_private *fep = netdev_priv(dev);
         int i;
 
         for (i = 0; i < ARRAY_SIZE(fec_stats); i++)
-                data[i] = readl(fep->hwp + fec_stats[i].offset);
+                fep->ethtool_stats[i] = readl(fep->hwp + fec_stats[i].offset);
+}
+
+static void fec_enet_get_ethtool_stats(struct net_device *dev,
+                                       struct ethtool_stats *stats, u64 *data)
+{
+        struct fec_enet_private *fep = netdev_priv(dev);
+
+        if (netif_running(dev))
+                fec_enet_update_ethtool_stats(dev);
+
+        memcpy(data, fep->ethtool_stats, FEC_STATS_SIZE);
 }
 
 static void fec_enet_get_strings(struct net_device *netdev,
@@ -2345,6 +2357,12 @@ static int fec_enet_get_sset_count(struct net_device *dev, int sset)
                 return -EOPNOTSUPP;
         }
 }
+
+#else   /* !defined(CONFIG_M5272) */
+#define FEC_STATS_SIZE  0
+static inline void fec_enet_update_ethtool_stats(struct net_device *dev)
+{
+}
 #endif /* !defined(CONFIG_M5272) */
 
 static int fec_enet_nway_reset(struct net_device *dev)
@@ -2874,6 +2892,8 @@ fec_enet_close(struct net_device *ndev)
         if (fep->quirks & FEC_QUIRK_ERR006687)
                 imx6q_cpuidle_fec_irqs_unused();
 
+        fec_enet_update_ethtool_stats(ndev);
+
         fec_enet_clk_enable(ndev, false);
         pinctrl_pm_select_sleep_state(&fep->pdev->dev);
         pm_runtime_mark_last_busy(&fep->pdev->dev);
@@ -3180,6 +3200,8 @@ static int fec_enet_init(struct net_device *ndev)
 
         fec_restart(ndev);
 
+        fec_enet_update_ethtool_stats(ndev);
+
         return 0;
 }
 
@@ -3278,8 +3300,8 @@ fec_probe(struct platform_device *pdev)
         fec_enet_get_queue_num(pdev, &num_tx_qs, &num_rx_qs);
 
         /* Init network device */
-        ndev = alloc_etherdev_mqs(sizeof(struct fec_enet_private),
-                                  num_tx_qs, num_rx_qs);
+        ndev = alloc_etherdev_mqs(sizeof(struct fec_enet_private) +
+                                  FEC_STATS_SIZE, num_tx_qs, num_rx_qs);
         if (!ndev)
                 return -ENOMEM;
 
@@ -3475,6 +3497,8 @@ failed_regulator:
 failed_clk_ipg:
         fec_enet_clk_enable(ndev, false);
 failed_clk:
+        if (of_phy_is_fixed_link(np))
+                of_phy_deregister_fixed_link(np);
 failed_phy:
         of_node_put(phy_node);
 failed_ioremap:
@@ -3488,6 +3512,7 @@ fec_drv_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
         struct fec_enet_private *fep = netdev_priv(ndev);
+        struct device_node *np = pdev->dev.of_node;
 
         cancel_work_sync(&fep->tx_timeout_work);
         fec_ptp_stop(pdev);
@@ -3495,6 +3520,8 @@ fec_drv_remove(struct platform_device *pdev)
         fec_enet_mii_remove(fep);
         if (fep->reg_phy)
                 regulator_disable(fep->reg_phy);
+        if (of_phy_is_fixed_link(np))
+                of_phy_deregister_fixed_link(np);
         of_node_put(fep->phy_node);
         free_netdev(ndev);
 
diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c
index 53ef51e3bd9e..71a5ded9d1de 100644
--- a/drivers/net/ethernet/freescale/fman/fman_memac.c
+++ b/drivers/net/ethernet/freescale/fman/fman_memac.c
@@ -1107,6 +1107,9 @@ int memac_free(struct fman_mac *memac)
 {
         free_init_resources(memac);
 
+        if (memac->pcsphy)
+                put_device(&memac->pcsphy->mdio.dev);
+
         kfree(memac->memac_drv_param);
         kfree(memac);
 
diff --git a/drivers/net/ethernet/freescale/fman/fman_tgec.c b/drivers/net/ethernet/freescale/fman/fman_tgec.c
index efabb04a1ae8..4b0f3a50b293 100644
--- a/drivers/net/ethernet/freescale/fman/fman_tgec.c
+++ b/drivers/net/ethernet/freescale/fman/fman_tgec.c
@@ -722,9 +722,6 @@ int tgec_free(struct fman_mac *tgec)
 {
         free_init_resources(tgec);
 
-        if (tgec->cfg)
-                tgec->cfg = NULL;
-
         kfree(tgec->cfg);
         kfree(tgec);
 
diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
index 8fe6b3e253fa..736db9d9b0ad 100644
--- a/drivers/net/ethernet/freescale/fman/mac.c
+++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -892,6 +892,8 @@ static int mac_probe(struct platform_device *_of_dev)
                 priv->fixed_link->duplex = phy->duplex;
                 priv->fixed_link->pause = phy->pause;
                 priv->fixed_link->asym_pause = phy->asym_pause;
+
+                put_device(&phy->mdio.dev);
         }
 
         err = mac_dev->init(mac_dev);
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index dc120c148d97..4b86260584a0 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -980,7 +980,7 @@ static int fs_enet_probe(struct platform_device *ofdev)
                 err = clk_prepare_enable(clk);
                 if (err) {
                         ret = err;
-                        goto out_free_fpi;
+                        goto out_deregister_fixed_link;
                 }
                 fpi->clk_per = clk;
         }
@@ -1061,6 +1061,9 @@ out_put:
         of_node_put(fpi->phy_node);
         if (fpi->clk_per)
                 clk_disable_unprepare(fpi->clk_per);
+out_deregister_fixed_link:
+        if (of_phy_is_fixed_link(ofdev->dev.of_node))
+                of_phy_deregister_fixed_link(ofdev->dev.of_node);
 out_free_fpi:
         kfree(fpi);
         return ret;
@@ -1079,6 +1082,8 @@ static int fs_enet_remove(struct platform_device *ofdev)
         of_node_put(fep->fpi->phy_node);
         if (fep->fpi->clk_per)
                 clk_disable_unprepare(fep->fpi->clk_per);
+        if (of_phy_is_fixed_link(ofdev->dev.of_node))
+                of_phy_deregister_fixed_link(ofdev->dev.of_node);
         free_netdev(ndev);
         return 0;
 }
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 4b4f5bc0e279..9061c2f82b9c 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -1312,6 +1312,7 @@ static void gfar_init_addr_hash_table(struct gfar_private *priv)
  */
 static int gfar_probe(struct platform_device *ofdev)
 {
+        struct device_node *np = ofdev->dev.of_node;
         struct net_device *dev = NULL;
         struct gfar_private *priv = NULL;
         int err = 0, i;
@@ -1462,6 +1463,8 @@ static int gfar_probe(struct platform_device *ofdev)
         return 0;
 
 register_fail:
+        if (of_phy_is_fixed_link(np))
+                of_phy_deregister_fixed_link(np);
         unmap_group_regs(priv);
         gfar_free_rx_queues(priv);
         gfar_free_tx_queues(priv);
@@ -1474,11 +1477,16 @@ register_fail:
 static int gfar_remove(struct platform_device *ofdev)
 {
         struct gfar_private *priv = platform_get_drvdata(ofdev);
+        struct device_node *np = ofdev->dev.of_node;
 
         of_node_put(priv->phy_node);
         of_node_put(priv->tbi_node);
 
         unregister_netdev(priv->ndev);
+
+        if (of_phy_is_fixed_link(np))
+                of_phy_deregister_fixed_link(np);
+
         unmap_group_regs(priv);
         gfar_free_rx_queues(priv);
         gfar_free_tx_queues(priv);
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 186ef8f16c80..f76d33279454 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3868,9 +3868,8 @@ static int ucc_geth_probe(struct platform_device* ofdev)
         dev = alloc_etherdev(sizeof(*ugeth));
 
         if (dev == NULL) {
-                of_node_put(ug_info->tbi_node);
-                of_node_put(ug_info->phy_node);
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto err_deregister_fixed_link;
         }
 
         ugeth = netdev_priv(dev);
@@ -3907,10 +3906,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
                 if (netif_msg_probe(ugeth))
                         pr_err("%s: Cannot register net device, aborting\n",
                                dev->name);
-                free_netdev(dev);
-                of_node_put(ug_info->tbi_node);
-                of_node_put(ug_info->phy_node);
-                return err;
+                goto err_free_netdev;
         }
 
         mac_addr = of_get_mac_address(np);
@@ -3923,16 +3919,29 @@ static int ucc_geth_probe(struct platform_device* ofdev)
         ugeth->node = np;
 
         return 0;
+
+err_free_netdev:
+        free_netdev(dev);
+err_deregister_fixed_link:
+        if (of_phy_is_fixed_link(np))
+                of_phy_deregister_fixed_link(np);
+        of_node_put(ug_info->tbi_node);
+        of_node_put(ug_info->phy_node);
+
+        return err;
 }
 
 static int ucc_geth_remove(struct platform_device* ofdev)
 {
         struct net_device *dev = platform_get_drvdata(ofdev);
         struct ucc_geth_private *ugeth = netdev_priv(dev);
+        struct device_node *np = ofdev->dev.of_node;
 
         unregister_netdev(dev);
         free_netdev(dev);
         ucc_geth_memclean(ugeth);
+        if (of_phy_is_fixed_link(np))
+                of_phy_deregister_fixed_link(np);
         of_node_put(ugeth->ug_info->tbi_node);
         of_node_put(ugeth->ug_info->phy_node);
 
diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.c b/drivers/net/ethernet/hisilicon/hns/hnae.c
index c54c6fac0d1d..b6ed818f78ff 100644
--- a/drivers/net/ethernet/hisilicon/hns/hnae.c
+++ b/drivers/net/ethernet/hisilicon/hns/hnae.c
@@ -332,8 +332,10 @@ struct hnae_handle *hnae_get_handle(struct device *owner_dev,
                 return ERR_PTR(-ENODEV);
 
         handle = dev->ops->get_handle(dev, port_id);
-        if (IS_ERR(handle))
+        if (IS_ERR(handle)) {
+                put_device(&dev->cls_dev);
                 return handle;
+        }
 
         handle->dev = dev;
         handle->owner_dev = owner_dev;
@@ -356,6 +358,8 @@ out_when_init_queue:
         for (j = i - 1; j >= 0; j--)
                 hnae_fini_queue(handle->qs[j]);
 
+        put_device(&dev->cls_dev);
+
         return ERR_PTR(-ENOMEM);
 }
 EXPORT_SYMBOL(hnae_get_handle);
@@ -377,6 +381,8 @@ void hnae_put_handle(struct hnae_handle *h)
                 dev->ops->put_handle(h);
 
         module_put(dev->owner);
+
+        put_device(&dev->cls_dev);
 }
 EXPORT_SYMBOL(hnae_put_handle);
 
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 54efa9a5167b..bd719e25dd76 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -2446,6 +2446,8 @@ static int ehea_open(struct net_device *dev)
 
         netif_info(port, ifup, dev, "enabling port\n");
 
+        netif_carrier_off(dev);
+
         ret = ehea_up(dev);
         if (!ret) {
                 port_napi_enable(port);
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index ebe60719e489..a36022ba4e42 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -58,7 +58,7 @@ static struct kobj_type ktype_veth_pool;
 
 static const char ibmveth_driver_name[] = "ibmveth";
 static const char ibmveth_driver_string[] = "IBM Power Virtual Ethernet Driver";
-#define ibmveth_driver_version "1.05"
+#define ibmveth_driver_version "1.06"
 
 MODULE_AUTHOR("Santiago Leon <santil@linux.vnet.ibm.com>");
 MODULE_DESCRIPTION("IBM Power Virtual Ethernet Driver");
@@ -137,6 +137,11 @@ static inline int ibmveth_rxq_frame_offset(struct ibmveth_adapter *adapter)
         return ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_OFF_MASK;
 }
 
+static inline int ibmveth_rxq_large_packet(struct ibmveth_adapter *adapter)
+{
+        return ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_LRG_PKT;
+}
+
 static inline int ibmveth_rxq_frame_length(struct ibmveth_adapter *adapter)
 {
         return be32_to_cpu(adapter->rx_queue.queue_addr[adapter->rx_queue.index].length);
@@ -1174,6 +1179,45 @@ map_failed:
         goto retry_bounce;
 }
 
+static void ibmveth_rx_mss_helper(struct sk_buff *skb, u16 mss, int lrg_pkt)
+{
+        int offset = 0;
+
+        /* only TCP packets will be aggregated */
+        if (skb->protocol == htons(ETH_P_IP)) {
+                struct iphdr *iph = (struct iphdr *)skb->data;
+
+                if (iph->protocol == IPPROTO_TCP) {
+                        offset = iph->ihl * 4;
+                        skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
+                } else {
+                        return;
+                }
+        } else if (skb->protocol == htons(ETH_P_IPV6)) {
+                struct ipv6hdr *iph6 = (struct ipv6hdr *)skb->data;
+
+                if (iph6->nexthdr == IPPROTO_TCP) {
+                        offset = sizeof(struct ipv6hdr);
+                        skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
+                } else {
+                        return;
+                }
+        } else {
+                return;
+        }
+        /* if mss is not set through Large Packet bit/mss in rx buffer,
+         * expect that the mss will be written to the tcp header checksum.
+         */
+        if (lrg_pkt) {
+                skb_shinfo(skb)->gso_size = mss;
+        } else if (offset) {
+                struct tcphdr *tcph = (struct tcphdr *)(skb->data + offset);
+
+                skb_shinfo(skb)->gso_size = ntohs(tcph->check);
+                tcph->check = 0;
+        }
+}
+
 static int ibmveth_poll(struct napi_struct *napi, int budget)
 {
         struct ibmveth_adapter *adapter =
@@ -1182,6 +1226,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
         int frames_processed = 0;
         unsigned long lpar_rc;
         struct iphdr *iph;
+        u16 mss = 0;
 
 restart_poll:
         while (frames_processed < budget) {
@@ -1199,9 +1244,21 @@ restart_poll:
                         int length = ibmveth_rxq_frame_length(adapter);
                         int offset = ibmveth_rxq_frame_offset(adapter);
                         int csum_good = ibmveth_rxq_csum_good(adapter);
+                        int lrg_pkt = ibmveth_rxq_large_packet(adapter);
 
                         skb = ibmveth_rxq_get_buffer(adapter);
 
+                        /* if the large packet bit is set in the rx queue
+                         * descriptor, the mss will be written by PHYP eight
+                         * bytes from the start of the rx buffer, which is
+                         * skb->data at this stage
+                         */
+                        if (lrg_pkt) {
+                                __be64 *rxmss = (__be64 *)(skb->data + 8);
+
+                                mss = (u16)be64_to_cpu(*rxmss);
+                        }
+
                         new_skb = NULL;
                         if (length < rx_copybreak)
                                 new_skb = netdev_alloc_skb(netdev, length);
@@ -1235,11 +1292,15 @@ restart_poll:
                                         if (iph->check == 0xffff) {
                                                 iph->check = 0;
                                                 iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
-                                                adapter->rx_large_packets++;
                                         }
                                 }
                         }
 
+                        if (length > netdev->mtu + ETH_HLEN) {
+                                ibmveth_rx_mss_helper(skb, mss, lrg_pkt);
+                                adapter->rx_large_packets++;
+                        }
+
                         napi_gro_receive(napi, skb);    /* send it up */
 
                         netdev->stats.rx_packets++;
diff --git a/drivers/net/ethernet/ibm/ibmveth.h b/drivers/net/ethernet/ibm/ibmveth.h
index 4eade67fe30c..7acda04d034e 100644
--- a/drivers/net/ethernet/ibm/ibmveth.h
+++ b/drivers/net/ethernet/ibm/ibmveth.h
@@ -209,6 +209,7 @@ struct ibmveth_rx_q_entry {
 #define IBMVETH_RXQ_TOGGLE              0x80000000
 #define IBMVETH_RXQ_TOGGLE_SHIFT        31
 #define IBMVETH_RXQ_VALID               0x40000000
+#define IBMVETH_RXQ_LRG_PKT             0x04000000
 #define IBMVETH_RXQ_NO_CSUM             0x02000000
 #define IBMVETH_RXQ_CSUM_GOOD           0x01000000
 #define IBMVETH_RXQ_OFF_MASK            0x0000FFFF
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 5f44c5520fbc..0fbf686f5e7c 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -74,7 +74,6 @@
 #include <asm/iommu.h>
 #include <linux/uaccess.h>
 #include <asm/firmware.h>
-#include <linux/seq_file.h>
 #include <linux/workqueue.h>
 
 #include "ibmvnic.h"
@@ -1505,9 +1504,8 @@ static void init_sub_crqs(struct ibmvnic_adapter *adapter, int retry)
                     adapter->max_rx_add_entries_per_subcrq > entries_page ?
                     entries_page : adapter->max_rx_add_entries_per_subcrq;
 
-                /* Choosing the maximum number of queues supported by firmware*/
-                adapter->req_tx_queues = adapter->max_tx_queues;
-                adapter->req_rx_queues = adapter->max_rx_queues;
+                adapter->req_tx_queues = adapter->opt_tx_comp_sub_queues;
+                adapter->req_rx_queues = adapter->opt_rx_comp_queues;
                 adapter->req_rx_add_queues = adapter->max_rx_add_queues;
 
                 adapter->req_mtu = adapter->max_mtu;
@@ -3706,7 +3704,7 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
         struct net_device *netdev;
         unsigned char *mac_addr_p;
         struct dentry *ent;
-        char buf[16]; /* debugfs name buf */
+        char buf[17]; /* debugfs name buf */
         int rc;
 
         dev_dbg(&dev->dev, "entering ibmvnic_probe for UA 0x%x\n",
@@ -3845,6 +3843,9 @@ static int ibmvnic_remove(struct vio_dev *dev)
         if (adapter->debugfs_dir && !IS_ERR(adapter->debugfs_dir))
                 debugfs_remove_recursive(adapter->debugfs_dir);
 
+        dma_unmap_single(&dev->dev, adapter->stats_token,
+                         sizeof(struct ibmvnic_statistics), DMA_FROM_DEVICE);
+
         if (adapter->ras_comps)
                 dma_free_coherent(&dev->dev,
                                   adapter->ras_comp_num *
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index edc9a6ac5169..9affd7c198bd 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -4931,11 +4931,15 @@ static int igb_tso(struct igb_ring *tx_ring,
 
         /* initialize outer IP header fields */
         if (ip.v4->version == 4) {
+                unsigned char *csum_start = skb_checksum_start(skb);
+                unsigned char *trans_start = ip.hdr + (ip.v4->ihl * 4);
+
                 /* IP header will have to cancel out any data that
                  * is not a part of the outer IP header
                  */
-                ip.v4->check = csum_fold(csum_add(lco_csum(skb),
-                                                  csum_unfold(l4.tcp->check)));
+                ip.v4->check = csum_fold(csum_partial(trans_start,
+                                                      csum_start - trans_start,
+                                                      0));
                 type_tucmd |= E1000_ADVTXD_TUCMD_IPV4;
 
                 ip.v4->tot_len = 0;
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 12bb877df860..7dff7f6239cd 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -1965,11 +1965,15 @@ static int igbvf_tso(struct igbvf_ring *tx_ring,
 
         /* initialize outer IP header fields */
         if (ip.v4->version == 4) {
+                unsigned char *csum_start = skb_checksum_start(skb);
+                unsigned char *trans_start = ip.hdr + (ip.v4->ihl * 4);
+
                 /* IP header will have to cancel out any data that
                  * is not a part of the outer IP header
                  */
-                ip.v4->check = csum_fold(csum_add(lco_csum(skb),
-                                                  csum_unfold(l4.tcp->check)));
+                ip.v4->check = csum_fold(csum_partial(trans_start,
+                                                      csum_start - trans_start,
+                                                      0));
                 type_tucmd |= E1000_ADVTXD_TUCMD_IPV4;
 
                 ip.v4->tot_len = 0;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index bd93d823cc25..fee1f2918ead 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7277,11 +7277,15 @@ static int ixgbe_tso(struct ixgbe_ring *tx_ring,
 
         /* initialize outer IP header fields */
         if (ip.v4->version == 4) {
+                unsigned char *csum_start = skb_checksum_start(skb);
+                unsigned char *trans_start = ip.hdr + (ip.v4->ihl * 4);
+
                 /* IP header will have to cancel out any data that
                  * is not a part of the outer IP header
                  */
-                ip.v4->check = csum_fold(csum_add(lco_csum(skb),
-                                                  csum_unfold(l4.tcp->check)));
+                ip.v4->check = csum_fold(csum_partial(trans_start,
+                                                      csum_start - trans_start,
+                                                      0));
                 type_tucmd |= IXGBE_ADVTXD_TUCMD_IPV4;
 
                 ip.v4->tot_len = 0;
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 7eaac3234049..cbf70fe4028a 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -3329,11 +3329,15 @@ static int ixgbevf_tso(struct ixgbevf_ring *tx_ring,
 
         /* initialize outer IP header fields */
         if (ip.v4->version == 4) {
+                unsigned char *csum_start = skb_checksum_start(skb);
+                unsigned char *trans_start = ip.hdr + (ip.v4->ihl * 4);
+
                 /* IP header will have to cancel out any data that
                  * is not a part of the outer IP header
                  */
-                ip.v4->check = csum_fold(csum_add(lco_csum(skb),
-                                                  csum_unfold(l4.tcp->check)));
+                ip.v4->check = csum_fold(csum_partial(trans_start,
+                                                      csum_start - trans_start,
+                                                      0));
                 type_tucmd |= IXGBE_ADVTXD_TUCMD_IPV4;
 
                 ip.v4->tot_len = 0;
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index 91e09d68b7e2..a167fd7ee13e 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -704,6 +704,7 @@ ltq_etop_probe(struct platform_device *pdev)
         priv->pldata = dev_get_platdata(&pdev->dev);
         priv->netdev = dev;
         spin_lock_init(&priv->lock);
+        SET_NETDEV_DEV(dev, &pdev->dev);
 
         for (i = 0; i < MAX_DMA_CHAN; i++) {
                 if (IS_TX(i))
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index bf5cc55ba24c..5b12022adf1f 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1381,6 +1381,7 @@ static unsigned int get_rx_coal(struct mv643xx_eth_private *mp)
                 temp = (val & 0x003fff00) >> 8;
 
         temp *= 64000000;
+        temp += mp->t_clk / 2;
         do_div(temp, mp->t_clk);
 
         return (unsigned int)temp;
@@ -1417,6 +1418,7 @@ static unsigned int get_tx_coal(struct mv643xx_eth_private *mp)
 
         temp = (rdlp(mp, TX_FIFO_URGENT_THRESHOLD) & 0x3fff0) >> 4;
         temp *= 64000000;
+        temp += mp->t_clk / 2;
         do_div(temp, mp->t_clk);
 
         return (unsigned int)temp;
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 5cb07c2017bf..707bc4680b9b 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -4151,7 +4151,7 @@ static int mvneta_probe(struct platform_device *pdev)
         dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
         dev->hw_features |= dev->features;
         dev->vlan_features |= dev->features;
-        dev->priv_flags |= IFF_UNICAST_FLT | IFF_LIVE_ADDR_CHANGE;
+        dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
         dev->gso_max_segs = MVNETA_MAX_TSO_SEGS;
 
         err = register_netdev(dev);
@@ -4191,6 +4191,8 @@ err_clk:
         clk_disable_unprepare(pp->clk);
 err_put_phy_node:
         of_node_put(phy_node);
+        if (of_phy_is_fixed_link(dn))
+                of_phy_deregister_fixed_link(dn);
 err_free_irq:
         irq_dispose_mapping(dev->irq);
 err_free_netdev:
@@ -4202,6 +4204,7 @@ err_free_netdev:
 static int mvneta_remove(struct platform_device *pdev)
 {
         struct net_device  *dev = platform_get_drvdata(pdev);
+        struct device_node *dn = pdev->dev.of_node;
         struct mvneta_port *pp = netdev_priv(dev);
 
         unregister_netdev(dev);
@@ -4209,6 +4212,8 @@ static int mvneta_remove(struct platform_device *pdev)
         clk_disable_unprepare(pp->clk);
         free_percpu(pp->ports);
         free_percpu(pp->stats);
+        if (of_phy_is_fixed_link(dn))
+                of_phy_deregister_fixed_link(dn);
         irq_dispose_mapping(dev->irq);
         of_node_put(pp->phy_node);
         free_netdev(dev);
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index 60227a3452a4..1026c452e39d 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -3293,7 +3293,7 @@ static void mvpp2_cls_init(struct mvpp2 *priv)
         mvpp2_write(priv, MVPP2_CLS_MODE_REG, MVPP2_CLS_MODE_ACTIVE_MASK);
 
         /* Clear classifier flow table */
-        memset(&fe.data, 0, MVPP2_CLS_FLOWS_TBL_DATA_WORDS);
+        memset(&fe.data, 0, sizeof(fe.data));
         for (index = 0; index < MVPP2_CLS_FLOWS_TBL_SIZE; index++) {
                 fe.index = index;
                 mvpp2_cls_flow_write(priv, &fe);
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index f05ea56dcff2..941c8e2c944e 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -5220,6 +5220,19 @@ static SIMPLE_DEV_PM_OPS(sky2_pm_ops, sky2_suspend, sky2_resume);
 
 static void sky2_shutdown(struct pci_dev *pdev)
 {
+        struct sky2_hw *hw = pci_get_drvdata(pdev);
+        int port;
+
+        for (port = 0; port < hw->ports; port++) {
+                struct net_device *ndev = hw->dev[port];
+
+                rtnl_lock();
+                if (netif_running(ndev)) {
+                        dev_close(ndev);
+                        netif_device_detach(ndev);
+                }
+                rtnl_unlock();
+        }
         sky2_suspend(&pdev->dev);
         pci_wake_from_d3(pdev, device_may_wakeup(&pdev->dev));
         pci_set_power_state(pdev, PCI_D3hot);
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 4a62ffd7729d..86a89cbd3ec9 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -318,6 +318,8 @@ static int mtk_phy_connect(struct net_device *dev)
         return 0;
 
 err_phy:
+        if (of_phy_is_fixed_link(mac->of_node))
+                of_phy_deregister_fixed_link(mac->of_node);
         of_node_put(np);
         dev_err(eth->dev, "%s: invalid phy\n", __func__);
         return -EINVAL;
@@ -1923,6 +1925,8 @@ static void mtk_uninit(struct net_device *dev)
         struct mtk_eth *eth = mac->hw;
 
         phy_disconnect(dev->phydev);
+        if (of_phy_is_fixed_link(mac->of_node))
+                of_phy_deregister_fixed_link(mac->of_node);
         mtk_irq_disable(eth, MTK_QDMA_INT_MASK, ~0);
         mtk_irq_disable(eth, MTK_PDMA_INT_MASK, ~0);
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 12c99a2655f2..fb8bb027b69c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -129,6 +129,9 @@ static enum mlx4_net_trans_rule_id mlx4_ip_proto_to_trans_rule_id(u8 ip_proto)
         }
 };
 
+/* Must not acquire state_lock, as its corresponding work_sync
+ * is done under it.
+ */
 static void mlx4_en_filter_work(struct work_struct *work)
 {
         struct mlx4_en_filter *filter = container_of(work,
@@ -2076,13 +2079,6 @@ err:
         return -ENOMEM;
 }
 
-static void mlx4_en_shutdown(struct net_device *dev)
-{
-        rtnl_lock();
-        netif_device_detach(dev);
-        mlx4_en_close(dev);
-        rtnl_unlock();
-}
 
 static int mlx4_en_copy_priv(struct mlx4_en_priv *dst,
                              struct mlx4_en_priv *src,
@@ -2159,8 +2155,6 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
-        bool shutdown = mdev->dev->persist->interface_state &
-                                            MLX4_INTERFACE_STATE_SHUTDOWN;
 
         en_dbg(DRV, priv, "Destroying netdev on port:%d\n", priv->port);
 
@@ -2168,10 +2162,7 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
         if (priv->registered) {
                 devlink_port_type_clear(mlx4_get_devlink_port(mdev->dev,
                                                               priv->port));
-                if (shutdown)
-                        mlx4_en_shutdown(dev);
-                else
-                        unregister_netdev(dev);
+                unregister_netdev(dev);
         }
 
         if (priv->allocated)
@@ -2189,20 +2180,18 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
         mutex_lock(&mdev->state_lock);
         mdev->pndev[priv->port] = NULL;
         mdev->upper[priv->port] = NULL;
-        mutex_unlock(&mdev->state_lock);
 
 #ifdef CONFIG_RFS_ACCEL
         mlx4_en_cleanup_filters(priv);
 #endif
 
         mlx4_en_free_resources(priv);
+        mutex_unlock(&mdev->state_lock);
 
         kfree(priv->tx_ring);
         kfree(priv->tx_cq);
 
-        if (!shutdown)
-                free_netdev(dev);
-        dev->ethtool_ops = NULL;
+        free_netdev(dev);
 }
 
 static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu)
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 6f4e67bc3538..75d07fa9d0b1 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -4147,11 +4147,8 @@ static void mlx4_shutdown(struct pci_dev *pdev)
 
         mlx4_info(persist->dev, "mlx4_shutdown was called\n");
         mutex_lock(&persist->interface_state_mutex);
-        if (persist->interface_state & MLX4_INTERFACE_STATE_UP) {
-                /* Notify mlx4 clients that the kernel is being shut down */
-                persist->interface_state |= MLX4_INTERFACE_STATE_SHUTDOWN;
+        if (persist->interface_state & MLX4_INTERFACE_STATE_UP)
                 mlx4_unload_one(pdev);
-        }
         mutex_unlock(&persist->interface_state_mutex);
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index 94b891c118c1..1a670b681555 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -1457,7 +1457,12 @@ EXPORT_SYMBOL_GPL(mlx4_multicast_detach);
 int mlx4_flow_steer_promisc_add(struct mlx4_dev *dev, u8 port,
                                 u32 qpn, enum mlx4_net_trans_promisc_mode mode)
 {
-        struct mlx4_net_trans_rule rule;
+        struct mlx4_net_trans_rule rule = {
+                .queue_mode = MLX4_NET_TRANS_Q_FIFO,
+                .exclusive = 0,
+                .allow_loopback = 1,
+        };
+
         u64 *regid_p;
 
         switch (mode) {
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
index aae46884bf93..521cfdb7d11e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
@@ -18,8 +18,6 @@ config MLX5_CORE_EN
         default n
         ---help---
           Ethernet support in Mellanox Technologies ConnectX-4 NIC.
-          Ethernet and Infiniband support in ConnectX-4 are currently mutually
-          exclusive.
 
 config MLX5_CORE_EN_DCB
         bool "Data Center Bridging (DCB) Support"
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 1e639f886021..bfe410e8a469 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -268,11 +268,6 @@ static void dump_buf(void *buf, int size, int data_only, int offset)
                 pr_debug("\n");
 }
 
-enum {
-        MLX5_DRIVER_STATUS_ABORTED = 0xfe,
-        MLX5_DRIVER_SYND = 0xbadd00de,
-};
-
 static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op,
                                        u32 *synd, u8 *status)
 {
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 7a43502a89cc..71382df59fc0 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -241,7 +241,7 @@ struct mlx5e_tstamp {
 };
 
 enum {
-        MLX5E_RQ_STATE_FLUSH,
+        MLX5E_RQ_STATE_ENABLED,
         MLX5E_RQ_STATE_UMR_WQE_IN_PROGRESS,
         MLX5E_RQ_STATE_AM,
 };
@@ -394,7 +394,7 @@ struct mlx5e_sq_dma {
 };
 
 enum {
-        MLX5E_SQ_STATE_FLUSH,
+        MLX5E_SQ_STATE_ENABLED,
         MLX5E_SQ_STATE_BF_ENABLE,
 };
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index f4c687ce4c59..246d98ebb588 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -759,6 +759,7 @@ static int mlx5e_open_rq(struct mlx5e_channel *c,
         if (err)
                 goto err_destroy_rq;
 
+        set_bit(MLX5E_RQ_STATE_ENABLED, &rq->state);
         err = mlx5e_modify_rq_state(rq, MLX5_RQC_STATE_RST, MLX5_RQC_STATE_RDY);
         if (err)
                 goto err_disable_rq;
@@ -773,6 +774,7 @@ static int mlx5e_open_rq(struct mlx5e_channel *c,
         return 0;
 
 err_disable_rq:
+        clear_bit(MLX5E_RQ_STATE_ENABLED, &rq->state);
         mlx5e_disable_rq(rq);
 err_destroy_rq:
         mlx5e_destroy_rq(rq);
@@ -782,7 +784,7 @@ err_destroy_rq:
 
 static void mlx5e_close_rq(struct mlx5e_rq *rq)
 {
-        set_bit(MLX5E_RQ_STATE_FLUSH, &rq->state);
+        clear_bit(MLX5E_RQ_STATE_ENABLED, &rq->state);
         napi_synchronize(&rq->channel->napi); /* prevent mlx5e_post_rx_wqes */
         cancel_work_sync(&rq->am.work);
 
@@ -1006,7 +1008,6 @@ static int mlx5e_enable_sq(struct mlx5e_sq *sq, struct mlx5e_sq_param *param)
         MLX5_SET(sqc,  sqc, min_wqe_inline_mode, sq->min_inline_mode);
         MLX5_SET(sqc,  sqc, state,              MLX5_SQC_STATE_RST);
         MLX5_SET(sqc,  sqc, tis_lst_sz, param->type == MLX5E_SQ_ICO ? 0 : 1);
-        MLX5_SET(sqc,  sqc, flush_in_error_en,  1);
 
         MLX5_SET(wq,   wq, wq_type,       MLX5_WQ_TYPE_CYCLIC);
         MLX5_SET(wq,   wq, uar_page,      sq->uar.index);
@@ -1083,6 +1084,7 @@ static int mlx5e_open_sq(struct mlx5e_channel *c,
         if (err)
                 goto err_destroy_sq;
 
+        set_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);
         err = mlx5e_modify_sq(sq, MLX5_SQC_STATE_RST, MLX5_SQC_STATE_RDY,
                               false, 0);
         if (err)
@@ -1096,6 +1098,7 @@ static int mlx5e_open_sq(struct mlx5e_channel *c,
         return 0;
 
 err_disable_sq:
+        clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);
         mlx5e_disable_sq(sq);
 err_destroy_sq:
         mlx5e_destroy_sq(sq);
@@ -1112,7 +1115,7 @@ static inline void netif_tx_disable_queue(struct netdev_queue *txq)
 
 static void mlx5e_close_sq(struct mlx5e_sq *sq)
 {
-        set_bit(MLX5E_SQ_STATE_FLUSH, &sq->state);
+        clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);
         /* prevent netif_tx_wake_queue */
         napi_synchronize(&sq->channel->napi);
 
@@ -1445,6 +1448,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
         c->netdev   = priv->netdev;
         c->mkey_be  = cpu_to_be32(priv->mdev->mlx5e_res.mkey.key);
         c->num_tc   = priv->params.num_tc;
+        c->xdp      = !!priv->xdp_prog;
 
         if (priv->params.rx_am_enabled)
                 rx_cq_profile = mlx5e_am_get_def_profile(priv->params.rx_cq_period_mode);
@@ -1468,6 +1472,12 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
         if (err)
                 goto err_close_tx_cqs;
 
+        /* XDP SQ CQ params are same as normal TXQ sq CQ params */
+        err = c->xdp ? mlx5e_open_cq(c, &cparam->tx_cq, &c->xdp_sq.cq,
+                                     priv->params.tx_cq_moderation) : 0;
+        if (err)
+                goto err_close_rx_cq;
+
         napi_enable(&c->napi);
 
         err = mlx5e_open_sq(c, 0, &cparam->icosq, &c->icosq);
@@ -1488,21 +1498,10 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
                 }
         }
 
-        if (priv->xdp_prog) {
-                /* XDP SQ CQ params are same as normal TXQ sq CQ params */
-                err = mlx5e_open_cq(c, &cparam->tx_cq, &c->xdp_sq.cq,
-                                    priv->params.tx_cq_moderation);
-                if (err)
-                        goto err_close_sqs;
-
-                err = mlx5e_open_sq(c, 0, &cparam->xdp_sq, &c->xdp_sq);
-                if (err) {
-                        mlx5e_close_cq(&c->xdp_sq.cq);
-                        goto err_close_sqs;
-                }
-        }
+        err = c->xdp ? mlx5e_open_sq(c, 0, &cparam->xdp_sq, &c->xdp_sq) : 0;
+        if (err)
+                goto err_close_sqs;
 
-        c->xdp = !!priv->xdp_prog;
         err = mlx5e_open_rq(c, &cparam->rq, &c->rq);
         if (err)
                 goto err_close_xdp_sq;
@@ -1512,7 +1511,8 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
 
         return 0;
 err_close_xdp_sq:
-        mlx5e_close_sq(&c->xdp_sq);
+        if (c->xdp)
+                mlx5e_close_sq(&c->xdp_sq);
 
 err_close_sqs:
         mlx5e_close_sqs(c);
@@ -1522,6 +1522,10 @@ err_close_icosq:
 
 err_disable_napi:
         napi_disable(&c->napi);
+        if (c->xdp)
+                mlx5e_close_cq(&c->xdp_sq.cq);
+
+err_close_rx_cq:
         mlx5e_close_cq(&c->rq.cq);
 
 err_close_tx_cqs:
@@ -3091,7 +3095,7 @@ static void mlx5e_tx_timeout(struct net_device *dev)
                 if (!netif_xmit_stopped(netdev_get_tx_queue(dev, i)))
                         continue;
                 sched_work = true;
-                set_bit(MLX5E_SQ_STATE_FLUSH, &sq->state);
+                clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);
                 netdev_err(dev, "TX timeout on queue: %d, SQ: 0x%x, CQ: 0x%x, SQ Cons: 0x%x SQ Prod: 0x%x\n",
                            i, sq->sqn, sq->cq.mcq.cqn, sq->cc, sq->pc);
         }
@@ -3146,13 +3150,13 @@ static int mlx5e_xdp_set(struct net_device *netdev, struct bpf_prog *prog)
         for (i = 0; i < priv->params.num_channels; i++) {
                 struct mlx5e_channel *c = priv->channel[i];
 
-                set_bit(MLX5E_RQ_STATE_FLUSH, &c->rq.state);
+                clear_bit(MLX5E_RQ_STATE_ENABLED, &c->rq.state);
                 napi_synchronize(&c->napi);
                 /* prevent mlx5e_poll_rx_cq from accessing rq->xdp_prog */
 
                 old_prog = xchg(&c->rq.xdp_prog, prog);
 
-                clear_bit(MLX5E_RQ_STATE_FLUSH, &c->rq.state);
+                set_bit(MLX5E_RQ_STATE_ENABLED, &c->rq.state);
                 /* napi_schedule in case we have missed anything */
                 set_bit(MLX5E_CHANNEL_NAPI_SCHED, &c->flags);
                 napi_schedule(&c->napi);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 7fe6559e4ab3..bf1c09ca73c0 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -308,7 +308,7 @@ static void mlx5e_build_rep_netdev(struct net_device *netdev)
         netdev->switchdev_ops = &mlx5e_rep_switchdev_ops;
 #endif
 
-        netdev->features         |= NETIF_F_VLAN_CHALLENGED | NETIF_F_HW_TC;
+        netdev->features         |= NETIF_F_VLAN_CHALLENGED | NETIF_F_HW_TC | NETIF_F_NETNS_LOCAL;
         netdev->hw_features      |= NETIF_F_HW_TC;
 
         eth_hw_addr_random(netdev);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index c6de6fba5843..33495d88aeb2 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -340,7 +340,7 @@ static inline void mlx5e_post_umr_wqe(struct mlx5e_rq *rq, u16 ix)
         while ((pi = (sq->pc & wq->sz_m1)) > sq->edge) {
                 sq->db.ico_wqe[pi].opcode = MLX5_OPCODE_NOP;
                 sq->db.ico_wqe[pi].num_wqebbs = 1;
-                mlx5e_send_nop(sq, true);
+                mlx5e_send_nop(sq, false);
         }
 
         wqe = mlx5_wq_cyc_get_wqe(wq, pi);
@@ -412,7 +412,7 @@ void mlx5e_post_rx_mpwqe(struct mlx5e_rq *rq)
 
         clear_bit(MLX5E_RQ_STATE_UMR_WQE_IN_PROGRESS, &rq->state);
 
-        if (unlikely(test_bit(MLX5E_RQ_STATE_FLUSH, &rq->state))) {
+        if (unlikely(!test_bit(MLX5E_RQ_STATE_ENABLED, &rq->state))) {
                 mlx5e_free_rx_mpwqe(rq, &rq->mpwqe.info[wq->head]);
                 return;
         }
@@ -445,7 +445,7 @@ void mlx5e_dealloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix)
 }
 
 #define RQ_CANNOT_POST(rq) \
-        (test_bit(MLX5E_RQ_STATE_FLUSH, &rq->state) || \
+        (!test_bit(MLX5E_RQ_STATE_ENABLED, &rq->state) || \
          test_bit(MLX5E_RQ_STATE_UMR_WQE_IN_PROGRESS, &rq->state))
 
 bool mlx5e_post_rx_wqes(struct mlx5e_rq *rq)
@@ -924,7 +924,7 @@ int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget)
         struct mlx5e_sq *xdp_sq = &rq->channel->xdp_sq;
         int work_done = 0;
 
-        if (unlikely(test_bit(MLX5E_RQ_STATE_FLUSH, &rq->state)))
+        if (unlikely(!test_bit(MLX5E_RQ_STATE_ENABLED, &rq->state)))
                 return 0;
 
         if (cq->decmprs_left)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index ce8c54d18906..6bb21b31cfeb 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -237,12 +237,15 @@ static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec
                         skb_flow_dissector_target(f->dissector,
                                                   FLOW_DISSECTOR_KEY_VLAN,
                                                   f->mask);
-                if (mask->vlan_id) {
+                if (mask->vlan_id || mask->vlan_priority) {
                         MLX5_SET(fte_match_set_lyr_2_4, headers_c, vlan_tag, 1);
                         MLX5_SET(fte_match_set_lyr_2_4, headers_v, vlan_tag, 1);
 
                         MLX5_SET(fte_match_set_lyr_2_4, headers_c, first_vid, mask->vlan_id);
                         MLX5_SET(fte_match_set_lyr_2_4, headers_v, first_vid, key->vlan_id);
+
+                        MLX5_SET(fte_match_set_lyr_2_4, headers_c, first_prio, mask->vlan_priority);
+                        MLX5_SET(fte_match_set_lyr_2_4, headers_v, first_prio, key->vlan_priority);
                 }
         }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
index 70a717382357..cfb68371c397 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
@@ -409,7 +409,7 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget)
 
         sq = container_of(cq, struct mlx5e_sq, cq);
 
-        if (unlikely(test_bit(MLX5E_SQ_STATE_FLUSH, &sq->state)))
+        if (unlikely(!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state)))
                 return false;
 
         npkts = 0;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
index 5703f19a6a24..e5c12a732aa1 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
@@ -56,7 +56,7 @@ static void mlx5e_poll_ico_cq(struct mlx5e_cq *cq)
         struct mlx5_cqe64 *cqe;
         u16 sqcc;
 
-        if (unlikely(test_bit(MLX5E_SQ_STATE_FLUSH, &sq->state)))
+        if (unlikely(!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state)))
                 return;
 
         cqe = mlx5e_get_cqe(cq);
@@ -113,7 +113,7 @@ static inline bool mlx5e_poll_xdp_tx_cq(struct mlx5e_cq *cq)
 
         sq = container_of(cq, struct mlx5e_sq, cq);
 
-        if (unlikely(test_bit(MLX5E_SQ_STATE_FLUSH, &sq->state)))
+        if (unlikely(!test_bit(MLX5E_SQ_STATE_ENABLED, &sq->state)))
                 return false;
 
         /* sq->cc must be updated only after mlx5_cqwq_update_db_record(),
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index c55ad8d00c05..d239f5d0ea36 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -57,7 +57,8 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw,
         if (esw->mode != SRIOV_OFFLOADS)
                 return ERR_PTR(-EOPNOTSUPP);
 
-        action = attr->action;
+        /* per flow vlan pop/push is emulated, don't set that into the firmware */
+        action = attr->action & ~(MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH | MLX5_FLOW_CONTEXT_ACTION_VLAN_POP);
 
         if (action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
                 dest.type = MLX5_FLOW_DESTINATION_TYPE_VPORT;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 89696048b045..914e5466f729 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1690,7 +1690,7 @@ static int init_root_ns(struct mlx5_flow_steering *steering)
 {
 
         steering->root_ns = create_root_ns(steering, FS_FT_NIC_RX);
-        if (IS_ERR_OR_NULL(steering->root_ns))
+        if (!steering->root_ns)
                 goto cleanup;
 
         if (init_root_tree(steering, &root_fs, &steering->root_ns->ns.node))
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index d5433c49b2b0..ada24e103b02 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -46,7 +46,6 @@
 #include <linux/mlx5/srq.h>
 #include <linux/debugfs.h>
 #include <linux/kmod.h>
-#include <linux/delay.h>
 #include <linux/mlx5/mlx5_ifc.h>
 #ifdef CONFIG_RFS_ACCEL
 #include <linux/cpu_rmap.h>
@@ -63,13 +62,13 @@ MODULE_DESCRIPTION("Mellanox Connect-IB, ConnectX-4 core driver");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRIVER_VERSION);
 
-int mlx5_core_debug_mask;
-module_param_named(debug_mask, mlx5_core_debug_mask, int, 0644);
+unsigned int mlx5_core_debug_mask;
+module_param_named(debug_mask, mlx5_core_debug_mask, uint, 0644);
 MODULE_PARM_DESC(debug_mask, "debug mask: 1 = dump cmd data, 2 = dump cmd exec time, 3 = both. Default=0");
 
 #define MLX5_DEFAULT_PROF       2
-static int prof_sel = MLX5_DEFAULT_PROF;
-module_param_named(prof_sel, prof_sel, int, 0444);
+static unsigned int prof_sel = MLX5_DEFAULT_PROF;
+module_param_named(prof_sel, prof_sel, uint, 0444);
 MODULE_PARM_DESC(prof_sel, "profile selector. Valid range 0 - 2");
 
 enum {
@@ -733,13 +732,15 @@ static int mlx5_core_set_issi(struct mlx5_core_dev *dev)
                 u8 status;
 
                 mlx5_cmd_mbox_status(query_out, &status, &syndrome);
-                if (status == MLX5_CMD_STAT_BAD_OP_ERR) {
-                        pr_debug("Only ISSI 0 is supported\n");
-                        return 0;
+                if (!status || syndrome == MLX5_DRIVER_SYND) {
+                        mlx5_core_err(dev, "Failed to query ISSI err(%d) status(%d) synd(%d)\n",
+                                      err, status, syndrome);
+                        return err;
                 }
 
-                pr_err("failed to query ISSI err(%d)\n", err);
-                return err;
+                mlx5_core_warn(dev, "Query ISSI is not supported by FW, ISSI is 0\n");
+                dev->issi = 0;
+                return 0;
         }
 
         sup_issi = MLX5_GET(query_issi_out, query_out, supported_issi_dw0);
@@ -753,7 +754,8 @@ static int mlx5_core_set_issi(struct mlx5_core_dev *dev)
                 err = mlx5_cmd_exec(dev, set_in, sizeof(set_in),
                                     set_out, sizeof(set_out));
                 if (err) {
-                        pr_err("failed to set ISSI=1 err(%d)\n", err);
+                        mlx5_core_err(dev, "Failed to set ISSI to 1 err(%d)\n",
+                                      err);
                         return err;
                 }
 
@@ -1226,15 +1228,9 @@ static int init_one(struct pci_dev *pdev,
 
         pci_set_drvdata(pdev, dev);
 
-        if (prof_sel < 0 || prof_sel >= ARRAY_SIZE(profile)) {
-                mlx5_core_warn(dev,
-                               "selected profile out of range, selecting default (%d)\n",
-                               MLX5_DEFAULT_PROF);
-                prof_sel = MLX5_DEFAULT_PROF;
-        }
-        dev->profile = &profile[prof_sel];
         dev->pdev = pdev;
         dev->event = mlx5_core_event;
+        dev->profile = &profile[prof_sel];
 
         INIT_LIST_HEAD(&priv->ctx_list);
         spin_lock_init(&priv->ctx_lock);
@@ -1450,10 +1446,22 @@ static struct pci_driver mlx5_core_driver = {
         .sriov_configure   = mlx5_core_sriov_configure,
 };
 
+static void mlx5_core_verify_params(void)
+{
+        if (prof_sel >= ARRAY_SIZE(profile)) {
+                pr_warn("mlx5_core: WARNING: Invalid module parameter prof_sel %d, valid range 0-%zu, changing back to default(%d)\n",
+                        prof_sel,
+                        ARRAY_SIZE(profile) - 1,
+                        MLX5_DEFAULT_PROF);
+                prof_sel = MLX5_DEFAULT_PROF;
+        }
+}
+
 static int __init init(void)
 {
         int err;
 
+        mlx5_core_verify_params();
         mlx5_register_debugfs();
 
         err = pci_register_driver(&mlx5_core_driver);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
index 187662c8ea96..63b9a0dba885 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
@@ -44,11 +44,11 @@
 
 #define MLX5_TOTAL_VPORTS(mdev) (1 + pci_sriov_get_totalvfs(mdev->pdev))
 
-extern int mlx5_core_debug_mask;
+extern uint mlx5_core_debug_mask;
 
 #define mlx5_core_dbg(__dev, format, ...)                               \
-        dev_dbg(&(__dev)->pdev->dev, "%s:%s:%d:(pid %d): " format,      \
-                 (__dev)->priv.name, __func__, __LINE__, current->pid,  \
+        dev_dbg(&(__dev)->pdev->dev, "%s:%d:(pid %d): " format,         \
+                 __func__, __LINE__, current->pid,                      \
                  ##__VA_ARGS__)
 
 #define mlx5_core_dbg_mask(__dev, mask, format, ...)                    \
@@ -63,8 +63,8 @@ do {									\
                ##__VA_ARGS__)
 
 #define mlx5_core_warn(__dev, format, ...)                              \
-        dev_warn(&(__dev)->pdev->dev, "%s:%s:%d:(pid %d): " format,     \
-                (__dev)->priv.name, __func__, __LINE__, current->pid,   \
+        dev_warn(&(__dev)->pdev->dev, "%s:%d:(pid %d): " format,        \
+                 __func__, __LINE__, current->pid,                      \
                 ##__VA_ARGS__)
 
 #define mlx5_core_info(__dev, format, ...)                              \
@@ -75,6 +75,11 @@ enum {
         MLX5_CMD_TIME, /* print command execution time */
 };
 
+enum {
+        MLX5_DRIVER_STATUS_ABORTED = 0xfe,
+        MLX5_DRIVER_SYND = 0xbadd00de,
+};
+
 int mlx5_query_hca_caps(struct mlx5_core_dev *dev);
 int mlx5_query_board_id(struct mlx5_core_dev *dev);
 int mlx5_cmd_init_hca(struct mlx5_core_dev *dev);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 1ec0a4ce3c46..dda5761e91bc 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -231,7 +231,7 @@ mlxsw_sp_span_entry_create(struct mlxsw_sp_port *port)
 
         span_entry->used = true;
         span_entry->id = index;
-        span_entry->ref_count = 0;
+        span_entry->ref_count = 1;
         span_entry->local_port = local_port;
         return span_entry;
 }
@@ -270,6 +270,7 @@ static struct mlxsw_sp_span_entry
 
         span_entry = mlxsw_sp_span_entry_find(port);
         if (span_entry) {
+                /* Already exists, just take a reference */
                 span_entry->ref_count++;
                 return span_entry;
         }
@@ -280,6 +281,7 @@ static struct mlxsw_sp_span_entry
 static int mlxsw_sp_span_entry_put(struct mlxsw_sp *mlxsw_sp,
                                    struct mlxsw_sp_span_entry *span_entry)
 {
+        WARN_ON(!span_entry->ref_count);
         if (--span_entry->ref_count == 0)
                 mlxsw_sp_span_entry_destroy(mlxsw_sp, span_entry);
         return 0;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index 9b22863a924b..97bbc1d21df8 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -115,7 +115,7 @@ struct mlxsw_sp_rif {
 struct mlxsw_sp_mid {
         struct list_head list;
         unsigned char addr[ETH_ALEN];
-        u16 vid;
+        u16 fid;
         u16 mid;
         unsigned int ref_count;
 };
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 4573da2c5560..e83072da6272 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -594,21 +594,22 @@ static int mlxsw_sp_vrs_init(struct mlxsw_sp *mlxsw_sp)
         return 0;
 }
 
+static void mlxsw_sp_router_fib_flush(struct mlxsw_sp *mlxsw_sp);
+
 static void mlxsw_sp_vrs_fini(struct mlxsw_sp *mlxsw_sp)
 {
+        mlxsw_sp_router_fib_flush(mlxsw_sp);
         kfree(mlxsw_sp->router.vrs);
 }
 
 struct mlxsw_sp_neigh_key {
-        unsigned char addr[sizeof(struct in6_addr)];
-        struct net_device *dev;
+        struct neighbour *n;
 };
 
 struct mlxsw_sp_neigh_entry {
         struct rhash_head ht_node;
         struct mlxsw_sp_neigh_key key;
         u16 rif;
-        struct neighbour *n;
         bool offloaded;
         struct delayed_work dw;
         struct mlxsw_sp_port *mlxsw_sp_port;
@@ -646,19 +647,15 @@ mlxsw_sp_neigh_entry_remove(struct mlxsw_sp *mlxsw_sp,
 static void mlxsw_sp_router_neigh_update_hw(struct work_struct *work);
 
 static struct mlxsw_sp_neigh_entry *
-mlxsw_sp_neigh_entry_create(const void *addr, size_t addr_len,
-                            struct net_device *dev, u16 rif,
-                            struct neighbour *n)
+mlxsw_sp_neigh_entry_create(struct neighbour *n, u16 rif)
 {
         struct mlxsw_sp_neigh_entry *neigh_entry;
 
         neigh_entry = kzalloc(sizeof(*neigh_entry), GFP_ATOMIC);
         if (!neigh_entry)
                 return NULL;
-        memcpy(neigh_entry->key.addr, addr, addr_len);
-        neigh_entry->key.dev = dev;
+        neigh_entry->key.n = n;
         neigh_entry->rif = rif;
-        neigh_entry->n = n;
         INIT_DELAYED_WORK(&neigh_entry->dw, mlxsw_sp_router_neigh_update_hw);
         INIT_LIST_HEAD(&neigh_entry->nexthop_list);
         return neigh_entry;
@@ -671,13 +668,11 @@ mlxsw_sp_neigh_entry_destroy(struct mlxsw_sp_neigh_entry *neigh_entry)
 }
 
 static struct mlxsw_sp_neigh_entry *
-mlxsw_sp_neigh_entry_lookup(struct mlxsw_sp *mlxsw_sp, const void *addr,
-                            size_t addr_len, struct net_device *dev)
+mlxsw_sp_neigh_entry_lookup(struct mlxsw_sp *mlxsw_sp, struct neighbour *n)
 {
-        struct mlxsw_sp_neigh_key key = {{ 0 } };
+        struct mlxsw_sp_neigh_key key;
 
-        memcpy(key.addr, addr, addr_len);
-        key.dev = dev;
+        key.n = n;
         return rhashtable_lookup_fast(&mlxsw_sp->router.neigh_ht,
                                       &key, mlxsw_sp_neigh_ht_params);
 }
@@ -689,26 +684,20 @@ int mlxsw_sp_router_neigh_construct(struct net_device *dev,
         struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
         struct mlxsw_sp_neigh_entry *neigh_entry;
         struct mlxsw_sp_rif *r;
-        u32 dip;
         int err;
 
         if (n->tbl != &arp_tbl)
                 return 0;
 
-        dip = ntohl(*((__be32 *) n->primary_key));
-        neigh_entry = mlxsw_sp_neigh_entry_lookup(mlxsw_sp, &dip, sizeof(dip),
-                                                  n->dev);
-        if (neigh_entry) {
-                WARN_ON(neigh_entry->n != n);
+        neigh_entry = mlxsw_sp_neigh_entry_lookup(mlxsw_sp, n);
+        if (neigh_entry)
                 return 0;
-        }
 
         r = mlxsw_sp_rif_find_by_dev(mlxsw_sp, n->dev);
         if (WARN_ON(!r))
                 return -EINVAL;
 
-        neigh_entry = mlxsw_sp_neigh_entry_create(&dip, sizeof(dip), n->dev,
-                                                  r->rif, n);
+        neigh_entry = mlxsw_sp_neigh_entry_create(n, r->rif);
         if (!neigh_entry)
                 return -ENOMEM;
         err = mlxsw_sp_neigh_entry_insert(mlxsw_sp, neigh_entry);
@@ -727,14 +716,11 @@ void mlxsw_sp_router_neigh_destroy(struct net_device *dev,
         struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
         struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
         struct mlxsw_sp_neigh_entry *neigh_entry;
-        u32 dip;
 
         if (n->tbl != &arp_tbl)
                 return;
 
-        dip = ntohl(*((__be32 *) n->primary_key));
-        neigh_entry = mlxsw_sp_neigh_entry_lookup(mlxsw_sp, &dip, sizeof(dip),
-                                                  n->dev);
+        neigh_entry = mlxsw_sp_neigh_entry_lookup(mlxsw_sp, n);
         if (!neigh_entry)
                 return;
         mlxsw_sp_neigh_entry_remove(mlxsw_sp, neigh_entry);
@@ -817,6 +803,26 @@ static void mlxsw_sp_router_neigh_rec_process(struct mlxsw_sp *mlxsw_sp,
         }
 }
 
+static bool mlxsw_sp_router_rauhtd_is_full(char *rauhtd_pl)
+{
+        u8 num_rec, last_rec_index, num_entries;
+
+        num_rec = mlxsw_reg_rauhtd_num_rec_get(rauhtd_pl);
+        last_rec_index = num_rec - 1;
+
+        if (num_rec < MLXSW_REG_RAUHTD_REC_MAX_NUM)
+                return false;
+        if (mlxsw_reg_rauhtd_rec_type_get(rauhtd_pl, last_rec_index) ==
+            MLXSW_REG_RAUHTD_TYPE_IPV6)
+                return true;
+
+        num_entries = mlxsw_reg_rauhtd_ipv4_rec_num_entries_get(rauhtd_pl,
+                                                                last_rec_index);
+        if (++num_entries == MLXSW_REG_RAUHTD_IPV4_ENT_PER_REC)
+                return true;
+        return false;
+}
+
 static int mlxsw_sp_router_neighs_update_rauhtd(struct mlxsw_sp *mlxsw_sp)
 {
         char *rauhtd_pl;
@@ -843,7 +849,7 @@ static int mlxsw_sp_router_neighs_update_rauhtd(struct mlxsw_sp *mlxsw_sp)
                 for (i = 0; i < num_rec; i++)
                         mlxsw_sp_router_neigh_rec_process(mlxsw_sp, rauhtd_pl,
                                                           i);
-        } while (num_rec);
+        } while (mlxsw_sp_router_rauhtd_is_full(rauhtd_pl));
         rtnl_unlock();
 
         kfree(rauhtd_pl);
@@ -862,7 +868,7 @@ static void mlxsw_sp_router_neighs_update_nh(struct mlxsw_sp *mlxsw_sp)
                  * is active regardless of the traffic.
                  */
                 if (!list_empty(&neigh_entry->nexthop_list))
-                        neigh_event_send(neigh_entry->n, NULL);
+                        neigh_event_send(neigh_entry->key.n, NULL);
         }
         rtnl_unlock();
 }
@@ -908,9 +914,9 @@ static void mlxsw_sp_router_probe_unresolved_nexthops(struct work_struct *work)
         rtnl_lock();
         list_for_each_entry(neigh_entry, &mlxsw_sp->router.nexthop_neighs_list,
                             nexthop_neighs_list_node) {
-                if (!(neigh_entry->n->nud_state & NUD_VALID) &&
+                if (!(neigh_entry->key.n->nud_state & NUD_VALID) &&
                     !list_empty(&neigh_entry->nexthop_list))
-                        neigh_event_send(neigh_entry->n, NULL);
+                        neigh_event_send(neigh_entry->key.n, NULL);
         }
         rtnl_unlock();
 
@@ -927,7 +933,7 @@ static void mlxsw_sp_router_neigh_update_hw(struct work_struct *work)
 {
         struct mlxsw_sp_neigh_entry *neigh_entry =
                 container_of(work, struct mlxsw_sp_neigh_entry, dw.work);
-        struct neighbour *n = neigh_entry->n;
+        struct neighbour *n = neigh_entry->key.n;
         struct mlxsw_sp_port *mlxsw_sp_port = neigh_entry->mlxsw_sp_port;
         struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
         char rauht_pl[MLXSW_REG_RAUHT_LEN];
@@ -1030,11 +1036,8 @@ int mlxsw_sp_router_netevent_event(struct notifier_block *unused,
 
                 mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
                 dip = ntohl(*((__be32 *) n->primary_key));
-                neigh_entry = mlxsw_sp_neigh_entry_lookup(mlxsw_sp,
-                                                          &dip,
-                                                          sizeof(__be32),
-                                                          dev);
-                if (WARN_ON(!neigh_entry) || WARN_ON(neigh_entry->n != n)) {
+                neigh_entry = mlxsw_sp_neigh_entry_lookup(mlxsw_sp, n);
+                if (WARN_ON(!neigh_entry)) {
                         mlxsw_sp_port_dev_put(mlxsw_sp_port);
                         return NOTIFY_DONE;
                 }
@@ -1343,33 +1346,26 @@ static int mlxsw_sp_nexthop_init(struct mlxsw_sp *mlxsw_sp,
                                  struct fib_nh *fib_nh)
 {
         struct mlxsw_sp_neigh_entry *neigh_entry;
-        u32 gwip = ntohl(fib_nh->nh_gw);
         struct net_device *dev = fib_nh->nh_dev;
         struct neighbour *n;
         u8 nud_state;
 
-        neigh_entry = mlxsw_sp_neigh_entry_lookup(mlxsw_sp, &gwip,
-                                                  sizeof(gwip), dev);
-        if (!neigh_entry) {
-                __be32 gwipn = htonl(gwip);
-
-                n = neigh_create(&arp_tbl, &gwipn, dev);
+        /* Take a reference of neigh here ensuring that neigh would
+         * not be detructed before the nexthop entry is finished.
+         * The reference is taken either in neigh_lookup() or
+         * in neith_create() in case n is not found.
+         */
+        n = neigh_lookup(&arp_tbl, &fib_nh->nh_gw, dev);
+        if (!n) {
+                n = neigh_create(&arp_tbl, &fib_nh->nh_gw, dev);
                 if (IS_ERR(n))
                         return PTR_ERR(n);
                 neigh_event_send(n, NULL);
-                neigh_entry = mlxsw_sp_neigh_entry_lookup(mlxsw_sp, &gwip,
-                                                          sizeof(gwip), dev);
-                if (!neigh_entry) {
-                        neigh_release(n);
-                        return -EINVAL;
-                }
-        } else {
-                /* Take a reference of neigh here ensuring that neigh would
-                 * not be detructed before the nexthop entry is finished.
-                 * The second branch takes the reference in neith_create()
-                 */
-                n = neigh_entry->n;
-                neigh_clone(n);
+        }
+        neigh_entry = mlxsw_sp_neigh_entry_lookup(mlxsw_sp, n);
+        if (!neigh_entry) {
+                neigh_release(n);
+                return -EINVAL;
         }
 
         /* If that is the first nexthop connected to that neigh, add to
@@ -1403,7 +1399,7 @@ static void mlxsw_sp_nexthop_fini(struct mlxsw_sp *mlxsw_sp,
         if (list_empty(&nh->neigh_entry->nexthop_list))
                 list_del(&nh->neigh_entry->nexthop_neighs_list_node);
 
-        neigh_release(neigh_entry->n);
+        neigh_release(neigh_entry->key.n);
 }
 
 static struct mlxsw_sp_nexthop_group *
@@ -1463,11 +1459,11 @@ static bool mlxsw_sp_nexthop_match(struct mlxsw_sp_nexthop *nh,
 
         for (i = 0; i < fi->fib_nhs; i++) {
                 struct fib_nh *fib_nh = &fi->fib_nh[i];
-                u32 gwip = ntohl(fib_nh->nh_gw);
+                struct neighbour *n = nh->neigh_entry->key.n;
 
-                if (memcmp(nh->neigh_entry->key.addr,
-                           &gwip, sizeof(u32)) == 0 &&
-                    nh->neigh_entry->key.dev == fib_nh->nh_dev)
+                if (memcmp(n->primary_key, &fib_nh->nh_gw,
+                           sizeof(fib_nh->nh_gw)) == 0 &&
+                    n->dev == fib_nh->nh_dev)
                         return true;
         }
         return false;
@@ -1874,18 +1870,18 @@ static int mlxsw_sp_router_set_abort_trap(struct mlxsw_sp *mlxsw_sp)
         return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ralue), ralue_pl);
 }
 
-static void mlxsw_sp_router_fib4_abort(struct mlxsw_sp *mlxsw_sp)
+static void mlxsw_sp_router_fib_flush(struct mlxsw_sp *mlxsw_sp)
 {
         struct mlxsw_resources *resources;
         struct mlxsw_sp_fib_entry *fib_entry;
         struct mlxsw_sp_fib_entry *tmp;
         struct mlxsw_sp_vr *vr;
         int i;
-        int err;
 
         resources = mlxsw_core_resources_get(mlxsw_sp->core);
         for (i = 0; i < resources->max_virtual_routers; i++) {
                 vr = &mlxsw_sp->router.vrs[i];
+
                 if (!vr->used)
                         continue;
 
@@ -1901,6 +1897,13 @@ static void mlxsw_sp_router_fib4_abort(struct mlxsw_sp *mlxsw_sp)
                                 break;
                 }
         }
+}
+
+static void mlxsw_sp_router_fib4_abort(struct mlxsw_sp *mlxsw_sp)
+{
+        int err;
+
+        mlxsw_sp_router_fib_flush(mlxsw_sp);
         mlxsw_sp->router.aborted = true;
         err = mlxsw_sp_router_set_abort_trap(mlxsw_sp);
         if (err)
@@ -1958,6 +1961,9 @@ static int mlxsw_sp_router_fib_event(struct notifier_block *nb,
         struct fib_entry_notifier_info *fen_info = ptr;
         int err;
 
+        if (!net_eq(fen_info->info.net, &init_net))
+                return NOTIFY_DONE;
+
         switch (event) {
         case FIB_EVENT_ENTRY_ADD:
                 err = mlxsw_sp_router_fib4_add(mlxsw_sp, fen_info);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index 5e00c79e8133..1e2c8eca3af1 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -929,12 +929,12 @@ static int mlxsw_sp_port_smid_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 mid,
 
 static struct mlxsw_sp_mid *__mlxsw_sp_mc_get(struct mlxsw_sp *mlxsw_sp,
                                               const unsigned char *addr,
-                                              u16 vid)
+                                              u16 fid)
 {
         struct mlxsw_sp_mid *mid;
 
         list_for_each_entry(mid, &mlxsw_sp->br_mids.list, list) {
-                if (ether_addr_equal(mid->addr, addr) && mid->vid == vid)
+                if (ether_addr_equal(mid->addr, addr) && mid->fid == fid)
                         return mid;
         }
         return NULL;
@@ -942,7 +942,7 @@ static struct mlxsw_sp_mid *__mlxsw_sp_mc_get(struct mlxsw_sp *mlxsw_sp,
 
 static struct mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp,
                                                 const unsigned char *addr,
-                                                u16 vid)
+                                                u16 fid)
 {
         struct mlxsw_sp_mid *mid;
         u16 mid_idx;
@@ -958,7 +958,7 @@ static struct mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp,
 
         set_bit(mid_idx, mlxsw_sp->br_mids.mapped);
         ether_addr_copy(mid->addr, addr);
-        mid->vid = vid;
+        mid->fid = fid;
         mid->mid = mid_idx;
         mid->ref_count = 0;
         list_add_tail(&mid->list, &mlxsw_sp->br_mids.list);
@@ -991,9 +991,9 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port *mlxsw_sp_port,
         if (switchdev_trans_ph_prepare(trans))
                 return 0;
 
-        mid = __mlxsw_sp_mc_get(mlxsw_sp, mdb->addr, mdb->vid);
+        mid = __mlxsw_sp_mc_get(mlxsw_sp, mdb->addr, fid);
         if (!mid) {
-                mid = __mlxsw_sp_mc_alloc(mlxsw_sp, mdb->addr, mdb->vid);
+                mid = __mlxsw_sp_mc_alloc(mlxsw_sp, mdb->addr, fid);
                 if (!mid) {
                         netdev_err(dev, "Unable to allocate MC group\n");
                         return -ENOMEM;
@@ -1137,7 +1137,7 @@ static int mlxsw_sp_port_mdb_del(struct mlxsw_sp_port *mlxsw_sp_port,
         u16 mid_idx;
         int err = 0;
 
-        mid = __mlxsw_sp_mc_get(mlxsw_sp, mdb->addr, mdb->vid);
+        mid = __mlxsw_sp_mc_get(mlxsw_sp, mdb->addr, fid);
         if (!mid) {
                 netdev_err(dev, "Unable to remove port from MC DB\n");
                 return -EINVAL;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_hsi.h b/drivers/net/ethernet/qlogic/qed/qed_hsi.h
index 72eee29c677f..2777d5bb4380 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_hsi.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_hsi.h
@@ -727,9 +727,6 @@ struct core_tx_bd_flags {
 #define CORE_TX_BD_FLAGS_L4_PROTOCOL_SHIFT      6
 #define CORE_TX_BD_FLAGS_L4_PSEUDO_CSUM_MODE_MASK       0x1
 #define CORE_TX_BD_FLAGS_L4_PSEUDO_CSUM_MODE_SHIFT 7
-#define CORE_TX_BD_FLAGS_ROCE_FLAV_MASK         0x1
-#define CORE_TX_BD_FLAGS_ROCE_FLAV_SHIFT        12
-
 };
 
 struct core_tx_bd {
diff --git a/drivers/net/ethernet/qlogic/qed/qed_ll2.c b/drivers/net/ethernet/qlogic/qed/qed_ll2.c
index 63e1a1b0ef8e..62ae55bd81b8 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_ll2.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.c
@@ -1119,6 +1119,7 @@ static void qed_ll2_prepare_tx_packet_set_bd(struct qed_hwfn *p_hwfn,
         start_bd->bd_flags.as_bitfield |= CORE_TX_BD_FLAGS_START_BD_MASK <<
             CORE_TX_BD_FLAGS_START_BD_SHIFT;
         SET_FIELD(start_bd->bitfield0, CORE_TX_BD_NBDS, num_of_bds);
+        SET_FIELD(start_bd->bitfield0, CORE_TX_BD_ROCE_FLAV, type);
         DMA_REGPAIR_LE(start_bd->addr, first_frag);
         start_bd->nbytes = cpu_to_le16(first_frag_len);
 
@@ -1729,6 +1730,7 @@ static int qed_ll2_start_xmit(struct qed_dev *cdev, struct sk_buff *skb)
                                                        mapping))) {
                                 DP_NOTICE(cdev,
                                           "Unable to map frag - dropping packet\n");
+                                rc = -ENOMEM;
                                 goto err;
                         }
                 } else {
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index c418360ba02a..333c7442e48a 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -839,20 +839,19 @@ static void qed_update_pf_params(struct qed_dev *cdev,
 {
         int i;
 
+        if (IS_ENABLED(CONFIG_QED_RDMA)) {
+                params->rdma_pf_params.num_qps = QED_ROCE_QPS;
+                params->rdma_pf_params.min_dpis = QED_ROCE_DPIS;
+                /* divide by 3 the MRs to avoid MF ILT overflow */
+                params->rdma_pf_params.num_mrs = RDMA_MAX_TIDS;
+                params->rdma_pf_params.gl_pi = QED_ROCE_PROTOCOL_INDEX;
+        }
+
         for (i = 0; i < cdev->num_hwfns; i++) {
                 struct qed_hwfn *p_hwfn = &cdev->hwfns[i];
 
                 p_hwfn->pf_params = *params;
         }
-
-        if (!IS_ENABLED(CONFIG_QED_RDMA))
-                return;
-
-        params->rdma_pf_params.num_qps = QED_ROCE_QPS;
-        params->rdma_pf_params.min_dpis = QED_ROCE_DPIS;
-        /* divide by 3 the MRs to avoid MF ILT overflow */
-        params->rdma_pf_params.num_mrs = RDMA_MAX_TIDS;
-        params->rdma_pf_params.gl_pi = QED_ROCE_PROTOCOL_INDEX;
 }
 
 static int qed_slowpath_start(struct qed_dev *cdev,
diff --git a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
index 12251a1032d1..7567cc464b88 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
@@ -175,16 +175,23 @@ static void qede_get_strings_stats(struct qede_dev *edev, u8 *buf)
         for (i = 0, k = 0; i < QEDE_QUEUE_CNT(edev); i++) {
                 int tc;
 
-                for (j = 0; j < QEDE_NUM_RQSTATS; j++)
-                        sprintf(buf + (k + j) * ETH_GSTRING_LEN,
-                                "%d:   %s", i, qede_rqstats_arr[j].string);
-                k += QEDE_NUM_RQSTATS;
-                for (tc = 0; tc < edev->num_tc; tc++) {
-                        for (j = 0; j < QEDE_NUM_TQSTATS; j++)
+                if (edev->fp_array[i].type & QEDE_FASTPATH_RX) {
+                        for (j = 0; j < QEDE_NUM_RQSTATS; j++)
                                 sprintf(buf + (k + j) * ETH_GSTRING_LEN,
-                                        "%d.%d: %s", i, tc,
-                                        qede_tqstats_arr[j].string);
-                        k += QEDE_NUM_TQSTATS;
+                                        "%d:   %s", i,
+                                        qede_rqstats_arr[j].string);
+                        k += QEDE_NUM_RQSTATS;
+                }
+
+                if (edev->fp_array[i].type & QEDE_FASTPATH_TX) {
+                        for (tc = 0; tc < edev->num_tc; tc++) {
+                                for (j = 0; j < QEDE_NUM_TQSTATS; j++)
+                                        sprintf(buf + (k + j) *
+                                                ETH_GSTRING_LEN,
+                                                "%d.%d: %s", i, tc,
+                                                qede_tqstats_arr[j].string);
+                                k += QEDE_NUM_TQSTATS;
+                        }
                 }
         }
 
diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index 7def29aaf65c..85f46dbecd5b 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -2839,7 +2839,7 @@ static int qede_alloc_sge_mem(struct qede_dev *edev, struct qede_rx_queue *rxq)
                 }
 
                 mapping = dma_map_page(&edev->pdev->dev, replace_buf->data, 0,
-                                       rxq->rx_buf_size, DMA_FROM_DEVICE);
+                                       PAGE_SIZE, DMA_FROM_DEVICE);
                 if (unlikely(dma_mapping_error(&edev->pdev->dev, mapping))) {
                         DP_NOTICE(edev,
                                   "Failed to map TPA replacement buffer\n");
diff --git a/drivers/net/ethernet/qualcomm/emac/emac-mac.c b/drivers/net/ethernet/qualcomm/emac/emac-mac.c
index 6fb3bee904d3..0b4deb31e742 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac-mac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac-mac.c
@@ -575,10 +575,11 @@ void emac_mac_start(struct emac_adapter *adpt)
 
         mac |= TXEN | RXEN;     /* enable RX/TX */
 
-        /* We don't have ethtool support yet, so force flow-control mode
-         * to 'full' always.
-         */
-        mac |= TXFC | RXFC;
+        /* Configure MAC flow control to match the PHY's settings. */
+        if (phydev->pause)
+                mac |= RXFC;
+        if (phydev->pause != phydev->asym_pause)
+                mac |= TXFC;
 
         /* setup link speed */
         mac &= ~SPEED_MASK;
@@ -1003,6 +1004,12 @@ int emac_mac_up(struct emac_adapter *adpt)
         writel((u32)~DIS_INT, adpt->base + EMAC_INT_STATUS);
         writel(adpt->irq.mask, adpt->base + EMAC_INT_MASK);
 
+        /* Enable pause frames.  Without this feature, the EMAC has been shown
+         * to receive (and drop) frames with FCS errors at gigabit connections.
+         */
+        adpt->phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
+        adpt->phydev->advertising |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
+
         adpt->phydev->irq = PHY_IGNORE_INTERRUPT;
         phy_start(adpt->phydev);
 
diff --git a/drivers/net/ethernet/qualcomm/emac/emac-phy.c b/drivers/net/ethernet/qualcomm/emac/emac-phy.c
index da4e90db4d98..99a14df28b96 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac-phy.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac-phy.c
@@ -212,6 +212,7 @@ int emac_phy_config(struct platform_device *pdev, struct emac_adapter *adpt)
 
                 phy_np = of_parse_phandle(np, "phy-handle", 0);
                 adpt->phydev = of_phy_find_device(phy_np);
+                of_node_put(phy_np);
         }
 
         if (!adpt->phydev) {
diff --git a/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c b/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
index 75c1b530e39e..72fe343c7a36 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
@@ -421,7 +421,7 @@ static const struct emac_reg_write sgmii_v2_laned[] = {
         /* CDR Settings */
         {EMAC_SGMII_LN_UCDR_FO_GAIN_MODE0,
                 UCDR_STEP_BY_TWO_MODE0 | UCDR_xO_GAIN_MODE(10)},
-        {EMAC_SGMII_LN_UCDR_SO_GAIN_MODE0, UCDR_xO_GAIN_MODE(6)},
+        {EMAC_SGMII_LN_UCDR_SO_GAIN_MODE0, UCDR_xO_GAIN_MODE(0)},
         {EMAC_SGMII_LN_UCDR_SO_CONFIG, UCDR_ENABLE | UCDR_SO_SATURATION(12)},
 
         /* TX/RX Settings */
diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c
index 4fede4b86538..57b35aeac51a 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac.c
@@ -711,6 +711,8 @@ static int emac_probe(struct platform_device *pdev)
 err_undo_napi:
         netif_napi_del(&adpt->rx_q.napi);
 err_undo_mdiobus:
+        if (!has_acpi_companion(&pdev->dev))
+                put_device(&adpt->phydev->mdio.dev);
         mdiobus_unregister(adpt->mii_bus);
 err_undo_clocks:
         emac_clks_teardown(adpt);
@@ -730,6 +732,8 @@ static int emac_remove(struct platform_device *pdev)
 
         emac_clks_teardown(adpt);
 
+        if (!has_acpi_companion(&pdev->dev))
+                put_device(&adpt->phydev->mdio.dev);
         mdiobus_unregister(adpt->mii_bus);
         free_netdev(netdev);
 
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 630536bc72f9..d6a217874a8b 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1008,20 +1008,18 @@ static int ravb_phy_init(struct net_device *ndev)
         of_node_put(pn);
         if (!phydev) {
                 netdev_err(ndev, "failed to connect PHY\n");
-                return -ENOENT;
+                err = -ENOENT;
+                goto err_deregister_fixed_link;
         }
 
         /* This driver only support 10/100Mbit speeds on Gen3
          * at this time.
          */
         if (priv->chip_id == RCAR_GEN3) {
-                int err;
-
                 err = phy_set_max_speed(phydev, SPEED_100);
                 if (err) {
                         netdev_err(ndev, "failed to limit PHY to 100Mbit/s\n");
-                        phy_disconnect(phydev);
-                        return err;
+                        goto err_phy_disconnect;
                 }
 
                 netdev_info(ndev, "limited PHY to 100Mbit/s\n");
@@ -1033,6 +1031,14 @@ static int ravb_phy_init(struct net_device *ndev)
         phy_attached_info(phydev);
 
         return 0;
+
+err_phy_disconnect:
+        phy_disconnect(phydev);
+err_deregister_fixed_link:
+        if (of_phy_is_fixed_link(np))
+                of_phy_deregister_fixed_link(np);
+
+        return err;
 }
 
 /* PHY control start function */
@@ -1634,6 +1640,7 @@ static void ravb_set_rx_mode(struct net_device *ndev)
 /* Device close function for Ethernet AVB */
 static int ravb_close(struct net_device *ndev)
 {
+        struct device_node *np = ndev->dev.parent->of_node;
         struct ravb_private *priv = netdev_priv(ndev);
         struct ravb_tstamp_skb *ts_skb, *ts_skb2;
 
@@ -1663,6 +1670,8 @@ static int ravb_close(struct net_device *ndev)
         if (ndev->phydev) {
                 phy_stop(ndev->phydev);
                 phy_disconnect(ndev->phydev);
+                if (of_phy_is_fixed_link(np))
+                        of_phy_deregister_fixed_link(np);
         }
 
         if (priv->chip_id != RCAR_GEN2) {
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 05b0dc55de77..1a92de705199 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -518,7 +518,7 @@ static struct sh_eth_cpu_data r7s72100_data = {
 
         .ecsr_value     = ECSR_ICD,
         .ecsipr_value   = ECSIPR_ICDIP,
-        .eesipr_value   = 0xff7f009f,
+        .eesipr_value   = 0xe77f009f,
 
         .tx_check       = EESR_TC1 | EESR_FTC,
         .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 3cf3557106c2..6b89e4a7b164 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -485,6 +485,9 @@ efx_copy_channel(const struct efx_channel *old_channel)
         *channel = *old_channel;
 
         channel->napi_dev = NULL;
+        INIT_HLIST_NODE(&channel->napi_str.napi_hash_node);
+        channel->napi_str.napi_id = 0;
+        channel->napi_str.state = 0;
         memset(&channel->eventq, 0, sizeof(channel->eventq));
 
         for (j = 0; j < EFX_TXQ_TYPES; j++) {
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index e9b8579e6241..8b0016a785c0 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -438,9 +438,16 @@ static int smsc911x_request_resources(struct platform_device *pdev)
         ret = regulator_bulk_get(&pdev->dev,
                         ARRAY_SIZE(pdata->supplies),
                         pdata->supplies);
-        if (ret)
+        if (ret) {
+                /*
+                 * Retry on deferrals, else just report the error
+                 * and try to continue.
+                 */
+                if (ret == -EPROBE_DEFER)
+                        return ret;
                 netdev_err(ndev, "couldn't get regulators %d\n",
                                 ret);
+        }
 
         /* Request optional RESET GPIO */
         pdata->reset_gpiod = devm_gpiod_get_optional(&pdev->dev,
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index 3818c5e06eba..4b78168a5f3c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -107,7 +107,7 @@ config DWMAC_STI
 config DWMAC_STM32
         tristate "STM32 DWMAC support"
         default ARCH_STM32
-        depends on OF && HAS_IOMEM
+        depends on OF && HAS_IOMEM && (ARCH_STM32 || COMPILE_TEST)
         select MFD_SYSCON
         ---help---
           Support for ethernet controller on STM32 SOCs.
diff --git a/drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c b/drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c
index 2920e2ee3864..489ef146201e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c
@@ -63,8 +63,8 @@
 #define TSE_PCS_SGMII_LINK_TIMER_0                      0x0D40
 #define TSE_PCS_SGMII_LINK_TIMER_1                      0x0003
 #define TSE_PCS_SW_RESET_TIMEOUT                        100
-#define TSE_PCS_USE_SGMII_AN_MASK                       BIT(2)
-#define TSE_PCS_USE_SGMII_ENA                           BIT(1)
+#define TSE_PCS_USE_SGMII_AN_MASK                       BIT(1)
+#define TSE_PCS_USE_SGMII_ENA                           BIT(0)
 
 #define SGMII_ADAPTER_CTRL_REG                          0x00
 #define SGMII_ADAPTER_DISABLE                           0x0001
diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index d3292c4a6eda..6d2de4e01f6d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -120,14 +120,17 @@ struct stmmac_extra_stats {
         unsigned long ip_csum_bypassed;
         unsigned long ipv4_pkt_rcvd;
         unsigned long ipv6_pkt_rcvd;
-        unsigned long rx_msg_type_ext_no_ptp;
-        unsigned long rx_msg_type_sync;
-        unsigned long rx_msg_type_follow_up;
-        unsigned long rx_msg_type_delay_req;
-        unsigned long rx_msg_type_delay_resp;
-        unsigned long rx_msg_type_pdelay_req;
-        unsigned long rx_msg_type_pdelay_resp;
-        unsigned long rx_msg_type_pdelay_follow_up;
+        unsigned long no_ptp_rx_msg_type_ext;
+        unsigned long ptp_rx_msg_type_sync;
+        unsigned long ptp_rx_msg_type_follow_up;
+        unsigned long ptp_rx_msg_type_delay_req;
+        unsigned long ptp_rx_msg_type_delay_resp;
+        unsigned long ptp_rx_msg_type_pdelay_req;
+        unsigned long ptp_rx_msg_type_pdelay_resp;
+        unsigned long ptp_rx_msg_type_pdelay_follow_up;
+        unsigned long ptp_rx_msg_type_announce;
+        unsigned long ptp_rx_msg_type_management;
+        unsigned long ptp_rx_msg_pkt_reserved_type;
         unsigned long ptp_frame_type;
         unsigned long ptp_ver;
         unsigned long timestamp_dropped;
@@ -482,11 +485,12 @@ struct stmmac_ops {
 /* PTP and HW Timer helpers */
 struct stmmac_hwtimestamp {
         void (*config_hw_tstamping) (void __iomem *ioaddr, u32 data);
-        u32 (*config_sub_second_increment) (void __iomem *ioaddr, u32 clk_rate);
+        u32 (*config_sub_second_increment)(void __iomem *ioaddr, u32 ptp_clock,
+                                           int gmac4);
         int (*init_systime) (void __iomem *ioaddr, u32 sec, u32 nsec);
         int (*config_addend) (void __iomem *ioaddr, u32 addend);
         int (*adjust_systime) (void __iomem *ioaddr, u32 sec, u32 nsec,
-                               int add_sub);
+                               int add_sub, int gmac4);
          u64(*get_systime) (void __iomem *ioaddr);
 };
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/descs.h b/drivers/net/ethernet/stmicro/stmmac/descs.h
index 2e4c171a2b41..e3c86d422109 100644
--- a/drivers/net/ethernet/stmicro/stmmac/descs.h
+++ b/drivers/net/ethernet/stmicro/stmmac/descs.h
@@ -155,14 +155,18 @@
 #define ERDES4_L3_L4_FILT_NO_MATCH_MASK GENMASK(27, 26)
 
 /* Extended RDES4 message type definitions */
-#define RDES_EXT_NO_PTP                 0
-#define RDES_EXT_SYNC                   1
-#define RDES_EXT_FOLLOW_UP              2
-#define RDES_EXT_DELAY_REQ              3
-#define RDES_EXT_DELAY_RESP             4
-#define RDES_EXT_PDELAY_REQ             5
-#define RDES_EXT_PDELAY_RESP            6
-#define RDES_EXT_PDELAY_FOLLOW_UP       7
+#define RDES_EXT_NO_PTP                 0x0
+#define RDES_EXT_SYNC                   0x1
+#define RDES_EXT_FOLLOW_UP              0x2
+#define RDES_EXT_DELAY_REQ              0x3
+#define RDES_EXT_DELAY_RESP             0x4
+#define RDES_EXT_PDELAY_REQ             0x5
+#define RDES_EXT_PDELAY_RESP            0x6
+#define RDES_EXT_PDELAY_FOLLOW_UP       0x7
+#define RDES_PTP_ANNOUNCE               0x8
+#define RDES_PTP_MANAGEMENT             0x9
+#define RDES_PTP_SIGNALING              0xa
+#define RDES_PTP_PKT_RESERVED_TYPE      0xf
 
 /* Basic descriptor structure for normal and alternate descriptors */
 struct dma_desc {
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
index b1e5f24708c9..e6e6c2fcc4b7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
@@ -50,10 +50,23 @@ static int dwmac_generic_probe(struct platform_device *pdev)
         if (plat_dat->init) {
                 ret = plat_dat->init(pdev, plat_dat->bsp_priv);
                 if (ret)
-                        return ret;
+                        goto err_remove_config_dt;
         }
 
-        return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        if (ret)
+                goto err_exit;
+
+        return 0;
+
+err_exit:
+        if (plat_dat->exit)
+                plat_dat->exit(pdev, plat_dat->bsp_priv);
+err_remove_config_dt:
+        if (pdev->dev.of_node)
+                stmmac_remove_config_dt(pdev, plat_dat);
+
+        return ret;
 }
 
 static const struct of_device_id dwmac_generic_match[] = {
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
index 36d3355f2fb0..866444b6c82f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
@@ -271,15 +271,17 @@ static int ipq806x_gmac_probe(struct platform_device *pdev)
                 return PTR_ERR(plat_dat);
 
         gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL);
-        if (!gmac)
-                return -ENOMEM;
+        if (!gmac) {
+                err = -ENOMEM;
+                goto err_remove_config_dt;
+        }
 
         gmac->pdev = pdev;
 
         err = ipq806x_gmac_of_parse(gmac);
         if (err) {
                 dev_err(dev, "device tree parsing error\n");
-                return err;
+                goto err_remove_config_dt;
         }
 
         regmap_write(gmac->qsgmii_csr, QSGMII_PCS_CAL_LCKDT_CTL,
@@ -300,7 +302,8 @@ static int ipq806x_gmac_probe(struct platform_device *pdev)
         default:
                 dev_err(&pdev->dev, "Unsupported PHY mode: \"%s\"\n",
                         phy_modes(gmac->phy_mode));
-                return -EINVAL;
+                err = -EINVAL;
+                goto err_remove_config_dt;
         }
         regmap_write(gmac->nss_common, NSS_COMMON_GMAC_CTL(gmac->id), val);
 
@@ -319,7 +322,8 @@ static int ipq806x_gmac_probe(struct platform_device *pdev)
         default:
                 dev_err(&pdev->dev, "Unsupported PHY mode: \"%s\"\n",
                         phy_modes(gmac->phy_mode));
-                return -EINVAL;
+                err = -EINVAL;
+                goto err_remove_config_dt;
         }
         regmap_write(gmac->nss_common, NSS_COMMON_CLK_SRC_CTRL, val);
 
@@ -346,7 +350,16 @@ static int ipq806x_gmac_probe(struct platform_device *pdev)
         plat_dat->bsp_priv = gmac;
         plat_dat->fix_mac_speed = ipq806x_gmac_fix_mac_speed;
 
-        return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        if (err)
+                goto err_remove_config_dt;
+
+        return 0;
+
+err_remove_config_dt:
+        stmmac_remove_config_dt(pdev, plat_dat);
+
+        return err;
 }
 
 static const struct of_device_id ipq806x_gmac_dwmac_match[] = {
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c
index 78e9d1861896..3d3f43d91b98 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c
@@ -46,7 +46,8 @@ static int lpc18xx_dwmac_probe(struct platform_device *pdev)
         reg = syscon_regmap_lookup_by_compatible("nxp,lpc1850-creg");
         if (IS_ERR(reg)) {
                 dev_err(&pdev->dev, "syscon lookup failed\n");
-                return PTR_ERR(reg);
+                ret = PTR_ERR(reg);
+                goto err_remove_config_dt;
         }
 
         if (plat_dat->interface == PHY_INTERFACE_MODE_MII) {
@@ -55,13 +56,23 @@ static int lpc18xx_dwmac_probe(struct platform_device *pdev)
                 ethmode = LPC18XX_CREG_CREG6_ETHMODE_RMII;
         } else {
                 dev_err(&pdev->dev, "Only MII and RMII mode supported\n");
-                return -EINVAL;
+                ret = -EINVAL;
+                goto err_remove_config_dt;
         }
 
         regmap_update_bits(reg, LPC18XX_CREG_CREG6,
                            LPC18XX_CREG_CREG6_ETHMODE_MASK, ethmode);
 
-        return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        if (ret)
+                goto err_remove_config_dt;
+
+        return 0;
+
+err_remove_config_dt:
+        stmmac_remove_config_dt(pdev, plat_dat);
+
+        return ret;
 }
 
 static const struct of_device_id lpc18xx_dwmac_match[] = {
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
index 309d99536a2c..7fdd1760a74c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
@@ -64,18 +64,31 @@ static int meson6_dwmac_probe(struct platform_device *pdev)
                 return PTR_ERR(plat_dat);
 
         dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
-        if (!dwmac)
-                return -ENOMEM;
+        if (!dwmac) {
+                ret = -ENOMEM;
+                goto err_remove_config_dt;
+        }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         dwmac->reg = devm_ioremap_resource(&pdev->dev, res);
-        if (IS_ERR(dwmac->reg))
-                return PTR_ERR(dwmac->reg);
+        if (IS_ERR(dwmac->reg)) {
+                ret = PTR_ERR(dwmac->reg);
+                goto err_remove_config_dt;
+        }
 
         plat_dat->bsp_priv = dwmac;
         plat_dat->fix_mac_speed = meson6_dwmac_fix_mac_speed;
 
-        return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        if (ret)
+                goto err_remove_config_dt;
+
+        return 0;
+
+err_remove_config_dt:
+        stmmac_remove_config_dt(pdev, plat_dat);
+
+        return ret;
 }
 
 static const struct of_device_id meson6_dwmac_match[] = {
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
index 250e4ceafc8d..ffaed1f35efe 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
@@ -264,32 +264,48 @@ static int meson8b_dwmac_probe(struct platform_device *pdev)
                 return PTR_ERR(plat_dat);
 
         dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
-        if (!dwmac)
-                return -ENOMEM;
+        if (!dwmac) {
+                ret = -ENOMEM;
+                goto err_remove_config_dt;
+        }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         dwmac->regs = devm_ioremap_resource(&pdev->dev, res);
-        if (IS_ERR(dwmac->regs))
-                return PTR_ERR(dwmac->regs);
+        if (IS_ERR(dwmac->regs)) {
+                ret = PTR_ERR(dwmac->regs);
+                goto err_remove_config_dt;
+        }
 
         dwmac->pdev = pdev;
         dwmac->phy_mode = of_get_phy_mode(pdev->dev.of_node);
         if (dwmac->phy_mode < 0) {
                 dev_err(&pdev->dev, "missing phy-mode property\n");
-                return -EINVAL;
+                ret = -EINVAL;
+                goto err_remove_config_dt;
         }
 
         ret = meson8b_init_clk(dwmac);
         if (ret)
-                return ret;
+                goto err_remove_config_dt;
 
         ret = meson8b_init_prg_eth(dwmac);
         if (ret)
-                return ret;
+                goto err_remove_config_dt;
 
         plat_dat->bsp_priv = dwmac;
 
-        return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        if (ret)
+                goto err_clk_disable;
+
+        return 0;
+
+err_clk_disable:
+        clk_disable_unprepare(dwmac->m25_div_clk);
+err_remove_config_dt:
+        stmmac_remove_config_dt(pdev, plat_dat);
+
+        return ret;
 }
 
 static int meson8b_dwmac_remove(struct platform_device *pdev)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 3740a4417fa0..d80c88bd2bba 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -981,14 +981,27 @@ static int rk_gmac_probe(struct platform_device *pdev)
         plat_dat->resume = rk_gmac_resume;
 
         plat_dat->bsp_priv = rk_gmac_setup(pdev, data);
-        if (IS_ERR(plat_dat->bsp_priv))
-                return PTR_ERR(plat_dat->bsp_priv);
+        if (IS_ERR(plat_dat->bsp_priv)) {
+                ret = PTR_ERR(plat_dat->bsp_priv);
+                goto err_remove_config_dt;
+        }
 
         ret = rk_gmac_init(pdev, plat_dat->bsp_priv);
         if (ret)
-                return ret;
+                goto err_remove_config_dt;
+
+        ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        if (ret)
+                goto err_gmac_exit;
+
+        return 0;
+
+err_gmac_exit:
+        rk_gmac_exit(pdev, plat_dat->bsp_priv);
+err_remove_config_dt:
+        stmmac_remove_config_dt(pdev, plat_dat);
 
-        return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        return ret;
 }
 
 static const struct of_device_id rk_gmac_dwmac_match[] = {
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index bec6963ac71e..0c420e97de1e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -304,6 +304,8 @@ static int socfpga_dwmac_probe(struct platform_device *pdev)
         struct device           *dev = &pdev->dev;
         int                     ret;
         struct socfpga_dwmac    *dwmac;
+        struct net_device       *ndev;
+        struct stmmac_priv      *stpriv;
 
         ret = stmmac_get_platform_resources(pdev, &stmmac_res);
         if (ret)
@@ -314,32 +316,43 @@ static int socfpga_dwmac_probe(struct platform_device *pdev)
                 return PTR_ERR(plat_dat);
 
         dwmac = devm_kzalloc(dev, sizeof(*dwmac), GFP_KERNEL);
-        if (!dwmac)
-                return -ENOMEM;
+        if (!dwmac) {
+                ret = -ENOMEM;
+                goto err_remove_config_dt;
+        }
 
         ret = socfpga_dwmac_parse_data(dwmac, dev);
         if (ret) {
                 dev_err(dev, "Unable to parse OF data\n");
-                return ret;
+                goto err_remove_config_dt;
         }
 
         plat_dat->bsp_priv = dwmac;
         plat_dat->fix_mac_speed = socfpga_dwmac_fix_mac_speed;
 
         ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        if (ret)
+                goto err_remove_config_dt;
 
-        if (!ret) {
-                struct net_device *ndev = platform_get_drvdata(pdev);
-                struct stmmac_priv *stpriv = netdev_priv(ndev);
+        ndev = platform_get_drvdata(pdev);
+        stpriv = netdev_priv(ndev);
 
-                /* The socfpga driver needs to control the stmmac reset to
-                 * set the phy mode. Create a copy of the core reset handel
-                 * so it can be used by the driver later.
-                 */
-                dwmac->stmmac_rst = stpriv->stmmac_rst;
+        /* The socfpga driver needs to control the stmmac reset to set the phy
+         * mode. Create a copy of the core reset handle so it can be used by
+         * the driver later.
+         */
+        dwmac->stmmac_rst = stpriv->stmmac_rst;
 
-                ret = socfpga_dwmac_set_phy_mode(dwmac);
-        }
+        ret = socfpga_dwmac_set_phy_mode(dwmac);
+        if (ret)
+                goto err_dvr_remove;
+
+        return 0;
+
+err_dvr_remove:
+        stmmac_dvr_remove(&pdev->dev);
+err_remove_config_dt:
+        stmmac_remove_config_dt(pdev, plat_dat);
 
         return ret;
 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
index 58c05acc2aab..060b98c37a85 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
@@ -345,13 +345,15 @@ static int sti_dwmac_probe(struct platform_device *pdev)
                 return PTR_ERR(plat_dat);
 
         dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
-        if (!dwmac)
-                return -ENOMEM;
+        if (!dwmac) {
+                ret = -ENOMEM;
+                goto err_remove_config_dt;
+        }
 
         ret = sti_dwmac_parse_data(dwmac, pdev);
         if (ret) {
                 dev_err(&pdev->dev, "Unable to parse OF data\n");
-                return ret;
+                goto err_remove_config_dt;
         }
 
         dwmac->fix_retime_src = data->fix_retime_src;
@@ -363,9 +365,20 @@ static int sti_dwmac_probe(struct platform_device *pdev)
 
         ret = sti_dwmac_init(pdev, plat_dat->bsp_priv);
         if (ret)
-                return ret;
+                goto err_remove_config_dt;
+
+        ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        if (ret)
+                goto err_dwmac_exit;
+
+        return 0;
+
+err_dwmac_exit:
+        sti_dwmac_exit(pdev, plat_dat->bsp_priv);
+err_remove_config_dt:
+        stmmac_remove_config_dt(pdev, plat_dat);
 
-        return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+        return ret;
 }
 
 static const struct sti_dwmac_of_data stih4xx_dwmac_data = {
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
index e5a926b8bee7..61cb24810d10 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
@@ -107,24 +107,33 @@ static int stm32_dwmac_probe(struct platform_device *pdev)
                 return PTR_ERR(plat_dat);
 
         dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
-        if (!dwmac)
-                return -ENOMEM;
+        if (!dwmac) {
+                ret = -ENOMEM;
+                goto err_remove_config_dt;
+        }
 
         ret = stm32_dwmac_parse_data(dwmac, &pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "Unable to parse OF data\n");
-                return ret;
+                goto err_remove_config_dt;
         }
 
         plat_dat->bsp_priv = dwmac;
 
         ret = stm32_dwmac_init(plat_dat);
         if (ret)
-                return ret;
+                goto err_remove_config_dt;
 
         ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
         if (ret)
-                stm32_dwmac_clk_disable(dwmac);
+                goto err_clk_disable;
+
+        return 0;
+
+err_clk_disable:
+        stm32_dwmac_clk_disable(dwmac);
+err_remove_config_dt:
+        stmmac_remove_config_dt(pdev, plat_dat);
 
         return ret;
 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
index adff46375a32..d07520fb969e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
@@ -120,22 +120,27 @@ static int sun7i_gmac_probe(struct platform_device *pdev)
                 return PTR_ERR(plat_dat);
 
         gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL);
-        if (!gmac)
-                return -ENOMEM;
+        if (!gmac) {
+                ret = -ENOMEM;
+                goto err_remove_config_dt;
+        }
 
         gmac->interface = of_get_phy_mode(dev->of_node);
 
         gmac->tx_clk = devm_clk_get(dev, "allwinner_gmac_tx");
         if (IS_ERR(gmac->tx_clk)) {
                 dev_err(dev, "could not get tx clock\n");
-                return PTR_ERR(gmac->tx_clk);
+                ret = PTR_ERR(gmac->tx_clk);
+                goto err_remove_config_dt;
         }
 
         /* Optional regulator for PHY */
         gmac->regulator = devm_regulator_get_optional(dev, "phy");
         if (IS_ERR(gmac->regulator)) {
-                if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER)
-                        return -EPROBE_DEFER;
+                if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER) {
+                        ret = -EPROBE_DEFER;
+                        goto err_remove_config_dt;
+                }
                 dev_info(dev, "no regulator found\n");
                 gmac->regulator = NULL;
         }
@@ -151,11 +156,18 @@ static int sun7i_gmac_probe(struct platform_device *pdev)
 
         ret = sun7i_gmac_init(pdev, plat_dat->bsp_priv);
         if (ret)
-                return ret;
+                goto err_remove_config_dt;
 
         ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
         if (ret)
-                sun7i_gmac_exit(pdev, plat_dat->bsp_priv);
+                goto err_gmac_exit;
+
+        return 0;
+
+err_gmac_exit:
+        sun7i_gmac_exit(pdev, plat_dat->bsp_priv);
+err_remove_config_dt:
+        stmmac_remove_config_dt(pdev, plat_dat);
 
         return ret;
 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
index 990746955216..f35385266fbf 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
@@ -43,9 +43,11 @@ static void dwmac1000_dma_axi(void __iomem *ioaddr, struct stmmac_axi *axi)
         if (axi->axi_xit_frm)
                 value |= DMA_AXI_LPI_XIT_FRM;
 
+        value &= ~DMA_AXI_WR_OSR_LMT;
         value |= (axi->axi_wr_osr_lmt & DMA_AXI_WR_OSR_LMT_MASK) <<
                  DMA_AXI_WR_OSR_LMT_SHIFT;
 
+        value &= ~DMA_AXI_RD_OSR_LMT;
         value |= (axi->axi_rd_osr_lmt & DMA_AXI_RD_OSR_LMT_MASK) <<
                  DMA_AXI_RD_OSR_LMT_SHIFT;
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
index a1b17cd7886b..a601f8d43b75 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
@@ -123,22 +123,29 @@ static int dwmac4_wrback_get_rx_status(void *data, struct stmmac_extra_stats *x,
                 x->ipv4_pkt_rcvd++;
         if (rdes1 & RDES1_IPV6_HEADER)
                 x->ipv6_pkt_rcvd++;
-        if (message_type == RDES_EXT_SYNC)
-                x->rx_msg_type_sync++;
+
+        if (message_type == RDES_EXT_NO_PTP)
+                x->no_ptp_rx_msg_type_ext++;
+        else if (message_type == RDES_EXT_SYNC)
+                x->ptp_rx_msg_type_sync++;
         else if (message_type == RDES_EXT_FOLLOW_UP)
-                x->rx_msg_type_follow_up++;
+                x->ptp_rx_msg_type_follow_up++;
         else if (message_type == RDES_EXT_DELAY_REQ)
-                x->rx_msg_type_delay_req++;
+                x->ptp_rx_msg_type_delay_req++;
         else if (message_type == RDES_EXT_DELAY_RESP)
-                x->rx_msg_type_delay_resp++;
+                x->ptp_rx_msg_type_delay_resp++;
         else if (message_type == RDES_EXT_PDELAY_REQ)
-                x->rx_msg_type_pdelay_req++;
+                x->ptp_rx_msg_type_pdelay_req++;
         else if (message_type == RDES_EXT_PDELAY_RESP)
-                x->rx_msg_type_pdelay_resp++;
+                x->ptp_rx_msg_type_pdelay_resp++;
         else if (message_type == RDES_EXT_PDELAY_FOLLOW_UP)
-                x->rx_msg_type_pdelay_follow_up++;
-        else
-                x->rx_msg_type_ext_no_ptp++;
+                x->ptp_rx_msg_type_pdelay_follow_up++;
+        else if (message_type == RDES_PTP_ANNOUNCE)
+                x->ptp_rx_msg_type_announce++;
+        else if (message_type == RDES_PTP_MANAGEMENT)
+                x->ptp_rx_msg_type_management++;
+        else if (message_type == RDES_PTP_PKT_RESERVED_TYPE)
+                x->ptp_rx_msg_pkt_reserved_type++;
 
         if (rdes1 & RDES1_PTP_PACKET_TYPE)
                 x->ptp_frame_type++;
@@ -204,14 +211,18 @@ static void dwmac4_rd_enable_tx_timestamp(struct dma_desc *p)
 
 static int dwmac4_wrback_get_tx_timestamp_status(struct dma_desc *p)
 {
-        return (p->des3 & TDES3_TIMESTAMP_STATUS)
-                >> TDES3_TIMESTAMP_STATUS_SHIFT;
+        /* Context type from W/B descriptor must be zero */
+        if (p->des3 & TDES3_CONTEXT_TYPE)
+                return -EINVAL;
+
+        /* Tx Timestamp Status is 1 so des0 and des1'll have valid values */
+        if (p->des3 & TDES3_TIMESTAMP_STATUS)
+                return 0;
+
+        return 1;
 }
 
-/*  NOTE: For RX CTX bit has to be checked before
- *  HAVE a specific function for TX and another one for RX
- */
-static u64 dwmac4_wrback_get_timestamp(void *desc, u32 ats)
+static inline u64 dwmac4_get_timestamp(void *desc, u32 ats)
 {
         struct dma_desc *p = (struct dma_desc *)desc;
         u64 ns;
@@ -223,12 +234,54 @@ static u64 dwmac4_wrback_get_timestamp(void *desc, u32 ats)
         return ns;
 }
 
-static int dwmac4_context_get_rx_timestamp_status(void *desc, u32 ats)
+static int dwmac4_rx_check_timestamp(void *desc)
+{
+        struct dma_desc *p = (struct dma_desc *)desc;
+        u32 own, ctxt;
+        int ret = 1;
+
+        own = p->des3 & RDES3_OWN;
+        ctxt = ((p->des3 & RDES3_CONTEXT_DESCRIPTOR)
+                >> RDES3_CONTEXT_DESCRIPTOR_SHIFT);
+
+        if (likely(!own && ctxt)) {
+                if ((p->des0 == 0xffffffff) && (p->des1 == 0xffffffff))
+                        /* Corrupted value */
+                        ret = -EINVAL;
+                else
+                        /* A valid Timestamp is ready to be read */
+                        ret = 0;
+        }
+
+        /* Timestamp not ready */
+        return ret;
+}
+
+static int dwmac4_wrback_get_rx_timestamp_status(void *desc, u32 ats)
 {
         struct dma_desc *p = (struct dma_desc *)desc;
+        int ret = -EINVAL;
+
+        /* Get the status from normal w/b descriptor */
+        if (likely(p->des3 & TDES3_RS1V)) {
+                if (likely(p->des1 & RDES1_TIMESTAMP_AVAILABLE)) {
+                        int i = 0;
+
+                        /* Check if timestamp is OK from context descriptor */
+                        do {
+                                ret = dwmac4_rx_check_timestamp(desc);
+                                if (ret < 0)
+                                        goto exit;
+                                i++;
 
-        return (p->des1 & RDES1_TIMESTAMP_AVAILABLE)
-                >> RDES1_TIMESTAMP_AVAILABLE_SHIFT;
+                        } while ((ret == 1) || (i < 10));
+
+                        if (i == 10)
+                                ret = -EBUSY;
+                }
+        }
+exit:
+        return ret;
 }
 
 static void dwmac4_rd_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
@@ -373,8 +426,8 @@ const struct stmmac_desc_ops dwmac4_desc_ops = {
         .get_rx_frame_len = dwmac4_wrback_get_rx_frame_len,
         .enable_tx_timestamp = dwmac4_rd_enable_tx_timestamp,
         .get_tx_timestamp_status = dwmac4_wrback_get_tx_timestamp_status,
-        .get_timestamp = dwmac4_wrback_get_timestamp,
-        .get_rx_timestamp_status = dwmac4_context_get_rx_timestamp_status,
+        .get_rx_timestamp_status = dwmac4_wrback_get_rx_timestamp_status,
+        .get_timestamp = dwmac4_get_timestamp,
         .set_tx_ic = dwmac4_rd_set_tx_ic,
         .prepare_tx_desc = dwmac4_rd_prepare_tx_desc,
         .prepare_tso_tx_desc = dwmac4_rd_prepare_tso_tx_desc,
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h
index 0902a2edeaa9..9736c505211a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h
@@ -59,10 +59,13 @@
 #define TDES3_CTXT_TCMSSV               BIT(26)
 
 /* TDES3 Common */
+#define TDES3_RS1V                      BIT(26)
+#define TDES3_RS1V_SHIFT                26
 #define TDES3_LAST_DESCRIPTOR           BIT(28)
 #define TDES3_LAST_DESCRIPTOR_SHIFT     28
 #define TDES3_FIRST_DESCRIPTOR          BIT(29)
 #define TDES3_CONTEXT_TYPE              BIT(30)
+#define TDES3_CONTEXT_TYPE_SHIFT        30
 
 /* TDS3 use for both format (read and write back) */
 #define TDES3_OWN                       BIT(31)
@@ -117,6 +120,7 @@
 #define RDES3_LAST_DESCRIPTOR           BIT(28)
 #define RDES3_FIRST_DESCRIPTOR          BIT(29)
 #define RDES3_CONTEXT_DESCRIPTOR        BIT(30)
+#define RDES3_CONTEXT_DESCRIPTOR_SHIFT  30
 
 /* RDES3 (read format) */
 #define RDES3_BUFFER1_VALID_ADDR        BIT(24)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
index 116151cd6a95..32bc2fc73cdc 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
@@ -30,9 +30,11 @@ static void dwmac4_dma_axi(void __iomem *ioaddr, struct stmmac_axi *axi)
         if (axi->axi_xit_frm)
                 value |= DMA_AXI_LPI_XIT_FRM;
 
+        value &= ~DMA_AXI_WR_OSR_LMT;
         value |= (axi->axi_wr_osr_lmt & DMA_AXI_OSR_MAX) <<
                  DMA_AXI_WR_OSR_LMT_SHIFT;
 
+        value &= ~DMA_AXI_RD_OSR_LMT;
         value |= (axi->axi_rd_osr_lmt & DMA_AXI_OSR_MAX) <<
                  DMA_AXI_RD_OSR_LMT_SHIFT;
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
index 38f19c99cf59..e75549327c34 100644
--- a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
@@ -150,22 +150,30 @@ static void enh_desc_get_ext_status(void *data, struct stmmac_extra_stats *x,
                         x->ipv4_pkt_rcvd++;
                 if (rdes4 & ERDES4_IPV6_PKT_RCVD)
                         x->ipv6_pkt_rcvd++;
-                if (message_type == RDES_EXT_SYNC)
-                        x->rx_msg_type_sync++;
+
+                if (message_type == RDES_EXT_NO_PTP)
+                        x->no_ptp_rx_msg_type_ext++;
+                else if (message_type == RDES_EXT_SYNC)
+                        x->ptp_rx_msg_type_sync++;
                 else if (message_type == RDES_EXT_FOLLOW_UP)
-                        x->rx_msg_type_follow_up++;
+                        x->ptp_rx_msg_type_follow_up++;
                 else if (message_type == RDES_EXT_DELAY_REQ)
-                        x->rx_msg_type_delay_req++;
+                        x->ptp_rx_msg_type_delay_req++;
                 else if (message_type == RDES_EXT_DELAY_RESP)
-                        x->rx_msg_type_delay_resp++;
+                        x->ptp_rx_msg_type_delay_resp++;
                 else if (message_type == RDES_EXT_PDELAY_REQ)
-                        x->rx_msg_type_pdelay_req++;
+                        x->ptp_rx_msg_type_pdelay_req++;
                 else if (message_type == RDES_EXT_PDELAY_RESP)
-                        x->rx_msg_type_pdelay_resp++;
+                        x->ptp_rx_msg_type_pdelay_resp++;
                 else if (message_type == RDES_EXT_PDELAY_FOLLOW_UP)
-                        x->rx_msg_type_pdelay_follow_up++;
-                else
-                        x->rx_msg_type_ext_no_ptp++;
+                        x->ptp_rx_msg_type_pdelay_follow_up++;
+                else if (message_type == RDES_PTP_ANNOUNCE)
+                        x->ptp_rx_msg_type_announce++;
+                else if (message_type == RDES_PTP_MANAGEMENT)
+                        x->ptp_rx_msg_type_management++;
+                else if (message_type == RDES_PTP_PKT_RESERVED_TYPE)
+                        x->ptp_rx_msg_pkt_reserved_type++;
+
                 if (rdes4 & ERDES4_PTP_FRAME_TYPE)
                         x->ptp_frame_type++;
                 if (rdes4 & ERDES4_PTP_VER)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index b15fc55f1b96..4d2a759b8465 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -129,6 +129,7 @@ struct stmmac_priv {
         int irq_wake;
         spinlock_t ptp_lock;
         void __iomem *mmcaddr;
+        void __iomem *ptpaddr;
         u32 rx_tail_addr;
         u32 tx_tail_addr;
         u32 mss;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index 1e06173fc9d7..c5d0142adda2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -115,14 +115,17 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = {
         STMMAC_STAT(ip_csum_bypassed),
         STMMAC_STAT(ipv4_pkt_rcvd),
         STMMAC_STAT(ipv6_pkt_rcvd),
-        STMMAC_STAT(rx_msg_type_ext_no_ptp),
-        STMMAC_STAT(rx_msg_type_sync),
-        STMMAC_STAT(rx_msg_type_follow_up),
-        STMMAC_STAT(rx_msg_type_delay_req),
-        STMMAC_STAT(rx_msg_type_delay_resp),
-        STMMAC_STAT(rx_msg_type_pdelay_req),
-        STMMAC_STAT(rx_msg_type_pdelay_resp),
-        STMMAC_STAT(rx_msg_type_pdelay_follow_up),
+        STMMAC_STAT(no_ptp_rx_msg_type_ext),
+        STMMAC_STAT(ptp_rx_msg_type_sync),
+        STMMAC_STAT(ptp_rx_msg_type_follow_up),
+        STMMAC_STAT(ptp_rx_msg_type_delay_req),
+        STMMAC_STAT(ptp_rx_msg_type_delay_resp),
+        STMMAC_STAT(ptp_rx_msg_type_pdelay_req),
+        STMMAC_STAT(ptp_rx_msg_type_pdelay_resp),
+        STMMAC_STAT(ptp_rx_msg_type_pdelay_follow_up),
+        STMMAC_STAT(ptp_rx_msg_type_announce),
+        STMMAC_STAT(ptp_rx_msg_type_management),
+        STMMAC_STAT(ptp_rx_msg_pkt_reserved_type),
         STMMAC_STAT(ptp_frame_type),
         STMMAC_STAT(ptp_ver),
         STMMAC_STAT(timestamp_dropped),
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
index a77f68918010..10d6059b2f26 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
@@ -34,21 +34,29 @@ static void stmmac_config_hw_tstamping(void __iomem *ioaddr, u32 data)
 }
 
 static u32 stmmac_config_sub_second_increment(void __iomem *ioaddr,
-                                              u32 ptp_clock)
+                                              u32 ptp_clock, int gmac4)
 {
         u32 value = readl(ioaddr + PTP_TCR);
         unsigned long data;
 
-        /* Convert the ptp_clock to nano second
-         * formula = (2/ptp_clock) * 1000000000
-         * where, ptp_clock = 50MHz.
+        /* For GMAC3.x, 4.x versions, convert the ptp_clock to nano second
+         *      formula = (1/ptp_clock) * 1000000000
+         * where ptp_clock is 50MHz if fine method is used to update system
          */
-        data = (2000000000ULL / ptp_clock);
+        if (value & PTP_TCR_TSCFUPDT)
+                data = (1000000000ULL / 50000000);
+        else
+                data = (1000000000ULL / ptp_clock);
 
         /* 0.465ns accuracy */
         if (!(value & PTP_TCR_TSCTRLSSR))
                 data = (data * 1000) / 465;
 
+        data &= PTP_SSIR_SSINC_MASK;
+
+        if (gmac4)
+                data = data << GMAC4_PTP_SSIR_SSINC_SHIFT;
+
         writel(data, ioaddr + PTP_SSIR);
 
         return data;
@@ -104,14 +112,30 @@ static int stmmac_config_addend(void __iomem *ioaddr, u32 addend)
 }
 
 static int stmmac_adjust_systime(void __iomem *ioaddr, u32 sec, u32 nsec,
-                                 int add_sub)
+                                 int add_sub, int gmac4)
 {
         u32 value;
         int limit;
 
+        if (add_sub) {
+                /* If the new sec value needs to be subtracted with
+                 * the system time, then MAC_STSUR reg should be
+                 * programmed with (2^32 – <new_sec_value>)
+                 */
+                if (gmac4)
+                        sec = (100000000ULL - sec);
+
+                value = readl(ioaddr + PTP_TCR);
+                if (value & PTP_TCR_TSCTRLSSR)
+                        nsec = (PTP_DIGITAL_ROLLOVER_MODE - nsec);
+                else
+                        nsec = (PTP_BINARY_ROLLOVER_MODE - nsec);
+        }
+
         writel(sec, ioaddr + PTP_STSUR);
-        writel(((add_sub << PTP_STNSUR_ADDSUB_SHIFT) | nsec),
-                ioaddr + PTP_STNSUR);
+        value = (add_sub << PTP_STNSUR_ADDSUB_SHIFT) | nsec;
+        writel(value, ioaddr + PTP_STNSUR);
+
         /* issue command to initialize the system time value */
         value = readl(ioaddr + PTP_TCR);
         value |= PTP_TCR_TSUPDT;
@@ -134,8 +158,9 @@ static u64 stmmac_get_systime(void __iomem *ioaddr)
 {
         u64 ns;
 
+        /* Get the TSSS value */
         ns = readl(ioaddr + PTP_STNSR);
-        /* convert sec time value to nanosecond */
+        /* Get the TSS and convert sec time value to nanosecond */
         ns += readl(ioaddr + PTP_STSR) * 1000000000ULL;
 
         return ns;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 48e71fad4210..caf069a465f2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -340,18 +340,17 @@ out:
 
 /* stmmac_get_tx_hwtstamp - get HW TX timestamps
  * @priv: driver private structure
- * @entry : descriptor index to be used.
+ * @p : descriptor pointer
  * @skb : the socket buffer
  * Description :
  * This function will read timestamp from the descriptor & pass it to stack.
  * and also perform some sanity checks.
  */
 static void stmmac_get_tx_hwtstamp(struct stmmac_priv *priv,
-                                   unsigned int entry, struct sk_buff *skb)
+                                   struct dma_desc *p, struct sk_buff *skb)
 {
         struct skb_shared_hwtstamps shhwtstamp;
         u64 ns;
-        void *desc = NULL;
 
         if (!priv->hwts_tx_en)
                 return;
@@ -360,58 +359,55 @@ static void stmmac_get_tx_hwtstamp(struct stmmac_priv *priv,
         if (likely(!skb || !(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS)))
                 return;
 
-        if (priv->adv_ts)
-                desc = (priv->dma_etx + entry);
-        else
-                desc = (priv->dma_tx + entry);
-
         /* check tx tstamp status */
-        if (!priv->hw->desc->get_tx_timestamp_status((struct dma_desc *)desc))
-                return;
+        if (!priv->hw->desc->get_tx_timestamp_status(p)) {
+                /* get the valid tstamp */
+                ns = priv->hw->desc->get_timestamp(p, priv->adv_ts);
 
-        /* get the valid tstamp */
-        ns = priv->hw->desc->get_timestamp(desc, priv->adv_ts);
+                memset(&shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps));
+                shhwtstamp.hwtstamp = ns_to_ktime(ns);
 
-        memset(&shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps));
-        shhwtstamp.hwtstamp = ns_to_ktime(ns);
-        /* pass tstamp to stack */
-        skb_tstamp_tx(skb, &shhwtstamp);
+                netdev_info(priv->dev, "get valid TX hw timestamp %llu\n", ns);
+                /* pass tstamp to stack */
+                skb_tstamp_tx(skb, &shhwtstamp);
+        }
 
         return;
 }
 
 /* stmmac_get_rx_hwtstamp - get HW RX timestamps
  * @priv: driver private structure
- * @entry : descriptor index to be used.
+ * @p : descriptor pointer
+ * @np : next descriptor pointer
  * @skb : the socket buffer
  * Description :
  * This function will read received packet's timestamp from the descriptor
  * and pass it to stack. It also perform some sanity checks.
  */
-static void stmmac_get_rx_hwtstamp(struct stmmac_priv *priv,
-                                   unsigned int entry, struct sk_buff *skb)
+static void stmmac_get_rx_hwtstamp(struct stmmac_priv *priv, struct dma_desc *p,
+                                   struct dma_desc *np, struct sk_buff *skb)
 {
         struct skb_shared_hwtstamps *shhwtstamp = NULL;
         u64 ns;
-        void *desc = NULL;
 
         if (!priv->hwts_rx_en)
                 return;
 
-        if (priv->adv_ts)
-                desc = (priv->dma_erx + entry);
-        else
-                desc = (priv->dma_rx + entry);
-
-        /* exit if rx tstamp is not valid */
-        if (!priv->hw->desc->get_rx_timestamp_status(desc, priv->adv_ts))
-                return;
+        /* Check if timestamp is available */
+        if (!priv->hw->desc->get_rx_timestamp_status(p, priv->adv_ts)) {
+                /* For GMAC4, the valid timestamp is from CTX next desc. */
+                if (priv->plat->has_gmac4)
+                        ns = priv->hw->desc->get_timestamp(np, priv->adv_ts);
+                else
+                        ns = priv->hw->desc->get_timestamp(p, priv->adv_ts);
 
-        /* get valid tstamp */
-        ns = priv->hw->desc->get_timestamp(desc, priv->adv_ts);
-        shhwtstamp = skb_hwtstamps(skb);
-        memset(shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps));
-        shhwtstamp->hwtstamp = ns_to_ktime(ns);
+                netdev_info(priv->dev, "get valid RX hw timestamp %llu\n", ns);
+                shhwtstamp = skb_hwtstamps(skb);
+                memset(shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps));
+                shhwtstamp->hwtstamp = ns_to_ktime(ns);
+        } else  {
+                netdev_err(priv->dev, "cannot get RX hw timestamp\n");
+        }
 }
 
 /**
@@ -598,17 +594,18 @@ static int stmmac_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr)
         priv->hwts_tx_en = config.tx_type == HWTSTAMP_TX_ON;
 
         if (!priv->hwts_tx_en && !priv->hwts_rx_en)
-                priv->hw->ptp->config_hw_tstamping(priv->ioaddr, 0);
+                priv->hw->ptp->config_hw_tstamping(priv->ptpaddr, 0);
         else {
                 value = (PTP_TCR_TSENA | PTP_TCR_TSCFUPDT | PTP_TCR_TSCTRLSSR |
                          tstamp_all | ptp_v2 | ptp_over_ethernet |
                          ptp_over_ipv6_udp | ptp_over_ipv4_udp | ts_event_en |
                          ts_master_en | snap_type_sel);
-                priv->hw->ptp->config_hw_tstamping(priv->ioaddr, value);
+                priv->hw->ptp->config_hw_tstamping(priv->ptpaddr, value);
 
                 /* program Sub Second Increment reg */
                 sec_inc = priv->hw->ptp->config_sub_second_increment(
-                        priv->ioaddr, priv->clk_ptp_rate);
+                        priv->ptpaddr, priv->clk_ptp_rate,
+                        priv->plat->has_gmac4);
                 temp = div_u64(1000000000ULL, sec_inc);
 
                 /* calculate default added value:
@@ -618,14 +615,14 @@ static int stmmac_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr)
                  */
                 temp = (u64)(temp << 32);
                 priv->default_addend = div_u64(temp, priv->clk_ptp_rate);
-                priv->hw->ptp->config_addend(priv->ioaddr,
+                priv->hw->ptp->config_addend(priv->ptpaddr,
                                              priv->default_addend);
 
                 /* initialize system time */
                 ktime_get_real_ts64(&now);
 
                 /* lower 32 bits of tv_sec are safe until y2106 */
-                priv->hw->ptp->init_systime(priv->ioaddr, (u32)now.tv_sec,
+                priv->hw->ptp->init_systime(priv->ptpaddr, (u32)now.tv_sec,
                                             now.tv_nsec);
         }
 
@@ -880,6 +877,13 @@ static int stmmac_init_phy(struct net_device *dev)
                 return -ENODEV;
         }
 
+        /* stmmac_adjust_link will change this to PHY_IGNORE_INTERRUPT to avoid
+         * subsequent PHY polling, make sure we force a link transition if
+         * we have a UP/DOWN/UP transition
+         */
+        if (phydev->is_pseudo_fixed_link)
+                phydev->irq = PHY_POLL;
+
         pr_debug("stmmac_init_phy:  %s: attached to PHY (UID 0x%x)"
                  " Link = %d\n", dev->name, phydev->phy_id, phydev->link);
 
@@ -1333,7 +1337,7 @@ static void stmmac_tx_clean(struct stmmac_priv *priv)
                                 priv->dev->stats.tx_packets++;
                                 priv->xstats.tx_pkt_n++;
                         }
-                        stmmac_get_tx_hwtstamp(priv, entry, skb);
+                        stmmac_get_tx_hwtstamp(priv, p, skb);
                 }
 
                 if (likely(priv->tx_skbuff_dma[entry].buf)) {
@@ -1479,10 +1483,13 @@ static void stmmac_mmc_setup(struct stmmac_priv *priv)
         unsigned int mode = MMC_CNTRL_RESET_ON_READ | MMC_CNTRL_COUNTER_RESET |
                             MMC_CNTRL_PRESET | MMC_CNTRL_FULL_HALF_PRESET;
 
-        if (priv->synopsys_id >= DWMAC_CORE_4_00)
+        if (priv->synopsys_id >= DWMAC_CORE_4_00) {
+                priv->ptpaddr = priv->ioaddr + PTP_GMAC4_OFFSET;
                 priv->mmcaddr = priv->ioaddr + MMC_GMAC4_OFFSET;
-        else
+        } else {
+                priv->ptpaddr = priv->ioaddr + PTP_GMAC3_X_OFFSET;
                 priv->mmcaddr = priv->ioaddr + MMC_GMAC3_X_OFFSET;
+        }
 
         dwmac_mmc_intr_all_mask(priv->mmcaddr);
 
@@ -2477,7 +2484,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
         if (netif_msg_rx_status(priv)) {
                 void *rx_head;
 
-                pr_debug("%s: descriptor ring:\n", __func__);
+                pr_info(">>>>>> %s: descriptor ring:\n", __func__);
                 if (priv->extend_desc)
                         rx_head = (void *)priv->dma_erx;
                 else
@@ -2488,6 +2495,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
         while (count < limit) {
                 int status;
                 struct dma_desc *p;
+                struct dma_desc *np;
 
                 if (priv->extend_desc)
                         p = (struct dma_desc *)(priv->dma_erx + entry);
@@ -2507,9 +2515,11 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
                 next_entry = priv->cur_rx;
 
                 if (priv->extend_desc)
-                        prefetch(priv->dma_erx + next_entry);
+                        np = (struct dma_desc *)(priv->dma_erx + next_entry);
                 else
-                        prefetch(priv->dma_rx + next_entry);
+                        np = priv->dma_rx + next_entry;
+
+                prefetch(np);
 
                 if ((priv->extend_desc) && (priv->hw->desc->rx_extended_status))
                         priv->hw->desc->rx_extended_status(&priv->dev->stats,
@@ -2561,7 +2571,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
                                 frame_len -= ETH_FCS_LEN;
 
                         if (netif_msg_rx_status(priv)) {
-                                pr_debug("\tdesc: %p [entry %d] buff=0x%x\n",
+                                pr_info("\tdesc: %p [entry %d] buff=0x%x\n",
                                         p, entry, des);
                                 if (frame_len > ETH_FRAME_LEN)
                                         pr_debug("\tframe size %d, COE: %d\n",
@@ -2618,13 +2628,13 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
                                                  DMA_FROM_DEVICE);
                         }
 
-                        stmmac_get_rx_hwtstamp(priv, entry, skb);
-
                         if (netif_msg_pktdata(priv)) {
                                 pr_debug("frame received (%dbytes)", frame_len);
                                 print_pkt(skb->data, frame_len);
                         }
 
+                        stmmac_get_rx_hwtstamp(priv, p, np, skb);
+
                         stmmac_rx_vlan(priv->dev, skb);
 
                         skb->protocol = eth_type_trans(skb, priv->dev);
@@ -3406,7 +3416,6 @@ int stmmac_dvr_remove(struct device *dev)
         stmmac_set_mac(priv->ioaddr, false);
         netif_carrier_off(ndev);
         unregister_netdev(ndev);
-        of_node_put(priv->plat->phy_node);
         if (priv->stmmac_rst)
                 reset_control_assert(priv->stmmac_rst);
         clk_disable_unprepare(priv->pclk);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 0a0d6a86f397..ac3d39c69509 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -126,8 +126,10 @@ static struct stmmac_axi *stmmac_axi_setup(struct platform_device *pdev)
         axi->axi_mb = of_property_read_bool(np, "snps,axi_mb");
         axi->axi_rb =  of_property_read_bool(np, "snps,axi_rb");
 
-        of_property_read_u32(np, "snps,wr_osr_lmt", &axi->axi_wr_osr_lmt);
-        of_property_read_u32(np, "snps,rd_osr_lmt", &axi->axi_rd_osr_lmt);
+        if (of_property_read_u32(np, "snps,wr_osr_lmt", &axi->axi_wr_osr_lmt))
+                axi->axi_wr_osr_lmt = 1;
+        if (of_property_read_u32(np, "snps,rd_osr_lmt", &axi->axi_rd_osr_lmt))
+                axi->axi_rd_osr_lmt = 1;
         of_property_read_u32_array(np, "snps,blen", axi->axi_blen, AXI_BLEN);
         of_node_put(np);
 
@@ -200,7 +202,6 @@ static int stmmac_dt_phy(struct plat_stmmacenet_data *plat,
 /**
  * stmmac_probe_config_dt - parse device-tree driver parameters
  * @pdev: platform_device structure
- * @plat: driver data platform structure
  * @mac: MAC address to use
  * Description:
  * this function is to read the driver parameters from device-tree and
@@ -306,7 +307,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
                 dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg),
                                        GFP_KERNEL);
                 if (!dma_cfg) {
-                        of_node_put(plat->phy_node);
+                        stmmac_remove_config_dt(pdev, plat);
                         return ERR_PTR(-ENOMEM);
                 }
                 plat->dma_cfg = dma_cfg;
@@ -329,14 +330,37 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
 
         return plat;
 }
+
+/**
+ * stmmac_remove_config_dt - undo the effects of stmmac_probe_config_dt()
+ * @pdev: platform_device structure
+ * @plat: driver data platform structure
+ *
+ * Release resources claimed by stmmac_probe_config_dt().
+ */
+void stmmac_remove_config_dt(struct platform_device *pdev,
+                             struct plat_stmmacenet_data *plat)
+{
+        struct device_node *np = pdev->dev.of_node;
+
+        if (of_phy_is_fixed_link(np))
+                of_phy_deregister_fixed_link(np);
+        of_node_put(plat->phy_node);
+}
 #else
 struct plat_stmmacenet_data *
 stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
 {
         return ERR_PTR(-ENOSYS);
 }
+
+void stmmac_remove_config_dt(struct platform_device *pdev,
+                             struct plat_stmmacenet_data *plat)
+{
+}
 #endif /* CONFIG_OF */
 EXPORT_SYMBOL_GPL(stmmac_probe_config_dt);
+EXPORT_SYMBOL_GPL(stmmac_remove_config_dt);
 
 int stmmac_get_platform_resources(struct platform_device *pdev,
                                   struct stmmac_resources *stmmac_res)
@@ -392,10 +416,13 @@ int stmmac_pltfr_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
         struct stmmac_priv *priv = netdev_priv(ndev);
+        struct plat_stmmacenet_data *plat = priv->plat;
         int ret = stmmac_dvr_remove(&pdev->dev);
 
-        if (priv->plat->exit)
-                priv->plat->exit(pdev, priv->plat->bsp_priv);
+        if (plat->exit)
+                plat->exit(pdev, plat->bsp_priv);
+
+        stmmac_remove_config_dt(pdev, plat);
 
         return ret;
 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h
index 64e147f53a9c..b72eb0de57b7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h
@@ -23,6 +23,8 @@
 
 struct plat_stmmacenet_data *
 stmmac_probe_config_dt(struct platform_device *pdev, const char **mac);
+void stmmac_remove_config_dt(struct platform_device *pdev,
+                             struct plat_stmmacenet_data *plat);
 
 int stmmac_get_platform_resources(struct platform_device *pdev,
                                   struct stmmac_resources *stmmac_res);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
index 1477471f8d44..3eb281d1db08 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
@@ -54,7 +54,7 @@ static int stmmac_adjust_freq(struct ptp_clock_info *ptp, s32 ppb)
 
         spin_lock_irqsave(&priv->ptp_lock, flags);
 
-        priv->hw->ptp->config_addend(priv->ioaddr, addend);
+        priv->hw->ptp->config_addend(priv->ptpaddr, addend);
 
         spin_unlock_irqrestore(&priv->ptp_lock, flags);
 
@@ -89,7 +89,8 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta)
 
         spin_lock_irqsave(&priv->ptp_lock, flags);
 
-        priv->hw->ptp->adjust_systime(priv->ioaddr, sec, nsec, neg_adj);
+        priv->hw->ptp->adjust_systime(priv->ptpaddr, sec, nsec, neg_adj,
+                                      priv->plat->has_gmac4);
 
         spin_unlock_irqrestore(&priv->ptp_lock, flags);
 
@@ -114,7 +115,7 @@ static int stmmac_get_time(struct ptp_clock_info *ptp, struct timespec64 *ts)
 
         spin_lock_irqsave(&priv->ptp_lock, flags);
 
-        ns = priv->hw->ptp->get_systime(priv->ioaddr);
+        ns = priv->hw->ptp->get_systime(priv->ptpaddr);
 
         spin_unlock_irqrestore(&priv->ptp_lock, flags);
 
@@ -141,7 +142,7 @@ static int stmmac_set_time(struct ptp_clock_info *ptp,
 
         spin_lock_irqsave(&priv->ptp_lock, flags);
 
-        priv->hw->ptp->init_systime(priv->ioaddr, ts->tv_sec, ts->tv_nsec);
+        priv->hw->ptp->init_systime(priv->ptpaddr, ts->tv_sec, ts->tv_nsec);
 
         spin_unlock_irqrestore(&priv->ptp_lock, flags);
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
index 4535df37c227..c06938c47af5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
@@ -22,51 +22,53 @@
   Author: Rayagond Kokatanur <rayagond@vayavyalabs.com>
 ******************************************************************************/
 
-#ifndef __STMMAC_PTP_H__
-#define __STMMAC_PTP_H__
+#ifndef __STMMAC_PTP_H__
+#define __STMMAC_PTP_H__
 
-/* IEEE 1588 PTP register offsets */
-#define PTP_TCR         0x0700  /* Timestamp Control Reg */
-#define PTP_SSIR        0x0704  /* Sub-Second Increment Reg */
-#define PTP_STSR        0x0708  /* System Time – Seconds Regr */
-#define PTP_STNSR       0x070C  /* System Time – Nanoseconds Reg */
-#define PTP_STSUR       0x0710  /* System Time – Seconds Update Reg */
-#define PTP_STNSUR      0x0714  /* System Time – Nanoseconds Update Reg */
-#define PTP_TAR         0x0718  /* Timestamp Addend Reg */
-#define PTP_TTSR        0x071C  /* Target Time Seconds Reg */
-#define PTP_TTNSR       0x0720  /* Target Time Nanoseconds Reg */
-#define PTP_STHWSR      0x0724  /* System Time - Higher Word Seconds Reg */
-#define PTP_TSR         0x0728  /* Timestamp Status */
+#define PTP_GMAC4_OFFSET        0xb00
+#define PTP_GMAC3_X_OFFSET      0x700
 
-#define PTP_STNSUR_ADDSUB_SHIFT 31
+/* IEEE 1588 PTP register offsets */
+#define PTP_TCR         0x00    /* Timestamp Control Reg */
+#define PTP_SSIR        0x04    /* Sub-Second Increment Reg */
+#define PTP_STSR        0x08    /* System Time – Seconds Regr */
+#define PTP_STNSR       0x0c    /* System Time – Nanoseconds Reg */
+#define PTP_STSUR       0x10    /* System Time – Seconds Update Reg */
+#define PTP_STNSUR      0x14    /* System Time – Nanoseconds Update Reg */
+#define PTP_TAR         0x18    /* Timestamp Addend Reg */
 
-/* PTP TCR defines */
-#define PTP_TCR_TSENA           0x00000001 /* Timestamp Enable */
-#define PTP_TCR_TSCFUPDT        0x00000002 /* Timestamp Fine/Coarse Update */
-#define PTP_TCR_TSINIT          0x00000004 /* Timestamp Initialize */
-#define PTP_TCR_TSUPDT          0x00000008 /* Timestamp Update */
-/* Timestamp Interrupt Trigger Enable */
-#define PTP_TCR_TSTRIG          0x00000010
-#define PTP_TCR_TSADDREG        0x00000020 /* Addend Reg Update */
-#define PTP_TCR_TSENALL         0x00000100 /* Enable Timestamp for All Frames */
-/* Timestamp Digital or Binary Rollover Control */
-#define PTP_TCR_TSCTRLSSR       0x00000200
+#define PTP_STNSUR_ADDSUB_SHIFT 31
+#define PTP_DIGITAL_ROLLOVER_MODE       0x3B9ACA00      /* 10e9-1 ns */
+#define PTP_BINARY_ROLLOVER_MODE        0x80000000      /* ~0.466 ns */
 
+/* PTP Timestamp control register defines */
+#define PTP_TCR_TSENA           BIT(0)  /* Timestamp Enable */
+#define PTP_TCR_TSCFUPDT        BIT(1)  /* Timestamp Fine/Coarse Update */
+#define PTP_TCR_TSINIT          BIT(2)  /* Timestamp Initialize */
+#define PTP_TCR_TSUPDT          BIT(3)  /* Timestamp Update */
+#define PTP_TCR_TSTRIG          BIT(4)  /* Timestamp Interrupt Trigger Enable */
+#define PTP_TCR_TSADDREG        BIT(5)  /* Addend Reg Update */
+#define PTP_TCR_TSENALL         BIT(8)  /* Enable Timestamp for All Frames */
+#define PTP_TCR_TSCTRLSSR       BIT(9)  /* Digital or Binary Rollover Control */
 /* Enable PTP packet Processing for Version 2 Format */
-#define PTP_TCR_TSVER2ENA       0x00000400
+#define PTP_TCR_TSVER2ENA       BIT(10)
 /* Enable Processing of PTP over Ethernet Frames */
-#define PTP_TCR_TSIPENA         0x00000800
+#define PTP_TCR_TSIPENA         BIT(11)
 /* Enable Processing of PTP Frames Sent over IPv6-UDP */
-#define PTP_TCR_TSIPV6ENA       0x00001000
+#define PTP_TCR_TSIPV6ENA       BIT(12)
 /* Enable Processing of PTP Frames Sent over IPv4-UDP */
-#define PTP_TCR_TSIPV4ENA       0x00002000
+#define PTP_TCR_TSIPV4ENA       BIT(13)
 /* Enable Timestamp Snapshot for Event Messages */
-#define PTP_TCR_TSEVNTENA       0x00004000
+#define PTP_TCR_TSEVNTENA       BIT(14)
 /* Enable Snapshot for Messages Relevant to Master */
-#define PTP_TCR_TSMSTRENA       0x00008000
+#define PTP_TCR_TSMSTRENA       BIT(15)
 /* Select PTP packets for Taking Snapshots */
-#define PTP_TCR_SNAPTYPSEL_1    0x00010000
+#define PTP_TCR_SNAPTYPSEL_1    GENMASK(17, 16)
 /* Enable MAC address for PTP Frame Filtering */
-#define PTP_TCR_TSENMACADDR     0x00040000
+#define PTP_TCR_TSENMACADDR     BIT(18)
+
+/* SSIR defines */
+#define PTP_SSIR_SSINC_MASK             0xff
+#define GMAC4_PTP_SSIR_SSINC_SHIFT      16
 
-#endif /* __STMMAC_PTP_H__ */
+#endif  /* __STMMAC_PTP_H__ */
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
index aa4f9d2d8fa9..02f452730d52 100644
--- a/drivers/net/ethernet/sun/sunbmac.c
+++ b/drivers/net/ethernet/sun/sunbmac.c
@@ -623,6 +623,7 @@ static int bigmac_init_hw(struct bigmac *bp, int from_irq)
         void __iomem *gregs        = bp->gregs;
         void __iomem *cregs        = bp->creg;
         void __iomem *bregs        = bp->bregs;
+        __u32 bblk_dvma = (__u32)bp->bblock_dvma;
         unsigned char *e = &bp->dev->dev_addr[0];
 
         /* Latch current counters into statistics. */
@@ -671,9 +672,9 @@ static int bigmac_init_hw(struct bigmac *bp, int from_irq)
                     bregs + BMAC_XIFCFG);
 
         /* Tell the QEC where the ring descriptors are. */
-        sbus_writel(bp->bblock_dvma + bib_offset(be_rxd, 0),
+        sbus_writel(bblk_dvma + bib_offset(be_rxd, 0),
                     cregs + CREG_RXDS);
-        sbus_writel(bp->bblock_dvma + bib_offset(be_txd, 0),
+        sbus_writel(bblk_dvma + bib_offset(be_txd, 0),
                     cregs + CREG_TXDS);
 
         /* Setup the FIFO pointers into QEC local memory. */
diff --git a/drivers/net/ethernet/sun/sunbmac.h b/drivers/net/ethernet/sun/sunbmac.h
index 06dd21707353..532fc56830cf 100644
--- a/drivers/net/ethernet/sun/sunbmac.h
+++ b/drivers/net/ethernet/sun/sunbmac.h
@@ -291,7 +291,7 @@ struct bigmac {
         void __iomem    *bregs; /* BigMAC Registers                   */
         void __iomem    *tregs; /* BigMAC Transceiver                 */
         struct bmac_init_block  *bmac_block;    /* RX and TX descriptors */
-        __u32                    bblock_dvma;   /* RX and TX descriptors */
+        dma_addr_t              bblock_dvma;    /* RX and TX descriptors */
 
         spinlock_t              lock;
 
diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
index 9b825780b3be..9582948145c1 100644
--- a/drivers/net/ethernet/sun/sunqe.c
+++ b/drivers/net/ethernet/sun/sunqe.c
@@ -124,7 +124,7 @@ static void qe_init_rings(struct sunqe *qep)
 {
         struct qe_init_block *qb = qep->qe_block;
         struct sunqe_buffers *qbufs = qep->buffers;
-        __u32 qbufs_dvma = qep->buffers_dvma;
+        __u32 qbufs_dvma = (__u32)qep->buffers_dvma;
         int i;
 
         qep->rx_new = qep->rx_old = qep->tx_new = qep->tx_old = 0;
@@ -144,6 +144,7 @@ static int qe_init(struct sunqe *qep, int from_irq)
         void __iomem *mregs = qep->mregs;
         void __iomem *gregs = qecp->gregs;
         unsigned char *e = &qep->dev->dev_addr[0];
+        __u32 qblk_dvma = (__u32)qep->qblock_dvma;
         u32 tmp;
         int i;
 
@@ -152,8 +153,8 @@ static int qe_init(struct sunqe *qep, int from_irq)
                 return -EAGAIN;
 
         /* Setup initial rx/tx init block pointers. */
-        sbus_writel(qep->qblock_dvma + qib_offset(qe_rxd, 0), cregs + CREG_RXDS);
-        sbus_writel(qep->qblock_dvma + qib_offset(qe_txd, 0), cregs + CREG_TXDS);
+        sbus_writel(qblk_dvma + qib_offset(qe_rxd, 0), cregs + CREG_RXDS);
+        sbus_writel(qblk_dvma + qib_offset(qe_txd, 0), cregs + CREG_TXDS);
 
         /* Enable/mask the various irq's. */
         sbus_writel(0, cregs + CREG_RIMASK);
@@ -413,7 +414,7 @@ static void qe_rx(struct sunqe *qep)
         struct net_device *dev = qep->dev;
         struct qe_rxd *this;
         struct sunqe_buffers *qbufs = qep->buffers;
-        __u32 qbufs_dvma = qep->buffers_dvma;
+        __u32 qbufs_dvma = (__u32)qep->buffers_dvma;
         int elem = qep->rx_new;
         u32 flags;
 
@@ -572,7 +573,7 @@ static int qe_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct sunqe *qep = netdev_priv(dev);
         struct sunqe_buffers *qbufs = qep->buffers;
-        __u32 txbuf_dvma, qbufs_dvma = qep->buffers_dvma;
+        __u32 txbuf_dvma, qbufs_dvma = (__u32)qep->buffers_dvma;
         unsigned char *txbuf;
         int len, entry;
 
diff --git a/drivers/net/ethernet/sun/sunqe.h b/drivers/net/ethernet/sun/sunqe.h
index 581781b6b2fa..ae190b77431b 100644
--- a/drivers/net/ethernet/sun/sunqe.h
+++ b/drivers/net/ethernet/sun/sunqe.h
@@ -334,12 +334,12 @@ struct sunqe {
         void __iomem                    *qcregs;                /* QEC per-channel Registers   */
         void __iomem                    *mregs;         /* Per-channel MACE Registers  */
         struct qe_init_block            *qe_block;      /* RX and TX descriptors       */
-        __u32                           qblock_dvma;    /* RX and TX descriptors       */
+        dma_addr_t                      qblock_dvma;    /* RX and TX descriptors       */
         spinlock_t                      lock;           /* Protects txfull state       */
         int                             rx_new, rx_old; /* RX ring extents             */
         int                             tx_new, tx_old; /* TX ring extents             */
         struct sunqe_buffers            *buffers;       /* CPU visible address.        */
-        __u32                           buffers_dvma;   /* DVMA visible address.       */
+        dma_addr_t                      buffers_dvma;   /* DVMA visible address.       */
         struct sunqec                   *parent;
         u8                              mconfig;        /* Base MACE mconfig value     */
         struct platform_device          *op;            /* QE's OF device struct       */
diff --git a/drivers/net/ethernet/synopsys/dwc_eth_qos.c b/drivers/net/ethernet/synopsys/dwc_eth_qos.c
index 5eedac495077..97d64bfed465 100644
--- a/drivers/net/ethernet/synopsys/dwc_eth_qos.c
+++ b/drivers/net/ethernet/synopsys/dwc_eth_qos.c
@@ -33,7 +33,6 @@
 #include <linux/stat.h>
 #include <linux/types.h>
 
-#include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
@@ -43,7 +42,6 @@
 
 #include <linux/phy.h>
 #include <linux/mii.h>
-#include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/vmalloc.h>
 
@@ -2883,7 +2881,7 @@ static int dwceqos_probe(struct platform_device *pdev)
         ret = of_get_phy_mode(lp->pdev->dev.of_node);
         if (ret < 0) {
                 dev_err(&lp->pdev->dev, "error in getting phy i/f\n");
-                goto err_out_clk_dis_phy;
+                goto err_out_deregister_fixed_link;
         }
 
         lp->phy_interface = ret;
@@ -2891,14 +2889,14 @@ static int dwceqos_probe(struct platform_device *pdev)
         ret = dwceqos_mii_init(lp);
         if (ret) {
                 dev_err(&lp->pdev->dev, "error in dwceqos_mii_init\n");
-                goto err_out_clk_dis_phy;
+                goto err_out_deregister_fixed_link;
         }
 
         ret = dwceqos_mii_probe(ndev);
         if (ret != 0) {
                 netdev_err(ndev, "mii_probe fail.\n");
                 ret = -ENXIO;
-                goto err_out_clk_dis_phy;
+                goto err_out_deregister_fixed_link;
         }
 
         dwceqos_set_umac_addr(lp, lp->ndev->dev_addr, 0);
@@ -2916,7 +2914,7 @@ static int dwceqos_probe(struct platform_device *pdev)
         if (ret) {
                 dev_err(&lp->pdev->dev, "Unable to retrieve DT, error %d\n",
                         ret);
-                goto err_out_clk_dis_phy;
+                goto err_out_deregister_fixed_link;
         }
         dev_info(&lp->pdev->dev, "pdev->id %d, baseaddr 0x%08lx, irq %d\n",
                  pdev->id, ndev->base_addr, ndev->irq);
@@ -2926,7 +2924,7 @@ static int dwceqos_probe(struct platform_device *pdev)
         if (ret) {
                 dev_err(&lp->pdev->dev, "Unable to request IRQ %d, error %d\n",
                         ndev->irq, ret);
-                goto err_out_clk_dis_phy;
+                goto err_out_deregister_fixed_link;
         }
 
         if (netif_msg_probe(lp))
@@ -2937,11 +2935,14 @@ static int dwceqos_probe(struct platform_device *pdev)
         ret = register_netdev(ndev);
         if (ret) {
                 dev_err(&pdev->dev, "Cannot register net device, aborting.\n");
-                        goto err_out_clk_dis_phy;
+                goto err_out_deregister_fixed_link;
         }
 
         return 0;
 
+err_out_deregister_fixed_link:
+        if (of_phy_is_fixed_link(pdev->dev.of_node))
+                of_phy_deregister_fixed_link(pdev->dev.of_node);
 err_out_clk_dis_phy:
         clk_disable_unprepare(lp->phy_ref_clk);
 err_out_clk_dis_aper:
@@ -2961,8 +2962,11 @@ static int dwceqos_remove(struct platform_device *pdev)
         if (ndev) {
                 lp = netdev_priv(ndev);
 
-                if (ndev->phydev)
+                if (ndev->phydev) {
                         phy_disconnect(ndev->phydev);
+                        if (of_phy_is_fixed_link(pdev->dev.of_node))
+                                of_phy_deregister_fixed_link(pdev->dev.of_node);
+                }
                 mdiobus_unregister(lp->mii_bus);
                 mdiobus_free(lp->mii_bus);
 
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index fa0cfda24fd9..28097be2ff28 100644
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -1113,6 +1113,7 @@ static int cpmac_probe(struct platform_device *pdev)
         if (!dev)
                 return -ENOMEM;
 
+        SET_NETDEV_DEV(dev, &pdev->dev);
         platform_set_drvdata(pdev, dev);
         priv = netdev_priv(dev);
 
diff --git a/drivers/net/ethernet/ti/cpsw-phy-sel.c b/drivers/net/ethernet/ti/cpsw-phy-sel.c
index 054a8dd23dae..18013645e76c 100644
--- a/drivers/net/ethernet/ti/cpsw-phy-sel.c
+++ b/drivers/net/ethernet/ti/cpsw-phy-sel.c
@@ -81,6 +81,7 @@ static void cpsw_gmii_sel_am3352(struct cpsw_phy_sel_priv *priv,
         };
 
         mask = GMII_SEL_MODE_MASK << (slave * 2) | BIT(slave + 6);
+        mask |= BIT(slave + 4);
         mode <<= slave * 2;
 
         if (priv->rmii_clock_external) {
@@ -176,9 +177,12 @@ void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave)
         }
 
         dev = bus_find_device(&platform_bus_type, NULL, node, match);
+        of_node_put(node);
         priv = dev_get_drvdata(dev);
 
         priv->cpsw_phy_sel(priv, phy_mode, slave);
+
+        put_device(dev);
 }
 EXPORT_SYMBOL_GPL(cpsw_phy_sel);
 
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index c6cff3d2ff05..b9087b828eff 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2375,8 +2375,11 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                          * to the PHY is the Ethernet MAC DT node.
                          */
                         ret = of_phy_register_fixed_link(slave_node);
-                        if (ret)
+                        if (ret) {
+                                if (ret != -EPROBE_DEFER)
+                                        dev_err(&pdev->dev, "failed to register fixed-link phy: %d\n", ret);
                                 return ret;
+                        }
                         slave_data->phy_node = of_node_get(slave_node);
                 } else if (parp) {
                         u32 phyid;
@@ -2397,6 +2400,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                         }
                         snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),
                                  PHY_ID_FMT, mdio->name, phyid);
+                        put_device(&mdio->dev);
                 } else {
                         dev_err(&pdev->dev,
                                 "No slave[%d] phy_id, phy-handle, or fixed-link property\n",
@@ -2440,6 +2444,34 @@ no_phy_slave:
         return 0;
 }
 
+static void cpsw_remove_dt(struct platform_device *pdev)
+{
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct cpsw_common *cpsw = ndev_to_cpsw(ndev);
+        struct cpsw_platform_data *data = &cpsw->data;
+        struct device_node *node = pdev->dev.of_node;
+        struct device_node *slave_node;
+        int i = 0;
+
+        for_each_available_child_of_node(node, slave_node) {
+                struct cpsw_slave_data *slave_data = &data->slave_data[i];
+
+                if (strcmp(slave_node->name, "slave"))
+                        continue;
+
+                if (of_phy_is_fixed_link(slave_node))
+                        of_phy_deregister_fixed_link(slave_node);
+
+                of_node_put(slave_data->phy_node);
+
+                i++;
+                if (i == data->slaves)
+                        break;
+        }
+
+        of_platform_depopulate(&pdev->dev);
+}
+
 static int cpsw_probe_dual_emac(struct cpsw_priv *priv)
 {
         struct cpsw_common              *cpsw = priv->cpsw;
@@ -2547,6 +2579,9 @@ static int cpsw_probe(struct platform_device *pdev)
         int irq;
 
         cpsw = devm_kzalloc(&pdev->dev, sizeof(struct cpsw_common), GFP_KERNEL);
+        if (!cpsw)
+                return -ENOMEM;
+
         cpsw->dev = &pdev->dev;
 
         ndev = alloc_etherdev_mq(sizeof(struct cpsw_priv), CPSW_MAX_QUEUES);
@@ -2584,11 +2619,19 @@ static int cpsw_probe(struct platform_device *pdev)
         /* Select default pin state */
         pinctrl_pm_select_default_state(&pdev->dev);
 
-        if (cpsw_probe_dt(&cpsw->data, pdev)) {
-                dev_err(&pdev->dev, "cpsw: platform data missing\n");
-                ret = -ENODEV;
+        /* Need to enable clocks with runtime PM api to access module
+         * registers
+         */
+        ret = pm_runtime_get_sync(&pdev->dev);
+        if (ret < 0) {
+                pm_runtime_put_noidle(&pdev->dev);
                 goto clean_runtime_disable_ret;
         }
+
+        ret = cpsw_probe_dt(&cpsw->data, pdev);
+        if (ret)
+                goto clean_dt_ret;
+
         data = &cpsw->data;
         cpsw->rx_ch_num = 1;
         cpsw->tx_ch_num = 1;
@@ -2608,7 +2651,7 @@ static int cpsw_probe(struct platform_device *pdev)
                                     GFP_KERNEL);
         if (!cpsw->slaves) {
                 ret = -ENOMEM;
-                goto clean_runtime_disable_ret;
+                goto clean_dt_ret;
         }
         for (i = 0; i < data->slaves; i++)
                 cpsw->slaves[i].slave_num = i;
@@ -2620,7 +2663,7 @@ static int cpsw_probe(struct platform_device *pdev)
         if (IS_ERR(clk)) {
                 dev_err(priv->dev, "fck is not found\n");
                 ret = -ENODEV;
-                goto clean_runtime_disable_ret;
+                goto clean_dt_ret;
         }
         cpsw->bus_freq_mhz = clk_get_rate(clk) / 1000000;
 
@@ -2628,26 +2671,17 @@ static int cpsw_probe(struct platform_device *pdev)
         ss_regs = devm_ioremap_resource(&pdev->dev, ss_res);
         if (IS_ERR(ss_regs)) {
                 ret = PTR_ERR(ss_regs);
-                goto clean_runtime_disable_ret;
+                goto clean_dt_ret;
         }
         cpsw->regs = ss_regs;
 
-        /* Need to enable clocks with runtime PM api to access module
-         * registers
-         */
-        ret = pm_runtime_get_sync(&pdev->dev);
-        if (ret < 0) {
-                pm_runtime_put_noidle(&pdev->dev);
-                goto clean_runtime_disable_ret;
-        }
         cpsw->version = readl(&cpsw->regs->id_ver);
-        pm_runtime_put_sync(&pdev->dev);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         cpsw->wr_regs = devm_ioremap_resource(&pdev->dev, res);
         if (IS_ERR(cpsw->wr_regs)) {
                 ret = PTR_ERR(cpsw->wr_regs);
-                goto clean_runtime_disable_ret;
+                goto clean_dt_ret;
         }
 
         memset(&dma_params, 0, sizeof(dma_params));
@@ -2684,7 +2718,7 @@ static int cpsw_probe(struct platform_device *pdev)
         default:
                 dev_err(priv->dev, "unknown version 0x%08x\n", cpsw->version);
                 ret = -ENODEV;
-                goto clean_runtime_disable_ret;
+                goto clean_dt_ret;
         }
         for (i = 0; i < cpsw->data.slaves; i++) {
                 struct cpsw_slave *slave = &cpsw->slaves[i];
@@ -2713,7 +2747,7 @@ static int cpsw_probe(struct platform_device *pdev)
         if (!cpsw->dma) {
                 dev_err(priv->dev, "error initializing dma\n");
                 ret = -ENOMEM;
-                goto clean_runtime_disable_ret;
+                goto clean_dt_ret;
         }
 
         cpsw->txch[0] = cpdma_chan_create(cpsw->dma, 0, cpsw_tx_handler, 0);
@@ -2811,16 +2845,23 @@ static int cpsw_probe(struct platform_device *pdev)
                 ret = cpsw_probe_dual_emac(priv);
                 if (ret) {
                         cpsw_err(priv, probe, "error probe slave 2 emac interface\n");
-                        goto clean_ale_ret;
+                        goto clean_unregister_netdev_ret;
                 }
         }
 
+        pm_runtime_put(&pdev->dev);
+
         return 0;
 
+clean_unregister_netdev_ret:
+        unregister_netdev(ndev);
 clean_ale_ret:
         cpsw_ale_destroy(cpsw->ale);
 clean_dma_ret:
         cpdma_ctlr_destroy(cpsw->dma);
+clean_dt_ret:
+        cpsw_remove_dt(pdev);
+        pm_runtime_put_sync(&pdev->dev);
 clean_runtime_disable_ret:
         pm_runtime_disable(&pdev->dev);
 clean_ndev_ret:
@@ -2846,7 +2887,7 @@ static int cpsw_remove(struct platform_device *pdev)
 
         cpsw_ale_destroy(cpsw->ale);
         cpdma_ctlr_destroy(cpsw->dma);
-        of_platform_depopulate(&pdev->dev);
+        cpsw_remove_dt(pdev);
         pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
         if (cpsw->data.dual_emac)
@@ -2889,6 +2930,8 @@ static int cpsw_resume(struct device *dev)
         /* Select default pin state */
         pinctrl_pm_select_default_state(dev);
 
+        /* shut up ASSERT_RTNL() warning in netif_set_real_num_tx/rx_queues */
+        rtnl_lock();
         if (cpsw->data.dual_emac) {
                 int i;
 
@@ -2900,6 +2943,8 @@ static int cpsw_resume(struct device *dev)
                 if (netif_running(ndev))
                         cpsw_ndo_open(ndev);
         }
+        rtnl_unlock();
+
         return 0;
 }
 #endif
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 2fd94a5bc1f3..481c7bf0395b 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1410,6 +1410,7 @@ static int emac_dev_open(struct net_device *ndev)
         int i = 0;
         struct emac_priv *priv = netdev_priv(ndev);
         struct phy_device *phydev = NULL;
+        struct device *phy = NULL;
 
         ret = pm_runtime_get_sync(&priv->pdev->dev);
         if (ret < 0) {
@@ -1488,19 +1489,20 @@ static int emac_dev_open(struct net_device *ndev)
 
         /* use the first phy on the bus if pdata did not give us a phy id */
         if (!phydev && !priv->phy_id) {
-                struct device *phy;
-
                 phy = bus_find_device(&mdio_bus_type, NULL, NULL,
                                       match_first_device);
-                if (phy)
+                if (phy) {
                         priv->phy_id = dev_name(phy);
+                        if (!priv->phy_id || !*priv->phy_id)
+                                put_device(phy);
+                }
         }
 
         if (!phydev && priv->phy_id && *priv->phy_id) {
                 phydev = phy_connect(ndev, priv->phy_id,
                                      &emac_adjust_link,
                                      PHY_INTERFACE_MODE_MII);
-
+                put_device(phy);        /* reference taken by bus_find_device */
                 if (IS_ERR(phydev)) {
                         dev_err(emac_dev, "could not connect to phy %s\n",
                                 priv->phy_id);
@@ -1765,6 +1767,7 @@ static int davinci_emac_try_get_mac(struct platform_device *pdev,
  */
 static int davinci_emac_probe(struct platform_device *pdev)
 {
+        struct device_node *np = pdev->dev.of_node;
         int rc = 0;
         struct resource *res, *res_ctrl;
         struct net_device *ndev;
@@ -1803,7 +1806,7 @@ static int davinci_emac_probe(struct platform_device *pdev)
         if (!pdata) {
                 dev_err(&pdev->dev, "no platform data\n");
                 rc = -ENODEV;
-                goto no_pdata;
+                goto err_free_netdev;
         }
 
         /* MAC addr and PHY mask , RMII enable info from platform_data */
@@ -1939,6 +1942,10 @@ no_cpdma_chan:
                 cpdma_chan_destroy(priv->rxchan);
         cpdma_ctlr_destroy(priv->dma);
 no_pdata:
+        if (of_phy_is_fixed_link(np))
+                of_phy_deregister_fixed_link(np);
+        of_node_put(priv->phy_node);
+err_free_netdev:
         free_netdev(ndev);
         return rc;
 }
@@ -1954,6 +1961,7 @@ static int davinci_emac_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
         struct emac_priv *priv = netdev_priv(ndev);
+        struct device_node *np = pdev->dev.of_node;
 
         dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n");
 
@@ -1966,6 +1974,8 @@ static int davinci_emac_remove(struct platform_device *pdev)
         unregister_netdev(ndev);
         of_node_put(priv->phy_node);
         pm_runtime_disable(&pdev->dev);
+        if (of_phy_is_fixed_link(np))
+                of_phy_deregister_fixed_link(np);
         free_netdev(ndev);
 
         return 0;
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
index 446ea580ad42..928c1dca2673 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
@@ -1694,7 +1694,7 @@ struct gelic_wl_scan_info *gelic_wl_find_best_bss(struct gelic_wl_info *wl)
                                 pr_debug("%s: bssid matched\n", __func__);
                                 break;
                         } else {
-                                pr_debug("%s: bssid unmached\n", __func__);
+                                pr_debug("%s: bssid unmatched\n", __func__);
                                 continue;
                         }
                 }
diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index 7f127dc1b7ba..fa32391720fe 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -708,8 +708,7 @@ static int eth_poll(struct napi_struct *napi, int budget)
                         if (!qmgr_stat_below_low_watermark(rxq) &&
                             napi_reschedule(napi)) { /* not empty again */
 #if DEBUG_RX
-                                printk(KERN_DEBUG "%s: eth_poll"
-                                       " napi_reschedule successed\n",
+                                printk(KERN_DEBUG "%s: eth_poll napi_reschedule succeeded\n",
                                        dev->name);
 #endif
                                 qmgr_disable_irq(rxq);
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 42edd7b7902f..8b4822ad27cb 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -859,7 +859,6 @@ static netdev_tx_t geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev,
         struct geneve_dev *geneve = netdev_priv(dev);
         struct geneve_sock *gs4;
         struct rtable *rt = NULL;
-        const struct iphdr *iip; /* interior IP header */
         int err = -EINVAL;
         struct flowi4 fl4;
         __u8 tos, ttl;
@@ -890,8 +889,6 @@ static netdev_tx_t geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev,
         sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
         skb_reset_mac_header(skb);
 
-        iip = ip_hdr(skb);
-
         if (info) {
                 const struct ip_tunnel_key *key = &info->key;
                 u8 *opts = NULL;
@@ -911,7 +908,7 @@ static netdev_tx_t geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev,
                 if (unlikely(err))
                         goto tx_error;
 
-                tos = ip_tunnel_ecn_encap(key->tos, iip, skb);
+                tos = ip_tunnel_ecn_encap(key->tos, ip_hdr(skb), skb);
                 ttl = key->ttl;
                 df = key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0;
         } else {
@@ -920,7 +917,7 @@ static netdev_tx_t geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev,
                 if (unlikely(err))
                         goto tx_error;
 
-                tos = ip_tunnel_ecn_encap(fl4.flowi4_tos, iip, skb);
+                tos = ip_tunnel_ecn_encap(fl4.flowi4_tos, ip_hdr(skb), skb);
                 ttl = geneve->ttl;
                 if (!ttl && IN_MULTICAST(ntohl(fl4.daddr)))
                         ttl = 1;
@@ -952,7 +949,6 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
 {
         struct geneve_dev *geneve = netdev_priv(dev);
         struct dst_entry *dst = NULL;
-        const struct iphdr *iip; /* interior IP header */
         struct geneve_sock *gs6;
         int err = -EINVAL;
         struct flowi6 fl6;
@@ -982,8 +978,6 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
         sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
         skb_reset_mac_header(skb);
 
-        iip = ip_hdr(skb);
-
         if (info) {
                 const struct ip_tunnel_key *key = &info->key;
                 u8 *opts = NULL;
@@ -1004,7 +998,7 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
                 if (unlikely(err))
                         goto tx_error;
 
-                prio = ip_tunnel_ecn_encap(key->tos, iip, skb);
+                prio = ip_tunnel_ecn_encap(key->tos, ip_hdr(skb), skb);
                 ttl = key->ttl;
                 label = info->key.label;
         } else {
@@ -1014,7 +1008,7 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
                         goto tx_error;
 
                 prio = ip_tunnel_ecn_encap(ip6_tclass(fl6.flowlabel),
-                                           iip, skb);
+                                           ip_hdr(skb), skb);
                 ttl = geneve->ttl;
                 if (!ttl && ipv6_addr_is_multicast(&fl6.daddr))
                         ttl = 1;
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index f6382150b16a..c9140c3aeb67 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -47,6 +47,10 @@
                                  NETIF_F_TSO | \
                                  NETIF_F_TSO6 | \
                                  NETIF_F_HW_CSUM)
+
+/* Restrict GSO size to account for NVGRE */
+#define NETVSC_GSO_MAX_SIZE     62768
+
 static int ring_size = 128;
 module_param(ring_size, int, S_IRUGO);
 MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)");
@@ -1400,6 +1404,7 @@ static int netvsc_probe(struct hv_device *dev,
         nvdev = net_device_ctx->nvdev;
         netif_set_real_num_tx_queues(net, nvdev->num_chn);
         netif_set_real_num_rx_queues(net, nvdev->num_chn);
+        netif_set_gso_max_size(net, NETVSC_GSO_MAX_SIZE);
 
         ret = register_netdev(net);
         if (ret != 0) {
diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c
index 9fa7ac9f8e68..f355df7cf84a 100644
--- a/drivers/net/ieee802154/adf7242.c
+++ b/drivers/net/ieee802154/adf7242.c
@@ -20,7 +20,6 @@
 #include <linux/skbuff.h>
 #include <linux/of.h>
 #include <linux/irq.h>
-#include <linux/delay.h>
 #include <linux/debugfs.h>
 #include <linux/bitops.h>
 #include <linux/ieee802154.h>
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index f442eb366863..dfbc4ef6d507 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -497,6 +497,7 @@ static int ipvlan_link_new(struct net *src_net, struct net_device *dev,
         struct net_device *phy_dev;
         int err;
         u16 mode = IPVLAN_MODE_L3;
+        bool create = false;
 
         if (!tb[IFLA_LINK])
                 return -EINVAL;
@@ -513,6 +514,7 @@ static int ipvlan_link_new(struct net *src_net, struct net_device *dev,
                 err = ipvlan_port_create(phy_dev);
                 if (err < 0)
                         return err;
+                create = true;
         }
 
         if (data && data[IFLA_IPVLAN_MODE])
@@ -536,22 +538,29 @@ static int ipvlan_link_new(struct net *src_net, struct net_device *dev,
 
         err = register_netdevice(dev);
         if (err < 0)
-                return err;
+                goto destroy_ipvlan_port;
 
         err = netdev_upper_dev_link(phy_dev, dev);
         if (err) {
-                unregister_netdevice(dev);
-                return err;
+                goto unregister_netdev;
         }
         err = ipvlan_set_port_mode(port, mode);
         if (err) {
-                unregister_netdevice(dev);
-                return err;
+                goto unlink_netdev;
         }
 
         list_add_tail_rcu(&ipvlan->pnode, &port->ipvlans);
         netif_stacked_transfer_operstate(phy_dev, dev);
         return 0;
+
+unlink_netdev:
+        netdev_upper_dev_unlink(phy_dev, dev);
+unregister_netdev:
+        unregister_netdevice(dev);
+destroy_ipvlan_port:
+        if (create)
+                ipvlan_port_destroy(phy_dev);
+        return err;
 }
 
 static void ipvlan_link_delete(struct net_device *dev, struct list_head *head)
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index a198946bc54f..8716b8c07feb 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1723,6 +1723,7 @@ static int irda_usb_probe(struct usb_interface *intf,
         /* Don't change this buffer size and allocation without doing
          * some heavy and complete testing. Don't ask why :-(
          * Jean II */
+        ret = -ENOMEM;
         self->speed_buff = kzalloc(IRDA_USB_SPEED_MTU, GFP_KERNEL);
         if (!self->speed_buff)
                 goto err_out_3;
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index 4e3d2e7c697c..e8c3a8c32534 100644
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -518,7 +518,9 @@ static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb,
                 
                 mtt = irda_get_mtt(skb);
                 pr_debug("%s(%ld), mtt=%d\n", __func__ , jiffies, mtt);
-                        if (mtt)
+                        if (mtt > 1000)
+                                mdelay(mtt/1000);
+                        else if (mtt)
                                 udelay(mtt);
 
                         /* Enable DMA interrupt */
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 3234fcdea317..26d6f0bbe14b 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -623,7 +623,8 @@ hash_add:
         return 0;
 
 clear_multi:
-        dev_set_allmulti(lowerdev, -1);
+        if (dev->flags & IFF_ALLMULTI)
+                dev_set_allmulti(lowerdev, -1);
 del_unicast:
         dev_uc_del(lowerdev, dev->dev_addr);
 out:
@@ -1278,6 +1279,7 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
         struct net_device *lowerdev;
         int err;
         int macmode;
+        bool create = false;
 
         if (!tb[IFLA_LINK])
                 return -EINVAL;
@@ -1304,12 +1306,18 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
                 err = macvlan_port_create(lowerdev);
                 if (err < 0)
                         return err;
+                create = true;
         }
         port = macvlan_port_get_rtnl(lowerdev);
 
         /* Only 1 macvlan device can be created in passthru mode */
-        if (port->passthru)
-                return -EINVAL;
+        if (port->passthru) {
+                /* The macvlan port must be not created this time,
+                 * still goto destroy_macvlan_port for readability.
+                 */
+                err = -EINVAL;
+                goto destroy_macvlan_port;
+        }
 
         vlan->lowerdev = lowerdev;
         vlan->dev      = dev;
@@ -1325,24 +1333,28 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
                 vlan->flags = nla_get_u16(data[IFLA_MACVLAN_FLAGS]);
 
         if (vlan->mode == MACVLAN_MODE_PASSTHRU) {
-                if (port->count)
-                        return -EINVAL;
+                if (port->count) {
+                        err = -EINVAL;
+                        goto destroy_macvlan_port;
+                }
                 port->passthru = true;
                 eth_hw_addr_inherit(dev, lowerdev);
         }
 
         if (data && data[IFLA_MACVLAN_MACADDR_MODE]) {
-                if (vlan->mode != MACVLAN_MODE_SOURCE)
-                        return -EINVAL;
+                if (vlan->mode != MACVLAN_MODE_SOURCE) {
+                        err = -EINVAL;
+                        goto destroy_macvlan_port;
+                }
                 macmode = nla_get_u32(data[IFLA_MACVLAN_MACADDR_MODE]);
                 err = macvlan_changelink_sources(vlan, macmode, data);
                 if (err)
-                        return err;
+                        goto destroy_macvlan_port;
         }
 
         err = register_netdevice(dev);
         if (err < 0)
-                return err;
+                goto destroy_macvlan_port;
 
         dev->priv_flags |= IFF_MACVLAN;
         err = netdev_upper_dev_link(lowerdev, dev);
@@ -1357,7 +1369,9 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
 
 unregister_netdev:
         unregister_netdevice(dev);
-
+destroy_macvlan_port:
+        if (create)
+                macvlan_port_destroy(port->dev);
         return err;
 }
 EXPORT_SYMBOL_GPL(macvlan_common_newlink);
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 070e3290aa6e..7869b0651576 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -491,7 +491,13 @@ static int macvtap_newlink(struct net *src_net,
         /* Don't put anything that may fail after macvlan_common_newlink
          * because we can't undo what it does.
          */
-        return macvlan_common_newlink(src_net, dev, tb, data);
+        err = macvlan_common_newlink(src_net, dev, tb, data);
+        if (err) {
+                netdev_rx_handler_unregister(dev);
+                return err;
+        }
+
+        return 0;
 }
 
 static void macvtap_dellink(struct net_device *dev,
@@ -736,13 +742,8 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
 
         if (zerocopy)
                 err = zerocopy_sg_from_iter(skb, from);
-        else {
+        else
                 err = skb_copy_datagram_from_iter(skb, 0, from, len);
-                if (!err && m && m->msg_control) {
-                        struct ubuf_info *uarg = m->msg_control;
-                        uarg->callback(uarg, false);
-                }
-        }
 
         if (err)
                 goto err_kfree;
@@ -773,7 +774,11 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
                 skb_shinfo(skb)->destructor_arg = m->msg_control;
                 skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY;
                 skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG;
+        } else if (m && m->msg_control) {
+                struct ubuf_info *uarg = m->msg_control;
+                uarg->callback(uarg, false);
         }
+
         if (vlan) {
                 skb->dev = vlan->dev;
                 dev_queue_xmit(skb);
diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
index c649c101bbab..eb5167210681 100644
--- a/drivers/net/phy/fixed_phy.c
+++ b/drivers/net/phy/fixed_phy.c
@@ -279,7 +279,7 @@ EXPORT_SYMBOL_GPL(fixed_phy_register);
 void fixed_phy_unregister(struct phy_device *phy)
 {
         phy_device_remove(phy);
-
+        of_node_put(phy->mdio.dev.of_node);
         fixed_phy_del(phy->mdio.addr);
 }
 EXPORT_SYMBOL_GPL(fixed_phy_unregister);
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 081df68d2ce1..ea92d524d5a8 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -318,12 +318,12 @@ static int ksz8041_config_init(struct phy_device *phydev)
         /* Limit supported and advertised modes in fiber mode */
         if (of_property_read_bool(of_node, "micrel,fiber-mode")) {
                 phydev->dev_flags |= MICREL_PHY_FXEN;
-                phydev->supported &= SUPPORTED_FIBRE |
-                                     SUPPORTED_100baseT_Full |
+                phydev->supported &= SUPPORTED_100baseT_Full |
                                      SUPPORTED_100baseT_Half;
-                phydev->advertising &= ADVERTISED_FIBRE |
-                                       ADVERTISED_100baseT_Full |
+                phydev->supported |= SUPPORTED_FIBRE;
+                phydev->advertising &= ADVERTISED_100baseT_Full |
                                        ADVERTISED_100baseT_Half;
+                phydev->advertising |= ADVERTISED_FIBRE;
                 phydev->autoneg = AUTONEG_DISABLE;
         }
 
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index e977ba931878..c4ceb082e970 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -723,6 +723,7 @@ struct phy_device *phy_connect(struct net_device *dev, const char *bus_id,
         phydev = to_phy_device(d);
 
         rc = phy_connect_direct(dev, phydev, handler, interface);
+        put_device(d);
         if (rc)
                 return ERR_PTR(rc);
 
@@ -856,11 +857,17 @@ EXPORT_SYMBOL(phy_attached_print);
 int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
                       u32 flags, phy_interface_t interface)
 {
+        struct module *ndev_owner = dev->dev.parent->driver->owner;
         struct mii_bus *bus = phydev->mdio.bus;
         struct device *d = &phydev->mdio.dev;
         int err;
 
-        if (!try_module_get(bus->owner)) {
+        /* For Ethernet device drivers that register their own MDIO bus, we
+         * will have bus->owner match ndev_mod, so we do not want to increment
+         * our own module->refcnt here, otherwise we would not be able to
+         * unload later on.
+         */
+        if (ndev_owner != bus->owner && !try_module_get(bus->owner)) {
                 dev_err(&dev->dev, "failed to get the bus module\n");
                 return -EIO;
         }
@@ -920,7 +927,8 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
 
 error:
         put_device(d);
-        module_put(bus->owner);
+        if (ndev_owner != bus->owner)
+                module_put(bus->owner);
         return err;
 }
 EXPORT_SYMBOL(phy_attach_direct);
@@ -953,6 +961,7 @@ struct phy_device *phy_attach(struct net_device *dev, const char *bus_id,
         phydev = to_phy_device(d);
 
         rc = phy_attach_direct(dev, phydev, phydev->dev_flags, interface);
+        put_device(d);
         if (rc)
                 return ERR_PTR(rc);
 
@@ -969,6 +978,8 @@ EXPORT_SYMBOL(phy_attach);
  */
 void phy_detach(struct phy_device *phydev)
 {
+        struct net_device *dev = phydev->attached_dev;
+        struct module *ndev_owner = dev->dev.parent->driver->owner;
         struct mii_bus *bus;
         int i;
 
@@ -996,7 +1007,8 @@ void phy_detach(struct phy_device *phydev)
         bus = phydev->mdio.bus;
 
         put_device(&phydev->mdio.dev);
-        module_put(bus->owner);
+        if (ndev_owner != bus->owner)
+                module_put(bus->owner);
 }
 EXPORT_SYMBOL(phy_detach);
 
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index aadd6e9f54ad..9cbe645e3d89 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -102,15 +102,19 @@ static int rtl8211f_config_init(struct phy_device *phydev)
         if (ret < 0)
                 return ret;
 
-        if (phydev->interface == PHY_INTERFACE_MODE_RGMII) {
-                /* enable TXDLY */
-                phy_write(phydev, RTL8211F_PAGE_SELECT, 0xd08);
-                reg = phy_read(phydev, 0x11);
+        phy_write(phydev, RTL8211F_PAGE_SELECT, 0xd08);
+        reg = phy_read(phydev, 0x11);
+
+        /* enable TX-delay for rgmii-id and rgmii-txid, otherwise disable it */
+        if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+            phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
                 reg |= RTL8211F_TX_DELAY;
-                phy_write(phydev, 0x11, reg);
-                /* restore to default page 0 */
-                phy_write(phydev, RTL8211F_PAGE_SELECT, 0x0);
-        }
+        else
+                reg &= ~RTL8211F_TX_DELAY;
+
+        phy_write(phydev, 0x11, reg);
+        /* restore to default page 0 */
+        phy_write(phydev, RTL8211F_PAGE_SELECT, 0x0);
 
         return 0;
 }
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 2e37eb337d48..24b4a09468dd 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -62,6 +62,10 @@
 /* Vitesse Extended Page Access Register */
 #define MII_VSC82X4_EXT_PAGE_ACCESS     0x1f
 
+/* Vitesse VSC8601 Extended PHY Control Register 1 */
+#define MII_VSC8601_EPHY_CTL            0x17
+#define MII_VSC8601_EPHY_CTL_RGMII_SKEW (1 << 8)
+
 #define PHY_ID_VSC8234                  0x000fc620
 #define PHY_ID_VSC8244                  0x000fc6c0
 #define PHY_ID_VSC8514                  0x00070670
@@ -111,6 +115,34 @@ static int vsc824x_config_init(struct phy_device *phydev)
         return err;
 }
 
+/* This adds a skew for both TX and RX clocks, so the skew should only be
+ * applied to "rgmii-id" interfaces. It may not work as expected
+ * on "rgmii-txid", "rgmii-rxid" or "rgmii" interfaces. */
+static int vsc8601_add_skew(struct phy_device *phydev)
+{
+        int ret;
+
+        ret = phy_read(phydev, MII_VSC8601_EPHY_CTL);
+        if (ret < 0)
+                return ret;
+
+        ret |= MII_VSC8601_EPHY_CTL_RGMII_SKEW;
+        return phy_write(phydev, MII_VSC8601_EPHY_CTL, ret);
+}
+
+static int vsc8601_config_init(struct phy_device *phydev)
+{
+        int ret = 0;
+
+        if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
+                ret = vsc8601_add_skew(phydev);
+
+        if (ret < 0)
+                return ret;
+
+        return genphy_config_init(phydev);
+}
+
 static int vsc824x_ack_interrupt(struct phy_device *phydev)
 {
         int err = 0;
@@ -275,7 +307,7 @@ static struct phy_driver vsc82xx_driver[] = {
         .phy_id_mask    = 0x000ffff0,
         .features       = PHY_GBIT_FEATURES,
         .flags          = PHY_HAS_INTERRUPT,
-        .config_init    = &genphy_config_init,
+        .config_init    = &vsc8601_config_init,
         .config_aneg    = &genphy_config_aneg,
         .read_status    = &genphy_read_status,
         .ack_interrupt  = &vsc824x_ack_interrupt,
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 8093e39ae263..db6acecabeaa 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1246,13 +1246,8 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
 
         if (zerocopy)
                 err = zerocopy_sg_from_iter(skb, from);
-        else {
+        else
                 err = skb_copy_datagram_from_iter(skb, 0, from, len);
-                if (!err && msg_control) {
-                        struct ubuf_info *uarg = msg_control;
-                        uarg->callback(uarg, false);
-                }
-        }
 
         if (err) {
                 this_cpu_inc(tun->pcpu_stats->rx_dropped);
@@ -1298,6 +1293,9 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
                 skb_shinfo(skb)->destructor_arg = msg_control;
                 skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY;
                 skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG;
+        } else if (msg_control) {
+                struct ubuf_info *uarg = msg_control;
+                uarg->callback(uarg, false);
         }
 
         skb_reset_network_header(skb);
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index cce24950a0ab..dc7b6392e75a 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -603,12 +603,12 @@ static void ax88772_suspend(struct usbnet *dev)
         u16 medium;
 
         /* Stop MAC operation */
-        medium = asix_read_medium_status(dev, 0);
+        medium = asix_read_medium_status(dev, 1);
         medium &= ~AX_MEDIUM_RE;
-        asix_write_medium_mode(dev, medium, 0);
+        asix_write_medium_mode(dev, medium, 1);
 
         netdev_dbg(dev->net, "ax88772_suspend: medium=0x%04x\n",
-                   asix_read_medium_status(dev, 0));
+                   asix_read_medium_status(dev, 1));
 
         /* Preserve BMCR for restoring */
         priv->presvd_phy_bmcr =
diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index e6338c16081a..8a6675d92b98 100644
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -1656,6 +1656,19 @@ static const struct driver_info ax88178a_info = {
         .tx_fixup = ax88179_tx_fixup,
 };
 
+static const struct driver_info cypress_GX3_info = {
+        .description = "Cypress GX3 SuperSpeed to Gigabit Ethernet Controller",
+        .bind = ax88179_bind,
+        .unbind = ax88179_unbind,
+        .status = ax88179_status,
+        .link_reset = ax88179_link_reset,
+        .reset = ax88179_reset,
+        .stop = ax88179_stop,
+        .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+        .rx_fixup = ax88179_rx_fixup,
+        .tx_fixup = ax88179_tx_fixup,
+};
+
 static const struct driver_info dlink_dub1312_info = {
         .description = "D-Link DUB-1312 USB 3.0 to Gigabit Ethernet Adapter",
         .bind = ax88179_bind,
@@ -1718,6 +1731,10 @@ static const struct usb_device_id products[] = {
         USB_DEVICE(0x0b95, 0x178a),
         .driver_info = (unsigned long)&ax88178a_info,
 }, {
+        /* Cypress GX3 SuperSpeed to Gigabit Ethernet Bridge Controller */
+        USB_DEVICE(0x04b4, 0x3610),
+        .driver_info = (unsigned long)&cypress_GX3_info,
+}, {
         /* D-Link DUB-1312 USB 3.0 to Gigabit Ethernet Adapter */
         USB_DEVICE(0x2001, 0x4a00),
         .driver_info = (unsigned long)&dlink_dub1312_info,
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index c47ec0a04c8e..dd623f674487 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -388,12 +388,6 @@ void usbnet_cdc_status(struct usbnet *dev, struct urb *urb)
         case USB_CDC_NOTIFY_NETWORK_CONNECTION:
                 netif_dbg(dev, timer, dev->net, "CDC: carrier %s\n",
                           event->wValue ? "on" : "off");
-
-                /* Work-around for devices with broken off-notifications */
-                if (event->wValue &&
-                    !test_bit(__LINK_STATE_NOCARRIER, &dev->net->state))
-                        usbnet_link_change(dev, 0, 0);
-
                 usbnet_link_change(dev, !!event->wValue, 0);
                 break;
         case USB_CDC_NOTIFY_SPEED_CHANGE:       /* tx/rx rates */
@@ -466,6 +460,36 @@ static int usbnet_cdc_zte_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
         return 1;
 }
 
+/* Ensure correct link state
+ *
+ * Some devices (ZTE MF823/831/910) export two carrier on notifications when
+ * connected. This causes the link state to be incorrect. Work around this by
+ * always setting the state to off, then on.
+ */
+void usbnet_cdc_zte_status(struct usbnet *dev, struct urb *urb)
+{
+        struct usb_cdc_notification *event;
+
+        if (urb->actual_length < sizeof(*event))
+                return;
+
+        event = urb->transfer_buffer;
+
+        if (event->bNotificationType != USB_CDC_NOTIFY_NETWORK_CONNECTION) {
+                usbnet_cdc_status(dev, urb);
+                return;
+        }
+
+        netif_dbg(dev, timer, dev->net, "CDC: carrier %s\n",
+                  event->wValue ? "on" : "off");
+
+        if (event->wValue &&
+            netif_carrier_ok(dev->net))
+                netif_carrier_off(dev->net);
+
+        usbnet_link_change(dev, !!event->wValue, 0);
+}
+
 static const struct driver_info cdc_info = {
         .description =  "CDC Ethernet Device",
         .flags =        FLAG_ETHER | FLAG_POINTTOPOINT,
@@ -481,7 +505,7 @@ static const struct driver_info	zte_cdc_info = {
         .flags =        FLAG_ETHER | FLAG_POINTTOPOINT,
         .bind =         usbnet_cdc_zte_bind,
         .unbind =       usbnet_cdc_unbind,
-        .status =       usbnet_cdc_status,
+        .status =       usbnet_cdc_zte_status,
         .set_rx_mode =  usbnet_cdc_update_filter,
         .manage_power = usbnet_manage_power,
         .rx_fixup = usbnet_cdc_zte_rx_fixup,
diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c
index 96a5028621c8..3a98f3762a4c 100644
--- a/drivers/net/usb/cdc_mbim.c
+++ b/drivers/net/usb/cdc_mbim.c
@@ -602,6 +602,21 @@ static const struct driver_info cdc_mbim_info_ndp_to_end = {
         .data = CDC_NCM_FLAG_NDP_TO_END,
 };
 
+/* Some modems (e.g. Telit LE922A6) do not work properly with altsetting
+ * toggle done in cdc_ncm_bind_common. CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE
+ * flag is used to avoid this procedure.
+ */
+static const struct driver_info cdc_mbim_info_avoid_altsetting_toggle = {
+        .description = "CDC MBIM",
+        .flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN,
+        .bind = cdc_mbim_bind,
+        .unbind = cdc_mbim_unbind,
+        .manage_power = cdc_mbim_manage_power,
+        .rx_fixup = cdc_mbim_rx_fixup,
+        .tx_fixup = cdc_mbim_tx_fixup,
+        .data = CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE,
+};
+
 static const struct usb_device_id mbim_devs[] = {
         /* This duplicate NCM entry is intentional. MBIM devices can
          * be disguised as NCM by default, and this is necessary to
@@ -626,6 +641,12 @@ static const struct usb_device_id mbim_devs[] = {
         { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
           .driver_info = (unsigned long)&cdc_mbim_info_ndp_to_end,
         },
+
+        /* Telit LE922A6 in MBIM composition */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x1bc7, 0x1041, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
+          .driver_info = (unsigned long)&cdc_mbim_info_avoid_altsetting_toggle,
+        },
+
         /* default entry */
         { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
           .driver_info = (unsigned long)&cdc_mbim_info_zlp,
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 877c9516e781..afbfc0f656f3 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -839,11 +839,18 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
 
         iface_no = ctx->data->cur_altsetting->desc.bInterfaceNumber;
 
+        /* Device-specific flags */
+        ctx->drvflags = drvflags;
+
         /* Reset data interface. Some devices will not reset properly
          * unless they are configured first.  Toggle the altsetting to
-         * force a reset
+         * force a reset.
+         * Some other devices do not work properly with this procedure
+         * that can be avoided using quirk CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE
          */
-        usb_set_interface(dev->udev, iface_no, data_altsetting);
+        if (!(ctx->drvflags & CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE))
+                usb_set_interface(dev->udev, iface_no, data_altsetting);
+
         temp = usb_set_interface(dev->udev, iface_no, 0);
         if (temp) {
                 dev_dbg(&intf->dev, "set interface failed\n");
@@ -890,9 +897,6 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
         /* finish setting up the device specific data */
         cdc_ncm_setup(dev);
 
-        /* Device-specific flags */
-        ctx->drvflags = drvflags;
-
         /* Allocate the delayed NDP if needed. */
         if (ctx->drvflags & CDC_NCM_FLAG_NDP_TO_END) {
                 ctx->delayed_ndp16 = kzalloc(ctx->max_ndp_size, GFP_KERNEL);
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index db558b8b32fe..f33460cec79f 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -3395,6 +3395,7 @@ static int lan78xx_probe(struct usb_interface *intf,
         if (buf) {
                 dev->urb_intr = usb_alloc_urb(0, GFP_KERNEL);
                 if (!dev->urb_intr) {
+                        ret = -ENOMEM;
                         kfree(buf);
                         goto out3;
                 } else {
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 3ff76c6db4f6..6fe1cdb0174f 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -894,6 +894,7 @@ static const struct usb_device_id products[] = {
         {QMI_FIXED_INTF(0x1bbb, 0x0203, 2)},    /* Alcatel L800MA */
         {QMI_FIXED_INTF(0x2357, 0x0201, 4)},    /* TP-LINK HSUPA Modem MA180 */
         {QMI_FIXED_INTF(0x2357, 0x9000, 4)},    /* TP-LINK MA260 */
+        {QMI_QUIRK_SET_DTR(0x1bc7, 0x1040, 2)}, /* Telit LE922A */
         {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)},    /* Telit LE920 */
         {QMI_FIXED_INTF(0x1bc7, 0x1201, 2)},    /* Telit LE920 */
         {QMI_FIXED_INTF(0x1c9e, 0x9b01, 3)},    /* XS Stick W100-2 from 4G Systems */
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 44d439f50961..efb84f092492 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -1730,7 +1730,7 @@ static u8 r8152_rx_csum(struct r8152 *tp, struct rx_desc *rx_desc)
         u8 checksum = CHECKSUM_NONE;
         u32 opts2, opts3;
 
-        if (tp->version == RTL_VER_01)
+        if (tp->version == RTL_VER_01 || tp->version == RTL_VER_02)
                 goto return_result;
 
         opts2 = le32_to_cpu(rx_desc->opts2);
@@ -1745,7 +1745,7 @@ static u8 r8152_rx_csum(struct r8152 *tp, struct rx_desc *rx_desc)
                         checksum = CHECKSUM_NONE;
                 else
                         checksum = CHECKSUM_UNNECESSARY;
-        } else if (RD_IPV6_CS) {
+        } else if (opts2 & RD_IPV6_CS) {
                 if ((opts2 & RD_UDP_CS) && !(opts3 & UDPF))
                         checksum = CHECKSUM_UNNECESSARY;
                 else if ((opts2 & RD_TCP_CS) && !(opts3 & TCPF))
@@ -3266,10 +3266,8 @@ static int rtl8152_open(struct net_device *netdev)
                 goto out;
 
         res = usb_autopm_get_interface(tp->intf);
-        if (res < 0) {
-                free_all_mem(tp);
-                goto out;
-        }
+        if (res < 0)
+                goto out_free;
 
         mutex_lock(&tp->control);
 
@@ -3285,10 +3283,9 @@ static int rtl8152_open(struct net_device *netdev)
                         netif_device_detach(tp->netdev);
                 netif_warn(tp, ifup, netdev, "intr_urb submit failed: %d\n",
                            res);
-                free_all_mem(tp);
-        } else {
-                napi_enable(&tp->napi);
+                goto out_unlock;
         }
+        napi_enable(&tp->napi);
 
         mutex_unlock(&tp->control);
 
@@ -3297,7 +3294,13 @@ static int rtl8152_open(struct net_device *netdev)
         tp->pm_notifier.notifier_call = rtl_notifier;
         register_pm_notifier(&tp->pm_notifier);
 #endif
+        return 0;
 
+out_unlock:
+        mutex_unlock(&tp->control);
+        usb_autopm_put_interface(tp->intf);
+out_free:
+        free_all_mem(tp);
 out:
         return res;
 }
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index fad84f3f4109..cbf1c613c67a 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -969,12 +969,17 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p)
         struct virtnet_info *vi = netdev_priv(dev);
         struct virtio_device *vdev = vi->vdev;
         int ret;
-        struct sockaddr *addr = p;
+        struct sockaddr *addr;
         struct scatterlist sg;
 
-        ret = eth_prepare_mac_addr_change(dev, p);
+        addr = kmalloc(sizeof(*addr), GFP_KERNEL);
+        if (!addr)
+                return -ENOMEM;
+        memcpy(addr, p, sizeof(*addr));
+
+        ret = eth_prepare_mac_addr_change(dev, addr);
         if (ret)
-                return ret;
+                goto out;
 
         if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_MAC_ADDR)) {
                 sg_init_one(&sg, addr->sa_data, dev->addr_len);
@@ -982,7 +987,8 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p)
                                           VIRTIO_NET_CTRL_MAC_ADDR_SET, &sg)) {
                         dev_warn(&vdev->dev,
                                  "Failed to set mac address by vq command.\n");
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto out;
                 }
         } else if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC) &&
                    !virtio_has_feature(vdev, VIRTIO_F_VERSION_1)) {
@@ -996,8 +1002,11 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p)
         }
 
         eth_commit_mac_addr_change(dev, p);
+        ret = 0;
 
-        return 0;
+out:
+        kfree(addr);
+        return ret;
 }
 
 static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev,
@@ -1497,6 +1506,11 @@ static void virtnet_free_queues(struct virtnet_info *vi)
                 netif_napi_del(&vi->rq[i].napi);
         }
 
+        /* We called napi_hash_del() before netif_napi_del(),
+         * we need to respect an RCU grace period before freeing vi->rq
+         */
+        synchronize_net();
+
         kfree(vi->rq);
         kfree(vi->sq);
 }
@@ -2038,23 +2052,33 @@ static struct virtio_device_id id_table[] = {
         { 0 },
 };
 
+#define VIRTNET_FEATURES \
+        VIRTIO_NET_F_CSUM, VIRTIO_NET_F_GUEST_CSUM, \
+        VIRTIO_NET_F_MAC, \
+        VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_HOST_TSO6, \
+        VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6, \
+        VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_UFO, \
+        VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ, \
+        VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN, \
+        VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, \
+        VIRTIO_NET_F_CTRL_MAC_ADDR, \
+        VIRTIO_NET_F_MTU
+
 static unsigned int features[] = {
-        VIRTIO_NET_F_CSUM, VIRTIO_NET_F_GUEST_CSUM,
-        VIRTIO_NET_F_GSO, VIRTIO_NET_F_MAC,
-        VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_HOST_TSO6,
-        VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6,
-        VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_UFO,
-        VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ,
-        VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN,
-        VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ,
-        VIRTIO_NET_F_CTRL_MAC_ADDR,
+        VIRTNET_FEATURES,
+};
+
+static unsigned int features_legacy[] = {
+        VIRTNET_FEATURES,
+        VIRTIO_NET_F_GSO,
         VIRTIO_F_ANY_LAYOUT,
-        VIRTIO_NET_F_MTU,
 };
 
 static struct virtio_driver virtio_net_driver = {
         .feature_table = features,
         .feature_table_size = ARRAY_SIZE(features),
+        .feature_table_legacy = features_legacy,
+        .feature_table_size_legacy = ARRAY_SIZE(features_legacy),
         .driver.name =  KBUILD_MODNAME,
         .driver.owner = THIS_MODULE,
         .id_table =     id_table,
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index f3c2fa3ab0d5..2ba01ca02c9c 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -611,6 +611,7 @@ static int vxlan_fdb_create(struct vxlan_dev *vxlan,
         struct vxlan_rdst *rd = NULL;
         struct vxlan_fdb *f;
         int notify = 0;
+        int rc;
 
         f = __vxlan_find_mac(vxlan, mac);
         if (f) {
@@ -641,8 +642,7 @@ static int vxlan_fdb_create(struct vxlan_dev *vxlan,
                 if ((flags & NLM_F_APPEND) &&
                     (is_multicast_ether_addr(f->eth_addr) ||
                      is_zero_ether_addr(f->eth_addr))) {
-                        int rc = vxlan_fdb_append(f, ip, port, vni, ifindex,
-                                                  &rd);
+                        rc = vxlan_fdb_append(f, ip, port, vni, ifindex, &rd);
 
                         if (rc < 0)
                                 return rc;
@@ -673,7 +673,11 @@ static int vxlan_fdb_create(struct vxlan_dev *vxlan,
                 INIT_LIST_HEAD(&f->remotes);
                 memcpy(f->eth_addr, mac, ETH_ALEN);
 
-                vxlan_fdb_append(f, ip, port, vni, ifindex, &rd);
+                rc = vxlan_fdb_append(f, ip, port, vni, ifindex, &rd);
+                if (rc < 0) {
+                        kfree(f);
+                        return rc;
+                }
 
                 ++vxlan->addrcnt;
                 hlist_add_head_rcu(&f->hlist,
@@ -944,7 +948,9 @@ static bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev)
 {
         struct vxlan_dev *vxlan;
         struct vxlan_sock *sock4;
-        struct vxlan_sock *sock6 = NULL;
+#if IS_ENABLED(CONFIG_IPV6)
+        struct vxlan_sock *sock6;
+#endif
         unsigned short family = dev->default_dst.remote_ip.sa.sa_family;
 
         sock4 = rtnl_dereference(dev->vn4_sock);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index b777e1b2f87a..78d9966a3957 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -4516,7 +4516,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
         /* store current 11d setting */
         if (brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_REGULATORY,
                                   &ifp->vif->is_11d)) {
-                supports_11d = false;
+                is_11d = supports_11d = false;
         } else {
                 country_ie = brcmf_parse_tlvs((u8 *)settings->beacon.tail,
                                               settings->beacon.tail_len,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index 4fdc3dad3e85..b88e2048ae0b 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -1087,6 +1087,15 @@ iwl_mvm_netdetect_config(struct iwl_mvm *mvm,
                 ret = iwl_mvm_switch_to_d3(mvm);
                 if (ret)
                         return ret;
+        } else {
+                /* In theory, we wouldn't have to stop a running sched
+                 * scan in order to start another one (for
+                 * net-detect).  But in practice this doesn't seem to
+                 * work properly, so stop any running sched_scan now.
+                 */
+                ret = iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_SCHED, true);
+                if (ret)
+                        return ret;
         }
 
         /* rfkill release can be either for wowlan or netdetect */
@@ -1254,7 +1263,10 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw,
  out:
         if (ret < 0) {
                 iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);
-                ieee80211_restart_hw(mvm->hw);
+                if (mvm->restart_fw > 0) {
+                        mvm->restart_fw--;
+                        ieee80211_restart_hw(mvm->hw);
+                }
                 iwl_mvm_free_nd(mvm);
         }
  out_noreset:
@@ -2088,6 +2100,16 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test)
         iwl_mvm_update_changed_regdom(mvm);
 
         if (mvm->net_detect) {
+                /* If this is a non-unified image, we restart the FW,
+                 * so no need to stop the netdetect scan.  If that
+                 * fails, continue and try to get the wake-up reasons,
+                 * but trigger a HW restart by keeping a failure code
+                 * in ret.
+                 */
+                if (unified_image)
+                        ret = iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_NETDETECT,
+                                                false);
+
                 iwl_mvm_query_netdetect_reasons(mvm, vif);
                 /* has unlocked the mutex, so skip that */
                 goto out;
@@ -2271,7 +2293,8 @@ static void iwl_mvm_d3_test_disconn_work_iter(void *_data, u8 *mac,
 static int iwl_mvm_d3_test_release(struct inode *inode, struct file *file)
 {
         struct iwl_mvm *mvm = inode->i_private;
-        int remaining_time = 10;
+        bool unified_image = fw_has_capa(&mvm->fw->ucode_capa,
+                                         IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);
 
         mvm->d3_test_active = false;
 
@@ -2282,17 +2305,21 @@ static int iwl_mvm_d3_test_release(struct inode *inode, struct file *file)
         mvm->trans->system_pm_mode = IWL_PLAT_PM_MODE_DISABLED;
 
         iwl_abort_notification_waits(&mvm->notif_wait);
-        ieee80211_restart_hw(mvm->hw);
+        if (!unified_image) {
+                int remaining_time = 10;
 
-        /* wait for restart and disconnect all interfaces */
-        while (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status) &&
-               remaining_time > 0) {
-                remaining_time--;
-                msleep(1000);
-        }
+                ieee80211_restart_hw(mvm->hw);
+
+                /* wait for restart and disconnect all interfaces */
+                while (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status) &&
+                       remaining_time > 0) {
+                        remaining_time--;
+                        msleep(1000);
+                }
 
-        if (remaining_time == 0)
-                IWL_ERR(mvm, "Timed out waiting for HW restart to finish!\n");
+                if (remaining_time == 0)
+                        IWL_ERR(mvm, "Timed out waiting for HW restart!\n");
+        }
 
         ieee80211_iterate_active_interfaces_atomic(
                 mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
index 07da4efe8458..7b7d2a146e30 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
@@ -1529,8 +1529,8 @@ static ssize_t iwl_dbgfs_mem_read(struct file *file, char __user *user_buf,
                 .data = { &cmd, },
                 .len = { sizeof(cmd) },
         };
-        size_t delta, len;
-        ssize_t ret;
+        size_t delta;
+        ssize_t ret, len;
 
         hcmd.id = iwl_cmd_id(*ppos >> 24 ? UMAC_RD_WR : LMAC_RD_WR,
                              DEBUG_GROUP, 0);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 318efd814037..1db1dc13e988 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -4121,7 +4121,6 @@ void iwl_mvm_sync_rx_queues_internal(struct iwl_mvm *mvm,
                                      struct iwl_mvm_internal_rxq_notif *notif,
                                      u32 size)
 {
-        DECLARE_WAIT_QUEUE_HEAD_ONSTACK(notif_waitq);
         u32 qmask = BIT(mvm->trans->num_rx_queues) - 1;
         int ret;
 
@@ -4143,7 +4142,7 @@ void iwl_mvm_sync_rx_queues_internal(struct iwl_mvm *mvm,
         }
 
         if (notif->sync)
-                ret = wait_event_timeout(notif_waitq,
+                ret = wait_event_timeout(mvm->rx_sync_waitq,
                                          atomic_read(&mvm->queue_sync_counter) == 0,
                                          HZ);
         WARN_ON_ONCE(!ret);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index d17cbf603f7c..c60703e0c246 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -937,6 +937,7 @@ struct iwl_mvm {
         /* sync d0i3_tx queue and IWL_MVM_STATUS_IN_D0I3 status flag */
         spinlock_t d0i3_tx_lock;
         wait_queue_head_t d0i3_exit_waitq;
+        wait_queue_head_t rx_sync_waitq;
 
         /* BT-Coex */
         struct iwl_bt_coex_profile_notif last_bt_notif;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 05fe6dd1a2c8..4d35deb628bc 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -619,6 +619,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         spin_lock_init(&mvm->refs_lock);
         skb_queue_head_init(&mvm->d0i3_tx);
         init_waitqueue_head(&mvm->d0i3_exit_waitq);
+        init_waitqueue_head(&mvm->rx_sync_waitq);
 
         atomic_set(&mvm->queue_sync_counter, 0);
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index a57c6ef5bc14..6c802cee900c 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -547,7 +547,8 @@ void iwl_mvm_rx_queue_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
                                   "Received expired RX queue sync message\n");
                         return;
                 }
-                atomic_dec(&mvm->queue_sync_counter);
+                if (!atomic_dec_return(&mvm->queue_sync_counter))
+                        wake_up(&mvm->rx_sync_waitq);
         }
 
         switch (internal_notif->type) {
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index f279fdd6eb44..fa9743205491 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -1199,6 +1199,9 @@ static int iwl_mvm_num_scans(struct iwl_mvm *mvm)
 
 static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type)
 {
+        bool unified_image = fw_has_capa(&mvm->fw->ucode_capa,
+                                         IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);
+
         /* This looks a bit arbitrary, but the idea is that if we run
          * out of possible simultaneous scans and the userspace is
          * trying to run a scan type that is already running, we
@@ -1225,12 +1228,30 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type)
                         return -EBUSY;
                 return iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true);
         case IWL_MVM_SCAN_NETDETECT:
-                /* No need to stop anything for net-detect since the
-                 * firmware is restarted anyway.  This way, any sched
-                 * scans that were running will be restarted when we
-                 * resume.
-                */
-                return 0;
+                /* For non-unified images, there's no need to stop
+                 * anything for net-detect since the firmware is
+                 * restarted anyway.  This way, any sched scans that
+                 * were running will be restarted when we resume.
+                 */
+                if (!unified_image)
+                        return 0;
+
+                /* If this is a unified image and we ran out of scans,
+                 * we need to stop something.  Prefer stopping regular
+                 * scans, because the results are useless at this
+                 * point, and we should be able to keep running
+                 * another scheduled scan while suspended.
+                 */
+                if (mvm->scan_status & IWL_MVM_SCAN_REGULAR_MASK)
+                        return iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_REGULAR,
+                                                 true);
+                if (mvm->scan_status & IWL_MVM_SCAN_SCHED_MASK)
+                        return iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_SCHED,
+                                                 true);
+
+                /* fall through, something is wrong if no scan was
+                 * running but we ran out of scans.
+                 */
         default:
                 WARN_ON(1);
                 break;
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 001be406a3d3..2f8134b2a504 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -541,48 +541,64 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
 MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
 
 #ifdef CONFIG_ACPI
-#define SPL_METHOD              "SPLC"
-#define SPL_DOMAINTYPE_MODULE   BIT(0)
-#define SPL_DOMAINTYPE_WIFI     BIT(1)
-#define SPL_DOMAINTYPE_WIGIG    BIT(2)
-#define SPL_DOMAINTYPE_RFEM     BIT(3)
+#define ACPI_SPLC_METHOD        "SPLC"
+#define ACPI_SPLC_DOMAIN_WIFI   (0x07)
 
-static u64 splx_get_pwr_limit(struct iwl_trans *trans, union acpi_object *splx)
+static u64 splc_get_pwr_limit(struct iwl_trans *trans, union acpi_object *splc)
 {
-        union acpi_object *limits, *domain_type, *power_limit;
-
-        if (splx->type != ACPI_TYPE_PACKAGE ||
-            splx->package.count != 2 ||
-            splx->package.elements[0].type != ACPI_TYPE_INTEGER ||
-            splx->package.elements[0].integer.value != 0) {
-                IWL_ERR(trans, "Unsupported splx structure\n");
+        union acpi_object *data_pkg, *dflt_pwr_limit;
+        int i;
+
+        /* We need at least two elements, one for the revision and one
+         * for the data itself.  Also check that the revision is
+         * supported (currently only revision 0).
+        */
+        if (splc->type != ACPI_TYPE_PACKAGE ||
+            splc->package.count < 2 ||
+            splc->package.elements[0].type != ACPI_TYPE_INTEGER ||
+            splc->package.elements[0].integer.value != 0) {
+                IWL_DEBUG_INFO(trans,
+                               "Unsupported structure returned by the SPLC method.  Ignoring.\n");
                 return 0;
         }
 
-        limits = &splx->package.elements[1];
-        if (limits->type != ACPI_TYPE_PACKAGE ||
-            limits->package.count < 2 ||
-            limits->package.elements[0].type != ACPI_TYPE_INTEGER ||
-            limits->package.elements[1].type != ACPI_TYPE_INTEGER) {
-                IWL_ERR(trans, "Invalid limits element\n");
-                return 0;
+        /* loop through all the packages to find the one for WiFi */
+        for (i = 1; i < splc->package.count; i++) {
+                union acpi_object *domain;
+
+                data_pkg = &splc->package.elements[i];
+
+                /* Skip anything that is not a package with the right
+                 * amount of elements (i.e. at least 2 integers).
+                 */
+                if (data_pkg->type != ACPI_TYPE_PACKAGE ||
+                    data_pkg->package.count < 2 ||
+                    data_pkg->package.elements[0].type != ACPI_TYPE_INTEGER ||
+                    data_pkg->package.elements[1].type != ACPI_TYPE_INTEGER)
+                        continue;
+
+                domain = &data_pkg->package.elements[0];
+                if (domain->integer.value == ACPI_SPLC_DOMAIN_WIFI)
+                        break;
+
+                data_pkg = NULL;
         }
 
-        domain_type = &limits->package.elements[0];
-        power_limit = &limits->package.elements[1];
-        if (!(domain_type->integer.value & SPL_DOMAINTYPE_WIFI)) {
-                IWL_DEBUG_INFO(trans, "WiFi power is not limited\n");
+        if (!data_pkg) {
+                IWL_DEBUG_INFO(trans,
+                               "No element for the WiFi domain returned by the SPLC method.\n");
                 return 0;
         }
 
-        return power_limit->integer.value;
+        dflt_pwr_limit = &data_pkg->package.elements[1];
+        return dflt_pwr_limit->integer.value;
 }
 
 static void set_dflt_pwr_limit(struct iwl_trans *trans, struct pci_dev *pdev)
 {
         acpi_handle pxsx_handle;
         acpi_handle handle;
-        struct acpi_buffer splx = {ACPI_ALLOCATE_BUFFER, NULL};
+        struct acpi_buffer splc = {ACPI_ALLOCATE_BUFFER, NULL};
         acpi_status status;
 
         pxsx_handle = ACPI_HANDLE(&pdev->dev);
@@ -593,23 +609,24 @@ static void set_dflt_pwr_limit(struct iwl_trans *trans, struct pci_dev *pdev)
         }
 
         /* Get the method's handle */
-        status = acpi_get_handle(pxsx_handle, (acpi_string)SPL_METHOD, &handle);
+        status = acpi_get_handle(pxsx_handle, (acpi_string)ACPI_SPLC_METHOD,
+                                 &handle);
         if (ACPI_FAILURE(status)) {
-                IWL_DEBUG_INFO(trans, "SPL method not found\n");
+                IWL_DEBUG_INFO(trans, "SPLC method not found\n");
                 return;
         }
 
         /* Call SPLC with no arguments */
-        status = acpi_evaluate_object(handle, NULL, NULL, &splx);
+        status = acpi_evaluate_object(handle, NULL, NULL, &splc);
         if (ACPI_FAILURE(status)) {
                 IWL_ERR(trans, "SPLC invocation failed (0x%x)\n", status);
                 return;
         }
 
-        trans->dflt_pwr_limit = splx_get_pwr_limit(trans, splx.pointer);
+        trans->dflt_pwr_limit = splc_get_pwr_limit(trans, splc.pointer);
         IWL_DEBUG_INFO(trans, "Default power limit set to %lld\n",
                        trans->dflt_pwr_limit);
-        kfree(splx.pointer);
+        kfree(splc.pointer);
 }
 
 #else /* CONFIG_ACPI */
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
index e9a278b60dfd..5f840f16f40b 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
@@ -592,6 +592,7 @@ error:
 static int iwl_pcie_txq_init(struct iwl_trans *trans, struct iwl_txq *txq,
                               int slots_num, u32 txq_id)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int ret;
 
         txq->need_update = false;
@@ -606,6 +607,13 @@ static int iwl_pcie_txq_init(struct iwl_trans *trans, struct iwl_txq *txq,
                 return ret;
 
         spin_lock_init(&txq->lock);
+
+        if (txq_id == trans_pcie->cmd_queue) {
+                static struct lock_class_key iwl_pcie_cmd_queue_lock_class;
+
+                lockdep_set_class(&txq->lock, &iwl_pcie_cmd_queue_lock_class);
+        }
+
         __skb_queue_head_init(&txq->overflow_q);
 
         /*
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 431f13b4faf6..d3bad5779376 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -826,7 +826,7 @@ static void mac80211_hwsim_set_tsf(struct ieee80211_hw *hw,
                 data->bcn_delta = do_div(delta, bcn_int);
         } else {
                 data->tsf_offset -= delta;
-                data->bcn_delta = -do_div(delta, bcn_int);
+                data->bcn_delta = -(s64)do_div(delta, bcn_int);
         }
 }
 
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 39ce76ad00bc..16241d21727b 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -2222,8 +2222,9 @@ done:
                         is_scanning_required = 1;
                 } else {
                         mwifiex_dbg(priv->adapter, MSG,
-                                    "info: trying to associate to '%s' bssid %pM\n",
-                                    (char *)req_ssid.ssid, bss->bssid);
+                                    "info: trying to associate to '%.*s' bssid %pM\n",
+                                    req_ssid.ssid_len, (char *)req_ssid.ssid,
+                                    bss->bssid);
                         memcpy(&priv->cfg_bssid, bss->bssid, ETH_ALEN);
                         break;
                 }
@@ -2283,8 +2284,8 @@ mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
         }
 
         mwifiex_dbg(adapter, INFO,
-                    "info: Trying to associate to %s and bssid %pM\n",
-                    (char *)sme->ssid, sme->bssid);
+                    "info: Trying to associate to %.*s and bssid %pM\n",
+                    (int)sme->ssid_len, (char *)sme->ssid, sme->bssid);
 
         if (!mwifiex_stop_bg_scan(priv))
                 cfg80211_sched_scan_stopped_rtnl(priv->wdev.wiphy);
@@ -2417,8 +2418,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
         }
 
         mwifiex_dbg(priv->adapter, MSG,
-                    "info: trying to join to %s and bssid %pM\n",
-                    (char *)params->ssid, params->bssid);
+                    "info: trying to join to %.*s and bssid %pM\n",
+                    params->ssid_len, (char *)params->ssid, params->bssid);
 
         mwifiex_set_ibss_params(priv, params);
 
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index e17879dd5d5a..bf2744e1e3db 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -304,7 +304,7 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue)
                 queue->rx_skbs[id] = skb;
 
                 ref = gnttab_claim_grant_reference(&queue->gref_rx_head);
-                BUG_ON((signed short)ref < 0);
+                WARN_ON_ONCE(IS_ERR_VALUE((unsigned long)(int)ref));
                 queue->grant_rx_ref[id] = ref;
 
                 page = skb_frag_page(&skb_shinfo(skb)->frags[0]);
@@ -428,7 +428,7 @@ static void xennet_tx_setup_grant(unsigned long gfn, unsigned int offset,
         id = get_id_from_freelist(&queue->tx_skb_freelist, queue->tx_skbs);
         tx = RING_GET_REQUEST(&queue->tx, queue->tx.req_prod_pvt++);
         ref = gnttab_claim_grant_reference(&queue->gref_tx_head);
-        BUG_ON((signed short)ref < 0);
+        WARN_ON_ONCE(IS_ERR_VALUE((unsigned long)(int)ref));
 
         gnttab_grant_foreign_access_ref(ref, queue->info->xbdev->otherend_id,
                                         gfn, GNTMAP_readonly);
diff --git a/drivers/nfc/mei_phy.c b/drivers/nfc/mei_phy.c
index 83deda4bb4d6..6f9563a96488 100644
--- a/drivers/nfc/mei_phy.c
+++ b/drivers/nfc/mei_phy.c
@@ -133,7 +133,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy)
                 return -ENOMEM;
 
         bytes_recv = mei_cldev_recv(phy->cldev, (u8 *)reply, if_version_length);
-        if (bytes_recv < 0 || bytes_recv < sizeof(struct mei_nfc_reply)) {
+        if (bytes_recv < 0 || bytes_recv < if_version_length) {
                 pr_err("Could not read IF version\n");
                 r = -EIO;
                 goto err;
diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c
index 0d5c29ae51de..7310a261c858 100644
--- a/drivers/ntb/hw/intel/ntb_hw_intel.c
+++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
@@ -112,17 +112,17 @@ MODULE_PARM_DESC(xeon_b2b_usd_bar2_addr64,
 
 module_param_named(xeon_b2b_usd_bar4_addr64,
                    xeon_b2b_usd_addr.bar4_addr64, ullong, 0644);
-MODULE_PARM_DESC(xeon_b2b_usd_bar2_addr64,
+MODULE_PARM_DESC(xeon_b2b_usd_bar4_addr64,
                  "XEON B2B USD BAR 4 64-bit address");
 
 module_param_named(xeon_b2b_usd_bar4_addr32,
                    xeon_b2b_usd_addr.bar4_addr32, ullong, 0644);
-MODULE_PARM_DESC(xeon_b2b_usd_bar2_addr64,
+MODULE_PARM_DESC(xeon_b2b_usd_bar4_addr32,
                  "XEON B2B USD split-BAR 4 32-bit address");
 
 module_param_named(xeon_b2b_usd_bar5_addr32,
                    xeon_b2b_usd_addr.bar5_addr32, ullong, 0644);
-MODULE_PARM_DESC(xeon_b2b_usd_bar2_addr64,
+MODULE_PARM_DESC(xeon_b2b_usd_bar5_addr32,
                  "XEON B2B USD split-BAR 5 32-bit address");
 
 module_param_named(xeon_b2b_dsd_bar2_addr64,
@@ -132,17 +132,17 @@ MODULE_PARM_DESC(xeon_b2b_dsd_bar2_addr64,
 
 module_param_named(xeon_b2b_dsd_bar4_addr64,
                    xeon_b2b_dsd_addr.bar4_addr64, ullong, 0644);
-MODULE_PARM_DESC(xeon_b2b_dsd_bar2_addr64,
+MODULE_PARM_DESC(xeon_b2b_dsd_bar4_addr64,
                  "XEON B2B DSD BAR 4 64-bit address");
 
 module_param_named(xeon_b2b_dsd_bar4_addr32,
                    xeon_b2b_dsd_addr.bar4_addr32, ullong, 0644);
-MODULE_PARM_DESC(xeon_b2b_dsd_bar2_addr64,
+MODULE_PARM_DESC(xeon_b2b_dsd_bar4_addr32,
                  "XEON B2B DSD split-BAR 4 32-bit address");
 
 module_param_named(xeon_b2b_dsd_bar5_addr32,
                    xeon_b2b_dsd_addr.bar5_addr32, ullong, 0644);
-MODULE_PARM_DESC(xeon_b2b_dsd_bar2_addr64,
+MODULE_PARM_DESC(xeon_b2b_dsd_bar5_addr32,
                  "XEON B2B DSD split-BAR 5 32-bit address");
 
 #ifndef ioread64
@@ -1755,6 +1755,8 @@ static int xeon_setup_b2b_mw(struct intel_ntb_dev *ndev,
                                             XEON_B2B_MIN_SIZE);
                 if (!ndev->peer_mmio)
                         return -EIO;
+
+                ndev->peer_addr = pci_resource_start(pdev, b2b_bar);
         }
 
         return 0;
@@ -2019,6 +2021,7 @@ static int intel_ntb_init_pci(struct intel_ntb_dev *ndev, struct pci_dev *pdev)
                 goto err_mmio;
         }
         ndev->peer_mmio = ndev->self_mmio;
+        ndev->peer_addr = pci_resource_start(pdev, 0);
 
         return 0;
 
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c
index 8601c10acf74..4eb8adb34508 100644
--- a/drivers/ntb/ntb_transport.c
+++ b/drivers/ntb/ntb_transport.c
@@ -257,7 +257,7 @@ enum {
 #define NTB_QP_DEF_NUM_ENTRIES  100
 #define NTB_LINK_DOWN_TIMEOUT   10
 #define DMA_RETRIES             20
-#define DMA_OUT_RESOURCE_TO     50
+#define DMA_OUT_RESOURCE_TO     msecs_to_jiffies(50)
 
 static void ntb_transport_rxc_db(unsigned long data);
 static const struct ntb_ctx_ops ntb_transport_ops;
diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
index 6a50f20bf1cd..e75d4fdc0866 100644
--- a/drivers/ntb/test/ntb_perf.c
+++ b/drivers/ntb/test/ntb_perf.c
@@ -72,7 +72,7 @@
 #define MAX_THREADS             32
 #define MAX_TEST_SIZE           SZ_1M
 #define MAX_SRCS                32
-#define DMA_OUT_RESOURCE_TO     50
+#define DMA_OUT_RESOURCE_TO     msecs_to_jiffies(50)
 #define DMA_RETRIES             20
 #define SZ_4G                   (1ULL << 32)
 #define MAX_SEG_ORDER           20 /* no larger than 1M for kmalloc buffer */
@@ -589,7 +589,7 @@ static ssize_t debugfs_run_read(struct file *filp, char __user *ubuf,
                 return -ENOMEM;
 
         if (mutex_is_locked(&perf->run_mutex)) {
-                out_off = snprintf(buf, 64, "running\n");
+                out_off = scnprintf(buf, 64, "running\n");
                 goto read_from_buf;
         }
 
@@ -600,14 +600,14 @@ static ssize_t debugfs_run_read(struct file *filp, char __user *ubuf,
                         break;
 
                 if (pctx->status) {
-                        out_off += snprintf(buf + out_off, 1024 - out_off,
+                        out_off += scnprintf(buf + out_off, 1024 - out_off,
                                             "%d: error %d\n", i,
                                             pctx->status);
                         continue;
                 }
 
                 rate = div64_u64(pctx->copied, pctx->diff_us);
-                out_off += snprintf(buf + out_off, 1024 - out_off,
+                out_off += scnprintf(buf + out_off, 1024 - out_off,
                         "%d: copied %llu bytes in %llu usecs, %llu MBytes/s\n",
                         i, pctx->copied, pctx->diff_us, rate);
         }
diff --git a/drivers/ntb/test/ntb_pingpong.c b/drivers/ntb/test/ntb_pingpong.c
index 7d311799fca1..435861189d97 100644
--- a/drivers/ntb/test/ntb_pingpong.c
+++ b/drivers/ntb/test/ntb_pingpong.c
@@ -88,7 +88,7 @@ MODULE_PARM_DESC(delay_ms, "Milliseconds to delay the response to peer");
 
 static unsigned long db_init = 0x7;
 module_param(db_init, ulong, 0644);
-MODULE_PARM_DESC(delay_ms, "Initial doorbell bits to ring on the peer");
+MODULE_PARM_DESC(db_init, "Initial doorbell bits to ring on the peer");
 
 struct pp_ctx {
         struct ntb_dev                  *ntb;
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
index a8b6949a8778..23d4a1728cdf 100644
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -715,7 +715,7 @@ EXPORT_SYMBOL_GPL(nd_cmd_in_size);
 
 u32 nd_cmd_out_size(struct nvdimm *nvdimm, int cmd,
                 const struct nd_cmd_desc *desc, int idx, const u32 *in_field,
-                const u32 *out_field)
+                const u32 *out_field, unsigned long remainder)
 {
         if (idx >= desc->out_num)
                 return UINT_MAX;
@@ -727,9 +727,24 @@ u32 nd_cmd_out_size(struct nvdimm *nvdimm, int cmd,
                 return in_field[1];
         else if (nvdimm && cmd == ND_CMD_VENDOR && idx == 2)
                 return out_field[1];
-        else if (!nvdimm && cmd == ND_CMD_ARS_STATUS && idx == 2)
-                return out_field[1] - 8;
-        else if (cmd == ND_CMD_CALL) {
+        else if (!nvdimm && cmd == ND_CMD_ARS_STATUS && idx == 2) {
+                /*
+                 * Per table 9-276 ARS Data in ACPI 6.1, out_field[1] is
+                 * "Size of Output Buffer in bytes, including this
+                 * field."
+                 */
+                if (out_field[1] < 4)
+                        return 0;
+                /*
+                 * ACPI 6.1 is ambiguous if 'status' is included in the
+                 * output size. If we encounter an output size that
+                 * overshoots the remainder by 4 bytes, assume it was
+                 * including 'status'.
+                 */
+                if (out_field[1] - 8 == remainder)
+                        return remainder;
+                return out_field[1] - 4;
+        } else if (cmd == ND_CMD_CALL) {
                 struct nd_cmd_pkg *pkg = (struct nd_cmd_pkg *) in_field;
 
                 return pkg->nd_size_out;
@@ -876,7 +891,7 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm,
         /* process an output envelope */
         for (i = 0; i < desc->out_num; i++) {
                 u32 out_size = nd_cmd_out_size(nvdimm, cmd, desc, i,
-                                (u32 *) in_env, (u32 *) out_env);
+                                (u32 *) in_env, (u32 *) out_env, 0);
                 u32 copy;
 
                 if (out_size == UINT_MAX) {
diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index f5e3011e31fc..5daf2f4be0cd 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -612,7 +612,7 @@ int nvme_nvm_register(struct nvme_ns *ns, char *disk_name, int node,
 
         ret = nvm_register(dev);
 
-        ns->lba_shift = ilog2(dev->sec_size) - 9;
+        ns->lba_shift = ilog2(dev->sec_size);
 
         if (sysfs_create_group(&dev->dev.kobj, attrs))
                 pr_warn("%s: failed to create sysfs group for identification\n",
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 0248d0e21fee..5e52034ab010 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1242,20 +1242,16 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
 
         result = nvme_enable_ctrl(&dev->ctrl, cap);
         if (result)
-                goto free_nvmeq;
+                return result;
 
         nvmeq->cq_vector = 0;
         result = queue_request_irq(nvmeq);
         if (result) {
                 nvmeq->cq_vector = -1;
-                goto free_nvmeq;
+                return result;
         }
 
         return result;
-
- free_nvmeq:
-        nvme_free_queues(dev, 0);
-        return result;
 }
 
 static bool nvme_should_reset(struct nvme_dev *dev, u32 csts)
@@ -1317,10 +1313,8 @@ static int nvme_create_io_queues(struct nvme_dev *dev)
         max = min(dev->max_qid, dev->queue_count - 1);
         for (i = dev->online_queues; i <= max; i++) {
                 ret = nvme_create_queue(dev->queues[i], i);
-                if (ret) {
-                        nvme_free_queues(dev, i);
+                if (ret)
                         break;
-                }
         }
 
         /*
@@ -1460,13 +1454,9 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
         result = queue_request_irq(adminq);
         if (result) {
                 adminq->cq_vector = -1;
-                goto free_queues;
+                return result;
         }
         return nvme_create_io_queues(dev);
-
- free_queues:
-        nvme_free_queues(dev, 1);
-        return result;
 }
 
 static void nvme_del_queue_end(struct request *req, int error)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 5a8388177959..3d25add36d91 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -83,6 +83,7 @@ enum nvme_rdma_queue_flags {
         NVME_RDMA_Q_CONNECTED = (1 << 0),
         NVME_RDMA_IB_QUEUE_ALLOCATED = (1 << 1),
         NVME_RDMA_Q_DELETING = (1 << 2),
+        NVME_RDMA_Q_LIVE = (1 << 3),
 };
 
 struct nvme_rdma_queue {
@@ -624,10 +625,18 @@ static int nvme_rdma_connect_io_queues(struct nvme_rdma_ctrl *ctrl)
 
         for (i = 1; i < ctrl->queue_count; i++) {
                 ret = nvmf_connect_io_queue(&ctrl->ctrl, i);
-                if (ret)
-                        break;
+                if (ret) {
+                        dev_info(ctrl->ctrl.device,
+                                "failed to connect i/o queue: %d\n", ret);
+                        goto out_free_queues;
+                }
+                set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[i].flags);
         }
 
+        return 0;
+
+out_free_queues:
+        nvme_rdma_free_io_queues(ctrl);
         return ret;
 }
 
@@ -712,6 +721,8 @@ static void nvme_rdma_reconnect_ctrl_work(struct work_struct *work)
         if (ret)
                 goto stop_admin_q;
 
+        set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[0].flags);
+
         ret = nvme_enable_ctrl(&ctrl->ctrl, ctrl->cap);
         if (ret)
                 goto stop_admin_q;
@@ -761,8 +772,10 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work)
 
         nvme_stop_keep_alive(&ctrl->ctrl);
 
-        for (i = 0; i < ctrl->queue_count; i++)
+        for (i = 0; i < ctrl->queue_count; i++) {
                 clear_bit(NVME_RDMA_Q_CONNECTED, &ctrl->queues[i].flags);
+                clear_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[i].flags);
+        }
 
         if (ctrl->queue_count > 1)
                 nvme_stop_queues(&ctrl->ctrl);
@@ -1378,6 +1391,24 @@ nvme_rdma_timeout(struct request *rq, bool reserved)
         return BLK_EH_HANDLED;
 }
 
+/*
+ * We cannot accept any other command until the Connect command has completed.
+ */
+static inline bool nvme_rdma_queue_is_ready(struct nvme_rdma_queue *queue,
+                struct request *rq)
+{
+        if (unlikely(!test_bit(NVME_RDMA_Q_LIVE, &queue->flags))) {
+                struct nvme_command *cmd = (struct nvme_command *)rq->cmd;
+
+                if (rq->cmd_type != REQ_TYPE_DRV_PRIV ||
+                    cmd->common.opcode != nvme_fabrics_command ||
+                    cmd->fabrics.fctype != nvme_fabrics_type_connect)
+                        return false;
+        }
+
+        return true;
+}
+
 static int nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
                 const struct blk_mq_queue_data *bd)
 {
@@ -1394,6 +1425,9 @@ static int nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
 
         WARN_ON_ONCE(rq->tag < 0);
 
+        if (!nvme_rdma_queue_is_ready(queue, rq))
+                return BLK_MQ_RQ_QUEUE_BUSY;
+
         dev = queue->device->dev;
         ib_dma_sync_single_for_cpu(dev, sqe->dma,
                         sizeof(struct nvme_command), DMA_TO_DEVICE);
@@ -1544,6 +1578,8 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl)
         if (error)
                 goto out_cleanup_queue;
 
+        set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[0].flags);
+
         error = nvmf_reg_read64(&ctrl->ctrl, NVME_REG_CAP, &ctrl->cap);
         if (error) {
                 dev_err(ctrl->ctrl.device,
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index b4cacb6f0258..a21437a33adb 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -838,9 +838,13 @@ static void nvmet_fatal_error_handler(struct work_struct *work)
 
 void nvmet_ctrl_fatal_error(struct nvmet_ctrl *ctrl)
 {
-        ctrl->csts |= NVME_CSTS_CFS;
-        INIT_WORK(&ctrl->fatal_err_work, nvmet_fatal_error_handler);
-        schedule_work(&ctrl->fatal_err_work);
+        mutex_lock(&ctrl->lock);
+        if (!(ctrl->csts & NVME_CSTS_CFS)) {
+                ctrl->csts |= NVME_CSTS_CFS;
+                INIT_WORK(&ctrl->fatal_err_work, nvmet_fatal_error_handler);
+                schedule_work(&ctrl->fatal_err_work);
+        }
+        mutex_unlock(&ctrl->lock);
 }
 EXPORT_SYMBOL_GPL(nvmet_ctrl_fatal_error);
 
diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
index f8d23999e0f2..005ef5d17a19 100644
--- a/drivers/nvme/target/rdma.c
+++ b/drivers/nvme/target/rdma.c
@@ -951,6 +951,7 @@ err_destroy_cq:
 
 static void nvmet_rdma_destroy_queue_ib(struct nvmet_rdma_queue *queue)
 {
+        ib_drain_qp(queue->cm_id->qp);
         rdma_destroy_qp(queue->cm_id);
         ib_free_cq(queue->cq);
 }
@@ -1066,6 +1067,7 @@ nvmet_rdma_alloc_queue(struct nvmet_rdma_device *ndev,
         spin_lock_init(&queue->rsp_wr_wait_lock);
         INIT_LIST_HEAD(&queue->free_rsps);
         spin_lock_init(&queue->rsps_lock);
+        INIT_LIST_HEAD(&queue->queue_list);
 
         queue->idx = ida_simple_get(&nvmet_rdma_queue_ida, 0, 0, GFP_KERNEL);
         if (queue->idx < 0) {
@@ -1244,7 +1246,6 @@ static void __nvmet_rdma_queue_disconnect(struct nvmet_rdma_queue *queue)
 
         if (disconnect) {
                 rdma_disconnect(queue->cm_id);
-                ib_drain_qp(queue->cm_id->qp);
                 schedule_work(&queue->release_work);
         }
 }
@@ -1269,7 +1270,12 @@ static void nvmet_rdma_queue_connect_fail(struct rdma_cm_id *cm_id,
 {
         WARN_ON_ONCE(queue->state != NVMET_RDMA_Q_CONNECTING);
 
-        pr_err("failed to connect queue\n");
+        mutex_lock(&nvmet_rdma_queue_mutex);
+        if (!list_empty(&queue->queue_list))
+                list_del_init(&queue->queue_list);
+        mutex_unlock(&nvmet_rdma_queue_mutex);
+
+        pr_err("failed to connect queue %d\n", queue->idx);
         schedule_work(&queue->release_work);
 }
 
@@ -1352,7 +1358,13 @@ static int nvmet_rdma_cm_handler(struct rdma_cm_id *cm_id,
         case RDMA_CM_EVENT_ADDR_CHANGE:
         case RDMA_CM_EVENT_DISCONNECTED:
         case RDMA_CM_EVENT_TIMEWAIT_EXIT:
-                nvmet_rdma_queue_disconnect(queue);
+                /*
+                 * We might end up here when we already freed the qp
+                 * which means queue release sequence is in progress,
+                 * so don't get in the way...
+                 */
+                if (queue)
+                        nvmet_rdma_queue_disconnect(queue);
                 break;
         case RDMA_CM_EVENT_DEVICE_REMOVAL:
                 ret = nvmet_rdma_device_removal(cm_id, queue);
diff --git a/drivers/of/base.c b/drivers/of/base.c
index d687e6de24a0..a0bccb54a9bd 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2077,8 +2077,6 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
                         name = of_get_property(of_aliases, "stdout", NULL);
                 if (name)
                         of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);
-                if (of_stdout)
-                        console_set_by_of();
         }
 
         if (!of_aliases)
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index b470f7e3521d..262281bd68fa 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -292,6 +292,7 @@ struct phy_device *of_phy_find_device(struct device_node *phy_np)
                 mdiodev = to_mdio_device(d);
                 if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY)
                         return to_phy_device(d);
+                put_device(d);
         }
 
         return NULL;
@@ -456,8 +457,11 @@ int of_phy_register_fixed_link(struct device_node *np)
                 status.link = 1;
                 status.duplex = of_property_read_bool(fixed_link_node,
                                                       "full-duplex");
-                if (of_property_read_u32(fixed_link_node, "speed", &status.speed))
+                if (of_property_read_u32(fixed_link_node, "speed",
+                                         &status.speed)) {
+                        of_node_put(fixed_link_node);
                         return -EINVAL;
+                }
                 status.pause = of_property_read_bool(fixed_link_node, "pause");
                 status.asym_pause = of_property_read_bool(fixed_link_node,
                                                           "asym-pause");
@@ -486,3 +490,18 @@ int of_phy_register_fixed_link(struct device_node *np)
         return -ENODEV;
 }
 EXPORT_SYMBOL(of_phy_register_fixed_link);
+
+void of_phy_deregister_fixed_link(struct device_node *np)
+{
+        struct phy_device *phydev;
+
+        phydev = of_phy_find_device(np);
+        if (!phydev)
+                return;
+
+        fixed_phy_unregister(phydev);
+
+        put_device(&phydev->mdio.dev);  /* of_phy_find_device() */
+        phy_device_free(phydev);        /* fixed_phy_register() */
+}
+EXPORT_SYMBOL(of_phy_deregister_fixed_link);
diff --git a/drivers/pci/host/pcie-designware-plat.c b/drivers/pci/host/pcie-designware-plat.c
index 8df6312ed300..1a02038c4640 100644
--- a/drivers/pci/host/pcie-designware-plat.c
+++ b/drivers/pci/host/pcie-designware-plat.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2015-2016 Synopsys, Inc. (www.synopsys.com)
  *
- * Authors: Joao Pinto <jpmpinto@gmail.com>
+ * Authors: Joao Pinto <Joao.Pinto@synopsys.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
diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c
index e0b22dab9b7a..e04f69beb42d 100644
--- a/drivers/pci/host/pcie-rockchip.c
+++ b/drivers/pci/host/pcie-rockchip.c
@@ -190,6 +190,9 @@ struct rockchip_pcie {
         struct  reset_control *mgmt_rst;
         struct  reset_control *mgmt_sticky_rst;
         struct  reset_control *pipe_rst;
+        struct  reset_control *pm_rst;
+        struct  reset_control *aclk_rst;
+        struct  reset_control *pclk_rst;
         struct  clk *aclk_pcie;
         struct  clk *aclk_perf_pcie;
         struct  clk *hclk_pcie;
@@ -408,6 +411,44 @@ static int rockchip_pcie_init_port(struct rockchip_pcie *rockchip)
 
         gpiod_set_value(rockchip->ep_gpio, 0);
 
+        err = reset_control_assert(rockchip->aclk_rst);
+        if (err) {
+                dev_err(dev, "assert aclk_rst err %d\n", err);
+                return err;
+        }
+
+        err = reset_control_assert(rockchip->pclk_rst);
+        if (err) {
+                dev_err(dev, "assert pclk_rst err %d\n", err);
+                return err;
+        }
+
+        err = reset_control_assert(rockchip->pm_rst);
+        if (err) {
+                dev_err(dev, "assert pm_rst err %d\n", err);
+                return err;
+        }
+
+        udelay(10);
+
+        err = reset_control_deassert(rockchip->pm_rst);
+        if (err) {
+                dev_err(dev, "deassert pm_rst err %d\n", err);
+                return err;
+        }
+
+        err = reset_control_deassert(rockchip->aclk_rst);
+        if (err) {
+                dev_err(dev, "deassert mgmt_sticky_rst err %d\n", err);
+                return err;
+        }
+
+        err = reset_control_deassert(rockchip->pclk_rst);
+        if (err) {
+                dev_err(dev, "deassert mgmt_sticky_rst err %d\n", err);
+                return err;
+        }
+
         err = phy_init(rockchip->phy);
         if (err < 0) {
                 dev_err(dev, "fail to init phy, err %d\n", err);
@@ -781,6 +822,27 @@ static int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip)
                 return PTR_ERR(rockchip->pipe_rst);
         }
 
+        rockchip->pm_rst = devm_reset_control_get(dev, "pm");
+        if (IS_ERR(rockchip->pm_rst)) {
+                if (PTR_ERR(rockchip->pm_rst) != -EPROBE_DEFER)
+                        dev_err(dev, "missing pm reset property in node\n");
+                return PTR_ERR(rockchip->pm_rst);
+        }
+
+        rockchip->pclk_rst = devm_reset_control_get(dev, "pclk");
+        if (IS_ERR(rockchip->pclk_rst)) {
+                if (PTR_ERR(rockchip->pclk_rst) != -EPROBE_DEFER)
+                        dev_err(dev, "missing pclk reset property in node\n");
+                return PTR_ERR(rockchip->pclk_rst);
+        }
+
+        rockchip->aclk_rst = devm_reset_control_get(dev, "aclk");
+        if (IS_ERR(rockchip->aclk_rst)) {
+                if (PTR_ERR(rockchip->aclk_rst) != -EPROBE_DEFER)
+                        dev_err(dev, "missing aclk reset property in node\n");
+                return PTR_ERR(rockchip->aclk_rst);
+        }
+
         rockchip->ep_gpio = devm_gpiod_get(dev, "ep", GPIOD_OUT_HIGH);
         if (IS_ERR(rockchip->ep_gpio)) {
                 dev_err(dev, "missing ep-gpios property in node\n");
diff --git a/drivers/pci/pci-mid.c b/drivers/pci/pci-mid.c
index 55f453de562e..c7f3408e3148 100644
--- a/drivers/pci/pci-mid.c
+++ b/drivers/pci/pci-mid.c
@@ -29,6 +29,11 @@ static int mid_pci_set_power_state(struct pci_dev *pdev, pci_power_t state)
         return intel_mid_pci_set_power_state(pdev, state);
 }
 
+static pci_power_t mid_pci_get_power_state(struct pci_dev *pdev)
+{
+        return intel_mid_pci_get_power_state(pdev);
+}
+
 static pci_power_t mid_pci_choose_state(struct pci_dev *pdev)
 {
         return PCI_D3hot;
@@ -52,6 +57,7 @@ static bool mid_pci_need_resume(struct pci_dev *dev)
 static struct pci_platform_pm_ops mid_pci_platform_pm = {
         .is_manageable  = mid_pci_power_manageable,
         .set_state      = mid_pci_set_power_state,
+        .get_state      = mid_pci_get_power_state,
         .choose_state   = mid_pci_choose_state,
         .sleep_wake     = mid_pci_sleep_wake,
         .run_wake       = mid_pci_run_wake,
diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c
index db553dc22c8e..2b6a59266689 100644
--- a/drivers/pci/pcie/aer/aer_inject.c
+++ b/drivers/pci/pcie/aer/aer_inject.c
@@ -307,20 +307,6 @@ out:
         return 0;
 }
 
-static struct pci_dev *pcie_find_root_port(struct pci_dev *dev)
-{
-        while (1) {
-                if (!pci_is_pcie(dev))
-                        break;
-                if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
-                        return dev;
-                if (!dev->bus->self)
-                        break;
-                dev = dev->bus->self;
-        }
-        return NULL;
-}
-
 static int find_aer_device_iter(struct device *device, void *data)
 {
         struct pcie_device **result = data;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index ab002671fa60..104c46d53121 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1439,6 +1439,21 @@ static void program_hpp_type1(struct pci_dev *dev, struct hpp_type1 *hpp)
                 dev_warn(&dev->dev, "PCI-X settings not supported\n");
 }
 
+static bool pcie_root_rcb_set(struct pci_dev *dev)
+{
+        struct pci_dev *rp = pcie_find_root_port(dev);
+        u16 lnkctl;
+
+        if (!rp)
+                return false;
+
+        pcie_capability_read_word(rp, PCI_EXP_LNKCTL, &lnkctl);
+        if (lnkctl & PCI_EXP_LNKCTL_RCB)
+                return true;
+
+        return false;
+}
+
 static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp)
 {
         int pos;
@@ -1468,9 +1483,20 @@ static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp)
                         ~hpp->pci_exp_devctl_and, hpp->pci_exp_devctl_or);
 
         /* Initialize Link Control Register */
-        if (pcie_cap_has_lnkctl(dev))
+        if (pcie_cap_has_lnkctl(dev)) {
+
+                /*
+                 * If the Root Port supports Read Completion Boundary of
+                 * 128, set RCB to 128.  Otherwise, clear it.
+                 */
+                hpp->pci_exp_lnkctl_and |= PCI_EXP_LNKCTL_RCB;
+                hpp->pci_exp_lnkctl_or &= ~PCI_EXP_LNKCTL_RCB;
+                if (pcie_root_rcb_set(dev))
+                        hpp->pci_exp_lnkctl_or |= PCI_EXP_LNKCTL_RCB;
+
                 pcie_capability_clear_and_set_word(dev, PCI_EXP_LNKCTL,
                         ~hpp->pci_exp_lnkctl_and, hpp->pci_exp_lnkctl_or);
+        }
 
         /* Find Advanced Error Reporting Enhanced Capability */
         pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 66c4d8f42233..9526e341988b 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -121,6 +121,14 @@ int pci_claim_resource(struct pci_dev *dev, int resource)
                 return -EINVAL;
         }
 
+        /*
+         * If we have a shadow copy in RAM, the PCI device doesn't respond
+         * to the shadow range, so we don't need to claim it, and upstream
+         * bridges don't need to route the range to the device.
+         */
+        if (res->flags & IORESOURCE_ROM_SHADOW)
+                return 0;
+
         root = pci_find_parent_resource(dev, res);
         if (!root) {
                 dev_info(&dev->dev, "can't claim BAR %d %pR: no compatible bridge window\n",
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 153f3122283d..b6b316de055c 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -107,7 +107,7 @@ int soc_pcmcia_regulator_set(struct soc_pcmcia_socket *skt,
 
                 ret = regulator_enable(r->reg);
         } else {
-                regulator_disable(r->reg);
+                ret = regulator_disable(r->reg);
         }
         if (ret == 0)
                 r->on = on;
diff --git a/drivers/phy/phy-da8xx-usb.c b/drivers/phy/phy-da8xx-usb.c
index 32ae78c8ca17..c85fb0b59729 100644
--- a/drivers/phy/phy-da8xx-usb.c
+++ b/drivers/phy/phy-da8xx-usb.c
@@ -198,7 +198,8 @@ static int da8xx_usb_phy_probe(struct platform_device *pdev)
         } else {
                 int ret;
 
-                ret = phy_create_lookup(d_phy->usb11_phy, "usb-phy", "ohci.0");
+                ret = phy_create_lookup(d_phy->usb11_phy, "usb-phy",
+                                        "ohci-da8xx");
                 if (ret)
                         dev_warn(dev, "Failed to create usb11 phy lookup\n");
                 ret = phy_create_lookup(d_phy->usb20_phy, "usb-phy",
@@ -216,7 +217,7 @@ static int da8xx_usb_phy_remove(struct platform_device *pdev)
 
         if (!pdev->dev.of_node) {
                 phy_remove_lookup(d_phy->usb20_phy, "usb-phy", "musb-da8xx");
-                phy_remove_lookup(d_phy->usb11_phy, "usb-phy", "ohci.0");
+                phy_remove_lookup(d_phy->usb11_phy, "usb-phy", "ohci-da8xx");
         }
 
         return 0;
diff --git a/drivers/phy/phy-rockchip-pcie.c b/drivers/phy/phy-rockchip-pcie.c
index a2b4c6b58aea..6904633cad68 100644
--- a/drivers/phy/phy-rockchip-pcie.c
+++ b/drivers/phy/phy-rockchip-pcie.c
@@ -249,21 +249,10 @@ err_refclk:
 static int rockchip_pcie_phy_exit(struct phy *phy)
 {
         struct rockchip_pcie_phy *rk_phy = phy_get_drvdata(phy);
-        int err = 0;
 
         clk_disable_unprepare(rk_phy->clk_pciephy_ref);
 
-        err = reset_control_deassert(rk_phy->phy_rst);
-        if (err) {
-                dev_err(&phy->dev, "deassert phy_rst err %d\n", err);
-                goto err_reset;
-        }
-
-        return err;
-
-err_reset:
-        clk_prepare_enable(rk_phy->clk_pciephy_ref);
-        return err;
+        return 0;
 }
 
 static const struct phy_ops ops = {
diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c
index b9342a2af7b3..fec34f5213c4 100644
--- a/drivers/phy/phy-sun4i-usb.c
+++ b/drivers/phy/phy-sun4i-usb.c
@@ -264,7 +264,7 @@ static int sun4i_usb_phy_init(struct phy *_phy)
                 return ret;
         }
 
-        if (data->cfg->enable_pmu_unk1) {
+        if (phy->pmu && data->cfg->enable_pmu_unk1) {
                 val = readl(phy->pmu + REG_PMU_UNK1);
                 writel(val & ~2, phy->pmu + REG_PMU_UNK1);
         }
diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
index 87e6334eab93..547ca7b3f098 100644
--- a/drivers/phy/phy-twl4030-usb.c
+++ b/drivers/phy/phy-twl4030-usb.c
@@ -459,8 +459,6 @@ static int twl4030_phy_power_off(struct phy *phy)
         struct twl4030_usb *twl = phy_get_drvdata(phy);
 
         dev_dbg(twl->dev, "%s\n", __func__);
-        pm_runtime_mark_last_busy(twl->dev);
-        pm_runtime_put_autosuspend(twl->dev);
 
         return 0;
 }
@@ -472,6 +470,8 @@ static int twl4030_phy_power_on(struct phy *phy)
         dev_dbg(twl->dev, "%s\n", __func__);
         pm_runtime_get_sync(twl->dev);
         schedule_delayed_work(&twl->id_workaround_work, HZ);
+        pm_runtime_mark_last_busy(twl->dev);
+        pm_runtime_put_autosuspend(twl->dev);
 
         return 0;
 }
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
index c8c72e8259d3..87b46390b695 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
@@ -26,7 +26,7 @@
 
 #define ASPEED_G5_NR_PINS 228
 
-#define COND1           SIG_DESC_BIT(SCU90, 6, 0)
+#define COND1           { SCU90, BIT(6), 0, 0 }
 #define COND2           { SCU94, GENMASK(1, 0), 0, 0 }
 
 #define B14 0
diff --git a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
index 7f7700716398..5d1e505c3c63 100644
--- a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
+++ b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
@@ -844,6 +844,6 @@ static struct platform_driver iproc_gpio_driver = {
 
 static int __init iproc_gpio_init(void)
 {
-        return platform_driver_probe(&iproc_gpio_driver, iproc_gpio_probe);
+        return platform_driver_register(&iproc_gpio_driver);
 }
 arch_initcall_sync(iproc_gpio_init);
diff --git a/drivers/pinctrl/bcm/pinctrl-nsp-gpio.c b/drivers/pinctrl/bcm/pinctrl-nsp-gpio.c
index 35783db1c10b..c8deb8be1da7 100644
--- a/drivers/pinctrl/bcm/pinctrl-nsp-gpio.c
+++ b/drivers/pinctrl/bcm/pinctrl-nsp-gpio.c
@@ -741,6 +741,6 @@ static struct platform_driver nsp_gpio_driver = {
 
 static int __init nsp_gpio_init(void)
 {
-        return platform_driver_probe(&nsp_gpio_driver, nsp_gpio_probe);
+        return platform_driver_register(&nsp_gpio_driver);
 }
 arch_initcall_sync(nsp_gpio_init);
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index 47613201269a..79c4e14a5a75 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -687,6 +687,7 @@ static int imx_pinctrl_probe_dt(struct platform_device *pdev,
         if (!info->functions)
                 return -ENOMEM;
 
+        info->group_index = 0;
         if (flat_funcs) {
                 info->ngroups = of_get_child_count(np);
         } else {
diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c
index 30389f4ccab4..c43b1e9a06af 100644
--- a/drivers/pinctrl/intel/pinctrl-cherryview.c
+++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
@@ -1652,12 +1652,15 @@ static int chv_pinctrl_probe(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM_SLEEP
-static int chv_pinctrl_suspend(struct device *dev)
+static int chv_pinctrl_suspend_noirq(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct chv_pinctrl *pctrl = platform_get_drvdata(pdev);
+        unsigned long flags;
         int i;
 
+        raw_spin_lock_irqsave(&chv_lock, flags);
+
         pctrl->saved_intmask = readl(pctrl->regs + CHV_INTMASK);
 
         for (i = 0; i < pctrl->community->npins; i++) {
@@ -1678,15 +1681,20 @@ static int chv_pinctrl_suspend(struct device *dev)
                 ctx->padctrl1 = readl(reg);
         }
 
+        raw_spin_unlock_irqrestore(&chv_lock, flags);
+
         return 0;
 }
 
-static int chv_pinctrl_resume(struct device *dev)
+static int chv_pinctrl_resume_noirq(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct chv_pinctrl *pctrl = platform_get_drvdata(pdev);
+        unsigned long flags;
         int i;
 
+        raw_spin_lock_irqsave(&chv_lock, flags);
+
         /*
          * Mask all interrupts before restoring per-pin configuration
          * registers because we don't know in which state BIOS left them
@@ -1731,12 +1739,15 @@ static int chv_pinctrl_resume(struct device *dev)
         chv_writel(0xffff, pctrl->regs + CHV_INTSTAT);
         chv_writel(pctrl->saved_intmask, pctrl->regs + CHV_INTMASK);
 
+        raw_spin_unlock_irqrestore(&chv_lock, flags);
+
         return 0;
 }
 #endif
 
 static const struct dev_pm_ops chv_pinctrl_pm_ops = {
-        SET_LATE_SYSTEM_SLEEP_PM_OPS(chv_pinctrl_suspend, chv_pinctrl_resume)
+        SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(chv_pinctrl_suspend_noirq,
+                                      chv_pinctrl_resume_noirq)
 };
 
 static const struct acpi_device_id chv_pinctrl_acpi_match[] = {
diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c
index 99da4cf91031..b7bb37167969 100644
--- a/drivers/pinctrl/pinctrl-st.c
+++ b/drivers/pinctrl/pinctrl-st.c
@@ -1512,7 +1512,7 @@ static int st_gpiolib_register_bank(struct st_pinctrl *info,
         if (info->irqmux_base || gpio_irq > 0) {
                 err = gpiochip_irqchip_add(&bank->gpio_chip, &st_gpio_irqchip,
                                            0, handle_simple_irq,
-                                           IRQ_TYPE_LEVEL_LOW);
+                                           IRQ_TYPE_NONE);
                 if (err) {
                         gpiochip_remove(&bank->gpio_chip);
                         dev_info(dev, "could not add irqchip\n");
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index 200667f08c37..efc43711ff5c 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -1092,9 +1092,11 @@ int stm32_pctl_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        ret = stm32_pctrl_dt_setup_irq(pdev, pctl);
-        if (ret)
-                return ret;
+        if (of_find_property(np, "interrupt-parent", NULL)) {
+                ret = stm32_pctrl_dt_setup_irq(pdev, pctl);
+                if (ret)
+                        return ret;
+        }
 
         for_each_child_of_node(np, child)
                 if (of_property_read_bool(child, "gpio-controller"))
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index a2323941e677..a7614fc542b5 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -934,6 +934,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
                 },
         },
         {
+                .ident = "Lenovo Yoga 900",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_MATCH(DMI_BOARD_NAME, "VIUU4"),
+                },
+        },
+        {
                 .ident = "Lenovo YOGA 910-13IKB",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
index ed5874217ee7..12dbb5063376 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -264,7 +264,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv)
                 return AE_OK;
 
         if (acpi_match_device_ids(dev, ids) == 0)
-                if (acpi_create_platform_device(dev))
+                if (acpi_create_platform_device(dev, NULL))
                         dev_info(&dev->dev,
                                  "intel-hid: created platform device\n");
 
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
index 146d02f8c9bc..78080763df51 100644
--- a/drivers/platform/x86/intel-vbtn.c
+++ b/drivers/platform/x86/intel-vbtn.c
@@ -164,7 +164,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv)
                 return AE_OK;
 
         if (acpi_match_device_ids(dev, ids) == 0)
-                if (acpi_create_platform_device(dev))
+                if (acpi_create_platform_device(dev, NULL))
                         dev_info(&dev->dev,
                                  "intel-vbtn: created platform device\n");
 
diff --git a/drivers/platform/x86/toshiba-wmi.c b/drivers/platform/x86/toshiba-wmi.c
index feac4576b837..2df07ee8f3c3 100644
--- a/drivers/platform/x86/toshiba-wmi.c
+++ b/drivers/platform/x86/toshiba-wmi.c
@@ -24,14 +24,15 @@
 #include <linux/acpi.h>
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
+#include <linux/dmi.h>
 
 MODULE_AUTHOR("Azael Avalos");
 MODULE_DESCRIPTION("Toshiba WMI Hotkey Driver");
 MODULE_LICENSE("GPL");
 
-#define TOSHIBA_WMI_EVENT_GUID  "59142400-C6A3-40FA-BADB-8A2652834100"
+#define WMI_EVENT_GUID  "59142400-C6A3-40FA-BADB-8A2652834100"
 
-MODULE_ALIAS("wmi:"TOSHIBA_WMI_EVENT_GUID);
+MODULE_ALIAS("wmi:"WMI_EVENT_GUID);
 
 static struct input_dev *toshiba_wmi_input_dev;
 
@@ -63,6 +64,16 @@ static void toshiba_wmi_notify(u32 value, void *context)
         kfree(response.pointer);
 }
 
+static struct dmi_system_id toshiba_wmi_dmi_table[] __initdata = {
+        {
+                .ident = "Toshiba laptop",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                },
+        },
+        {}
+};
+
 static int __init toshiba_wmi_input_setup(void)
 {
         acpi_status status;
@@ -81,7 +92,7 @@ static int __init toshiba_wmi_input_setup(void)
         if (err)
                 goto err_free_dev;
 
-        status = wmi_install_notify_handler(TOSHIBA_WMI_EVENT_GUID,
+        status = wmi_install_notify_handler(WMI_EVENT_GUID,
                                             toshiba_wmi_notify, NULL);
         if (ACPI_FAILURE(status)) {
                 err = -EIO;
@@ -95,7 +106,7 @@ static int __init toshiba_wmi_input_setup(void)
         return 0;
 
  err_remove_notifier:
-        wmi_remove_notify_handler(TOSHIBA_WMI_EVENT_GUID);
+        wmi_remove_notify_handler(WMI_EVENT_GUID);
  err_free_keymap:
         sparse_keymap_free(toshiba_wmi_input_dev);
  err_free_dev:
@@ -105,7 +116,7 @@ static int __init toshiba_wmi_input_setup(void)
 
 static void toshiba_wmi_input_destroy(void)
 {
-        wmi_remove_notify_handler(TOSHIBA_WMI_EVENT_GUID);
+        wmi_remove_notify_handler(WMI_EVENT_GUID);
         sparse_keymap_free(toshiba_wmi_input_dev);
         input_unregister_device(toshiba_wmi_input_dev);
 }
@@ -114,7 +125,8 @@ static int __init toshiba_wmi_init(void)
 {
         int ret;
 
-        if (!wmi_has_guid(TOSHIBA_WMI_EVENT_GUID))
+        if (!wmi_has_guid(WMI_EVENT_GUID) ||
+            !dmi_check_system(toshiba_wmi_dmi_table))
                 return -ENODEV;
 
         ret = toshiba_wmi_input_setup();
@@ -130,7 +142,7 @@ static int __init toshiba_wmi_init(void)
 
 static void __exit toshiba_wmi_exit(void)
 {
-        if (wmi_has_guid(TOSHIBA_WMI_EVENT_GUID))
+        if (wmi_has_guid(WMI_EVENT_GUID))
                 toshiba_wmi_input_destroy();
 }
 
diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index 381871b2bb46..9d5bd7d5c610 100644
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -474,6 +474,7 @@ static int meson_pwm_probe(struct platform_device *pdev)
         if (IS_ERR(meson->base))
                 return PTR_ERR(meson->base);
 
+        spin_lock_init(&meson->lock);
         meson->chip.dev = &pdev->dev;
         meson->chip.ops = &meson_pwm_ops;
         meson->chip.base = -1;
diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c
index 0296d8178ae2..a813239300c3 100644
--- a/drivers/pwm/sysfs.c
+++ b/drivers/pwm/sysfs.c
@@ -425,6 +425,8 @@ void pwmchip_sysfs_unexport_children(struct pwm_chip *chip)
                 if (test_bit(PWMF_EXPORTED, &pwm->flags))
                         pwm_unexport_child(parent, pwm);
         }
+
+        put_device(parent);
 }
 
 static int __init pwm_sysfs_init(void)
diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c
index 3314bf299a51..fb44d5215e30 100644
--- a/drivers/regulator/rk808-regulator.c
+++ b/drivers/regulator/rk808-regulator.c
@@ -120,7 +120,7 @@ static const struct regulator_linear_range rk808_ldo3_voltage_ranges[] = {
 static int rk808_buck1_2_get_voltage_sel_regmap(struct regulator_dev *rdev)
 {
         struct rk808_regulator_data *pdata = rdev_get_drvdata(rdev);
-        int id = rdev->desc->id - RK808_ID_DCDC1;
+        int id = rdev_get_id(rdev);
         struct gpio_desc *gpio = pdata->dvs_gpio[id];
         unsigned int val;
         int ret;
@@ -193,7 +193,7 @@ static int rk808_buck1_2_set_voltage_sel(struct regulator_dev *rdev,
                                          unsigned sel)
 {
         struct rk808_regulator_data *pdata = rdev_get_drvdata(rdev);
-        int id = rdev->desc->id - RK808_ID_DCDC1;
+        int id = rdev_get_id(rdev);
         struct gpio_desc *gpio = pdata->dvs_gpio[id];
         unsigned int reg = rdev->desc->vsel_reg;
         unsigned old_sel;
@@ -232,7 +232,7 @@ static int rk808_buck1_2_set_voltage_time_sel(struct regulator_dev *rdev,
                                        unsigned int new_selector)
 {
         struct rk808_regulator_data *pdata = rdev_get_drvdata(rdev);
-        int id = rdev->desc->id - RK808_ID_DCDC1;
+        int id = rdev_get_id(rdev);
         struct gpio_desc *gpio = pdata->dvs_gpio[id];
 
         /* if there is no dvs1/2 pin, we don't need wait extra time here. */
@@ -245,8 +245,7 @@ static int rk808_buck1_2_set_voltage_time_sel(struct regulator_dev *rdev,
 static int rk808_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
 {
         unsigned int ramp_value = RK808_RAMP_RATE_10MV_PER_US;
-        unsigned int reg = rk808_buck_config_regs[rdev->desc->id -
-                                                  RK808_ID_DCDC1];
+        unsigned int reg = rk808_buck_config_regs[rdev_get_id(rdev)];
 
         switch (ramp_delay) {
         case 1 ... 2000:
diff --git a/drivers/rtc/rtc-asm9260.c b/drivers/rtc/rtc-asm9260.c
index 18a93d3e3f93..d36534965635 100644
--- a/drivers/rtc/rtc-asm9260.c
+++ b/drivers/rtc/rtc-asm9260.c
@@ -327,6 +327,7 @@ static const struct of_device_id asm9260_dt_ids[] = {
         { .compatible = "alphascale,asm9260-rtc", },
         {}
 };
+MODULE_DEVICE_TABLE(of, asm9260_dt_ids);
 
 static struct platform_driver asm9260_rtc_driver = {
         .probe          = asm9260_rtc_probe,
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index dd3d59806ffa..7030d7cd3861 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -776,7 +776,7 @@ static void cmos_do_shutdown(int rtc_irq)
         spin_unlock_irq(&rtc_lock);
 }
 
-static void __exit cmos_do_remove(struct device *dev)
+static void cmos_do_remove(struct device *dev)
 {
         struct cmos_rtc *cmos = dev_get_drvdata(dev);
         struct resource *ports;
@@ -996,8 +996,9 @@ static u32 rtc_handler(void *context)
         struct cmos_rtc *cmos = dev_get_drvdata(dev);
         unsigned char rtc_control = 0;
         unsigned char rtc_intr;
+        unsigned long flags;
 
-        spin_lock_irq(&rtc_lock);
+        spin_lock_irqsave(&rtc_lock, flags);
         if (cmos_rtc.suspend_ctrl)
                 rtc_control = CMOS_READ(RTC_CONTROL);
         if (rtc_control & RTC_AIE) {
@@ -1006,7 +1007,7 @@ static u32 rtc_handler(void *context)
                 rtc_intr = CMOS_READ(RTC_INTR_FLAGS);
                 rtc_update_irq(cmos->rtc, 1, rtc_intr);
         }
-        spin_unlock_irq(&rtc_lock);
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         pm_wakeup_event(dev, 0);
         acpi_clear_event(ACPI_EVENT_RTC);
@@ -1129,7 +1130,7 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
                                 pnp_irq(pnp, 0));
 }
 
-static void __exit cmos_pnp_remove(struct pnp_dev *pnp)
+static void cmos_pnp_remove(struct pnp_dev *pnp)
 {
         cmos_do_remove(&pnp->dev);
 }
@@ -1161,7 +1162,7 @@ static struct pnp_driver cmos_pnp_driver = {
         .name           = (char *) driver_name,
         .id_table       = rtc_ids,
         .probe          = cmos_pnp_probe,
-        .remove         = __exit_p(cmos_pnp_remove),
+        .remove         = cmos_pnp_remove,
         .shutdown       = cmos_pnp_shutdown,
 
         /* flag ensures resume() gets called, and stops syslog spam */
@@ -1238,7 +1239,7 @@ static int __init cmos_platform_probe(struct platform_device *pdev)
         return cmos_do_probe(&pdev->dev, resource, irq);
 }
 
-static int __exit cmos_platform_remove(struct platform_device *pdev)
+static int cmos_platform_remove(struct platform_device *pdev)
 {
         cmos_do_remove(&pdev->dev);
         return 0;
@@ -1263,7 +1264,7 @@ static void cmos_platform_shutdown(struct platform_device *pdev)
 MODULE_ALIAS("platform:rtc_cmos");
 
 static struct platform_driver cmos_platform_driver = {
-        .remove         = __exit_p(cmos_platform_remove),
+        .remove         = cmos_platform_remove,
         .shutdown       = cmos_platform_shutdown,
         .driver = {
                 .name           = driver_name,
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index b04ea9b5ae67..51e52446eacb 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -113,6 +113,7 @@
 /* OMAP_RTC_OSC_REG bit fields: */
 #define OMAP_RTC_OSC_32KCLK_EN          BIT(6)
 #define OMAP_RTC_OSC_SEL_32KCLK_SRC     BIT(3)
+#define OMAP_RTC_OSC_OSC32K_GZ_DISABLE  BIT(4)
 
 /* OMAP_RTC_IRQWAKEEN bit fields: */
 #define OMAP_RTC_IRQWAKEEN_ALARM_WAKEEN BIT(1)
@@ -146,6 +147,7 @@ struct omap_rtc {
         u8 interrupts_reg;
         bool is_pmic_controller;
         bool has_ext_clk;
+        bool is_suspending;
         const struct omap_rtc_device_type *type;
         struct pinctrl_dev *pctldev;
 };
@@ -786,8 +788,9 @@ static int omap_rtc_probe(struct platform_device *pdev)
          */
         if (rtc->has_ext_clk) {
                 reg = rtc_read(rtc, OMAP_RTC_OSC_REG);
-                rtc_write(rtc, OMAP_RTC_OSC_REG,
-                          reg | OMAP_RTC_OSC_SEL_32KCLK_SRC);
+                reg &= ~OMAP_RTC_OSC_OSC32K_GZ_DISABLE;
+                reg |= OMAP_RTC_OSC_32KCLK_EN | OMAP_RTC_OSC_SEL_32KCLK_SRC;
+                rtc_writel(rtc, OMAP_RTC_OSC_REG, reg);
         }
 
         rtc->type->lock(rtc);
@@ -898,8 +901,7 @@ static int omap_rtc_suspend(struct device *dev)
                 rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, 0);
         rtc->type->lock(rtc);
 
-        /* Disable the clock/module */
-        pm_runtime_put_sync(dev);
+        rtc->is_suspending = true;
 
         return 0;
 }
@@ -908,9 +910,6 @@ static int omap_rtc_resume(struct device *dev)
 {
         struct omap_rtc *rtc = dev_get_drvdata(dev);
 
-        /* Enable the clock/module so that we can access the registers */
-        pm_runtime_get_sync(dev);
-
         rtc->type->unlock(rtc);
         if (device_may_wakeup(dev))
                 disable_irq_wake(rtc->irq_alarm);
@@ -918,11 +917,34 @@ static int omap_rtc_resume(struct device *dev)
                 rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, rtc->interrupts_reg);
         rtc->type->lock(rtc);
 
+        rtc->is_suspending = false;
+
         return 0;
 }
 #endif
 
-static SIMPLE_DEV_PM_OPS(omap_rtc_pm_ops, omap_rtc_suspend, omap_rtc_resume);
+#ifdef CONFIG_PM
+static int omap_rtc_runtime_suspend(struct device *dev)
+{
+        struct omap_rtc *rtc = dev_get_drvdata(dev);
+
+        if (rtc->is_suspending && !rtc->has_ext_clk)
+                return -EBUSY;
+
+        return 0;
+}
+
+static int omap_rtc_runtime_resume(struct device *dev)
+{
+        return 0;
+}
+#endif
+
+static const struct dev_pm_ops omap_rtc_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(omap_rtc_suspend, omap_rtc_resume)
+        SET_RUNTIME_PM_OPS(omap_rtc_runtime_suspend,
+                           omap_rtc_runtime_resume, NULL)
+};
 
 static void omap_rtc_shutdown(struct platform_device *pdev)
 {
diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index aebc4ddb3060..ac05317bba7f 100644
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -1083,7 +1083,7 @@ unsigned int beiscsi_boot_get_sinfo(struct beiscsi_hba *phba)
         nonemb_cmd = &phba->boot_struct.nonemb_cmd;
         nonemb_cmd->size = sizeof(*resp);
         nonemb_cmd->va = pci_alloc_consistent(phba->ctrl.pdev,
-                                              sizeof(nonemb_cmd->size),
+                                              nonemb_cmd->size,
                                               &nonemb_cmd->dma);
         if (!nonemb_cmd->va) {
                 mutex_unlock(&ctrl->mbox_lock);
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index d1421139e6ea..2ffe029ff2b6 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -2081,9 +2081,10 @@ void cxgbi_cleanup_task(struct iscsi_task *task)
         /*  never reached the xmit task callout */
         if (tdata->skb)
                 __kfree_skb(tdata->skb);
-        memset(tdata, 0, sizeof(*tdata));
 
         task_release_itt(task, task->hdr_itt);
+        memset(tdata, 0, sizeof(*tdata));
+
         iscsi_tcp_cleanup_task(task);
 }
 EXPORT_SYMBOL_GPL(cxgbi_cleanup_task);
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 241829e59668..7bb20684e9fa 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -793,6 +793,7 @@ static void alua_rtpg_work(struct work_struct *work)
                 WARN_ON(pg->flags & ALUA_PG_RUN_RTPG);
                 WARN_ON(pg->flags & ALUA_PG_RUN_STPG);
                 spin_unlock_irqrestore(&pg->lock, flags);
+                kref_put(&pg->kref, release_port_group);
                 return;
         }
         if (pg->flags & ALUA_SYNC_STPG)
@@ -890,6 +891,7 @@ static void alua_rtpg_queue(struct alua_port_group *pg,
                 /* Do not queue if the worker is already running */
                 if (!(pg->flags & ALUA_PG_RUNNING)) {
                         kref_get(&pg->kref);
+                        sdev = NULL;
                         start_queue = 1;
                 }
         }
@@ -901,7 +903,8 @@ static void alua_rtpg_queue(struct alua_port_group *pg,
         if (start_queue &&
             !queue_delayed_work(alua_wq, &pg->rtpg_work,
                                 msecs_to_jiffies(ALUA_RTPG_DELAY_MSECS))) {
-                scsi_device_put(sdev);
+                if (sdev)
+                        scsi_device_put(sdev);
                 kref_put(&pg->kref, release_port_group);
         }
 }
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index d007ec18179a..a1d6ab76a514 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -2009,7 +2009,7 @@ static struct hpsa_scsi_dev_t *lookup_hpsa_scsi_dev(struct ctlr_info *h,
 
 static int hpsa_slave_alloc(struct scsi_device *sdev)
 {
-        struct hpsa_scsi_dev_t *sd;
+        struct hpsa_scsi_dev_t *sd = NULL;
         unsigned long flags;
         struct ctlr_info *h;
 
@@ -2026,7 +2026,8 @@ static int hpsa_slave_alloc(struct scsi_device *sdev)
                         sd->target = sdev_id(sdev);
                         sd->lun = sdev->lun;
                 }
-        } else
+        }
+        if (!sd)
                 sd = lookup_hpsa_scsi_dev(h, sdev_channel(sdev),
                                         sdev_id(sdev), sdev->lun);
 
@@ -3840,6 +3841,7 @@ static int hpsa_update_device_info(struct ctlr_info *h,
                 sizeof(this_device->vendor));
         memcpy(this_device->model, &inq_buff[16],
                 sizeof(this_device->model));
+        this_device->rev = inq_buff[2];
         memset(this_device->device_id, 0,
                 sizeof(this_device->device_id));
         if (hpsa_get_device_id(h, scsi3addr, this_device->device_id, 8,
@@ -3929,10 +3931,14 @@ static void figure_bus_target_lun(struct ctlr_info *h,
 
         if (!is_logical_dev_addr_mode(lunaddrbytes)) {
                 /* physical device, target and lun filled in later */
-                if (is_hba_lunid(lunaddrbytes))
+                if (is_hba_lunid(lunaddrbytes)) {
+                        int bus = HPSA_HBA_BUS;
+
+                        if (!device->rev)
+                                bus = HPSA_LEGACY_HBA_BUS;
                         hpsa_set_bus_target_lun(device,
-                                        HPSA_HBA_BUS, 0, lunid & 0x3fff);
-                else
+                                        bus, 0, lunid & 0x3fff);
+                } else
                         /* defer target, lun assignment for physical devices */
                         hpsa_set_bus_target_lun(device,
                                         HPSA_PHYSICAL_DEVICE_BUS, -1, -1);
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index 82cdfad874f3..9ea162de80dc 100644
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -69,6 +69,7 @@ struct hpsa_scsi_dev_t {
         u64 sas_address;
         unsigned char vendor[8];        /* bytes 8-15 of inquiry data */
         unsigned char model[16];        /* bytes 16-31 of inquiry data */
+        unsigned char rev;              /* byte 2 of inquiry data */
         unsigned char raid_level;       /* from inquiry page 0xC1 */
         unsigned char volume_offline;   /* discovered via TUR or VPD */
         u16 queue_depth;                /* max queue_depth for this device */
@@ -402,6 +403,7 @@ struct offline_device_entry {
 #define HPSA_RAID_VOLUME_BUS            1
 #define HPSA_EXTERNAL_RAID_VOLUME_BUS   2
 #define HPSA_HBA_BUS                    0
+#define HPSA_LEGACY_HBA_BUS             3
 
 /*
         Send the command to the hardware
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 04ce7cfb6d1b..50c71678a156 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -308,7 +308,7 @@ struct fc_host_statistics *fc_get_host_stats(struct Scsi_Host *shost)
         fc_stats = &lport->host_stats;
         memset(fc_stats, 0, sizeof(struct fc_host_statistics));
 
-        fc_stats->seconds_since_last_reset = (lport->boot_time - jiffies) / HZ;
+        fc_stats->seconds_since_last_reset = (jiffies - lport->boot_time) / HZ;
 
         for_each_possible_cpu(cpu) {
                 struct fc_stats *stats;
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index c5326055beee..f4f77c5b0c83 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1323,18 +1323,20 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 {
         lockdep_assert_held(&phba->hbalock);
 
-        BUG_ON(!piocb || !piocb->vport);
+        BUG_ON(!piocb);
 
         list_add_tail(&piocb->list, &pring->txcmplq);
         piocb->iocb_flag |= LPFC_IO_ON_TXCMPLQ;
 
         if ((unlikely(pring->ringno == LPFC_ELS_RING)) &&
            (piocb->iocb.ulpCommand != CMD_ABORT_XRI_CN) &&
-           (piocb->iocb.ulpCommand != CMD_CLOSE_XRI_CN) &&
-            (!(piocb->vport->load_flag & FC_UNLOADING)))
-                mod_timer(&piocb->vport->els_tmofunc,
-                          jiffies +
-                          msecs_to_jiffies(1000 * (phba->fc_ratov << 1)));
+           (piocb->iocb.ulpCommand != CMD_CLOSE_XRI_CN)) {
+                BUG_ON(!piocb->vport);
+                if (!(piocb->vport->load_flag & FC_UNLOADING))
+                        mod_timer(&piocb->vport->els_tmofunc,
+                                  jiffies +
+                                  msecs_to_jiffies(1000 * (phba->fc_ratov << 1)));
+        }
 
         return 0;
 }
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index ca86c885dfaa..3aaea713bf37 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -2233,7 +2233,7 @@ struct megasas_instance_template {
 };
 
 #define MEGASAS_IS_LOGICAL(scp)                                         \
-        (scp->device->channel < MEGASAS_MAX_PD_CHANNELS) ? 0 : 1
+        ((scp->device->channel < MEGASAS_MAX_PD_CHANNELS) ? 0 : 1)
 
 #define MEGASAS_DEV_INDEX(scp)                                          \
         (((scp->device->channel % 2) * MEGASAS_MAX_DEV_PER_CHANNEL) +   \
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 209a969a979d..1c4744e78173 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -1273,9 +1273,9 @@ scsih_target_alloc(struct scsi_target *starget)
                         sas_target_priv_data->handle = raid_device->handle;
                         sas_target_priv_data->sas_address = raid_device->wwid;
                         sas_target_priv_data->flags |= MPT_TARGET_FLAGS_VOLUME;
-                        sas_target_priv_data->raid_device = raid_device;
                         if (ioc->is_warpdrive)
-                                raid_device->starget = starget;
+                                sas_target_priv_data->raid_device = raid_device;
+                        raid_device->starget = starget;
                 }
                 spin_unlock_irqrestore(&ioc->raid_device_lock, flags);
                 return 0;
@@ -3885,6 +3885,11 @@ _scsih_temp_threshold_events(struct MPT3SAS_ADAPTER *ioc,
         }
 }
 
+static inline bool ata_12_16_cmd(struct scsi_cmnd *scmd)
+{
+        return (scmd->cmnd[0] == ATA_12 || scmd->cmnd[0] == ATA_16);
+}
+
 /**
  * _scsih_flush_running_cmds - completing outstanding commands.
  * @ioc: per adapter object
@@ -3906,6 +3911,9 @@ _scsih_flush_running_cmds(struct MPT3SAS_ADAPTER *ioc)
                 if (!scmd)
                         continue;
                 count++;
+                if (ata_12_16_cmd(scmd))
+                        scsi_internal_device_unblock(scmd->device,
+                                                        SDEV_RUNNING);
                 mpt3sas_base_free_smid(ioc, smid);
                 scsi_dma_unmap(scmd);
                 if (ioc->pci_error_recovery)
@@ -4010,8 +4018,6 @@ _scsih_eedp_error_handling(struct scsi_cmnd *scmd, u16 ioc_status)
             SAM_STAT_CHECK_CONDITION;
 }
 
-
-
 /**
  * scsih_qcmd - main scsi request entry point
  * @scmd: pointer to scsi command object
@@ -4038,6 +4044,13 @@ scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
         if (ioc->logging_level & MPT_DEBUG_SCSI)
                 scsi_print_command(scmd);
 
+        /*
+         * Lock the device for any subsequent command until command is
+         * done.
+         */
+        if (ata_12_16_cmd(scmd))
+                scsi_internal_device_block(scmd->device);
+
         sas_device_priv_data = scmd->device->hostdata;
         if (!sas_device_priv_data || !sas_device_priv_data->sas_target) {
                 scmd->result = DID_NO_CONNECT << 16;
@@ -4613,6 +4626,9 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
         if (scmd == NULL)
                 return 1;
 
+        if (ata_12_16_cmd(scmd))
+                scsi_internal_device_unblock(scmd->device, SDEV_RUNNING);
+
         mpi_request = mpt3sas_base_get_msg_frame(ioc, smid);
 
         if (mpi_reply == NULL) {
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 86eb19902bac..c7cc8035eacb 100644
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -791,8 +791,10 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmf
         slot->slot_tag = tag;
 
         slot->buf = pci_pool_alloc(mvi->dma_pool, GFP_ATOMIC, &slot->buf_dma);
-        if (!slot->buf)
+        if (!slot->buf) {
+                rc = -ENOMEM;
                 goto err_out_tag;
+        }
         memset(slot->buf, 0, MVS_SLOT_BUF_SZ);
 
         tei.task = task;
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index ace65db1d2a2..56d6142852a5 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -707,6 +707,11 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
         srb_t *sp;
         int rval;
 
+        if (unlikely(test_bit(UNLOADING, &base_vha->dpc_flags))) {
+                cmd->result = DID_NO_CONNECT << 16;
+                goto qc24_fail_command;
+        }
+
         if (ha->flags.eeh_busy) {
                 if (ha->flags.pci_channel_io_perm_failure) {
                         ql_dbg(ql_dbg_aer, vha, 0x9010,
@@ -1451,6 +1456,20 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res)
                 for (cnt = 1; cnt < req->num_outstanding_cmds; cnt++) {
                         sp = req->outstanding_cmds[cnt];
                         if (sp) {
+                                /* Don't abort commands in adapter during EEH
+                                 * recovery as it's not accessible/responding.
+                                 */
+                                if (!ha->flags.eeh_busy) {
+                                        /* Get a reference to the sp and drop the lock.
+                                         * The reference ensures this sp->done() call
+                                         * - and not the call in qla2xxx_eh_abort() -
+                                         * ends the SCSI command (with result 'res').
+                                         */
+                                        sp_get(sp);
+                                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+                                        qla2xxx_eh_abort(GET_CMD_SP(sp));
+                                        spin_lock_irqsave(&ha->hardware_lock, flags);
+                                }
                                 req->outstanding_cmds[cnt] = NULL;
                                 sp->done(vha, sp, res);
                         }
@@ -2341,6 +2360,8 @@ qla2xxx_scan_finished(struct Scsi_Host *shost, unsigned long time)
 {
         scsi_qla_host_t *vha = shost_priv(shost);
 
+        if (test_bit(UNLOADING, &vha->dpc_flags))
+                return 1;
         if (!vha->host)
                 return 1;
         if (time > vha->hw->loop_reset_delay * HZ)
diff --git a/drivers/scsi/qlogicpti.h b/drivers/scsi/qlogicpti.h
index 4377e87ee79c..892a0b058b99 100644
--- a/drivers/scsi/qlogicpti.h
+++ b/drivers/scsi/qlogicpti.h
@@ -356,8 +356,8 @@ struct qlogicpti {
 
         /* The rest of the elements are unimportant for performance. */
         struct qlogicpti         *next;
-        __u32                     res_dvma;             /* Ptr to RESPONSE bufs (DVMA)*/
-        __u32                     req_dvma;             /* Ptr to REQUEST bufs (DVMA) */
+        dma_addr_t                res_dvma;             /* Ptr to RESPONSE bufs (DVMA)*/
+        dma_addr_t                req_dvma;             /* Ptr to REQUEST bufs (DVMA) */
         u_char                    fware_majrev, fware_minrev, fware_micrev;
         struct Scsi_Host         *qhost;
         int                       qpti_id;
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index 4a0d3cdc607c..15ca09cd16f3 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -793,6 +793,7 @@ static int pvscsi_abort(struct scsi_cmnd *cmd)
         unsigned long flags;
         int result = SUCCESS;
         DECLARE_COMPLETION_ONSTACK(abort_cmp);
+        int done;
 
         scmd_printk(KERN_DEBUG, cmd, "task abort on host %u, %p\n",
                     adapter->host->host_no, cmd);
@@ -824,10 +825,10 @@ static int pvscsi_abort(struct scsi_cmnd *cmd)
         pvscsi_abort_cmd(adapter, ctx);
         spin_unlock_irqrestore(&adapter->hw_lock, flags);
         /* Wait for 2 secs for the completion. */
-        wait_for_completion_timeout(&abort_cmp, msecs_to_jiffies(2000));
+        done = wait_for_completion_timeout(&abort_cmp, msecs_to_jiffies(2000));
         spin_lock_irqsave(&adapter->hw_lock, flags);
 
-        if (!completion_done(&abort_cmp)) {
+        if (!done) {
                 /*
                  * Failed to abort the command, unmark the fact that it
                  * was requested to be aborted.
diff --git a/drivers/scsi/vmw_pvscsi.h b/drivers/scsi/vmw_pvscsi.h
index c097d2ccbde3..d41292ef85f2 100644
--- a/drivers/scsi/vmw_pvscsi.h
+++ b/drivers/scsi/vmw_pvscsi.h
@@ -26,7 +26,7 @@
 
 #include <linux/types.h>
 
-#define PVSCSI_DRIVER_VERSION_STRING   "1.0.6.0-k"
+#define PVSCSI_DRIVER_VERSION_STRING   "1.0.7.0-k"
 
 #define PVSCSI_MAX_NUM_SG_ENTRIES_PER_SEGMENT 128
 
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c
index 7043eb0543f6..5ab49a798164 100644
--- a/drivers/staging/comedi/drivers/ni_tio.c
+++ b/drivers/staging/comedi/drivers/ni_tio.c
@@ -207,7 +207,8 @@ static int ni_tio_clock_period_ps(const struct ni_gpct *counter,
                  * clock period is specified by user with prescaling
                  * already taken into account.
                  */
-                return counter->clock_period_ps;
+                *period_ps = counter->clock_period_ps;
+                return 0;
         }
 
         switch (generic_clock_source & NI_GPCT_PRESCALE_MODE_CLOCK_SRC_MASK) {
diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c
index 34307ac3f255..d33d6fe078ad 100644
--- a/drivers/staging/greybus/arche-platform.c
+++ b/drivers/staging/greybus/arche-platform.c
@@ -186,6 +186,7 @@ int arche_platform_change_state(enum arche_platform_state state,
 exit:
         spin_unlock_irqrestore(&arche_pdata->wake_lock, flags);
         mutex_unlock(&arche_pdata->platform_state_mutex);
+        put_device(&pdev->dev);
         of_node_put(np);
         return ret;
 }
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index 5eecf1cb1028..3892a7470410 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -655,6 +655,7 @@ static void ad5933_work(struct work_struct *work)
         __be16 buf[2];
         int val[2];
         unsigned char status;
+        int ret;
 
         mutex_lock(&indio_dev->mlock);
         if (st->state == AD5933_CTRL_INIT_START_FREQ) {
@@ -662,19 +663,22 @@ static void ad5933_work(struct work_struct *work)
                 ad5933_cmd(st, AD5933_CTRL_START_SWEEP);
                 st->state = AD5933_CTRL_START_SWEEP;
                 schedule_delayed_work(&st->work, st->poll_time_jiffies);
-                mutex_unlock(&indio_dev->mlock);
-                return;
+                goto out;
         }
 
-        ad5933_i2c_read(st->client, AD5933_REG_STATUS, 1, &status);
+        ret = ad5933_i2c_read(st->client, AD5933_REG_STATUS, 1, &status);
+        if (ret)
+                goto out;
 
         if (status & AD5933_STAT_DATA_VALID) {
                 int scan_count = bitmap_weight(indio_dev->active_scan_mask,
                                                indio_dev->masklength);
-                ad5933_i2c_read(st->client,
+                ret = ad5933_i2c_read(st->client,
                                 test_bit(1, indio_dev->active_scan_mask) ?
                                 AD5933_REG_REAL_DATA : AD5933_REG_IMAG_DATA,
                                 scan_count * 2, (u8 *)buf);
+                if (ret)
+                        goto out;
 
                 if (scan_count == 2) {
                         val[0] = be16_to_cpu(buf[0]);
@@ -686,8 +690,7 @@ static void ad5933_work(struct work_struct *work)
         } else {
                 /* no data available - try again later */
                 schedule_delayed_work(&st->work, st->poll_time_jiffies);
-                mutex_unlock(&indio_dev->mlock);
-                return;
+                goto out;
         }
 
         if (status & AD5933_STAT_SWEEP_DONE) {
@@ -700,7 +703,7 @@ static void ad5933_work(struct work_struct *work)
                 ad5933_cmd(st, AD5933_CTRL_INC_FREQ);
                 schedule_delayed_work(&st->work, st->poll_time_jiffies);
         }
-
+out:
         mutex_unlock(&indio_dev->mlock);
 }
 
diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
index a324322ee0ad..499952c8ef39 100644
--- a/drivers/staging/nvec/nvec_ps2.c
+++ b/drivers/staging/nvec/nvec_ps2.c
@@ -106,13 +106,12 @@ static int nvec_mouse_probe(struct platform_device *pdev)
 {
         struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
         struct serio *ser_dev;
-        char mouse_reset[] = { NVEC_PS2, SEND_COMMAND, PSMOUSE_RST, 3 };
 
-        ser_dev = devm_kzalloc(&pdev->dev, sizeof(struct serio), GFP_KERNEL);
+        ser_dev = kzalloc(sizeof(struct serio), GFP_KERNEL);
         if (!ser_dev)
                 return -ENOMEM;
 
-        ser_dev->id.type = SERIO_PS_PSTHRU;
+        ser_dev->id.type = SERIO_8042;
         ser_dev->write = ps2_sendcommand;
         ser_dev->start = ps2_startstreaming;
         ser_dev->stop = ps2_stopstreaming;
@@ -127,9 +126,6 @@ static int nvec_mouse_probe(struct platform_device *pdev)
 
         serio_register_port(ser_dev);
 
-        /* mouse reset */
-        nvec_write_async(nvec, mouse_reset, sizeof(mouse_reset));
-
         return 0;
 }
 
diff --git a/drivers/staging/sm750fb/ddk750_reg.h b/drivers/staging/sm750fb/ddk750_reg.h
index 955247979aaa..4ed6d8d7712a 100644
--- a/drivers/staging/sm750fb/ddk750_reg.h
+++ b/drivers/staging/sm750fb/ddk750_reg.h
@@ -601,13 +601,13 @@
 
 #define PANEL_PLANE_TL                                0x08001C
 #define PANEL_PLANE_TL_TOP_SHIFT                      16
-#define PANEL_PLANE_TL_TOP_MASK                       (0xeff << 16)
-#define PANEL_PLANE_TL_LEFT_MASK                      0xeff
+#define PANEL_PLANE_TL_TOP_MASK                       (0x7ff << 16)
+#define PANEL_PLANE_TL_LEFT_MASK                      0x7ff
 
 #define PANEL_PLANE_BR                                0x080020
 #define PANEL_PLANE_BR_BOTTOM_SHIFT                   16
-#define PANEL_PLANE_BR_BOTTOM_MASK                    (0xeff << 16)
-#define PANEL_PLANE_BR_RIGHT_MASK                     0xeff
+#define PANEL_PLANE_BR_BOTTOM_MASK                    (0x7ff << 16)
+#define PANEL_PLANE_BR_RIGHT_MASK                     0x7ff
 
 #define PANEL_HORIZONTAL_TOTAL                        0x080024
 #define PANEL_HORIZONTAL_TOTAL_TOTAL_SHIFT            16
diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c
index 7a223074df3d..afada655f861 100644
--- a/drivers/thermal/intel_powerclamp.c
+++ b/drivers/thermal/intel_powerclamp.c
@@ -669,9 +669,16 @@ static struct thermal_cooling_device_ops powerclamp_cooling_ops = {
         .set_cur_state = powerclamp_set_cur_state,
 };
 
+static const struct x86_cpu_id __initconst intel_powerclamp_ids[] = {
+        { X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_MWAIT },
+        {}
+};
+MODULE_DEVICE_TABLE(x86cpu, intel_powerclamp_ids);
+
 static int __init powerclamp_probe(void)
 {
-        if (!boot_cpu_has(X86_FEATURE_MWAIT)) {
+
+        if (!x86_match_cpu(intel_powerclamp_ids)) {
                 pr_err("CPU does not support MWAIT");
                 return -ENODEV;
         }
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 69426e644d17..3dbb4a21ab44 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -914,6 +914,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
         if (!ci)
                 return -ENOMEM;
 
+        spin_lock_init(&ci->lock);
         ci->dev = dev;
         ci->platdata = dev_get_platdata(dev);
         ci->imx28_write_fix = !!(ci->platdata->flags &
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 661f43fe0f9e..c9e80ad48fdc 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1889,8 +1889,6 @@ static int udc_start(struct ci_hdrc *ci)
         struct usb_otg_caps *otg_caps = &ci->platdata->ci_otg_caps;
         int retval = 0;
 
-        spin_lock_init(&ci->lock);
-
         ci->gadget.ops          = &usb_gadget_ops;
         ci->gadget.speed        = USB_SPEED_UNKNOWN;
         ci->gadget.max_speed    = USB_SPEED_HIGH;
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 78f0f85bebdc..fada988512a1 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -932,8 +932,6 @@ static int wait_serial_change(struct acm *acm, unsigned long arg)
         DECLARE_WAITQUEUE(wait, current);
         struct async_icount old, new;
 
-        if (arg & (TIOCM_DSR | TIOCM_RI | TIOCM_CD))
-                return -EINVAL;
         do {
                 spin_lock_irq(&acm->read_lock);
                 old = acm->oldcount;
@@ -1161,6 +1159,8 @@ static int acm_probe(struct usb_interface *intf,
         if (quirks == IGNORE_DEVICE)
                 return -ENODEV;
 
+        memset(&h, 0x00, sizeof(struct usb_cdc_parsed_header));
+
         num_rx_buf = (quirks == SINGLE_RX_URB) ? 1 : ACM_NR;
 
         /* handle quirks deadly to normal probing*/
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 7287a763cd0c..fea446900cad 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -769,15 +769,14 @@ static int dwc3_core_init(struct dwc3 *dwc)
         return 0;
 
 err4:
-        phy_power_off(dwc->usb2_generic_phy);
+        phy_power_off(dwc->usb3_generic_phy);
 
 err3:
-        phy_power_off(dwc->usb3_generic_phy);
+        phy_power_off(dwc->usb2_generic_phy);
 
 err2:
         usb_phy_set_suspend(dwc->usb2_phy, 1);
         usb_phy_set_suspend(dwc->usb3_phy, 1);
-        dwc3_core_exit(dwc);
 
 err1:
         usb_phy_shutdown(dwc->usb2_phy);
diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c
index 89a2f712fdfe..aaaf256f71dd 100644
--- a/drivers/usb/dwc3/dwc3-st.c
+++ b/drivers/usb/dwc3/dwc3-st.c
@@ -31,6 +31,7 @@
 #include <linux/slab.h>
 #include <linux/regmap.h>
 #include <linux/reset.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/usb/of.h>
 
 #include "core.h"
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index e40d47d47d82..17989b72cdae 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -3225,11 +3225,11 @@ static bool ffs_func_req_match(struct usb_function *f,
 
         switch (creq->bRequestType & USB_RECIP_MASK) {
         case USB_RECIP_INTERFACE:
-                return ffs_func_revmap_intf(func,
-                                            le16_to_cpu(creq->wIndex) >= 0);
+                return (ffs_func_revmap_intf(func,
+                                             le16_to_cpu(creq->wIndex)) >= 0);
         case USB_RECIP_ENDPOINT:
-                return ffs_func_revmap_ep(func,
-                                          le16_to_cpu(creq->wIndex) >= 0);
+                return (ffs_func_revmap_ep(func,
+                                           le16_to_cpu(creq->wIndex)) >= 0);
         default:
                 return (bool) (func->ffs->user_flags &
                                FUNCTIONFS_ALL_CTRL_RECIP);
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
index fe1811650dbc..5d1bd13a56c1 100644
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -588,14 +588,6 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
 
         req->length = length;
 
-        /* throttle high/super speed IRQ rate back slightly */
-        if (gadget_is_dualspeed(dev->gadget))
-                req->no_interrupt = (((dev->gadget->speed == USB_SPEED_HIGH ||
-                                       dev->gadget->speed == USB_SPEED_SUPER)) &&
-                                        !list_empty(&dev->tx_reqs))
-                        ? ((atomic_read(&dev->tx_qlen) % dev->qmult) != 0)
-                        : 0;
-
         retval = usb_ep_queue(in, req, GFP_ATOMIC);
         switch (retval) {
         default:
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index d793f548dfe2..a9a1e4c40480 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -995,6 +995,14 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
         }
         val = readl(base + ext_cap_offset);
 
+        /* Auto handoff never worked for these devices. Force it and continue */
+        if ((pdev->vendor == PCI_VENDOR_ID_TI && pdev->device == 0x8241) ||
+                        (pdev->vendor == PCI_VENDOR_ID_RENESAS
+                         && pdev->device == 0x0014)) {
+                val = (val | XHCI_HC_OS_OWNED) & ~XHCI_HC_BIOS_OWNED;
+                writel(val, base + ext_cap_offset);
+        }
+
         /* If the BIOS owns the HC, signal that the OS wants it, and wait */
         if (val & XHCI_HC_BIOS_OWNED) {
                 writel(val | XHCI_HC_OS_OWNED, base + ext_cap_offset);
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index 210b7e43a6fd..2440f88e07a3 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -479,7 +479,8 @@ static int da8xx_probe(struct platform_device *pdev)
 
         glue->phy = devm_phy_get(&pdev->dev, "usb-phy");
         if (IS_ERR(glue->phy)) {
-                dev_err(&pdev->dev, "failed to get phy\n");
+                if (PTR_ERR(glue->phy) != -EPROBE_DEFER)
+                        dev_err(&pdev->dev, "failed to get phy\n");
                 return PTR_ERR(glue->phy);
         }
 
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 27dadc0d9114..c3e172e15ec3 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -986,7 +986,7 @@ b_host:
         }
 #endif
 
-        schedule_work(&musb->irq_work);
+        schedule_delayed_work(&musb->irq_work, 0);
 
         return handled;
 }
@@ -1855,14 +1855,23 @@ static void musb_pm_runtime_check_session(struct musb *musb)
                 MUSB_DEVCTL_HR;
         switch (devctl & ~s) {
         case MUSB_QUIRK_B_INVALID_VBUS_91:
-                if (!musb->session && !musb->quirk_invalid_vbus) {
-                        musb->quirk_invalid_vbus = true;
+                if (musb->quirk_retries--) {
                         musb_dbg(musb,
-                                 "First invalid vbus, assume no session");
+                                 "Poll devctl on invalid vbus, assume no session");
+                        schedule_delayed_work(&musb->irq_work,
+                                              msecs_to_jiffies(1000));
+
                         return;
                 }
-                break;
         case MUSB_QUIRK_A_DISCONNECT_19:
+                if (musb->quirk_retries--) {
+                        musb_dbg(musb,
+                                 "Poll devctl on possible host mode disconnect");
+                        schedule_delayed_work(&musb->irq_work,
+                                              msecs_to_jiffies(1000));
+
+                        return;
+                }
                 if (!musb->session)
                         break;
                 musb_dbg(musb, "Allow PM on possible host mode disconnect");
@@ -1886,9 +1895,9 @@ static void musb_pm_runtime_check_session(struct musb *musb)
                 if (error < 0)
                         dev_err(musb->controller, "Could not enable: %i\n",
                                 error);
+                musb->quirk_retries = 3;
         } else {
                 musb_dbg(musb, "Allow PM with no session: %02x", devctl);
-                musb->quirk_invalid_vbus = false;
                 pm_runtime_mark_last_busy(musb->controller);
                 pm_runtime_put_autosuspend(musb->controller);
         }
@@ -1899,7 +1908,7 @@ static void musb_pm_runtime_check_session(struct musb *musb)
 /* Only used to provide driver mode change events */
 static void musb_irq_work(struct work_struct *data)
 {
-        struct musb *musb = container_of(data, struct musb, irq_work);
+        struct musb *musb = container_of(data, struct musb, irq_work.work);
 
         musb_pm_runtime_check_session(musb);
 
@@ -1969,6 +1978,7 @@ static struct musb *allocate_instance(struct device *dev,
         INIT_LIST_HEAD(&musb->control);
         INIT_LIST_HEAD(&musb->in_bulk);
         INIT_LIST_HEAD(&musb->out_bulk);
+        INIT_LIST_HEAD(&musb->pending_list);
 
         musb->vbuserr_retry = VBUSERR_RETRY_COUNT;
         musb->a_wait_bcon = OTG_TIME_A_WAIT_BCON;
@@ -2018,6 +2028,84 @@ static void musb_free(struct musb *musb)
         musb_host_free(musb);
 }
 
+struct musb_pending_work {
+        int (*callback)(struct musb *musb, void *data);
+        void *data;
+        struct list_head node;
+};
+
+/*
+ * Called from musb_runtime_resume(), musb_resume(), and
+ * musb_queue_resume_work(). Callers must take musb->lock.
+ */
+static int musb_run_resume_work(struct musb *musb)
+{
+        struct musb_pending_work *w, *_w;
+        unsigned long flags;
+        int error = 0;
+
+        spin_lock_irqsave(&musb->list_lock, flags);
+        list_for_each_entry_safe(w, _w, &musb->pending_list, node) {
+                if (w->callback) {
+                        error = w->callback(musb, w->data);
+                        if (error < 0) {
+                                dev_err(musb->controller,
+                                        "resume callback %p failed: %i\n",
+                                        w->callback, error);
+                        }
+                }
+                list_del(&w->node);
+                devm_kfree(musb->controller, w);
+        }
+        spin_unlock_irqrestore(&musb->list_lock, flags);
+
+        return error;
+}
+
+/*
+ * Called to run work if device is active or else queue the work to happen
+ * on resume. Caller must take musb->lock and must hold an RPM reference.
+ *
+ * Note that we cowardly refuse queuing work after musb PM runtime
+ * resume is done calling musb_run_resume_work() and return -EINPROGRESS
+ * instead.
+ */
+int musb_queue_resume_work(struct musb *musb,
+                           int (*callback)(struct musb *musb, void *data),
+                           void *data)
+{
+        struct musb_pending_work *w;
+        unsigned long flags;
+        int error;
+
+        if (WARN_ON(!callback))
+                return -EINVAL;
+
+        if (pm_runtime_active(musb->controller))
+                return callback(musb, data);
+
+        w = devm_kzalloc(musb->controller, sizeof(*w), GFP_ATOMIC);
+        if (!w)
+                return -ENOMEM;
+
+        w->callback = callback;
+        w->data = data;
+        spin_lock_irqsave(&musb->list_lock, flags);
+        if (musb->is_runtime_suspended) {
+                list_add_tail(&w->node, &musb->pending_list);
+                error = 0;
+        } else {
+                dev_err(musb->controller, "could not add resume work %p\n",
+                        callback);
+                devm_kfree(musb->controller, w);
+                error = -EINPROGRESS;
+        }
+        spin_unlock_irqrestore(&musb->list_lock, flags);
+
+        return error;
+}
+EXPORT_SYMBOL_GPL(musb_queue_resume_work);
+
 static void musb_deassert_reset(struct work_struct *work)
 {
         struct musb *musb;
@@ -2065,6 +2153,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         }
 
         spin_lock_init(&musb->lock);
+        spin_lock_init(&musb->list_lock);
         musb->board_set_power = plat->set_power;
         musb->min_power = plat->min_power;
         musb->ops = plat->platform_ops;
@@ -2114,11 +2203,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
                 musb->io.ep_offset = musb_flat_ep_offset;
                 musb->io.ep_select = musb_flat_ep_select;
         }
-        /* And override them with platform specific ops if specified. */
-        if (musb->ops->ep_offset)
-                musb->io.ep_offset = musb->ops->ep_offset;
-        if (musb->ops->ep_select)
-                musb->io.ep_select = musb->ops->ep_select;
 
         /* At least tusb6010 has its own offsets */
         if (musb->ops->ep_offset)
@@ -2213,7 +2297,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         musb_generic_disable(musb);
 
         /* Init IRQ workqueue before request_irq */
-        INIT_WORK(&musb->irq_work, musb_irq_work);
+        INIT_DELAYED_WORK(&musb->irq_work, musb_irq_work);
         INIT_DELAYED_WORK(&musb->deassert_reset_work, musb_deassert_reset);
         INIT_DELAYED_WORK(&musb->finish_resume_work, musb_host_finish_resume);
 
@@ -2296,6 +2380,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         if (status)
                 goto fail5;
 
+        musb->is_initialized = 1;
         pm_runtime_mark_last_busy(musb->controller);
         pm_runtime_put_autosuspend(musb->controller);
 
@@ -2309,7 +2394,7 @@ fail4:
         musb_host_cleanup(musb);
 
 fail3:
-        cancel_work_sync(&musb->irq_work);
+        cancel_delayed_work_sync(&musb->irq_work);
         cancel_delayed_work_sync(&musb->finish_resume_work);
         cancel_delayed_work_sync(&musb->deassert_reset_work);
         if (musb->dma_controller)
@@ -2376,7 +2461,7 @@ static int musb_remove(struct platform_device *pdev)
          */
         musb_exit_debugfs(musb);
 
-        cancel_work_sync(&musb->irq_work);
+        cancel_delayed_work_sync(&musb->irq_work);
         cancel_delayed_work_sync(&musb->finish_resume_work);
         cancel_delayed_work_sync(&musb->deassert_reset_work);
         pm_runtime_get_sync(musb->controller);
@@ -2562,6 +2647,7 @@ static int musb_suspend(struct device *dev)
 
         musb_platform_disable(musb);
         musb_generic_disable(musb);
+        WARN_ON(!list_empty(&musb->pending_list));
 
         spin_lock_irqsave(&musb->lock, flags);
 
@@ -2583,9 +2669,11 @@ static int musb_suspend(struct device *dev)
 
 static int musb_resume(struct device *dev)
 {
-        struct musb     *musb = dev_to_musb(dev);
-        u8              devctl;
-        u8              mask;
+        struct musb *musb = dev_to_musb(dev);
+        unsigned long flags;
+        int error;
+        u8 devctl;
+        u8 mask;
 
         /*
          * For static cmos like DaVinci, register values were preserved
@@ -2619,6 +2707,13 @@ static int musb_resume(struct device *dev)
 
         musb_start(musb);
 
+        spin_lock_irqsave(&musb->lock, flags);
+        error = musb_run_resume_work(musb);
+        if (error)
+                dev_err(musb->controller, "resume work failed with %i\n",
+                        error);
+        spin_unlock_irqrestore(&musb->lock, flags);
+
         return 0;
 }
 
@@ -2627,14 +2722,16 @@ static int musb_runtime_suspend(struct device *dev)
         struct musb     *musb = dev_to_musb(dev);
 
         musb_save_context(musb);
+        musb->is_runtime_suspended = 1;
 
         return 0;
 }
 
 static int musb_runtime_resume(struct device *dev)
 {
-        struct musb     *musb = dev_to_musb(dev);
-        static int      first = 1;
+        struct musb *musb = dev_to_musb(dev);
+        unsigned long flags;
+        int error;
 
         /*
          * When pm_runtime_get_sync called for the first time in driver
@@ -2645,9 +2742,10 @@ static int musb_runtime_resume(struct device *dev)
          * Also context restore without save does not make
          * any sense
          */
-        if (!first)
-                musb_restore_context(musb);
-        first = 0;
+        if (!musb->is_initialized)
+                return 0;
+
+        musb_restore_context(musb);
 
         if (musb->need_finish_resume) {
                 musb->need_finish_resume = 0;
@@ -2655,6 +2753,14 @@ static int musb_runtime_resume(struct device *dev)
                                 msecs_to_jiffies(USB_RESUME_TIMEOUT));
         }
 
+        spin_lock_irqsave(&musb->lock, flags);
+        error = musb_run_resume_work(musb);
+        if (error)
+                dev_err(musb->controller, "resume work failed with %i\n",
+                        error);
+        musb->is_runtime_suspended = 0;
+        spin_unlock_irqrestore(&musb->lock, flags);
+
         return 0;
 }
 
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 2cb88a498f8a..91817d77d59c 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -303,13 +303,14 @@ struct musb_context_registers {
 struct musb {
         /* device lock */
         spinlock_t              lock;
+        spinlock_t              list_lock;      /* resume work list lock */
 
         struct musb_io          io;
         const struct musb_platform_ops *ops;
         struct musb_context_registers context;
 
         irqreturn_t             (*isr)(int, void *);
-        struct work_struct      irq_work;
+        struct delayed_work     irq_work;
         struct delayed_work     deassert_reset_work;
         struct delayed_work     finish_resume_work;
         struct delayed_work     gadget_work;
@@ -337,6 +338,7 @@ struct musb {
         struct list_head        control;        /* of musb_qh */
         struct list_head        in_bulk;        /* of musb_qh */
         struct list_head        out_bulk;       /* of musb_qh */
+        struct list_head        pending_list;   /* pending work list */
 
         struct timer_list       otg_timer;
         struct notifier_block   nb;
@@ -379,12 +381,15 @@ struct musb {
 
         int                     port_mode;      /* MUSB_PORT_MODE_* */
         bool                    session;
-        bool                    quirk_invalid_vbus;
+        unsigned long           quirk_retries;
         bool                    is_host;
 
         int                     a_wait_bcon;    /* VBUS timeout in msecs */
         unsigned long           idle_timeout;   /* Next timeout in jiffies */
 
+        unsigned                is_initialized:1;
+        unsigned                is_runtime_suspended:1;
+
         /* active means connected and not suspended */
         unsigned                is_active:1;
 
@@ -540,6 +545,10 @@ extern irqreturn_t musb_interrupt(struct musb *);
 
 extern void musb_hnp_stop(struct musb *musb);
 
+int musb_queue_resume_work(struct musb *musb,
+                           int (*callback)(struct musb *musb, void *data),
+                           void *data);
+
 static inline void musb_platform_set_vbus(struct musb *musb, int is_on)
 {
         if (musb->ops->set_vbus)
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 0f17d2140db6..feae1561b9ab 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -185,24 +185,19 @@ static void dsps_musb_disable(struct musb *musb)
         musb_writel(reg_base, wrp->coreintr_clear, wrp->usb_bitmap);
         musb_writel(reg_base, wrp->epintr_clear,
                          wrp->txep_bitmap | wrp->rxep_bitmap);
+        del_timer_sync(&glue->timer);
         musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
 }
 
-static void otg_timer(unsigned long _musb)
+/* Caller must take musb->lock */
+static int dsps_check_status(struct musb *musb, void *unused)
 {
-        struct musb *musb = (void *)_musb;
         void __iomem *mregs = musb->mregs;
         struct device *dev = musb->controller;
         struct dsps_glue *glue = dev_get_drvdata(dev->parent);
         const struct dsps_musb_wrapper *wrp = glue->wrp;
         u8 devctl;
-        unsigned long flags;
         int skip_session = 0;
-        int err;
-
-        err = pm_runtime_get_sync(dev);
-        if (err < 0)
-                dev_err(dev, "Poll could not pm_runtime_get: %i\n", err);
 
         /*
          * We poll because DSPS IP's won't expose several OTG-critical
@@ -212,7 +207,6 @@ static void otg_timer(unsigned long _musb)
         dev_dbg(musb->controller, "Poll devctl %02x (%s)\n", devctl,
                                 usb_otg_state_string(musb->xceiv->otg->state));
 
-        spin_lock_irqsave(&musb->lock, flags);
         switch (musb->xceiv->otg->state) {
         case OTG_STATE_A_WAIT_VRISE:
                 mod_timer(&glue->timer, jiffies +
@@ -245,8 +239,30 @@ static void otg_timer(unsigned long _musb)
         default:
                 break;
         }
-        spin_unlock_irqrestore(&musb->lock, flags);
 
+        return 0;
+}
+
+static void otg_timer(unsigned long _musb)
+{
+        struct musb *musb = (void *)_musb;
+        struct device *dev = musb->controller;
+        unsigned long flags;
+        int err;
+
+        err = pm_runtime_get(dev);
+        if ((err != -EINPROGRESS) && err < 0) {
+                dev_err(dev, "Poll could not pm_runtime_get: %i\n", err);
+                pm_runtime_put_noidle(dev);
+
+                return;
+        }
+
+        spin_lock_irqsave(&musb->lock, flags);
+        err = musb_queue_resume_work(musb, dsps_check_status, NULL);
+        if (err < 0)
+                dev_err(dev, "%s resume work: %i\n", __func__, err);
+        spin_unlock_irqrestore(&musb->lock, flags);
         pm_runtime_mark_last_busy(dev);
         pm_runtime_put_autosuspend(dev);
 }
@@ -767,28 +783,13 @@ static int dsps_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, glue);
         pm_runtime_enable(&pdev->dev);
-        pm_runtime_use_autosuspend(&pdev->dev);
-        pm_runtime_set_autosuspend_delay(&pdev->dev, 200);
-
-        ret = pm_runtime_get_sync(&pdev->dev);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "pm_runtime_get_sync FAILED");
-                goto err2;
-        }
-
         ret = dsps_create_musb_pdev(glue, pdev);
         if (ret)
-                goto err3;
-
-        pm_runtime_mark_last_busy(&pdev->dev);
-        pm_runtime_put_autosuspend(&pdev->dev);
+                goto err;
 
         return 0;
 
-err3:
-        pm_runtime_put_sync(&pdev->dev);
-err2:
-        pm_runtime_dont_use_autosuspend(&pdev->dev);
+err:
         pm_runtime_disable(&pdev->dev);
         return ret;
 }
@@ -799,9 +800,6 @@ static int dsps_remove(struct platform_device *pdev)
 
         platform_device_unregister(glue->musb);
 
-        /* disable usbss clocks */
-        pm_runtime_dont_use_autosuspend(&pdev->dev);
-        pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
 
         return 0;
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 4042ea017985..a55173c9e564 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1114,7 +1114,7 @@ static int musb_gadget_enable(struct usb_ep *ep,
                         musb_ep->dma ? "dma, " : "",
                         musb_ep->packet_sz);
 
-        schedule_work(&musb->irq_work);
+        schedule_delayed_work(&musb->irq_work, 0);
 
 fail:
         spin_unlock_irqrestore(&musb->lock, flags);
@@ -1158,7 +1158,7 @@ static int musb_gadget_disable(struct usb_ep *ep)
         musb_ep->desc = NULL;
         musb_ep->end_point.desc = NULL;
 
-        schedule_work(&musb->irq_work);
+        schedule_delayed_work(&musb->irq_work, 0);
 
         spin_unlock_irqrestore(&(musb->lock), flags);
 
@@ -1222,13 +1222,22 @@ void musb_ep_restart(struct musb *musb, struct musb_request *req)
                 rxstate(musb, req);
 }
 
+static int musb_ep_restart_resume_work(struct musb *musb, void *data)
+{
+        struct musb_request *req = data;
+
+        musb_ep_restart(musb, req);
+
+        return 0;
+}
+
 static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req,
                         gfp_t gfp_flags)
 {
         struct musb_ep          *musb_ep;
         struct musb_request     *request;
         struct musb             *musb;
-        int                     status = 0;
+        int                     status;
         unsigned long           lockflags;
 
         if (!ep || !req)
@@ -1245,6 +1254,17 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req,
         if (request->ep != musb_ep)
                 return -EINVAL;
 
+        status = pm_runtime_get(musb->controller);
+        if ((status != -EINPROGRESS) && status < 0) {
+                dev_err(musb->controller,
+                        "pm runtime get failed in %s\n",
+                        __func__);
+                pm_runtime_put_noidle(musb->controller);
+
+                return status;
+        }
+        status = 0;
+
         trace_musb_req_enq(request);
 
         /* request is mine now... */
@@ -1255,7 +1275,6 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req,
 
         map_dma_buffer(request, musb, musb_ep);
 
-        pm_runtime_get_sync(musb->controller);
         spin_lock_irqsave(&musb->lock, lockflags);
 
         /* don't queue if the ep is down */
@@ -1271,8 +1290,14 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req,
         list_add_tail(&request->list, &musb_ep->req_list);
 
         /* it this is the head of the queue, start i/o ... */
-        if (!musb_ep->busy && &request->list == musb_ep->req_list.next)
-                musb_ep_restart(musb, request);
+        if (!musb_ep->busy && &request->list == musb_ep->req_list.next) {
+                status = musb_queue_resume_work(musb,
+                                                musb_ep_restart_resume_work,
+                                                request);
+                if (status < 0)
+                        dev_err(musb->controller, "%s resume work: %i\n",
+                                __func__, status);
+        }
 
 unlock:
         spin_unlock_irqrestore(&musb->lock, lockflags);
@@ -1969,7 +1994,7 @@ static int musb_gadget_stop(struct usb_gadget *g)
          */
 
         /* Force check of devctl register for PM runtime */
-        schedule_work(&musb->irq_work);
+        schedule_delayed_work(&musb->irq_work, 0);
 
         pm_runtime_mark_last_busy(musb->controller);
         pm_runtime_put_autosuspend(musb->controller);
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index cc1225485509..e8be8e39ab8f 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -513,17 +513,18 @@ static int omap2430_probe(struct platform_device *pdev)
         }
 
         pm_runtime_enable(glue->dev);
-        pm_runtime_use_autosuspend(glue->dev);
-        pm_runtime_set_autosuspend_delay(glue->dev, 100);
 
         ret = platform_device_add(musb);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register musb device\n");
-                goto err2;
+                goto err3;
         }
 
         return 0;
 
+err3:
+        pm_runtime_disable(glue->dev);
+
 err2:
         platform_device_put(musb);
 
@@ -535,10 +536,7 @@ static int omap2430_remove(struct platform_device *pdev)
 {
         struct omap2430_glue *glue = platform_get_drvdata(pdev);
 
-        pm_runtime_get_sync(glue->dev);
         platform_device_unregister(glue->musb);
-        pm_runtime_put_sync(glue->dev);
-        pm_runtime_dont_use_autosuspend(glue->dev);
         pm_runtime_disable(glue->dev);
 
         return 0;
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index df7c9f46be54..e85cc8e4e7a9 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -724,7 +724,7 @@ tusb_otg_ints(struct musb *musb, u32 int_src, void __iomem *tbase)
                         dev_dbg(musb->controller, "vbus change, %s, otg %03x\n",
                                 usb_otg_state_string(musb->xceiv->otg->state), otg_stat);
                         idle_timeout = jiffies + (1 * HZ);
-                        schedule_work(&musb->irq_work);
+                        schedule_delayed_work(&musb->irq_work, 0);
 
                 } else /* A-dev state machine */ {
                         dev_dbg(musb->controller, "vbus change, %s, otg %03x\n",
@@ -814,7 +814,7 @@ tusb_otg_ints(struct musb *musb, u32 int_src, void __iomem *tbase)
                         break;
                 }
         }
-        schedule_work(&musb->irq_work);
+        schedule_delayed_work(&musb->irq_work, 0);
 
         return idle_timeout;
 }
@@ -864,7 +864,7 @@ static irqreturn_t tusb_musb_interrupt(int irq, void *__hci)
                 musb_writel(tbase, TUSB_PRCM_WAKEUP_CLEAR, reg);
                 if (reg & ~TUSB_PRCM_WNORCS) {
                         musb->is_active = 1;
-                        schedule_work(&musb->irq_work);
+                        schedule_delayed_work(&musb->irq_work, 0);
                 }
                 dev_dbg(musb->controller, "wake %sactive %02x\n",
                                 musb->is_active ? "" : "in", reg);
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index f61477bed3a8..243ac5ebe46a 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -131,6 +131,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */
         { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */
         { USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */
+        { USB_DEVICE(0x10C4, 0x8962) }, /* Brim Brothers charging dock */
         { USB_DEVICE(0x10C4, 0x8977) }, /* CEL MeshWorks DevKit Device */
         { USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */
         { USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 0ff7f38d7800..6e9fc8bcc285 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1012,6 +1012,8 @@ static const struct usb_device_id id_table_combined[] = {
         { USB_DEVICE(ICPDAS_VID, ICPDAS_I7561U_PID) },
         { USB_DEVICE(ICPDAS_VID, ICPDAS_I7563U_PID) },
         { USB_DEVICE(WICED_VID, WICED_USB20706V2_PID) },
+        { USB_DEVICE(TI_VID, TI_CC3200_LAUNCHPAD_PID),
+                .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { }                                     /* Terminating entry */
 };
 
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 21011c0a4c64..48ee04c94a75 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -596,6 +596,12 @@
 #define STK541_PID              0x2109 /* Zigbee Controller */
 
 /*
+ * Texas Instruments
+ */
+#define TI_VID                  0x0451
+#define TI_CC3200_LAUNCHPAD_PID 0xC32A /* SimpleLink Wi-Fi CC3200 LaunchPad */
+
+/*
  * Blackfin gnICE JTAG
  * http://docs.blackfin.uclinux.org/doku.php?id=hw:jtag:gnice
  */
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index ffd086733421..1a59f335b063 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -954,10 +954,15 @@ int usb_stor_CB_transport(struct scsi_cmnd *srb, struct us_data *us)
 
         /* COMMAND STAGE */
         /* let's send the command via the control pipe */
+        /*
+         * Command is sometime (f.e. after scsi_eh_prep_cmnd) on the stack.
+         * Stack may be vmallocated.  So no DMA for us.  Make a copy.
+         */
+        memcpy(us->iobuf, srb->cmnd, srb->cmd_len);
         result = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe,
                                       US_CBI_ADSC, 
                                       USB_TYPE_CLASS | USB_RECIP_INTERFACE, 0, 
-                                      us->ifnum, srb->cmnd, srb->cmd_len);
+                                      us->ifnum, us->iobuf, srb->cmd_len);
 
         /* check the return code for the command */
         usb_stor_dbg(us, "Call to usb_stor_ctrl_transfer() returned %d\n",
diff --git a/drivers/uwb/lc-rc.c b/drivers/uwb/lc-rc.c
index d059ad4d0dbd..97ee1b46db69 100644
--- a/drivers/uwb/lc-rc.c
+++ b/drivers/uwb/lc-rc.c
@@ -56,8 +56,11 @@ static struct uwb_rc *uwb_rc_find_by_index(int index)
         struct uwb_rc *rc = NULL;
 
         dev = class_find_device(&uwb_rc_class, NULL, &index, uwb_rc_index_match);
-        if (dev)
+        if (dev) {
                 rc = dev_get_drvdata(dev);
+                put_device(dev);
+        }
+
         return rc;
 }
 
@@ -467,7 +470,9 @@ struct uwb_rc *__uwb_rc_try_get(struct uwb_rc *target_rc)
         if (dev) {
                 rc = dev_get_drvdata(dev);
                 __uwb_rc_get(rc);
+                put_device(dev);
         }
+
         return rc;
 }
 EXPORT_SYMBOL_GPL(__uwb_rc_try_get);
@@ -520,8 +525,11 @@ struct uwb_rc *uwb_rc_get_by_grandpa(const struct device *grandpa_dev)
 
         dev = class_find_device(&uwb_rc_class, NULL, grandpa_dev,
                                 find_rc_grandpa);
-        if (dev)
+        if (dev) {
                 rc = dev_get_drvdata(dev);
+                put_device(dev);
+        }
+
         return rc;
 }
 EXPORT_SYMBOL_GPL(uwb_rc_get_by_grandpa);
@@ -553,8 +561,10 @@ struct uwb_rc *uwb_rc_get_by_dev(const struct uwb_dev_addr *addr)
         struct uwb_rc *rc = NULL;
 
         dev = class_find_device(&uwb_rc_class, NULL, addr, find_rc_dev);
-        if (dev)
+        if (dev) {
                 rc = dev_get_drvdata(dev);
+                put_device(dev);
+        }
 
         return rc;
 }
diff --git a/drivers/uwb/pal.c b/drivers/uwb/pal.c
index c1304b8d4985..678e93741ae1 100644
--- a/drivers/uwb/pal.c
+++ b/drivers/uwb/pal.c
@@ -97,6 +97,8 @@ static bool uwb_rc_class_device_exists(struct uwb_rc *target_rc)
 
         dev = class_find_device(&uwb_rc_class, NULL, target_rc, find_rc);
 
+        put_device(dev);
+
         return (dev != NULL);
 }
 
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index e3b30ea9ece5..a504e2e003da 100644
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -506,7 +506,7 @@ static void vhost_vsock_reset_orphans(struct sock *sk)
          * executing.
          */
 
-        if (!vhost_vsock_get(vsk->local_addr.svm_cid)) {
+        if (!vhost_vsock_get(vsk->remote_addr.svm_cid)) {
                 sock_set_flag(sk, SOCK_DONE);
                 vsk->peer_shutdown = SHUTDOWN_MASK;
                 sk->sk_state = SS_UNCONNECTED;
diff --git a/drivers/video/fbdev/amba-clcd-versatile.c b/drivers/video/fbdev/amba-clcd-versatile.c
index 19ad8645d93c..e5d9bfc1703a 100644
--- a/drivers/video/fbdev/amba-clcd-versatile.c
+++ b/drivers/video/fbdev/amba-clcd-versatile.c
@@ -526,8 +526,8 @@ int versatile_clcd_init_panel(struct clcd_fb *fb,
         np = of_find_matching_node_and_match(NULL, versatile_clcd_of_match,
                                              &clcd_id);
         if (!np) {
-                dev_err(dev, "no Versatile syscon node\n");
-                return -ENODEV;
+                /* Vexpress does not have this */
+                return 0;
         }
         versatile_clcd_type = (enum versatile_clcd)clcd_id->data;
 
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index fdd3228e0678..3eb58cb51e56 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -155,6 +155,7 @@ config TANGOX_WATCHDOG
 config WDAT_WDT
         tristate "ACPI Watchdog Action Table (WDAT)"
         depends on ACPI
+        select WATCHDOG_CORE
         select ACPI_WATCHDOG
         help
           This driver adds support for systems with ACPI Watchdog Action
diff --git a/fs/aio.c b/fs/aio.c
index 1157e13a36d6..428484f2f841 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1078,6 +1078,17 @@ static void aio_complete(struct kiocb *kiocb, long res, long res2)
         unsigned tail, pos, head;
         unsigned long   flags;
 
+        if (kiocb->ki_flags & IOCB_WRITE) {
+                struct file *file = kiocb->ki_filp;
+
+                /*
+                 * Tell lockdep we inherited freeze protection from submission
+                 * thread.
+                 */
+                __sb_writers_acquired(file_inode(file)->i_sb, SB_FREEZE_WRITE);
+                file_end_write(file);
+        }
+
         /*
          * Special case handling for sync iocbs:
          *  - events go directly into the iocb for fast handling
@@ -1392,122 +1403,106 @@ SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx)
         return -EINVAL;
 }
 
-typedef ssize_t (rw_iter_op)(struct kiocb *, struct iov_iter *);
-
-static int aio_setup_vectored_rw(int rw, char __user *buf, size_t len,
-                                 struct iovec **iovec,
-                                 bool compat,
-                                 struct iov_iter *iter)
+static int aio_setup_rw(int rw, struct iocb *iocb, struct iovec **iovec,
+                bool vectored, bool compat, struct iov_iter *iter)
 {
+        void __user *buf = (void __user *)(uintptr_t)iocb->aio_buf;
+        size_t len = iocb->aio_nbytes;
+
+        if (!vectored) {
+                ssize_t ret = import_single_range(rw, buf, len, *iovec, iter);
+                *iovec = NULL;
+                return ret;
+        }
 #ifdef CONFIG_COMPAT
         if (compat)
-                return compat_import_iovec(rw,
-                                (struct compat_iovec __user *)buf,
-                                len, UIO_FASTIOV, iovec, iter);
+                return compat_import_iovec(rw, buf, len, UIO_FASTIOV, iovec,
+                                iter);
 #endif
-        return import_iovec(rw, (struct iovec __user *)buf,
-                                len, UIO_FASTIOV, iovec, iter);
+        return import_iovec(rw, buf, len, UIO_FASTIOV, iovec, iter);
 }
 
-/*
- * aio_run_iocb:
- *      Performs the initial checks and io submission.
- */
-static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode,
-                            char __user *buf, size_t len, bool compat)
+static inline ssize_t aio_ret(struct kiocb *req, ssize_t ret)
+{
+        switch (ret) {
+        case -EIOCBQUEUED:
+                return ret;
+        case -ERESTARTSYS:
+        case -ERESTARTNOINTR:
+        case -ERESTARTNOHAND:
+        case -ERESTART_RESTARTBLOCK:
+                /*
+                 * There's no easy way to restart the syscall since other AIO's
+                 * may be already running. Just fail this IO with EINTR.
+                 */
+                ret = -EINTR;
+                /*FALLTHRU*/
+        default:
+                aio_complete(req, ret, 0);
+                return 0;
+        }
+}
+
+static ssize_t aio_read(struct kiocb *req, struct iocb *iocb, bool vectored,
+                bool compat)
 {
         struct file *file = req->ki_filp;
-        ssize_t ret;
-        int rw;
-        fmode_t mode;
-        rw_iter_op *iter_op;
         struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
         struct iov_iter iter;
+        ssize_t ret;
 
-        switch (opcode) {
-        case IOCB_CMD_PREAD:
-        case IOCB_CMD_PREADV:
-                mode    = FMODE_READ;
-                rw      = READ;
-                iter_op = file->f_op->read_iter;
-                goto rw_common;
-
-        case IOCB_CMD_PWRITE:
-        case IOCB_CMD_PWRITEV:
-                mode    = FMODE_WRITE;
-                rw      = WRITE;
-                iter_op = file->f_op->write_iter;
-                goto rw_common;
-rw_common:
-                if (unlikely(!(file->f_mode & mode)))
-                        return -EBADF;
-
-                if (!iter_op)
-                        return -EINVAL;
-
-                if (opcode == IOCB_CMD_PREADV || opcode == IOCB_CMD_PWRITEV)
-                        ret = aio_setup_vectored_rw(rw, buf, len,
-                                                &iovec, compat, &iter);
-                else {
-                        ret = import_single_range(rw, buf, len, iovec, &iter);
-                        iovec = NULL;
-                }
-                if (!ret)
-                        ret = rw_verify_area(rw, file, &req->ki_pos,
-                                             iov_iter_count(&iter));
-                if (ret < 0) {
-                        kfree(iovec);
-                        return ret;
-                }
-
-                if (rw == WRITE)
-                        file_start_write(file);
-
-                ret = iter_op(req, &iter);
-
-                if (rw == WRITE)
-                        file_end_write(file);
-                kfree(iovec);
-                break;
-
-        case IOCB_CMD_FDSYNC:
-                if (!file->f_op->aio_fsync)
-                        return -EINVAL;
-
-                ret = file->f_op->aio_fsync(req, 1);
-                break;
+        if (unlikely(!(file->f_mode & FMODE_READ)))
+                return -EBADF;
+        if (unlikely(!file->f_op->read_iter))
+                return -EINVAL;
 
-        case IOCB_CMD_FSYNC:
-                if (!file->f_op->aio_fsync)
-                        return -EINVAL;
+        ret = aio_setup_rw(READ, iocb, &iovec, vectored, compat, &iter);
+        if (ret)
+                return ret;
+        ret = rw_verify_area(READ, file, &req->ki_pos, iov_iter_count(&iter));
+        if (!ret)
+                ret = aio_ret(req, file->f_op->read_iter(req, &iter));
+        kfree(iovec);
+        return ret;
+}
 
-                ret = file->f_op->aio_fsync(req, 0);
-                break;
+static ssize_t aio_write(struct kiocb *req, struct iocb *iocb, bool vectored,
+                bool compat)
+{
+        struct file *file = req->ki_filp;
+        struct iovec inline_vecs[UIO_FASTIOV], *iovec = inline_vecs;
+        struct iov_iter iter;
+        ssize_t ret;
 
-        default:
-                pr_debug("EINVAL: no operation provided\n");
+        if (unlikely(!(file->f_mode & FMODE_WRITE)))
+                return -EBADF;
+        if (unlikely(!file->f_op->write_iter))
                 return -EINVAL;
-        }
 
-        if (ret != -EIOCBQUEUED) {
+        ret = aio_setup_rw(WRITE, iocb, &iovec, vectored, compat, &iter);
+        if (ret)
+                return ret;
+        ret = rw_verify_area(WRITE, file, &req->ki_pos, iov_iter_count(&iter));
+        if (!ret) {
+                req->ki_flags |= IOCB_WRITE;
+                file_start_write(file);
+                ret = aio_ret(req, file->f_op->write_iter(req, &iter));
                 /*
-                 * There's no easy way to restart the syscall since other AIO's
-                 * may be already running. Just fail this IO with EINTR.
+                 * We release freeze protection in aio_complete().  Fool lockdep
+                 * by telling it the lock got released so that it doesn't
+                 * complain about held lock when we return to userspace.
                  */
-                if (unlikely(ret == -ERESTARTSYS || ret == -ERESTARTNOINTR ||
-                             ret == -ERESTARTNOHAND ||
-                             ret == -ERESTART_RESTARTBLOCK))
-                        ret = -EINTR;
-                aio_complete(req, ret, 0);
+                __sb_writers_release(file_inode(file)->i_sb, SB_FREEZE_WRITE);
         }
-
-        return 0;
+        kfree(iovec);
+        return ret;
 }
 
 static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
                          struct iocb *iocb, bool compat)
 {
         struct aio_kiocb *req;
+        struct file *file;
         ssize_t ret;
 
         /* enforce forwards compatibility on users */
@@ -1530,7 +1525,7 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
         if (unlikely(!req))
                 return -EAGAIN;
 
-        req->common.ki_filp = fget(iocb->aio_fildes);
+        req->common.ki_filp = file = fget(iocb->aio_fildes);
         if (unlikely(!req->common.ki_filp)) {
                 ret = -EBADF;
                 goto out_put_req;
@@ -1565,13 +1560,29 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
         req->ki_user_iocb = user_iocb;
         req->ki_user_data = iocb->aio_data;
 
-        ret = aio_run_iocb(&req->common, iocb->aio_lio_opcode,
-                           (char __user *)(unsigned long)iocb->aio_buf,
-                           iocb->aio_nbytes,
-                           compat);
-        if (ret)
-                goto out_put_req;
+        get_file(file);
+        switch (iocb->aio_lio_opcode) {
+        case IOCB_CMD_PREAD:
+                ret = aio_read(&req->common, iocb, false, compat);
+                break;
+        case IOCB_CMD_PWRITE:
+                ret = aio_write(&req->common, iocb, false, compat);
+                break;
+        case IOCB_CMD_PREADV:
+                ret = aio_read(&req->common, iocb, true, compat);
+                break;
+        case IOCB_CMD_PWRITEV:
+                ret = aio_write(&req->common, iocb, true, compat);
+                break;
+        default:
+                pr_debug("invalid aio operation %d\n", iocb->aio_lio_opcode);
+                ret = -EINVAL;
+                break;
+        }
+        fput(file);
 
+        if (ret && ret != -EIOCBQUEUED)
+                goto out_put_req;
         return 0;
 out_put_req:
         put_reqs_available(ctx, 1);
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 78180d151730..a594c7879cc2 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -1261,26 +1261,30 @@ static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags)
                         return -ECHILD;
 
                 op = ceph_snap(dir) == CEPH_SNAPDIR ?
-                        CEPH_MDS_OP_LOOKUPSNAP : CEPH_MDS_OP_LOOKUP;
+                        CEPH_MDS_OP_LOOKUPSNAP : CEPH_MDS_OP_GETATTR;
                 req = ceph_mdsc_create_request(mdsc, op, USE_ANY_MDS);
                 if (!IS_ERR(req)) {
                         req->r_dentry = dget(dentry);
-                        req->r_num_caps = 2;
+                        req->r_num_caps = op == CEPH_MDS_OP_GETATTR ? 1 : 2;
 
                         mask = CEPH_STAT_CAP_INODE | CEPH_CAP_AUTH_SHARED;
                         if (ceph_security_xattr_wanted(dir))
                                 mask |= CEPH_CAP_XATTR_SHARED;
                         req->r_args.getattr.mask = mask;
 
-                        req->r_locked_dir = dir;
                         err = ceph_mdsc_do_request(mdsc, NULL, req);
-                        if (err == 0 || err == -ENOENT) {
-                                if (dentry == req->r_dentry) {
-                                        valid = !d_unhashed(dentry);
-                                } else {
-                                        d_invalidate(req->r_dentry);
-                                        err = -EAGAIN;
-                                }
+                        switch (err) {
+                        case 0:
+                                if (d_really_is_positive(dentry) &&
+                                    d_inode(dentry) == req->r_target_inode)
+                                        valid = 1;
+                                break;
+                        case -ENOENT:
+                                if (d_really_is_negative(dentry))
+                                        valid = 1;
+                                /* Fallthrough */
+                        default:
+                                break;
                         }
                         ceph_mdsc_put_request(req);
                         dout("d_revalidate %p lookup result=%d\n",
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 18630e800208..f995e3528a33 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1770,7 +1770,6 @@ const struct file_operations ceph_file_fops = {
         .fsync = ceph_fsync,
         .lock = ceph_lock,
         .flock = ceph_flock,
-        .splice_read = generic_file_splice_read,
         .splice_write = iter_file_splice_write,
         .unlocked_ioctl = ceph_ioctl,
         .compat_ioctl   = ceph_ioctl,
diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c
index 8347c90cf483..5eb04129f938 100644
--- a/fs/cifs/cifsencrypt.c
+++ b/fs/cifs/cifsencrypt.c
@@ -808,7 +808,11 @@ calc_seckey(struct cifs_ses *ses)
         struct crypto_skcipher *tfm_arc4;
         struct scatterlist sgin, sgout;
         struct skcipher_request *req;
-        unsigned char sec_key[CIFS_SESS_KEY_SIZE]; /* a nonce */
+        unsigned char *sec_key;
+
+        sec_key = kmalloc(CIFS_SESS_KEY_SIZE, GFP_KERNEL);
+        if (sec_key == NULL)
+                return -ENOMEM;
 
         get_random_bytes(sec_key, CIFS_SESS_KEY_SIZE);
 
@@ -816,7 +820,7 @@ calc_seckey(struct cifs_ses *ses)
         if (IS_ERR(tfm_arc4)) {
                 rc = PTR_ERR(tfm_arc4);
                 cifs_dbg(VFS, "could not allocate crypto API arc4\n");
-                return rc;
+                goto out;
         }
 
         rc = crypto_skcipher_setkey(tfm_arc4, ses->auth_key.response,
@@ -854,7 +858,8 @@ calc_seckey(struct cifs_ses *ses)
 
 out_free_cipher:
         crypto_free_skcipher(tfm_arc4);
-
+out:
+        kfree(sec_key);
         return rc;
 }
 
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 3f3185febc58..e3fed9249a04 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -3427,6 +3427,7 @@ static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL,
         __u16 rc = 0;
         struct cifs_posix_acl *cifs_acl = (struct cifs_posix_acl *)parm_data;
         struct posix_acl_xattr_header *local_acl = (void *)pACL;
+        struct posix_acl_xattr_entry *ace = (void *)(local_acl + 1);
         int count;
         int i;
 
@@ -3453,8 +3454,7 @@ static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL,
                 return 0;
         }
         for (i = 0; i < count; i++) {
-                rc = convert_ace_to_cifs_ace(&cifs_acl->ace_array[i],
-                        (struct posix_acl_xattr_entry *)(local_acl + 1));
+                rc = convert_ace_to_cifs_ace(&cifs_acl->ace_array[i], &ace[i]);
                 if (rc != 0) {
                         /* ACE not converted */
                         break;
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index aab5227979e2..4547aeddd12b 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -412,6 +412,9 @@ cifs_reconnect(struct TCP_Server_Info *server)
                 }
         } while (server->tcpStatus == CifsNeedReconnect);
 
+        if (server->tcpStatus == CifsNeedNegotiate)
+                mod_delayed_work(cifsiod_wq, &server->echo, 0);
+
         return rc;
 }
 
@@ -421,17 +424,25 @@ cifs_echo_request(struct work_struct *work)
         int rc;
         struct TCP_Server_Info *server = container_of(work,
                                         struct TCP_Server_Info, echo.work);
-        unsigned long echo_interval = server->echo_interval;
+        unsigned long echo_interval;
+
+        /*
+         * If we need to renegotiate, set echo interval to zero to
+         * immediately call echo service where we can renegotiate.
+         */
+        if (server->tcpStatus == CifsNeedNegotiate)
+                echo_interval = 0;
+        else
+                echo_interval = server->echo_interval;
 
         /*
-         * We cannot send an echo if it is disabled or until the
-         * NEGOTIATE_PROTOCOL request is done, which is indicated by
-         * server->ops->need_neg() == true. Also, no need to ping if
-         * we got a response recently.
+         * We cannot send an echo if it is disabled.
+         * Also, no need to ping if we got a response recently.
          */
 
         if (server->tcpStatus == CifsNeedReconnect ||
-            server->tcpStatus == CifsExiting || server->tcpStatus == CifsNew ||
+            server->tcpStatus == CifsExiting ||
+            server->tcpStatus == CifsNew ||
             (server->ops->can_echo && !server->ops->can_echo(server)) ||
             time_before(jiffies, server->lstrp + echo_interval - HZ))
                 goto requeue_echo;
@@ -442,7 +453,7 @@ cifs_echo_request(struct work_struct *work)
                          server->hostname);
 
 requeue_echo:
-        queue_delayed_work(cifsiod_wq, &server->echo, echo_interval);
+        queue_delayed_work(cifsiod_wq, &server->echo, server->echo_interval);
 }
 
 static bool
diff --git a/fs/coredump.c b/fs/coredump.c
index 281b768000e6..eb9c92c9b20f 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -1,6 +1,7 @@
 #include <linux/slab.h>
 #include <linux/file.h>
 #include <linux/fdtable.h>
+#include <linux/freezer.h>
 #include <linux/mm.h>
 #include <linux/stat.h>
 #include <linux/fcntl.h>
@@ -423,7 +424,9 @@ static int coredump_wait(int exit_code, struct core_state *core_state)
         if (core_waiters > 0) {
                 struct core_thread *ptr;
 
+                freezer_do_not_count();
                 wait_for_completion(&core_state->startup);
+                freezer_count();
                 /*
                  * Wait for all the threads to become inactive, so that
                  * all the thread context (extended register state, like
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c
index 9a28133ac3b8..9b774f4b50c8 100644
--- a/fs/crypto/fname.c
+++ b/fs/crypto/fname.c
@@ -39,65 +39,54 @@ static void fname_crypt_complete(struct crypto_async_request *req, int res)
 static int fname_encrypt(struct inode *inode,
                         const struct qstr *iname, struct fscrypt_str *oname)
 {
-        u32 ciphertext_len;
         struct skcipher_request *req = NULL;
         DECLARE_FS_COMPLETION_RESULT(ecr);
         struct fscrypt_info *ci = inode->i_crypt_info;
         struct crypto_skcipher *tfm = ci->ci_ctfm;
         int res = 0;
         char iv[FS_CRYPTO_BLOCK_SIZE];
-        struct scatterlist src_sg, dst_sg;
+        struct scatterlist sg;
         int padding = 4 << (ci->ci_flags & FS_POLICY_FLAGS_PAD_MASK);
-        char *workbuf, buf[32], *alloc_buf = NULL;
-        unsigned lim;
+        unsigned int lim;
+        unsigned int cryptlen;
 
         lim = inode->i_sb->s_cop->max_namelen(inode);
         if (iname->len <= 0 || iname->len > lim)
                 return -EIO;
 
-        ciphertext_len = max(iname->len, (u32)FS_CRYPTO_BLOCK_SIZE);
-        ciphertext_len = round_up(ciphertext_len, padding);
-        ciphertext_len = min(ciphertext_len, lim);
+        /*
+         * Copy the filename to the output buffer for encrypting in-place and
+         * pad it with the needed number of NUL bytes.
+         */
+        cryptlen = max_t(unsigned int, iname->len, FS_CRYPTO_BLOCK_SIZE);
+        cryptlen = round_up(cryptlen, padding);
+        cryptlen = min(cryptlen, lim);
+        memcpy(oname->name, iname->name, iname->len);
+        memset(oname->name + iname->len, 0, cryptlen - iname->len);
 
-        if (ciphertext_len <= sizeof(buf)) {
-                workbuf = buf;
-        } else {
-                alloc_buf = kmalloc(ciphertext_len, GFP_NOFS);
-                if (!alloc_buf)
-                        return -ENOMEM;
-                workbuf = alloc_buf;
-        }
+        /* Initialize the IV */
+        memset(iv, 0, FS_CRYPTO_BLOCK_SIZE);
 
-        /* Allocate request */
+        /* Set up the encryption request */
         req = skcipher_request_alloc(tfm, GFP_NOFS);
         if (!req) {
                 printk_ratelimited(KERN_ERR
-                        "%s: crypto_request_alloc() failed\n", __func__);
-                kfree(alloc_buf);
+                        "%s: skcipher_request_alloc() failed\n", __func__);
                 return -ENOMEM;
         }
         skcipher_request_set_callback(req,
                         CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,
                         fname_crypt_complete, &ecr);
+        sg_init_one(&sg, oname->name, cryptlen);
+        skcipher_request_set_crypt(req, &sg, &sg, cryptlen, iv);
 
-        /* Copy the input */
-        memcpy(workbuf, iname->name, iname->len);
-        if (iname->len < ciphertext_len)
-                memset(workbuf + iname->len, 0, ciphertext_len - iname->len);
-
-        /* Initialize IV */
-        memset(iv, 0, FS_CRYPTO_BLOCK_SIZE);
-
-        /* Create encryption request */
-        sg_init_one(&src_sg, workbuf, ciphertext_len);
-        sg_init_one(&dst_sg, oname->name, ciphertext_len);
-        skcipher_request_set_crypt(req, &src_sg, &dst_sg, ciphertext_len, iv);
+        /* Do the encryption */
         res = crypto_skcipher_encrypt(req);
         if (res == -EINPROGRESS || res == -EBUSY) {
+                /* Request is being completed asynchronously; wait for it */
                 wait_for_completion(&ecr.completion);
                 res = ecr.res;
         }
-        kfree(alloc_buf);
         skcipher_request_free(req);
         if (res < 0) {
                 printk_ratelimited(KERN_ERR
@@ -105,7 +94,7 @@ static int fname_encrypt(struct inode *inode,
                 return res;
         }
 
-        oname->len = ciphertext_len;
+        oname->len = cryptlen;
         return 0;
 }
 
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c
index 82f0285f5d08..67fb6d8876d0 100644
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@ -185,7 +185,7 @@ int get_crypt_info(struct inode *inode)
         struct crypto_skcipher *ctfm;
         const char *cipher_str;
         int keysize;
-        u8 raw_key[FS_MAX_KEY_SIZE];
+        u8 *raw_key = NULL;
         int res;
 
         res = fscrypt_initialize();
@@ -238,6 +238,15 @@ retry:
         if (res)
                 goto out;
 
+        /*
+         * This cannot be a stack buffer because it is passed to the scatterlist
+         * crypto API as part of key derivation.
+         */
+        res = -ENOMEM;
+        raw_key = kmalloc(FS_MAX_KEY_SIZE, GFP_NOFS);
+        if (!raw_key)
+                goto out;
+
         if (fscrypt_dummy_context_enabled(inode)) {
                 memset(raw_key, 0x42, FS_AES_256_XTS_KEY_SIZE);
                 goto got_key;
@@ -276,7 +285,8 @@ got_key:
         if (res)
                 goto out;
 
-        memzero_explicit(raw_key, sizeof(raw_key));
+        kzfree(raw_key);
+        raw_key = NULL;
         if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) != NULL) {
                 put_crypt_info(crypt_info);
                 goto retry;
@@ -287,7 +297,7 @@ out:
         if (res == -ENOKEY)
                 res = 0;
         put_crypt_info(crypt_info);
-        memzero_explicit(raw_key, sizeof(raw_key));
+        kzfree(raw_key);
         return res;
 }
 
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 282a51b07c57..a8a750f59621 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -235,6 +235,7 @@ struct ext4_io_submit {
 #define EXT4_MAX_BLOCK_SIZE             65536
 #define EXT4_MIN_BLOCK_LOG_SIZE         10
 #define EXT4_MAX_BLOCK_LOG_SIZE         16
+#define EXT4_MAX_CLUSTER_LOG_SIZE       30
 #ifdef __KERNEL__
 # define EXT4_BLOCK_SIZE(s)             ((s)->s_blocksize)
 #else
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 20da99da0a34..52b0530c5d65 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3565,7 +3565,15 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
         if (blocksize < EXT4_MIN_BLOCK_SIZE ||
             blocksize > EXT4_MAX_BLOCK_SIZE) {
                 ext4_msg(sb, KERN_ERR,
-                       "Unsupported filesystem blocksize %d", blocksize);
+                       "Unsupported filesystem blocksize %d (%d log_block_size)",
+                         blocksize, le32_to_cpu(es->s_log_block_size));
+                goto failed_mount;
+        }
+        if (le32_to_cpu(es->s_log_block_size) >
+            (EXT4_MAX_BLOCK_LOG_SIZE - EXT4_MIN_BLOCK_LOG_SIZE)) {
+                ext4_msg(sb, KERN_ERR,
+                         "Invalid log block size: %u",
+                         le32_to_cpu(es->s_log_block_size));
                 goto failed_mount;
         }
 
@@ -3697,6 +3705,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                                  "block size (%d)", clustersize, blocksize);
                         goto failed_mount;
                 }
+                if (le32_to_cpu(es->s_log_cluster_size) >
+                    (EXT4_MAX_CLUSTER_LOG_SIZE - EXT4_MIN_BLOCK_LOG_SIZE)) {
+                        ext4_msg(sb, KERN_ERR,
+                                 "Invalid log cluster size: %u",
+                                 le32_to_cpu(es->s_log_cluster_size));
+                        goto failed_mount;
+                }
                 sbi->s_cluster_bits = le32_to_cpu(es->s_log_cluster_size) -
                         le32_to_cpu(es->s_log_block_size);
                 sbi->s_clusters_per_group =
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 6a4d0e5418a1..096f79997f75 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -286,6 +286,11 @@ const struct dentry_operations fuse_dentry_operations = {
         .d_release      = fuse_dentry_release,
 };
 
+const struct dentry_operations fuse_root_dentry_operations = {
+        .d_init         = fuse_dentry_init,
+        .d_release      = fuse_dentry_release,
+};
+
 int fuse_valid_type(int m)
 {
         return S_ISREG(m) || S_ISDIR(m) || S_ISLNK(m) || S_ISCHR(m) ||
@@ -1734,8 +1739,6 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
                  * This should be done on write(), truncate() and chown().
                  */
                 if (!fc->handle_killpriv) {
-                        int kill;
-
                         /*
                          * ia_mode calculation may have used stale i_mode.
                          * Refresh and recalculate.
@@ -1745,12 +1748,11 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
                                 return ret;
 
                         attr->ia_mode = inode->i_mode;
-                        kill = should_remove_suid(entry);
-                        if (kill & ATTR_KILL_SUID) {
+                        if (inode->i_mode & S_ISUID) {
                                 attr->ia_valid |= ATTR_MODE;
                                 attr->ia_mode &= ~S_ISUID;
                         }
-                        if (kill & ATTR_KILL_SGID) {
+                        if ((inode->i_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
                                 attr->ia_valid |= ATTR_MODE;
                                 attr->ia_mode &= ~S_ISGID;
                         }
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index abc66a6237fd..2401c5dabb2a 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1985,6 +1985,10 @@ static int fuse_write_end(struct file *file, struct address_space *mapping,
 {
         struct inode *inode = page->mapping->host;
 
+        /* Haven't copied anything?  Skip zeroing, size extending, dirtying. */
+        if (!copied)
+                goto unlock;
+
         if (!PageUptodate(page)) {
                 /* Zero any unwritten bytes at the end of the page */
                 size_t endoff = (pos + copied) & ~PAGE_MASK;
@@ -1995,6 +1999,8 @@ static int fuse_write_end(struct file *file, struct address_space *mapping,
 
         fuse_write_update_size(inode, pos + copied);
         set_page_dirty(page);
+
+unlock:
         unlock_page(page);
         put_page(page);
 
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index 0dfbb136e59a..91307940c8ac 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -692,6 +692,7 @@ static inline u64 get_node_id(struct inode *inode)
 extern const struct file_operations fuse_dev_operations;
 
 extern const struct dentry_operations fuse_dentry_operations;
+extern const struct dentry_operations fuse_root_dentry_operations;
 
 /**
  * Inode to nodeid comparison.
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 17141099f2e7..6fe6a88ecb4a 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -1131,10 +1131,11 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
 
         err = -ENOMEM;
         root = fuse_get_root_inode(sb, d.rootmode);
+        sb->s_d_op = &fuse_root_dentry_operations;
         root_dentry = d_make_root(root);
         if (!root_dentry)
                 goto err_dev_free;
-        /* only now - we want root dentry with NULL ->d_op */
+        /* Root dentry doesn't have .d_revalidate */
         sb->s_d_op = &fuse_dentry_operations;
 
         init_req = fuse_request_alloc(0);
diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c
index 98b3eb7d8eaf..0ec137310320 100644
--- a/fs/isofs/rock.c
+++ b/fs/isofs/rock.c
@@ -377,9 +377,9 @@ repeat:
                         {
                                 int p;
                                 for (p = 0; p < rr->u.ER.len_id; p++)
-                                        printk("%c", rr->u.ER.data[p]);
+                                        printk(KERN_CONT "%c", rr->u.ER.data[p]);
                         }
-                        printk("\n");
+                        printk(KERN_CONT "\n");
                         break;
                 case SIG('P', 'X'):
                         inode->i_mode = isonum_733(rr->u.PX.mode);
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 532d8e242d4d..484bebc20bca 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -197,7 +197,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv,
         }
 
         ret = -EPROTONOSUPPORT;
-        if (minorversion == 0)
+        if (!IS_ENABLED(CONFIG_NFS_V4_1) || minorversion == 0)
                 ret = nfs4_callback_up_net(serv, net);
         else if (xprt->ops->bc_up)
                 ret = xprt->ops->bc_up(serv, net);
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 7555ba889d1f..ebecfb8fba06 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -314,7 +314,8 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat
                 /* Match the full socket address */
                 if (!rpc_cmp_addr_port(sap, clap))
                         /* Match all xprt_switch full socket addresses */
-                        if (!rpc_clnt_xprt_switch_has_addr(clp->cl_rpcclient,
+                        if (IS_ERR(clp->cl_rpcclient) ||
+                            !rpc_clnt_xprt_switch_has_addr(clp->cl_rpcclient,
                                                            sap))
                                 continue;
 
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index c8162c660c44..5551e8ef67fd 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -98,7 +98,7 @@ rename_retry:
                 return end;
         }
         namelen = strlen(base);
-        if (flags & NFS_PATH_CANONICAL) {
+        if (*end == '/') {
                 /* Strip off excess slashes in base string */
                 while (namelen > 0 && base[namelen - 1] == '/')
                         namelen--;
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 9b3a82abab07..1452177c822d 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -542,6 +542,13 @@ static inline bool nfs4_valid_open_stateid(const struct nfs4_state *state)
         return test_bit(NFS_STATE_RECOVERY_FAILED, &state->flags) == 0;
 }
 
+static inline bool nfs4_state_match_open_stateid_other(const struct nfs4_state *state,
+                const nfs4_stateid *stateid)
+{
+        return test_bit(NFS_OPEN_STATE, &state->flags) &&
+                nfs4_stateid_match_other(&state->open_stateid, stateid);
+}
+
 #else
 
 #define nfs4_close_state(a, b) do { } while (0)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 7897826d7c51..241da19b7da4 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1451,7 +1451,6 @@ static void nfs_resync_open_stateid_locked(struct nfs4_state *state)
 }
 
 static void nfs_clear_open_stateid_locked(struct nfs4_state *state,
-                nfs4_stateid *arg_stateid,
                 nfs4_stateid *stateid, fmode_t fmode)
 {
         clear_bit(NFS_O_RDWR_STATE, &state->flags);
@@ -1469,10 +1468,9 @@ static void nfs_clear_open_stateid_locked(struct nfs4_state *state,
         }
         if (stateid == NULL)
                 return;
-        /* Handle races with OPEN */
-        if (!nfs4_stateid_match_other(arg_stateid, &state->open_stateid) ||
-            (nfs4_stateid_match_other(stateid, &state->open_stateid) &&
-            !nfs4_stateid_is_newer(stateid, &state->open_stateid))) {
+        /* Handle OPEN+OPEN_DOWNGRADE races */
+        if (nfs4_stateid_match_other(stateid, &state->open_stateid) &&
+            !nfs4_stateid_is_newer(stateid, &state->open_stateid)) {
                 nfs_resync_open_stateid_locked(state);
                 return;
         }
@@ -1486,7 +1484,9 @@ static void nfs_clear_open_stateid(struct nfs4_state *state,
         nfs4_stateid *stateid, fmode_t fmode)
 {
         write_seqlock(&state->seqlock);
-        nfs_clear_open_stateid_locked(state, arg_stateid, stateid, fmode);
+        /* Ignore, if the CLOSE argment doesn't match the current stateid */
+        if (nfs4_state_match_open_stateid_other(state, arg_stateid))
+                nfs_clear_open_stateid_locked(state, stateid, fmode);
         write_sequnlock(&state->seqlock);
         if (test_bit(NFS_STATE_RECLAIM_NOGRACE, &state->flags))
                 nfs4_schedule_state_manager(state->owner->so_server->nfs_client);
@@ -2564,15 +2564,23 @@ static void nfs41_check_delegation_stateid(struct nfs4_state *state)
 static int nfs41_check_expired_locks(struct nfs4_state *state)
 {
         int status, ret = NFS_OK;
-        struct nfs4_lock_state *lsp;
+        struct nfs4_lock_state *lsp, *prev = NULL;
         struct nfs_server *server = NFS_SERVER(state->inode);
 
         if (!test_bit(LK_STATE_IN_USE, &state->flags))
                 goto out;
+
+        spin_lock(&state->state_lock);
         list_for_each_entry(lsp, &state->lock_states, ls_locks) {
                 if (test_bit(NFS_LOCK_INITIALIZED, &lsp->ls_flags)) {
                         struct rpc_cred *cred = lsp->ls_state->owner->so_cred;
 
+                        atomic_inc(&lsp->ls_count);
+                        spin_unlock(&state->state_lock);
+
+                        nfs4_put_lock_state(prev);
+                        prev = lsp;
+
                         status = nfs41_test_and_free_expired_stateid(server,
                                         &lsp->ls_stateid,
                                         cred);
@@ -2585,10 +2593,14 @@ static int nfs41_check_expired_locks(struct nfs4_state *state)
                                         set_bit(NFS_LOCK_LOST, &lsp->ls_flags);
                         } else if (status != NFS_OK) {
                                 ret = status;
-                                break;
+                                nfs4_put_lock_state(prev);
+                                goto out;
                         }
+                        spin_lock(&state->state_lock);
                 }
-        };
+        }
+        spin_unlock(&state->state_lock);
+        nfs4_put_lock_state(prev);
 out:
         return ret;
 }
@@ -3122,7 +3134,8 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data)
         } else if (is_rdwr)
                 calldata->arg.fmode |= FMODE_READ|FMODE_WRITE;
 
-        if (!nfs4_valid_open_stateid(state))
+        if (!nfs4_valid_open_stateid(state) ||
+            test_bit(NFS_OPEN_STATE, &state->flags) == 0)
                 call_close = 0;
         spin_unlock(&state->owner->so_lock);
 
@@ -5569,6 +5582,7 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)
         switch (task->tk_status) {
         case 0:
                 renew_lease(data->res.server, data->timestamp);
+                break;
         case -NFS4ERR_ADMIN_REVOKED:
         case -NFS4ERR_DELEG_REVOKED:
         case -NFS4ERR_EXPIRED:
@@ -5579,8 +5593,6 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)
         case -NFS4ERR_OLD_STATEID:
         case -NFS4ERR_STALE_STATEID:
                 task->tk_status = 0;
-                if (data->roc)
-                        pnfs_roc_set_barrier(data->inode, data->roc_barrier);
                 break;
         default:
                 if (nfs4_async_handle_error(task, data->res.server,
@@ -5590,6 +5602,8 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)
                 }
         }
         data->rpc_status = task->tk_status;
+        if (data->roc && data->rpc_status == 0)
+                pnfs_roc_set_barrier(data->inode, data->roc_barrier);
 }
 
 static void nfs4_delegreturn_release(void *calldata)
diff --git a/fs/nfs/nfs4session.c b/fs/nfs/nfs4session.c
index b62973045a3e..a61350f75c74 100644
--- a/fs/nfs/nfs4session.c
+++ b/fs/nfs/nfs4session.c
@@ -178,12 +178,14 @@ static int nfs4_slot_get_seqid(struct nfs4_slot_table  *tbl, u32 slotid,
         __must_hold(&tbl->slot_tbl_lock)
 {
         struct nfs4_slot *slot;
+        int ret;
 
         slot = nfs4_lookup_slot(tbl, slotid);
-        if (IS_ERR(slot))
-                return PTR_ERR(slot);
-        *seq_nr = slot->seq_nr;
-        return 0;
+        ret = PTR_ERR_OR_ZERO(slot);
+        if (!ret)
+                *seq_nr = slot->seq_nr;
+
+        return ret;
 }
 
 /*
@@ -196,7 +198,7 @@ static int nfs4_slot_get_seqid(struct nfs4_slot_table  *tbl, u32 slotid,
 static bool nfs4_slot_seqid_in_use(struct nfs4_slot_table *tbl,
                 u32 slotid, u32 seq_nr)
 {
-        u32 cur_seq;
+        u32 cur_seq = 0;
         bool ret = false;
 
         spin_lock(&tbl->slot_tbl_lock);
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 5f4281ec5f72..0959c9661662 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1547,6 +1547,7 @@ restart:
                                 ssleep(1);
                         case -NFS4ERR_ADMIN_REVOKED:
                         case -NFS4ERR_STALE_STATEID:
+                        case -NFS4ERR_OLD_STATEID:
                         case -NFS4ERR_BAD_STATEID:
                         case -NFS4ERR_RECLAIM_BAD:
                         case -NFS4ERR_RECLAIM_CONFLICT:
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 56b2d96f9103..259ef85f435a 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -146,6 +146,8 @@ set_pnfs_layoutdriver(struct nfs_server *server, const struct nfs_fh *mntfh,
         u32 id;
         int i;
 
+        if (fsinfo->nlayouttypes == 0)
+                goto out_no_driver;
         if (!(server->nfs_client->cl_exchange_flags &
                  (EXCHGID4_FLAG_USE_NON_PNFS | EXCHGID4_FLAG_USE_PNFS_MDS))) {
                 printk(KERN_ERR "NFS: %s: cl_exchange_flags 0x%x\n",
diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
index a18613579001..0ee19ecc982d 100644
--- a/fs/ntfs/dir.c
+++ b/fs/ntfs/dir.c
@@ -1544,8 +1544,6 @@ const struct file_operations ntfs_dir_ops = {
         .iterate        = ntfs_readdir,         /* Read directory contents. */
 #ifdef NTFS_RW
         .fsync          = ntfs_dir_fsync,       /* Sync a directory to disk. */
-        /*.aio_fsync    = ,*/                   /* Sync all outstanding async
-                                                   i/o operations on a kiocb. */
 #endif /* NTFS_RW */
         /*.ioctl        = ,*/                   /* Perform function on the
                                                    mounted filesystem. */
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index e7054e2ac922..3ecb9f337b7d 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -3699,7 +3699,7 @@ static void ocfs2_dx_dir_transfer_leaf(struct inode *dir, u32 split_hash,
 static int ocfs2_dx_dir_rebalance_credits(struct ocfs2_super *osb,
                                           struct ocfs2_dx_root_block *dx_root)
 {
-        int credits = ocfs2_clusters_to_blocks(osb->sb, 2);
+        int credits = ocfs2_clusters_to_blocks(osb->sb, 3);
 
         credits += ocfs2_calc_extend_credits(osb->sb, &dx_root->dr_list);
         credits += ocfs2_quota_trans_credits(osb->sb);
diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
index eb09aa026723..38887cc5577f 100644
--- a/fs/orangefs/orangefs-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -114,6 +114,7 @@ static const struct seq_operations help_debug_ops = {
 };
 
 const struct file_operations debug_help_fops = {
+        .owner          = THIS_MODULE,
         .open           = orangefs_debug_help_open,
         .read           = seq_read,
         .release        = seq_release,
@@ -121,6 +122,7 @@ const struct file_operations debug_help_fops = {
 };
 
 static const struct file_operations kernel_debug_fops = {
+        .owner          = THIS_MODULE,
         .open           = orangefs_debug_open,
         .read           = orangefs_debug_read,
         .write          = orangefs_debug_write,
@@ -141,6 +143,9 @@ static struct client_debug_mask client_debug_mask;
  */
 static DEFINE_MUTEX(orangefs_debug_lock);
 
+/* Used to protect data in ORANGEFS_KMOD_DEBUG_HELP_FILE */
+static DEFINE_MUTEX(orangefs_help_file_lock);
+
 /*
  * initialize kmod debug operations, create orangefs debugfs dir and
  * ORANGEFS_KMOD_DEBUG_HELP_FILE.
@@ -289,6 +294,8 @@ static void *help_start(struct seq_file *m, loff_t *pos)
 
         gossip_debug(GOSSIP_DEBUGFS_DEBUG, "help_start: start\n");
 
+        mutex_lock(&orangefs_help_file_lock);
+
         if (*pos == 0)
                 payload = m->private;
 
@@ -305,6 +312,7 @@ static void *help_next(struct seq_file *m, void *v, loff_t *pos)
 static void help_stop(struct seq_file *m, void *p)
 {
         gossip_debug(GOSSIP_DEBUGFS_DEBUG, "help_stop: start\n");
+        mutex_unlock(&orangefs_help_file_lock);
 }
 
 static int help_show(struct seq_file *m, void *v)
@@ -610,32 +618,54 @@ out:
  * /sys/kernel/debug/orangefs/debug-help can be catted to
  * see all the available kernel and client debug keywords.
  *
- * When the kernel boots, we have no idea what keywords the
+ * When orangefs.ko initializes, we have no idea what keywords the
  * client supports, nor their associated masks.
  *
- * We pass through this function once at boot and stamp a
+ * We pass through this function once at module-load and stamp a
  * boilerplate "we don't know" message for the client in the
  * debug-help file. We pass through here again when the client
  * starts and then we can fill out the debug-help file fully.
  *
  * The client might be restarted any number of times between
- * reboots, we only build the debug-help file the first time.
+ * module reloads, we only build the debug-help file the first time.
  */
 int orangefs_prepare_debugfs_help_string(int at_boot)
 {
-        int rc = -EINVAL;
-        int i;
-        int byte_count = 0;
         char *client_title = "Client Debug Keywords:\n";
         char *kernel_title = "Kernel Debug Keywords:\n";
+        size_t string_size =  DEBUG_HELP_STRING_SIZE;
+        size_t result_size;
+        size_t i;
+        char *new;
+        int rc = -EINVAL;
 
         gossip_debug(GOSSIP_UTILS_DEBUG, "%s: start\n", __func__);
 
-        if (at_boot) {
-                byte_count += strlen(HELP_STRING_UNINITIALIZED);
+        if (at_boot)
                 client_title = HELP_STRING_UNINITIALIZED;
-        } else {
-                /*
+
+        /* build a new debug_help_string. */
+        new = kzalloc(DEBUG_HELP_STRING_SIZE, GFP_KERNEL);
+        if (!new) {
+                rc = -ENOMEM;
+                goto out;
+        }
+
+        /*
+         * strlcat(dst, src, size) will append at most
+         * "size - strlen(dst) - 1" bytes of src onto dst,
+         * null terminating the result, and return the total
+         * length of the string it tried to create.
+         *
+         * We'll just plow through here building our new debug
+         * help string and let strlcat take care of assuring that
+         * dst doesn't overflow.
+         */
+        strlcat(new, client_title, string_size);
+
+        if (!at_boot) {
+
+                /*
                  * fill the client keyword/mask array and remember
                  * how many elements there were.
                  */
@@ -644,64 +674,40 @@ int orangefs_prepare_debugfs_help_string(int at_boot)
                 if (cdm_element_count <= 0)
                         goto out;
 
-                /* Count the bytes destined for debug_help_string. */
-                byte_count += strlen(client_title);
-
                 for (i = 0; i < cdm_element_count; i++) {
-                        byte_count += strlen(cdm_array[i].keyword + 2);
-                        if (byte_count >= DEBUG_HELP_STRING_SIZE) {
-                                pr_info("%s: overflow 1!\n", __func__);
-                                goto out;
-                        }
+                        strlcat(new, "\t", string_size);
+                        strlcat(new, cdm_array[i].keyword, string_size);
+                        strlcat(new, "\n", string_size);
                 }
-
-                gossip_debug(GOSSIP_UTILS_DEBUG,
-                             "%s: cdm_element_count:%d:\n",
-                             __func__,
-                             cdm_element_count);
         }
 
-        byte_count += strlen(kernel_title);
+        strlcat(new, "\n", string_size);
+        strlcat(new, kernel_title, string_size);
+
         for (i = 0; i < num_kmod_keyword_mask_map; i++) {
-                byte_count +=
-                        strlen(s_kmod_keyword_mask_map[i].keyword + 2);
-                if (byte_count >= DEBUG_HELP_STRING_SIZE) {
-                        pr_info("%s: overflow 2!\n", __func__);
-                        goto out;
-                }
+                strlcat(new, "\t", string_size);
+                strlcat(new, s_kmod_keyword_mask_map[i].keyword, string_size);
+                result_size = strlcat(new, "\n", string_size);
         }
 
-        /* build debug_help_string. */
-        debug_help_string = kzalloc(DEBUG_HELP_STRING_SIZE, GFP_KERNEL);
-        if (!debug_help_string) {
-                rc = -ENOMEM;
+        /* See if we tried to put too many bytes into "new"... */
+        if (result_size >= string_size) {
+                kfree(new);
                 goto out;
         }
 
-        strcat(debug_help_string, client_title);
-
-        if (!at_boot) {
-                for (i = 0; i < cdm_element_count; i++) {
-                        strcat(debug_help_string, "\t");
-                        strcat(debug_help_string, cdm_array[i].keyword);
-                        strcat(debug_help_string, "\n");
-                }
-        }
-
-        strcat(debug_help_string, "\n");
-        strcat(debug_help_string, kernel_title);
-
-        for (i = 0; i < num_kmod_keyword_mask_map; i++) {
-                strcat(debug_help_string, "\t");
-                strcat(debug_help_string, s_kmod_keyword_mask_map[i].keyword);
-                strcat(debug_help_string, "\n");
+        if (at_boot) {
+                debug_help_string = new;
+        } else {
+                mutex_lock(&orangefs_help_file_lock);
+                memset(debug_help_string, 0, DEBUG_HELP_STRING_SIZE);
+                strlcat(debug_help_string, new, string_size);
+                mutex_unlock(&orangefs_help_file_lock);
         }
 
         rc = 0;
 
-out:
-
-        return rc;
+out:    return rc;
 
 }
 
@@ -959,8 +965,12 @@ int orangefs_debugfs_new_client_string(void __user *arg)
         ret = copy_from_user(&client_debug_array_string,
                                      (void __user *)arg,
                                      ORANGEFS_MAX_DEBUG_STRING_LEN);
-        if (ret != 0)
+
+        if (ret != 0) {
+                pr_info("%s: CLIENT_STRING: copy_from_user failed\n",
+                        __func__);
                 return -EIO;
+        }
 
         /*
          * The real client-core makes an effort to ensure
@@ -975,45 +985,18 @@ int orangefs_debugfs_new_client_string(void __user *arg)
         client_debug_array_string[ORANGEFS_MAX_DEBUG_STRING_LEN - 1] =
                 '\0';
         
-        if (ret != 0) {
-                pr_info("%s: CLIENT_STRING: copy_from_user failed\n",
-                        __func__);
-                return -EIO;
-        }
-
         pr_info("%s: client debug array string has been received.\n",
                 __func__);
 
         if (!help_string_initialized) {
 
-                /* Free the "we don't know yet" default string... */
-                kfree(debug_help_string);
-
-                /* build a proper debug help string */
+                /* Build a proper debug help string. */
                 if (orangefs_prepare_debugfs_help_string(0)) {
                         gossip_err("%s: no debug help string \n",
                                    __func__);
                         return -EIO;
                 }
 
-                /* Replace the boilerplate boot-time debug-help file. */
-                debugfs_remove(help_file_dentry);
-
-                help_file_dentry =
-                        debugfs_create_file(
-                                ORANGEFS_KMOD_DEBUG_HELP_FILE,
-                                0444,
-                                debug_dir,
-                                debug_help_string,
-                                &debug_help_fops);
-
-                if (!help_file_dentry) {
-                        gossip_err("%s: debugfs_create_file failed for"
-                                   " :%s:!\n",
-                                   __func__,
-                                   ORANGEFS_KMOD_DEBUG_HELP_FILE);
-                        return -EIO;
-                }
         }
 
         debug_mask_to_string(&client_debug_mask, 1);
diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c
index 2e5b03065f34..4113eb0495bf 100644
--- a/fs/orangefs/orangefs-mod.c
+++ b/fs/orangefs/orangefs-mod.c
@@ -124,7 +124,7 @@ static int __init orangefs_init(void)
          * unknown at boot time.
          *
          * orangefs_prepare_debugfs_help_string will be used again
-         * later to rebuild the debug-help file after the client starts
+         * later to rebuild the debug-help-string after the client starts
          * and passes along the needed info. The argument signifies
          * which time orangefs_prepare_debugfs_help_string is being
          * called.
@@ -152,7 +152,9 @@ static int __init orangefs_init(void)
 
         ret = register_filesystem(&orangefs_fs_type);
         if (ret == 0) {
-                pr_info("orangefs: module version %s loaded\n", ORANGEFS_VERSION);
+                pr_info("%s: module version %s loaded\n",
+                        __func__,
+                        ORANGEFS_VERSION);
                 ret = 0;
                 goto out;
         }
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index edd46a0e951d..0e100856c7b8 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -328,11 +328,11 @@ static struct dentry *ovl_d_real(struct dentry *dentry,
         if (!real)
                 goto bug;
 
+        /* Handle recursion */
+        real = d_real(real, inode, open_flags);
+
         if (!inode || inode == d_inode(real))
                 return real;
-
-        /* Handle recursion */
-        return d_real(real, inode, open_flags);
 bug:
         WARN(1, "ovl_d_real(%pd4, %s:%lu): real dentry not found\n", dentry,
              inode ? inode->i_sb->s_id : "NULL", inode ? inode->i_ino : 0);
diff --git a/fs/splice.c b/fs/splice.c
index 153d4f3bd441..5a7750bd2eea 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -299,13 +299,8 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos,
 {
         struct iov_iter to;
         struct kiocb kiocb;
-        loff_t isize;
         int idx, ret;
 
-        isize = i_size_read(in->f_mapping->host);
-        if (unlikely(*ppos >= isize))
-                return 0;
-
         iov_iter_pipe(&to, ITER_PIPE | READ, pipe, len);
         idx = to.idx;
         init_sync_kiocb(&kiocb, in);
@@ -413,7 +408,8 @@ static ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
         if (res <= 0)
                 return -ENOMEM;
 
-        nr_pages = res / PAGE_SIZE;
+        BUG_ON(dummy);
+        nr_pages = DIV_ROUND_UP(res, PAGE_SIZE);
 
         vec = __vec;
         if (nr_pages > PIPE_DEF_BUFFERS) {
diff --git a/fs/xattr.c b/fs/xattr.c
index 3368659c471e..2d13b4e62fae 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -170,7 +170,7 @@ int __vfs_setxattr_noperm(struct dentry *dentry, const char *name,
                 const void *value, size_t size, int flags)
 {
         struct inode *inode = dentry->d_inode;
-        int error = -EOPNOTSUPP;
+        int error = -EAGAIN;
         int issec = !strncmp(name, XATTR_SECURITY_PREFIX,
                                    XATTR_SECURITY_PREFIX_LEN);
 
@@ -183,15 +183,21 @@ int __vfs_setxattr_noperm(struct dentry *dentry, const char *name,
                         security_inode_post_setxattr(dentry, name, value,
                                                      size, flags);
                 }
-        } else if (issec) {
-                const char *suffix = name + XATTR_SECURITY_PREFIX_LEN;
-
+        } else {
                 if (unlikely(is_bad_inode(inode)))
                         return -EIO;
-                error = security_inode_setsecurity(inode, suffix, value,
-                                                   size, flags);
-                if (!error)
-                        fsnotify_xattr(dentry);
+        }
+        if (error == -EAGAIN) {
+                error = -EOPNOTSUPP;
+
+                if (issec) {
+                        const char *suffix = name + XATTR_SECURITY_PREFIX_LEN;
+
+                        error = security_inode_setsecurity(inode, suffix, value,
+                                                           size, flags);
+                        if (!error)
+                                fsnotify_xattr(dentry);
+                }
         }
 
         return error;
diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
index 613c5cf19436..5c2929f94bd3 100644
--- a/fs/xfs/libxfs/xfs_defer.c
+++ b/fs/xfs/libxfs/xfs_defer.c
@@ -199,9 +199,9 @@ xfs_defer_intake_work(
         struct xfs_defer_pending        *dfp;
 
         list_for_each_entry(dfp, &dop->dop_intake, dfp_list) {
-                trace_xfs_defer_intake_work(tp->t_mountp, dfp);
                 dfp->dfp_intent = dfp->dfp_type->create_intent(tp,
                                 dfp->dfp_count);
+                trace_xfs_defer_intake_work(tp->t_mountp, dfp);
                 list_sort(tp->t_mountp, &dfp->dfp_work,
                                 dfp->dfp_type->diff_items);
                 list_for_each(li, &dfp->dfp_work)
@@ -221,21 +221,14 @@ xfs_defer_trans_abort(
         struct xfs_defer_pending        *dfp;
 
         trace_xfs_defer_trans_abort(tp->t_mountp, dop);
-        /*
-         * If the transaction was committed, drop the intent reference
-         * since we're bailing out of here. The other reference is
-         * dropped when the intent hits the AIL.  If the transaction
-         * was not committed, the intent is freed by the intent item
-         * unlock handler on abort.
-         */
-        if (!dop->dop_committed)
-                return;
 
-        /* Abort intent items. */
+        /* Abort intent items that don't have a done item. */
         list_for_each_entry(dfp, &dop->dop_pending, dfp_list) {
                 trace_xfs_defer_pending_abort(tp->t_mountp, dfp);
-                if (!dfp->dfp_done)
+                if (dfp->dfp_intent && !dfp->dfp_done) {
                         dfp->dfp_type->abort_intent(dfp->dfp_intent);
+                        dfp->dfp_intent = NULL;
+                }
         }
 
         /* Shut down FS. */
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 1b949e08015c..c19700e2a2fe 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -230,72 +230,62 @@ struct acpi_table_facs {
 /* Fields common to all versions of the FADT */
 
 struct acpi_table_fadt {
-        struct acpi_table_header header;        /* [V1] Common ACPI table header */
-        u32 facs;               /* [V1] 32-bit physical address of FACS */
-        u32 dsdt;               /* [V1] 32-bit physical address of DSDT */
-        u8 model;               /* [V1] System Interrupt Model (ACPI 1.0) - not used in ACPI 2.0+ */
-        u8 preferred_profile;   /* [V1] Conveys preferred power management profile to OSPM. */
-        u16 sci_interrupt;      /* [V1] System vector of SCI interrupt */
-        u32 smi_command;        /* [V1] 32-bit Port address of SMI command port */
-        u8 acpi_enable;         /* [V1] Value to write to SMI_CMD to enable ACPI */
-        u8 acpi_disable;        /* [V1] Value to write to SMI_CMD to disable ACPI */
-        u8 s4_bios_request;     /* [V1] Value to write to SMI_CMD to enter S4BIOS state */
-        u8 pstate_control;      /* [V1] Processor performance state control */
-        u32 pm1a_event_block;   /* [V1] 32-bit port address of Power Mgt 1a Event Reg Blk */
-        u32 pm1b_event_block;   /* [V1] 32-bit port address of Power Mgt 1b Event Reg Blk */
-        u32 pm1a_control_block; /* [V1] 32-bit port address of Power Mgt 1a Control Reg Blk */
-        u32 pm1b_control_block; /* [V1] 32-bit port address of Power Mgt 1b Control Reg Blk */
-        u32 pm2_control_block;  /* [V1] 32-bit port address of Power Mgt 2 Control Reg Blk */
-        u32 pm_timer_block;     /* [V1] 32-bit port address of Power Mgt Timer Ctrl Reg Blk */
-        u32 gpe0_block;         /* [V1] 32-bit port address of General Purpose Event 0 Reg Blk */
-        u32 gpe1_block;         /* [V1] 32-bit port address of General Purpose Event 1 Reg Blk */
-        u8 pm1_event_length;    /* [V1] Byte Length of ports at pm1x_event_block */
-        u8 pm1_control_length;  /* [V1] Byte Length of ports at pm1x_control_block */
-        u8 pm2_control_length;  /* [V1] Byte Length of ports at pm2_control_block */
-        u8 pm_timer_length;     /* [V1] Byte Length of ports at pm_timer_block */
-        u8 gpe0_block_length;   /* [V1] Byte Length of ports at gpe0_block */
-        u8 gpe1_block_length;   /* [V1] Byte Length of ports at gpe1_block */
-        u8 gpe1_base;           /* [V1] Offset in GPE number space where GPE1 events start */
-        u8 cst_control;         /* [V1] Support for the _CST object and C-States change notification */
-        u16 c2_latency;         /* [V1] Worst case HW latency to enter/exit C2 state */
-        u16 c3_latency;         /* [V1] Worst case HW latency to enter/exit C3 state */
-        u16 flush_size;         /* [V1] Processor memory cache line width, in bytes */
-        u16 flush_stride;       /* [V1] Number of flush strides that need to be read */
-        u8 duty_offset;         /* [V1] Processor duty cycle index in processor P_CNT reg */
-        u8 duty_width;          /* [V1] Processor duty cycle value bit width in P_CNT register */
-        u8 day_alarm;           /* [V1] Index to day-of-month alarm in RTC CMOS RAM */
-        u8 month_alarm;         /* [V1] Index to month-of-year alarm in RTC CMOS RAM */
-        u8 century;             /* [V1] Index to century in RTC CMOS RAM */
-        u16 boot_flags;         /* [V3] IA-PC Boot Architecture Flags (see below for individual flags) */
-        u8 reserved;            /* [V1] Reserved, must be zero */
-        u32 flags;              /* [V1] Miscellaneous flag bits (see below for individual flags) */
-        /* End of Version 1 FADT fields (ACPI 1.0) */
-
-        struct acpi_generic_address reset_register;     /* [V3] 64-bit address of the Reset register */
-        u8 reset_value;         /* [V3] Value to write to the reset_register port to reset the system */
-        u16 arm_boot_flags;     /* [V5] ARM-Specific Boot Flags (see below for individual flags) (ACPI 5.1) */
-        u8 minor_revision;      /* [V5] FADT Minor Revision (ACPI 5.1) */
-        u64 Xfacs;              /* [V3] 64-bit physical address of FACS */
-        u64 Xdsdt;              /* [V3] 64-bit physical address of DSDT */
-        struct acpi_generic_address xpm1a_event_block;  /* [V3] 64-bit Extended Power Mgt 1a Event Reg Blk address */
-        struct acpi_generic_address xpm1b_event_block;  /* [V3] 64-bit Extended Power Mgt 1b Event Reg Blk address */
-        struct acpi_generic_address xpm1a_control_block;        /* [V3] 64-bit Extended Power Mgt 1a Control Reg Blk address */
-        struct acpi_generic_address xpm1b_control_block;        /* [V3] 64-bit Extended Power Mgt 1b Control Reg Blk address */
-        struct acpi_generic_address xpm2_control_block; /* [V3] 64-bit Extended Power Mgt 2 Control Reg Blk address */
-        struct acpi_generic_address xpm_timer_block;    /* [V3] 64-bit Extended Power Mgt Timer Ctrl Reg Blk address */
-        struct acpi_generic_address xgpe0_block;        /* [V3] 64-bit Extended General Purpose Event 0 Reg Blk address */
-        struct acpi_generic_address xgpe1_block;        /* [V3] 64-bit Extended General Purpose Event 1 Reg Blk address */
-        /* End of Version 3 FADT fields (ACPI 2.0) */
-
-        struct acpi_generic_address sleep_control;      /* [V4] 64-bit Sleep Control register (ACPI 5.0) */
-        /* End of Version 4 FADT fields (ACPI 3.0 and ACPI 4.0) (Field was originally reserved in ACPI 3.0) */
-
-        struct acpi_generic_address sleep_status;       /* [V5] 64-bit Sleep Status register (ACPI 5.0) */
-        /* End of Version 5 FADT fields (ACPI 5.0) */
-
-        u64 hypervisor_id;      /* [V6] Hypervisor Vendor ID (ACPI 6.0) */
-        /* End of Version 6 FADT fields (ACPI 6.0) */
-
+        struct acpi_table_header header;        /* Common ACPI table header */
+        u32 facs;               /* 32-bit physical address of FACS */
+        u32 dsdt;               /* 32-bit physical address of DSDT */
+        u8 model;               /* System Interrupt Model (ACPI 1.0) - not used in ACPI 2.0+ */
+        u8 preferred_profile;   /* Conveys preferred power management profile to OSPM. */
+        u16 sci_interrupt;      /* System vector of SCI interrupt */
+        u32 smi_command;        /* 32-bit Port address of SMI command port */
+        u8 acpi_enable;         /* Value to write to SMI_CMD to enable ACPI */
+        u8 acpi_disable;        /* Value to write to SMI_CMD to disable ACPI */
+        u8 s4_bios_request;     /* Value to write to SMI_CMD to enter S4BIOS state */
+        u8 pstate_control;      /* Processor performance state control */
+        u32 pm1a_event_block;   /* 32-bit port address of Power Mgt 1a Event Reg Blk */
+        u32 pm1b_event_block;   /* 32-bit port address of Power Mgt 1b Event Reg Blk */
+        u32 pm1a_control_block; /* 32-bit port address of Power Mgt 1a Control Reg Blk */
+        u32 pm1b_control_block; /* 32-bit port address of Power Mgt 1b Control Reg Blk */
+        u32 pm2_control_block;  /* 32-bit port address of Power Mgt 2 Control Reg Blk */
+        u32 pm_timer_block;     /* 32-bit port address of Power Mgt Timer Ctrl Reg Blk */
+        u32 gpe0_block;         /* 32-bit port address of General Purpose Event 0 Reg Blk */
+        u32 gpe1_block;         /* 32-bit port address of General Purpose Event 1 Reg Blk */
+        u8 pm1_event_length;    /* Byte Length of ports at pm1x_event_block */
+        u8 pm1_control_length;  /* Byte Length of ports at pm1x_control_block */
+        u8 pm2_control_length;  /* Byte Length of ports at pm2_control_block */
+        u8 pm_timer_length;     /* Byte Length of ports at pm_timer_block */
+        u8 gpe0_block_length;   /* Byte Length of ports at gpe0_block */
+        u8 gpe1_block_length;   /* Byte Length of ports at gpe1_block */
+        u8 gpe1_base;           /* Offset in GPE number space where GPE1 events start */
+        u8 cst_control;         /* Support for the _CST object and C-States change notification */
+        u16 c2_latency;         /* Worst case HW latency to enter/exit C2 state */
+        u16 c3_latency;         /* Worst case HW latency to enter/exit C3 state */
+        u16 flush_size;         /* Processor memory cache line width, in bytes */
+        u16 flush_stride;       /* Number of flush strides that need to be read */
+        u8 duty_offset;         /* Processor duty cycle index in processor P_CNT reg */
+        u8 duty_width;          /* Processor duty cycle value bit width in P_CNT register */
+        u8 day_alarm;           /* Index to day-of-month alarm in RTC CMOS RAM */
+        u8 month_alarm;         /* Index to month-of-year alarm in RTC CMOS RAM */
+        u8 century;             /* Index to century in RTC CMOS RAM */
+        u16 boot_flags;         /* IA-PC Boot Architecture Flags (see below for individual flags) */
+        u8 reserved;            /* Reserved, must be zero */
+        u32 flags;              /* Miscellaneous flag bits (see below for individual flags) */
+        struct acpi_generic_address reset_register;     /* 64-bit address of the Reset register */
+        u8 reset_value;         /* Value to write to the reset_register port to reset the system */
+        u16 arm_boot_flags;     /* ARM-Specific Boot Flags (see below for individual flags) (ACPI 5.1) */
+        u8 minor_revision;      /* FADT Minor Revision (ACPI 5.1) */
+        u64 Xfacs;              /* 64-bit physical address of FACS */
+        u64 Xdsdt;              /* 64-bit physical address of DSDT */
+        struct acpi_generic_address xpm1a_event_block;  /* 64-bit Extended Power Mgt 1a Event Reg Blk address */
+        struct acpi_generic_address xpm1b_event_block;  /* 64-bit Extended Power Mgt 1b Event Reg Blk address */
+        struct acpi_generic_address xpm1a_control_block;        /* 64-bit Extended Power Mgt 1a Control Reg Blk address */
+        struct acpi_generic_address xpm1b_control_block;        /* 64-bit Extended Power Mgt 1b Control Reg Blk address */
+        struct acpi_generic_address xpm2_control_block; /* 64-bit Extended Power Mgt 2 Control Reg Blk address */
+        struct acpi_generic_address xpm_timer_block;    /* 64-bit Extended Power Mgt Timer Ctrl Reg Blk address */
+        struct acpi_generic_address xgpe0_block;        /* 64-bit Extended General Purpose Event 0 Reg Blk address */
+        struct acpi_generic_address xgpe1_block;        /* 64-bit Extended General Purpose Event 1 Reg Blk address */
+        struct acpi_generic_address sleep_control;      /* 64-bit Sleep Control register (ACPI 5.0) */
+        struct acpi_generic_address sleep_status;       /* 64-bit Sleep Status register (ACPI 5.0) */
+        u64 hypervisor_id;      /* Hypervisor Vendor ID (ACPI 6.0) */
 };
 
 /* Masks for FADT IA-PC Boot Architecture Flags (boot_flags) [Vx]=Introduced in this FADT revision */
@@ -311,8 +301,8 @@ struct acpi_table_fadt {
 
 /* Masks for FADT ARM Boot Architecture Flags (arm_boot_flags) ACPI 5.1 */
 
-#define ACPI_FADT_PSCI_COMPLIANT    (1) /* 00: [V5] PSCI 0.2+ is implemented */
-#define ACPI_FADT_PSCI_USE_HVC      (1<<1)      /* 01: [V5] HVC must be used instead of SMC as the PSCI conduit */
+#define ACPI_FADT_PSCI_COMPLIANT    (1) /* 00: [V5+] PSCI 0.2+ is implemented */
+#define ACPI_FADT_PSCI_USE_HVC      (1<<1)      /* 01: [V5+] HVC must be used instead of SMC as the PSCI conduit */
 
 /* Masks for FADT flags */
 
@@ -409,34 +399,20 @@ struct acpi_table_desc {
  * match the expected length. In other words, the length of the
  * FADT is the bottom line as to what the version really is.
  *
- * NOTE: There is no officialy released V2 of the FADT. This
- * version was used only for prototyping and testing during the
- * 32-bit to 64-bit transition. V3 was the first official 64-bit
- * version of the FADT.
- *
- * Update this list of defines when a new version of the FADT is
- * added to the ACPI specification. Note that the FADT version is
- * only incremented when new fields are appended to the existing
- * version. Therefore, the FADT version is competely independent
- * from the version of the ACPI specification where it is
- * defined.
- *
- * For reference, the various FADT lengths are as follows:
- *     FADT V1 size: 0x074      ACPI 1.0
- *     FADT V3 size: 0x0F4      ACPI 2.0
- *     FADT V4 size: 0x100      ACPI 3.0 and ACPI 4.0
- *     FADT V5 size: 0x10C      ACPI 5.0
- *     FADT V6 size: 0x114      ACPI 6.0
+ * For reference, the values below are as follows:
+ *     FADT V1 size: 0x074
+ *     FADT V2 size: 0x084
+ *     FADT V3 size: 0x0F4
+ *     FADT V4 size: 0x0F4
+ *     FADT V5 size: 0x10C
+ *     FADT V6 size: 0x114
  */
-#define ACPI_FADT_V1_SIZE       (u32) (ACPI_FADT_OFFSET (flags) + 4)    /* ACPI 1.0 */
-#define ACPI_FADT_V3_SIZE       (u32) (ACPI_FADT_OFFSET (sleep_control))        /* ACPI 2.0 */
-#define ACPI_FADT_V4_SIZE       (u32) (ACPI_FADT_OFFSET (sleep_status)) /* ACPI 3.0 and ACPI 4.0 */
-#define ACPI_FADT_V5_SIZE       (u32) (ACPI_FADT_OFFSET (hypervisor_id))        /* ACPI 5.0 */
-#define ACPI_FADT_V6_SIZE       (u32) (sizeof (struct acpi_table_fadt)) /* ACPI 6.0 */
-
-/* Update these when new FADT versions are added */
+#define ACPI_FADT_V1_SIZE       (u32) (ACPI_FADT_OFFSET (flags) + 4)
+#define ACPI_FADT_V2_SIZE       (u32) (ACPI_FADT_OFFSET (minor_revision) + 1)
+#define ACPI_FADT_V3_SIZE       (u32) (ACPI_FADT_OFFSET (sleep_control))
+#define ACPI_FADT_V5_SIZE       (u32) (ACPI_FADT_OFFSET (hypervisor_id))
+#define ACPI_FADT_V6_SIZE       (u32) (sizeof (struct acpi_table_fadt))
 
-#define ACPI_FADT_MAX_VERSION   6
 #define ACPI_FADT_CONFORMANCE   "ACPI 6.1 (FADT version 6)"
 
 #endif                          /* __ACTBL_H__ */
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index a5d98d171866..e861a24f06f2 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -191,6 +191,9 @@
 #ifndef __init
 #define __init
 #endif
+#ifndef __iomem
+#define __iomem
+#endif
 
 /* Host-dependent types and defines for user-space ACPICA */
 
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h
index 40e887068da2..0504ef8f3aa3 100644
--- a/include/asm-generic/percpu.h
+++ b/include/asm-generic/percpu.h
@@ -118,9 +118,9 @@ do {									\
 #define this_cpu_generic_read(pcp)                                      \
 ({                                                                      \
         typeof(pcp) __ret;                                              \
-        preempt_disable();                                              \
+        preempt_disable_notrace();                                      \
         __ret = raw_cpu_generic_read(pcp);                              \
-        preempt_enable();                                               \
+        preempt_enable_notrace();                                       \
         __ret;                                                          \
 })
 
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h
index af0254c09424..4df64a1fc09e 100644
--- a/include/asm-generic/sections.h
+++ b/include/asm-generic/sections.h
@@ -14,6 +14,8 @@
  * [_sdata, _edata]: contains .data.* sections, may also contain .rodata.*
  *                   and/or .init.* sections.
  * [__start_rodata, __end_rodata]: contains .rodata.* sections
+ * [__start_data_ro_after_init, __end_data_ro_after_init]:
+ *                   contains data.ro_after_init section
  * [__init_begin, __init_end]: contains .init.* sections, but .init.text.*
  *                   may be out of this range on some architectures.
  * [_sinittext, _einittext]: contains .init.text.* sections
@@ -31,6 +33,7 @@ extern char _data[], _sdata[], _edata[];
 extern char __bss_start[], __bss_stop[];
 extern char __init_begin[], __init_end[];
 extern char _sinittext[], _einittext[];
+extern char __start_data_ro_after_init[], __end_data_ro_after_init[];
 extern char _end[];
 extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[];
 extern char __kprobes_text_start[], __kprobes_text_end[];
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 30747960bc54..31e1d639abed 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -259,7 +259,10 @@
  * own by defining an empty RO_AFTER_INIT_DATA.
  */
 #ifndef RO_AFTER_INIT_DATA
-#define RO_AFTER_INIT_DATA *(.data..ro_after_init)
+#define RO_AFTER_INIT_DATA                                              \
+        __start_data_ro_after_init = .;                                 \
+        *(.data..ro_after_init)                                         \
+        __end_data_ro_after_init = .;
 #endif
 
 /*
diff --git a/include/crypto/drbg.h b/include/crypto/drbg.h
index 61580b19f9f6..22f884c97387 100644
--- a/include/crypto/drbg.h
+++ b/include/crypto/drbg.h
@@ -124,6 +124,8 @@ struct drbg_state {
         struct skcipher_request *ctr_req;       /* CTR mode request handle */
         __u8 *ctr_null_value_buf;               /* CTR mode unaligned buffer */
         __u8 *ctr_null_value;                   /* CTR mode aligned zero buf */
+        __u8 *outscratchpadbuf;                 /* CTR mode output scratchpad */
+        __u8 *outscratchpad;                    /* CTR mode aligned outbuf */
         struct completion ctr_completion;       /* CTR mode async handler */
         int ctr_async_err;                      /* CTR mode async error */
 
diff --git a/include/dt-bindings/sound/cs42l42.h b/include/dt-bindings/sound/cs42l42.h
new file mode 100644
index 000000000000..399a123aed58
--- /dev/null
+++ b/include/dt-bindings/sound/cs42l42.h
@@ -0,0 +1,73 @@
+/*
+ * cs42l42.h -- CS42L42 ALSA SoC audio driver DT bindings header
+ *
+ * Copyright 2016 Cirrus Logic, Inc.
+ *
+ * Author: James Schulman <james.schulman@cirrus.com>
+ * Author: Brian Austin <brian.austin@cirrus.com>
+ * Author: Michael White <michael.white@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 __DT_CS42L42_H
+#define __DT_CS42L42_H
+
+/* HPOUT Load Capacity */
+#define CS42L42_HPOUT_LOAD_1NF          0
+#define CS42L42_HPOUT_LOAD_10NF         1
+
+/* HPOUT Clamp to GND Overide */
+#define CS42L42_HPOUT_CLAMP_EN          0
+#define CS42L42_HPOUT_CLAMP_DIS         1
+
+/* Tip Sense Inversion */
+#define CS42L42_TS_INV_DIS                      0
+#define CS42L42_TS_INV_EN                       1
+
+/* Tip Sense Debounce */
+#define CS42L42_TS_DBNCE_0                      0
+#define CS42L42_TS_DBNCE_125                    1
+#define CS42L42_TS_DBNCE_250                    2
+#define CS42L42_TS_DBNCE_500                    3
+#define CS42L42_TS_DBNCE_750                    4
+#define CS42L42_TS_DBNCE_1000                   5
+#define CS42L42_TS_DBNCE_1250                   6
+#define CS42L42_TS_DBNCE_1500                   7
+
+/* Button Press Software Debounce Times */
+#define CS42L42_BTN_DET_INIT_DBNCE_MIN          0
+#define CS42L42_BTN_DET_INIT_DBNCE_DEFAULT      100
+#define CS42L42_BTN_DET_INIT_DBNCE_MAX          200
+
+#define CS42L42_BTN_DET_EVENT_DBNCE_MIN         0
+#define CS42L42_BTN_DET_EVENT_DBNCE_DEFAULT     10
+#define CS42L42_BTN_DET_EVENT_DBNCE_MAX         20
+
+/* Button Detect Level Sensitivities */
+#define CS42L42_NUM_BIASES              4
+
+#define CS42L42_HS_DET_LEVEL_15         0x0F
+#define CS42L42_HS_DET_LEVEL_8          0x08
+#define CS42L42_HS_DET_LEVEL_4          0x04
+#define CS42L42_HS_DET_LEVEL_1          0x01
+
+#define CS42L42_HS_DET_LEVEL_MIN        0
+#define CS42L42_HS_DET_LEVEL_MAX        0x3F
+
+/* HS Bias Ramp Rate */
+
+#define CS42L42_HSBIAS_RAMP_FAST_RISE_SLOW_FALL         0
+#define CS42L42_HSBIAS_RAMP_FAST                        1
+#define CS42L42_HSBIAS_RAMP_SLOW                        2
+#define CS42L42_HSBIAS_RAMP_SLOWEST                     3
+
+#define CS42L42_HSBIAS_RAMP_TIME0                       10
+#define CS42L42_HSBIAS_RAMP_TIME1                       40
+#define CS42L42_HSBIAS_RAMP_TIME2                       90
+#define CS42L42_HSBIAS_RAMP_TIME3                       170
+
+#endif /* __DT_CS42L42_H */
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 689a8b9b9c8f..61a3d90f32b3 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -555,7 +555,8 @@ int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
 int acpi_device_modalias(struct device *, char *, int);
 void acpi_walk_dep_device_list(acpi_handle handle);
 
-struct platform_device *acpi_create_platform_device(struct acpi_device *);
+struct platform_device *acpi_create_platform_device(struct acpi_device *,
+                                                    struct property_entry *);
 #define ACPI_PTR(_ptr)  (_ptr)
 
 static inline void acpi_device_set_enumerated(struct acpi_device *adev)
diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h
index 7035b997aaa5..6aaf425cebc3 100644
--- a/include/linux/bpf_verifier.h
+++ b/include/linux/bpf_verifier.h
@@ -14,7 +14,7 @@
   * are obviously wrong for any sort of memory access.
   */
 #define BPF_REGISTER_MAX_RANGE (1024 * 1024 * 1024)
-#define BPF_REGISTER_MIN_RANGE -(1024 * 1024 * 1024)
+#define BPF_REGISTER_MIN_RANGE -1
 
 struct bpf_reg_state {
         enum bpf_reg_type type;
@@ -22,7 +22,8 @@ struct bpf_reg_state {
          * Used to determine if any memory access using this register will
          * result in a bad access.
          */
-        u64 min_value, max_value;
+        s64 min_value;
+        u64 max_value;
         union {
                 /* valid when type == CONST_IMM | PTR_TO_STACK | UNKNOWN_VALUE */
                 s64 imm;
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 96337b15a60d..a8e66344bacc 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -258,6 +258,8 @@ struct ceph_watch_item {
         struct ceph_entity_addr addr;
 };
 
+#define CEPH_LINGER_ID_START    0xffff000000000000ULL
+
 struct ceph_osd_client {
         struct ceph_client     *client;
 
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 432f5c97e18f..928e5ca0caee 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -263,7 +263,9 @@
 #endif
 #endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP && !__CHECKER__ */
 
-#if GCC_VERSION >= 50000
+#if GCC_VERSION >= 70000
+#define KASAN_ABI_VERSION 5
+#elif GCC_VERSION >= 50000
 #define KASAN_ABI_VERSION 4
 #elif GCC_VERSION >= 40902
 #define KASAN_ABI_VERSION 3
diff --git a/include/linux/console.h b/include/linux/console.h
index 3672809234a7..d530c4627e54 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -173,12 +173,6 @@ static inline void console_sysfs_notify(void)
 #endif
 extern bool console_suspend_enabled;
 
-#ifdef CONFIG_OF
-extern void console_set_by_of(void);
-#else
-static inline void console_set_by_of(void) {}
-#endif
-
 /* Suspend and resume console messages over PM events */
 extern void suspend_console(void);
 extern void resume_console(void);
diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
index c46d2aa16d81..1d18af034554 100644
--- a/include/linux/frontswap.h
+++ b/include/linux/frontswap.h
@@ -106,8 +106,9 @@ static inline void frontswap_invalidate_area(unsigned type)
 
 static inline void frontswap_init(unsigned type, unsigned long *map)
 {
-        if (frontswap_enabled())
-                __frontswap_init(type, map);
+#ifdef CONFIG_FRONTSWAP
+        __frontswap_init(type, map);
+#endif
 }
 
 #endif /* _LINUX_FRONTSWAP_H */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 16d2b6e874d6..dc0478c07b2a 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -321,6 +321,7 @@ struct writeback_control;
 #define IOCB_HIPRI              (1 << 3)
 #define IOCB_DSYNC              (1 << 4)
 #define IOCB_SYNC               (1 << 5)
+#define IOCB_WRITE              (1 << 6)
 
 struct kiocb {
         struct file             *ki_filp;
@@ -1709,7 +1710,6 @@ struct file_operations {
         int (*flush) (struct file *, fl_owner_t id);
         int (*release) (struct inode *, struct file *);
         int (*fsync) (struct file *, loff_t, loff_t, int datasync);
-        int (*aio_fsync) (struct kiocb *, int datasync);
         int (*fasync) (int, struct file *, int);
         int (*lock) (struct file *, int, struct file_lock *);
         ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index 9b9f65d99873..e35e6de633b9 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -22,7 +22,7 @@ extern int mincore_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
                         unsigned char *vec);
 extern bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr,
                          unsigned long new_addr, unsigned long old_end,
-                         pmd_t *old_pmd, pmd_t *new_pmd);
+                         pmd_t *old_pmd, pmd_t *new_pmd, bool *need_flush);
 extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
                         unsigned long addr, pgprot_t newprot,
                         int prot_numa);
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 2d9b650047a5..d49e26c6cdc7 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -429,6 +429,7 @@ struct intel_iommu {
         struct page_req_dsc *prq;
         unsigned char prq_name[16];    /* Name for PRQ interrupt */
         struct idr pasid_idr;
+        u32 pasid_max;
 #endif
         struct q_inval  *qi;            /* Queued invalidation info */
         u32 *iommu_state; /* Store iommu states between suspend and resume.*/
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index ca1ad9ebbc92..a0649973ee5b 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -149,7 +149,7 @@ static inline bool inet6_exact_dif_match(struct net *net, struct sk_buff *skb)
 {
 #if defined(CONFIG_NET_L3_MASTER_DEV)
         if (!net->ipv4.sysctl_tcp_l3mdev_accept &&
-            ipv6_l3mdev_skb(IP6CB(skb)->flags))
+            skb && ipv6_l3mdev_skb(IP6CB(skb)->flags))
                 return true;
 #endif
         return false;
diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h
index f4947fda11e7..8458c5351e56 100644
--- a/include/linux/libnvdimm.h
+++ b/include/linux/libnvdimm.h
@@ -143,7 +143,7 @@ u32 nd_cmd_in_size(struct nvdimm *nvdimm, int cmd,
                 const struct nd_cmd_desc *desc, int idx, void *buf);
 u32 nd_cmd_out_size(struct nvdimm *nvdimm, int cmd,
                 const struct nd_cmd_desc *desc, int idx, const u32 *in_field,
-                const u32 *out_field);
+                const u32 *out_field, unsigned long remainder);
 int nvdimm_bus_check_dimm_count(struct nvdimm_bus *nvdimm_bus, int dimm_count);
 struct nd_region *nvdimm_pmem_region_create(struct nvdimm_bus *nvdimm_bus,
                 struct nd_region_desc *ndr_desc);
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 3be7abd6e722..c9f379689dd0 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -476,7 +476,6 @@ enum {
 enum {
         MLX4_INTERFACE_STATE_UP         = 1 << 0,
         MLX4_INTERFACE_STATE_DELETION   = 1 << 1,
-        MLX4_INTERFACE_STATE_SHUTDOWN   = 1 << 2,
 };
 
 #define MSTR_SM_CHANGE_MASK (MLX4_EQ_PORT_INFO_MSTR_SM_SL_CHANGE_MASK | \
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 91ee3643ccc8..e16a2a980ea8 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1619,7 +1619,7 @@ enum netdev_priv_flags {
  *      @dcbnl_ops:     Data Center Bridging netlink ops
  *      @num_tc:        Number of traffic classes in the net device
  *      @tc_to_txq:     XXX: need comments on this one
- *      @prio_tc_map    XXX: need comments on this one
+ *      @prio_tc_map:   XXX: need comments on this one
  *
  *      @fcoe_ddp_xid:  Max exchange id for FCoE LRO by ddp
  *
@@ -3354,6 +3354,21 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb);
 bool is_skb_forwardable(const struct net_device *dev,
                         const struct sk_buff *skb);
 
+static __always_inline int ____dev_forward_skb(struct net_device *dev,
+                                               struct sk_buff *skb)
+{
+        if (skb_orphan_frags(skb, GFP_ATOMIC) ||
+            unlikely(!is_skb_forwardable(dev, skb))) {
+                atomic_long_inc(&dev->rx_dropped);
+                kfree_skb(skb);
+                return NET_RX_DROP;
+        }
+
+        skb_scrub_packet(skb, true);
+        skb->priority = 0;
+        return 0;
+}
+
 void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev);
 
 extern int              netdev_budget;
diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h
index 2ab233661ae5..a58cca8bcb29 100644
--- a/include/linux/of_mdio.h
+++ b/include/linux/of_mdio.h
@@ -29,6 +29,7 @@ struct phy_device *of_phy_attach(struct net_device *dev,
 extern struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np);
 extern int of_mdio_parse_addr(struct device *dev, const struct device_node *np);
 extern int of_phy_register_fixed_link(struct device_node *np);
+extern void of_phy_deregister_fixed_link(struct device_node *np);
 extern bool of_phy_is_fixed_link(struct device_node *np);
 
 #else /* CONFIG_OF */
@@ -83,6 +84,9 @@ static inline int of_phy_register_fixed_link(struct device_node *np)
 {
         return -ENOSYS;
 }
+static inline void of_phy_deregister_fixed_link(struct device_node *np)
+{
+}
 static inline bool of_phy_is_fixed_link(struct device_node *np)
 {
         return false;
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index dd15d39e1985..7dbe9148b2f8 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -374,16 +374,13 @@ static inline struct page *read_mapping_page(struct address_space *mapping,
 }
 
 /*
- * Get the offset in PAGE_SIZE.
- * (TODO: hugepage should have ->index in PAGE_SIZE)
+ * Get index of the page with in radix-tree
+ * (TODO: remove once hugetlb pages will have ->index in PAGE_SIZE)
  */
-static inline pgoff_t page_to_pgoff(struct page *page)
+static inline pgoff_t page_to_index(struct page *page)
 {
         pgoff_t pgoff;
 
-        if (unlikely(PageHeadHuge(page)))
-                return page->index << compound_order(page);
-
         if (likely(!PageTransTail(page)))
                 return page->index;
 
@@ -397,6 +394,18 @@ static inline pgoff_t page_to_pgoff(struct page *page)
 }
 
 /*
+ * Get the offset in PAGE_SIZE.
+ * (TODO: hugepage should have ->index in PAGE_SIZE)
+ */
+static inline pgoff_t page_to_pgoff(struct page *page)
+{
+        if (unlikely(PageHeadHuge(page)))
+                return page->index << compound_order(page);
+
+        return page_to_index(page);
+}
+
+/*
  * Return byte-offset into filesystem object for page.
  */
 static inline loff_t page_offset(struct page *page)
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 0e49f70dbd9b..a38772a85588 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1928,6 +1928,20 @@ static inline int pci_pcie_type(const struct pci_dev *dev)
         return (pcie_caps_reg(dev) & PCI_EXP_FLAGS_TYPE) >> 4;
 }
 
+static inline struct pci_dev *pcie_find_root_port(struct pci_dev *dev)
+{
+        while (1) {
+                if (!pci_is_pcie(dev))
+                        break;
+                if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
+                        return dev;
+                if (!dev->bus->self)
+                        break;
+                dev = dev->bus->self;
+        }
+        return NULL;
+}
+
 void pci_request_acs(void);
 bool pci_acs_enabled(struct pci_dev *pdev, u16 acs_flags);
 bool pci_acs_path_enabled(struct pci_dev *start,
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
index ee1bed7dbfc6..78bb0d7f6b11 100644
--- a/include/linux/phy/phy.h
+++ b/include/linux/phy/phy.h
@@ -253,6 +253,13 @@ static inline int phy_set_mode(struct phy *phy, enum phy_mode mode)
         return -ENOSYS;
 }
 
+static inline int phy_reset(struct phy *phy)
+{
+        if (!phy)
+                return 0;
+        return -ENOSYS;
+}
+
 static inline int phy_get_bus_width(struct phy *phy)
 {
         return -ENOSYS;
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 348f51b0ec92..e9c009dc3a4a 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2567,6 +2567,7 @@ extern void sched_autogroup_create_attach(struct task_struct *p);
 extern void sched_autogroup_detach(struct task_struct *p);
 extern void sched_autogroup_fork(struct signal_struct *sig);
 extern void sched_autogroup_exit(struct signal_struct *sig);
+extern void sched_autogroup_exit_task(struct task_struct *p);
 #ifdef CONFIG_PROC_FS
 extern void proc_sched_autogroup_show_task(struct task_struct *p, struct seq_file *m);
 extern int proc_sched_autogroup_set_nice(struct task_struct *p, int nice);
@@ -2576,6 +2577,7 @@ static inline void sched_autogroup_create_attach(struct task_struct *p) { }
 static inline void sched_autogroup_detach(struct task_struct *p) { }
 static inline void sched_autogroup_fork(struct signal_struct *sig) { }
 static inline void sched_autogroup_exit(struct signal_struct *sig) { }
+static inline void sched_autogroup_exit_task(struct task_struct *p) { }
 #endif
 
 extern int yield_to(struct task_struct *p, bool preempt);
diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index ab02a457da1f..e5d193440374 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -25,6 +25,7 @@ struct svc_xprt_ops {
         void            (*xpo_detach)(struct svc_xprt *);
         void            (*xpo_free)(struct svc_xprt *);
         int             (*xpo_secure_port)(struct svc_rqst *);
+        void            (*xpo_kill_temp_xprt)(struct svc_xprt *);
 };
 
 struct svc_xprt_class {
diff --git a/include/linux/usb/cdc_ncm.h b/include/linux/usb/cdc_ncm.h
index 3a375d07d0dc..00d232406f18 100644
--- a/include/linux/usb/cdc_ncm.h
+++ b/include/linux/usb/cdc_ncm.h
@@ -81,7 +81,8 @@
 #define CDC_NCM_TIMER_INTERVAL_MAX              (U32_MAX / NSEC_PER_USEC)
 
 /* Driver flags */
-#define CDC_NCM_FLAG_NDP_TO_END 0x02            /* NDP is placed at end of frame */
+#define CDC_NCM_FLAG_NDP_TO_END                 0x02    /* NDP is placed at end of frame */
+#define CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE   0x04    /* Avoid altsetting toggle during init */
 
 #define cdc_ncm_comm_intf_is_mbim(x)  ((x)->desc.bInterfaceSubClass == USB_CDC_SUBCLASS_MBIM && \
                                        (x)->desc.bInterfaceProtocol == USB_CDC_PROTO_NONE)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index f00bf667ec33..554671c81f4a 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1018,7 +1018,7 @@ static inline void hci_set_drvdata(struct hci_dev *hdev, void *data)
 }
 
 struct hci_dev *hci_dev_get(int index);
-struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src);
+struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, u8 src_type);
 
 struct hci_dev *hci_alloc_dev(void);
 void hci_free_dev(struct hci_dev *hdev);
diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
index d15214d673b2..2a1abbf8da74 100644
--- a/include/net/gro_cells.h
+++ b/include/net/gro_cells.h
@@ -68,6 +68,9 @@ static inline int gro_cells_init(struct gro_cells *gcells, struct net_device *de
                 struct gro_cell *cell = per_cpu_ptr(gcells->cells, i);
 
                 __skb_queue_head_init(&cell->napi_skbs);
+
+                set_bit(NAPI_STATE_NO_BUSY_POLL, &cell->napi.state);
+
                 netif_napi_add(dev, &cell->napi, gro_cell_poll, 64);
                 napi_enable(&cell->napi);
         }
diff --git a/include/net/ip.h b/include/net/ip.h
index 5413883ac47f..d3a107850a41 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -47,8 +47,7 @@ struct inet_skb_parm {
 #define IPSKB_REROUTED          BIT(4)
 #define IPSKB_DOREDIRECT        BIT(5)
 #define IPSKB_FRAG_PMTU         BIT(6)
-#define IPSKB_FRAG_SEGS         BIT(7)
-#define IPSKB_L3SLAVE           BIT(8)
+#define IPSKB_L3SLAVE           BIT(7)
 
         u16                     frag_max_size;
 };
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index 20ed9699fcd4..1b1cf33cbfb0 100644
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
@@ -146,6 +146,7 @@ static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb,
 {
         int pkt_len, err;
 
+        memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
         pkt_len = skb->len - skb_inner_network_offset(skb);
         err = ip6_local_out(dev_net(skb_dst(skb)->dev), sk, skb);
         if (unlikely(net_xmit_eval(err)))
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index b9314b48e39f..f390c3bb05c5 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -243,6 +243,7 @@ int fib_table_dump(struct fib_table *table, struct sk_buff *skb,
                    struct netlink_callback *cb);
 int fib_table_flush(struct net *net, struct fib_table *table);
 struct fib_table *fib_trie_unmerge(struct fib_table *main_tb);
+void fib_table_flush_external(struct fib_table *table);
 void fib_free_table(struct fib_table *tb);
 
 #ifndef CONFIG_IP_MULTIPLE_TABLES
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 8fed1cd78658..f11ca837361b 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -970,6 +970,8 @@ int compat_ipv6_setsockopt(struct sock *sk, int level, int optname,
 int compat_ipv6_getsockopt(struct sock *sk, int level, int optname,
                            char __user *optval, int __user *optlen);
 
+int __ip6_datagram_connect(struct sock *sk, struct sockaddr *addr,
+                           int addr_len);
 int ip6_datagram_connect(struct sock *sk, struct sockaddr *addr, int addr_len);
 int ip6_datagram_connect_v6_only(struct sock *sk, struct sockaddr *addr,
                                  int addr_len);
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index fc4f757107df..0940598c002f 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -170,7 +170,7 @@ static inline struct net *copy_net_ns(unsigned long flags,
 extern struct list_head net_namespace_list;
 
 struct net *get_net_ns_by_pid(pid_t pid);
-struct net *get_net_ns_by_fd(int pid);
+struct net *get_net_ns_by_fd(int fd);
 
 #ifdef CONFIG_SYSCTL
 void ipx_register_sysctl(void);
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 50418052a520..d9d52c020a70 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -100,6 +100,9 @@ struct nf_conn {
 
         possible_net_t ct_net;
 
+#if IS_ENABLED(CONFIG_NF_NAT)
+        struct rhlist_head nat_bysource;
+#endif
         /* all members below initialized via memset */
         u8 __nfct_init_offset[0];
 
@@ -117,9 +120,6 @@ struct nf_conn {
         /* Extensions */
         struct nf_ct_ext *ext;
 
-#if IS_ENABLED(CONFIG_NF_NAT)
-        struct rhash_head       nat_bysource;
-#endif
         /* Storage reserved for other modules, must be the last member */
         union nf_conntrack_proto proto;
 };
diff --git a/include/net/netfilter/nf_conntrack_labels.h b/include/net/netfilter/nf_conntrack_labels.h
index 498814626e28..1723a67c0b0a 100644
--- a/include/net/netfilter/nf_conntrack_labels.h
+++ b/include/net/netfilter/nf_conntrack_labels.h
@@ -30,8 +30,7 @@ static inline struct nf_conn_labels *nf_ct_labels_ext_add(struct nf_conn *ct)
         if (net->ct.labels_used == 0)
                 return NULL;
 
-        return nf_ct_ext_add_length(ct, NF_CT_EXT_LABELS,
-                                    sizeof(struct nf_conn_labels), GFP_ATOMIC);
+        return nf_ct_ext_add(ct, NF_CT_EXT_LABELS, GFP_ATOMIC);
 #else
         return NULL;
 #endif
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 5031e072567b..b02af0bf5777 100644
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -145,7 +145,7 @@ static inline enum nft_registers nft_type_to_reg(enum nft_data_types type)
         return type == NFT_DATA_VERDICT ? NFT_REG_VERDICT : NFT_REG_1 * NFT_REG_SIZE / NFT_REG32_SIZE;
 }
 
-unsigned int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest);
+int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest);
 unsigned int nft_parse_register(const struct nlattr *attr);
 int nft_dump_register(struct sk_buff *skb, unsigned int attr, unsigned int reg);
 
@@ -313,7 +313,7 @@ void nft_unregister_set(struct nft_set_ops *ops);
  *      @size: maximum set size
  *      @nelems: number of elements
  *      @ndeact: number of deactivated elements queued for removal
- *      @timeout: default timeout value in msecs
+ *      @timeout: default timeout value in jiffies
  *      @gc_int: garbage collection interval in msecs
  *      @policy: set parameterization (see enum nft_set_policies)
  *      @udlen: user data length
@@ -542,7 +542,8 @@ void *nft_set_elem_init(const struct nft_set *set,
                         const struct nft_set_ext_tmpl *tmpl,
                         const u32 *key, const u32 *data,
                         u64 timeout, gfp_t gfp);
-void nft_set_elem_destroy(const struct nft_set *set, void *elem);
+void nft_set_elem_destroy(const struct nft_set *set, void *elem,
+                          bool destroy_expr);
 
 /**
  *      struct nft_set_gc_batch_head - nf_tables set garbage collection batch
@@ -693,7 +694,6 @@ static inline int nft_expr_clone(struct nft_expr *dst, struct nft_expr *src)
 {
         int err;
 
-        __module_get(src->ops->type->owner);
         if (src->ops->clone) {
                 dst->ops = src->ops;
                 err = src->ops->clone(dst, src);
@@ -702,6 +702,8 @@ static inline int nft_expr_clone(struct nft_expr *dst, struct nft_expr *src)
         } else {
                 memcpy(dst, src, src->ops->size);
         }
+
+        __module_get(src->ops->type->owner);
         return 0;
 }
 
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 87a7f42e7639..31acc3f4f132 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -152,7 +152,7 @@ void sctp_unhash_endpoint(struct sctp_endpoint *);
 struct sock *sctp_err_lookup(struct net *net, int family, struct sk_buff *,
                              struct sctphdr *, struct sctp_association **,
                              struct sctp_transport **);
-void sctp_err_finish(struct sock *, struct sctp_association *);
+void sctp_err_finish(struct sock *, struct sctp_transport *);
 void sctp_icmp_frag_needed(struct sock *, struct sctp_association *,
                            struct sctp_transport *t, __u32 pmtu);
 void sctp_icmp_redirect(struct sock *, struct sctp_transport *,
diff --git a/include/net/sock.h b/include/net/sock.h
index 73c6b008f1b7..92b269709b9a 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1596,11 +1596,11 @@ static inline void sock_put(struct sock *sk)
 void sock_gen_put(struct sock *sk);
 
 int __sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested,
-                     unsigned int trim_cap);
+                     unsigned int trim_cap, bool refcounted);
 static inline int sk_receive_skb(struct sock *sk, struct sk_buff *skb,
                                  const int nested)
 {
-        return __sk_receive_skb(sk, skb, nested, 1);
+        return __sk_receive_skb(sk, skb, nested, 1, true);
 }
 
 static inline void sk_tx_queue_set(struct sock *sk, int tx_queue)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 5b82d4d94834..123979fe12bf 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -805,7 +805,7 @@ static inline bool inet_exact_dif_match(struct net *net, struct sk_buff *skb)
 {
 #if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV)
         if (!net->ipv4.sysctl_tcp_l3mdev_accept &&
-            ipv4_l3mdev_skb(TCP_SKB_CB(skb)->header.h4.flags))
+            skb && ipv4_l3mdev_skb(TCP_SKB_CB(skb)->header.h4.flags))
                 return true;
 #endif
         return false;
@@ -1220,6 +1220,7 @@ static inline void tcp_prequeue_init(struct tcp_sock *tp)
 
 bool tcp_prequeue(struct sock *sk, struct sk_buff *skb);
 bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb);
+int tcp_filter(struct sock *sk, struct sk_buff *skb);
 
 #undef STATE_TRACE
 
diff --git a/include/sound/cs35l34.h b/include/sound/cs35l34.h
new file mode 100644
index 000000000000..9c927cffbe46
--- /dev/null
+++ b/include/sound/cs35l34.h
@@ -0,0 +1,35 @@
+/*
+ * linux/sound/cs35l34.h -- Platform data for CS35l34
+ *
+ * Copyright (c) 2016 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 __CS35L34_H
+#define __CS35L34_H
+
+struct cs35l34_platform_data {
+        /* Set AIF to half drive strength */
+        bool aif_half_drv;
+        /* Digital Soft Ramp Disable */
+        bool digsft_disable;
+        /* Amplifier Invert */
+        bool amp_inv;
+        /* Peak current (mA) */
+        unsigned int boost_peak;
+        /* Boost inductor value (nH) */
+        unsigned int boost_ind;
+        /* Boost Controller Voltage Setting (mV) */
+        unsigned int boost_vtge;
+        /* Gain Change Zero Cross */
+        bool gain_zc_disable;
+        /* SDIN Left/Right Selection */
+        unsigned int i2s_sdinloc;
+        /* TDM Rising Edge */
+        bool tdm_rising_edge;
+};
+
+#endif /* __CS35L34_H */
diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h
index 67be2445941a..1c8f9e1ef2a5 100644
--- a/include/sound/dmaengine_pcm.h
+++ b/include/sound/dmaengine_pcm.h
@@ -71,7 +71,6 @@ struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream)
  * @slave_id: Slave requester id for the DMA channel.
  * @filter_data: Custom DMA channel filter data, this will usually be used when
  * requesting the DMA channel.
- * @chan_name: Custom channel name to use when requesting DMA channel.
  * @fifo_size: FIFO size of the DAI controller in bytes
  * @flags: PCM_DAI flags, only SND_DMAENGINE_PCM_DAI_FLAG_PACK for now
  */
@@ -81,7 +80,6 @@ struct snd_dmaengine_dai_dma_data {
         u32 maxburst;
         unsigned int slave_id;
         void *filter_data;
-        const char *chan_name;
         unsigned int fifo_size;
         unsigned int flags;
 };
@@ -107,10 +105,6 @@ void snd_dmaengine_pcm_set_config_from_dai_data(
  * playback.
  */
 #define SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX BIT(3)
-/*
- * The PCM streams have custom channel names specified.
- */
-#define SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME BIT(4)
 
 /**
  * struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM
diff --git a/include/sound/rt5514.h b/include/sound/rt5514.h
new file mode 100644
index 000000000000..ef18494769ee
--- /dev/null
+++ b/include/sound/rt5514.h
@@ -0,0 +1,20 @@
+/*
+ * linux/sound/rt5514.h -- Platform data for RT5514
+ *
+ * Copyright 2016 Realtek Semiconductor Corp.
+ * Author: Oder Chiou <oder_chiou@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 __LINUX_SND_RT5514_H
+#define __LINUX_SND_RT5514_H
+
+struct rt5514_platform_data {
+        unsigned int dmic_init_delay;
+};
+
+#endif
+
diff --git a/include/sound/rt5665.h b/include/sound/rt5665.h
new file mode 100755
index 000000000000..963229e71dc7
--- /dev/null
+++ b/include/sound/rt5665.h
@@ -0,0 +1,47 @@
+/*
+ * linux/sound/rt5665.h -- Platform data for RT5665
+ *
+ * Copyright 2016 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_RT5665_H
+#define __LINUX_SND_RT5665_H
+
+enum rt5665_dmic1_data_pin {
+        RT5665_DMIC1_NULL,
+        RT5665_DMIC1_DATA_GPIO4,
+        RT5665_DMIC1_DATA_IN2N,
+};
+
+enum rt5665_dmic2_data_pin {
+        RT5665_DMIC2_NULL,
+        RT5665_DMIC2_DATA_GPIO5,
+        RT5665_DMIC2_DATA_IN2P,
+};
+
+enum rt5665_jd_src {
+        RT5665_JD_NULL,
+        RT5665_JD1,
+};
+
+struct rt5665_platform_data {
+        bool in1_diff;
+        bool in2_diff;
+        bool in3_diff;
+        bool in4_diff;
+
+        int ldo1_en; /* GPIO for LDO1_EN */
+
+        enum rt5665_dmic1_data_pin dmic1_data_pin;
+        enum rt5665_dmic2_data_pin dmic2_data_pin;
+        enum rt5665_jd_src jd_src;
+
+        unsigned int sar_hs_type;
+};
+
+#endif
+
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index fd6412551145..64e90ca9ad32 100644
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -1,5 +1,5 @@
 /*
- * simple_card_core.h
+ * simple_card_utils.h
  *
  * Copyright (c) 2016 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
  *
@@ -7,8 +7,8 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#ifndef __SIMPLE_CARD_CORE_H
-#define __SIMPLE_CARD_CORE_H
+#ifndef __SIMPLE_CARD_UTILS_H
+#define __SIMPLE_CARD_UTILS_H
 
 #include <sound/soc.h>
 
@@ -68,4 +68,4 @@ void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
 
 int asoc_simple_card_clean_reference(struct snd_soc_card *card);
 
-#endif /* __SIMPLE_CARD_CORE_H */
+#endif /* __SIMPLE_CARD_UTILS_H */
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 964b7de1a1cc..200e1f04c166 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -15,6 +15,7 @@
 
 
 #include <linux/list.h>
+#include <sound/asoc.h>
 
 struct snd_pcm_substream;
 struct snd_soc_dapm_widget;
@@ -26,13 +27,13 @@ struct snd_compr_stream;
  * Describes the physical PCM data formating and clocking. Add new formats
  * to the end.
  */
-#define SND_SOC_DAIFMT_I2S              1 /* I2S mode */
-#define SND_SOC_DAIFMT_RIGHT_J          2 /* Right Justified mode */
-#define SND_SOC_DAIFMT_LEFT_J           3 /* Left Justified mode */
-#define SND_SOC_DAIFMT_DSP_A            4 /* L data MSB after FRM LRC */
-#define SND_SOC_DAIFMT_DSP_B            5 /* L data MSB during FRM LRC */
-#define SND_SOC_DAIFMT_AC97             6 /* AC97 */
-#define SND_SOC_DAIFMT_PDM              7 /* Pulse density modulation */
+#define SND_SOC_DAIFMT_I2S              SND_SOC_DAI_FORMAT_I2S
+#define SND_SOC_DAIFMT_RIGHT_J          SND_SOC_DAI_FORMAT_RIGHT_J
+#define SND_SOC_DAIFMT_LEFT_J           SND_SOC_DAI_FORMAT_LEFT_J
+#define SND_SOC_DAIFMT_DSP_A            SND_SOC_DAI_FORMAT_DSP_A
+#define SND_SOC_DAIFMT_DSP_B            SND_SOC_DAI_FORMAT_DSP_B
+#define SND_SOC_DAIFMT_AC97             SND_SOC_DAI_FORMAT_AC97
+#define SND_SOC_DAIFMT_PDM              SND_SOC_DAI_FORMAT_PDM
 
 /* left and right justified also known as MSB and LSB respectively */
 #define SND_SOC_DAIFMT_MSB              SND_SOC_DAIFMT_LEFT_J
@@ -207,6 +208,30 @@ struct snd_soc_dai_ops {
                 struct snd_soc_dai *);
 };
 
+struct snd_soc_cdai_ops {
+        /*
+         * for compress ops
+         */
+        int (*startup)(struct snd_compr_stream *,
+                        struct snd_soc_dai *);
+        int (*shutdown)(struct snd_compr_stream *,
+                        struct snd_soc_dai *);
+        int (*set_params)(struct snd_compr_stream *,
+                        struct snd_compr_params *, struct snd_soc_dai *);
+        int (*get_params)(struct snd_compr_stream *,
+                        struct snd_codec *, struct snd_soc_dai *);
+        int (*set_metadata)(struct snd_compr_stream *,
+                        struct snd_compr_metadata *, struct snd_soc_dai *);
+        int (*get_metadata)(struct snd_compr_stream *,
+                        struct snd_compr_metadata *, struct snd_soc_dai *);
+        int (*trigger)(struct snd_compr_stream *, int,
+                        struct snd_soc_dai *);
+        int (*pointer)(struct snd_compr_stream *,
+                        struct snd_compr_tstamp *, struct snd_soc_dai *);
+        int (*ack)(struct snd_compr_stream *, size_t,
+                        struct snd_soc_dai *);
+};
+
 /*
  * Digital Audio Interface Driver.
  *
@@ -236,6 +261,7 @@ struct snd_soc_dai_driver {
 
         /* ops */
         const struct snd_soc_dai_ops *ops;
+        const struct snd_soc_cdai_ops *cops;
 
         /* DAI capabilities */
         struct snd_soc_pcm_stream capture;
@@ -268,8 +294,9 @@ struct snd_soc_dai {
         unsigned int symmetric_rates:1;
         unsigned int symmetric_channels:1;
         unsigned int symmetric_samplebits:1;
+        unsigned int probed:1;
+
         unsigned int active;
-        unsigned char probed:1;
 
         struct snd_soc_dapm_widget *playback_widget;
         struct snd_soc_dapm_widget *capture_widget;
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index f60d755f7ac6..a466f4bdc835 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -272,6 +272,16 @@ struct device;
 
 
 /* dapm kcontrol types */
+#define SOC_DAPM_DOUBLE(xname, reg, lshift, rshift, max, invert) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .info = snd_soc_info_volsw, \
+        .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \
+        .private_value = SOC_DOUBLE_VALUE(reg, lshift, rshift, max, invert, 0) }
+#define SOC_DAPM_DOUBLE_R(xname, lreg, rreg, shift, max, invert) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .info = snd_soc_info_volsw, \
+        .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \
+        .private_value = SOC_DOUBLE_R_VALUE(lreg, rreg, shift, max, invert) }
 #define SOC_DAPM_SINGLE(xname, reg, shift, max, invert) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
         .info = snd_soc_info_volsw, \
@@ -615,6 +625,10 @@ struct snd_soc_dapm_update {
         int reg;
         int mask;
         int val;
+        int reg2;
+        int mask2;
+        int val2;
+        bool has_second_set;
 };
 
 struct snd_soc_dapm_wcache {
diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h
index b897b9d63161..f9cc7b9271ac 100644
--- a/include/sound/soc-topology.h
+++ b/include/sound/soc-topology.h
@@ -53,7 +53,7 @@ struct snd_soc_dobj_control {
 
 /* dynamic widget object */
 struct snd_soc_dobj_widget {
-        unsigned int kcontrol_enum:1;   /* this widget is an enum kcontrol */
+        unsigned int kcontrol_type;     /* kcontrol type: mixer, enum, bytes */
 };
 
 /* generic dynamic object - all dynamic objects belong to this struct */
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 4f1c784e44f6..2b502f6cc6d0 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -782,6 +782,8 @@ struct snd_soc_component_driver {
 
         int (*probe)(struct snd_soc_component *);
         void (*remove)(struct snd_soc_component *);
+        int (*suspend)(struct snd_soc_component *);
+        int (*resume)(struct snd_soc_component *);
 
         /* DT */
         int (*of_xlate_dai_name)(struct snd_soc_component *component,
@@ -807,9 +809,11 @@ struct snd_soc_component {
 
         unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */
         unsigned int registered_as_component:1;
+        unsigned int auxiliary:1; /* for auxiliary component of the card */
+        unsigned int suspended:1; /* is in suspend PM state */
 
         struct list_head list;
-        struct list_head list_aux; /* for auxiliary component of the card */
+        struct list_head card_list;
 
         struct snd_soc_dai_driver *dai_drv;
         int num_dai;
@@ -852,6 +856,8 @@ struct snd_soc_component {
 
         int (*probe)(struct snd_soc_component *);
         void (*remove)(struct snd_soc_component *);
+        int (*suspend)(struct snd_soc_component *);
+        int (*resume)(struct snd_soc_component *);
 
         /* machine specific init */
         int (*init)(struct snd_soc_component *component);
@@ -868,11 +874,9 @@ struct snd_soc_codec {
         const struct snd_soc_codec_driver *driver;
 
         struct list_head list;
-        struct list_head card_list;
 
         /* runtime */
         unsigned int cache_bypass:1; /* Suppress access to the cache */
-        unsigned int suspended:1; /* Codec is in suspend PM state */
         unsigned int cache_init:1; /* codec cache has been initialized */
 
         /* codec IO */
@@ -1025,13 +1029,13 @@ struct snd_soc_dai_link {
         const struct snd_soc_ops *ops;
         const struct snd_soc_compr_ops *compr_ops;
 
-        /* For unidirectional dai links */
-        bool playback_only;
-        bool capture_only;
-
         /* Mark this pcm with non atomic ops */
         bool nonatomic;
 
+        /* For unidirectional dai links */
+        unsigned int playback_only:1;
+        unsigned int capture_only:1;
+
         /* Keep DAI active over suspend */
         unsigned int ignore_suspend:1;
 
@@ -1148,7 +1152,6 @@ struct snd_soc_card {
          */
         struct snd_soc_aux_dev *aux_dev;
         int num_aux_devs;
-        struct list_head aux_comp_list;
 
         const struct snd_kcontrol_new *controls;
         int num_controls;
@@ -1170,7 +1173,7 @@ struct snd_soc_card {
         struct work_struct deferred_resume_work;
 
         /* lists of probed devices belonging to this card */
-        struct list_head codec_dev_list;
+        struct list_head component_dev_list;
 
         struct list_head widgets;
         struct list_head paths;
@@ -1203,14 +1206,11 @@ struct snd_soc_pcm_runtime {
         enum snd_soc_pcm_subclass pcm_subclass;
         struct snd_pcm_ops ops;
 
-        unsigned int dev_registered:1;
-
         /* Dynamic PCM BE runtime data */
         struct snd_soc_dpcm_runtime dpcm[2];
         int fe_compr;
 
         long pmdown_time;
-        unsigned char pop_wait:1;
 
         /* runtime devices */
         struct snd_pcm *pcm;
@@ -1219,7 +1219,6 @@ struct snd_soc_pcm_runtime {
         struct snd_soc_platform *platform;
         struct snd_soc_dai *codec_dai;
         struct snd_soc_dai *cpu_dai;
-        struct snd_soc_component *component; /* Only valid for AUX dev rtds */
 
         struct snd_soc_dai **codec_dais;
         unsigned int num_codecs;
@@ -1232,6 +1231,10 @@ struct snd_soc_pcm_runtime {
 
         unsigned int num; /* 0-based and monotonic increasing */
         struct list_head list; /* rtd list of the soc card */
+
+        /* bit field */
+        unsigned int dev_registered:1;
+        unsigned int pop_wait:1;
 };
 
 /* mixer control */
@@ -1541,11 +1544,10 @@ static inline void *snd_soc_platform_get_drvdata(struct snd_soc_platform *platfo
 
 static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
 {
-        INIT_LIST_HEAD(&card->codec_dev_list);
         INIT_LIST_HEAD(&card->widgets);
         INIT_LIST_HEAD(&card->paths);
         INIT_LIST_HEAD(&card->dapm_list);
-        INIT_LIST_HEAD(&card->aux_comp_list);
+        INIT_LIST_HEAD(&card->component_dev_list);
 }
 
 static inline bool snd_soc_volsw_is_stereo(struct soc_mixer_control *mc)
@@ -1642,25 +1644,43 @@ static inline struct snd_soc_platform *snd_soc_kcontrol_platform(
 int snd_soc_util_init(void);
 void snd_soc_util_exit(void);
 
-int snd_soc_of_parse_card_name(struct snd_soc_card *card,
-                               const char *propname);
-int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,
-                                          const char *propname);
+#define snd_soc_of_parse_card_name(card, propname) \
+        snd_soc_of_parse_card_name_from_node(card, NULL, propname)
+int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card,
+                                         struct device_node *np,
+                                         const char *propname);
+#define snd_soc_of_parse_audio_simple_widgets(card, propname)\
+        snd_soc_of_parse_audio_simple_widgets_from_node(card, NULL, propname)
+int snd_soc_of_parse_audio_simple_widgets_from_node(struct snd_soc_card *card,
+                                                    struct device_node *np,
+                                                    const char *propname);
+
 int snd_soc_of_parse_tdm_slot(struct device_node *np,
                               unsigned int *tx_mask,
                               unsigned int *rx_mask,
                               unsigned int *slots,
                               unsigned int *slot_width);
-void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,
+#define snd_soc_of_parse_audio_prefix(card, codec_conf, of_node, propname) \
+        snd_soc_of_parse_audio_prefix_from_node(card, NULL, codec_conf, \
+                                                of_node, propname)
+void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card,
+                                   struct device_node *np,
                                    struct snd_soc_codec_conf *codec_conf,
                                    struct device_node *of_node,
                                    const char *propname);
-int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
-                                   const char *propname);
+
+#define snd_soc_of_parse_audio_routing(card, propname) \
+        snd_soc_of_parse_audio_routing_from_node(card, NULL, propname)
+int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,
+                                             struct device_node *np,
+                                             const char *propname);
+
 unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
                                      const char *prefix,
                                      struct device_node **bitclkmaster,
                                      struct device_node **framemaster);
+int snd_soc_get_dai_name(struct of_phandle_args *args,
+                         const char **dai_name);
 int snd_soc_of_get_dai_name(struct device_node *of_node,
                             const char **dai_name);
 int snd_soc_of_get_dai_link_codecs(struct device *dev,
@@ -1671,6 +1691,9 @@ int snd_soc_add_dai_link(struct snd_soc_card *card,
                                 struct snd_soc_dai_link *dai_link);
 void snd_soc_remove_dai_link(struct snd_soc_card *card,
                              struct snd_soc_dai_link *dai_link);
+struct snd_soc_dai_link *snd_soc_find_dai_link(struct snd_soc_card *card,
+                                               int id, const char *name,
+                                               const char *stream_name);
 
 int snd_soc_register_dai(struct snd_soc_component *component,
         struct snd_soc_dai_driver *dai_drv);
@@ -1697,4 +1720,24 @@ static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm)
         mutex_unlock(&dapm->card->dapm_mutex);
 }
 
+int snd_soc_component_enable_pin(struct snd_soc_component *component,
+                                 const char *pin);
+int snd_soc_component_enable_pin_unlocked(struct snd_soc_component *component,
+                                          const char *pin);
+int snd_soc_component_disable_pin(struct snd_soc_component *component,
+                                  const char *pin);
+int snd_soc_component_disable_pin_unlocked(struct snd_soc_component *component,
+                                           const char *pin);
+int snd_soc_component_nc_pin(struct snd_soc_component *component,
+                             const char *pin);
+int snd_soc_component_nc_pin_unlocked(struct snd_soc_component *component,
+                                      const char *pin);
+int snd_soc_component_get_pin_status(struct snd_soc_component *component,
+                                     const char *pin);
+int snd_soc_component_force_enable_pin(struct snd_soc_component *component,
+                                       const char *pin);
+int snd_soc_component_force_enable_pin_unlocked(
+                                        struct snd_soc_component *component,
+                                        const char *pin);
+
 #endif
diff --git a/include/uapi/linux/atm_zatm.h b/include/uapi/linux/atm_zatm.h
index 5cd4d4d2dd1d..9c9c6ad55f14 100644
--- a/include/uapi/linux/atm_zatm.h
+++ b/include/uapi/linux/atm_zatm.h
@@ -14,7 +14,6 @@
 
 #include <linux/atmapi.h>
 #include <linux/atmioc.h>
-#include <linux/time.h>
 
 #define ZATM_GETPOOL    _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc)
                                                 /* get pool statistics */
diff --git a/include/uapi/linux/bpqether.h b/include/uapi/linux/bpqether.h
index a6c35e1a89ad..05865edaefda 100644
--- a/include/uapi/linux/bpqether.h
+++ b/include/uapi/linux/bpqether.h
@@ -5,9 +5,7 @@
  *      Defines for the BPQETHER pseudo device driver
  */
 
-#ifndef __LINUX_IF_ETHER_H
 #include <linux/if_ether.h>
-#endif
 
 #define SIOCSBPQETHOPT          (SIOCDEVPRIVATE+0)      /* reserved */
 #define SIOCSBPQETHADDR         (SIOCDEVPRIVATE+1)
diff --git a/include/uapi/linux/can.h b/include/uapi/linux/can.h
index 9692cda5f8fc..c48d93a28d1a 100644
--- a/include/uapi/linux/can.h
+++ b/include/uapi/linux/can.h
@@ -196,5 +196,6 @@ struct can_filter {
 };
 
 #define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */
+#define CAN_RAW_FILTER_MAX 512 /* maximum number of can_filter set via setsockopt() */
 
 #endif /* !_UAPI_CAN_H */
diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h
index e601c8c3bdc7..1158a043342a 100644
--- a/include/uapi/linux/if.h
+++ b/include/uapi/linux/if.h
@@ -31,7 +31,7 @@
 #include <linux/hdlc/ioctl.h>
 
 /* For glibc compatibility. An empty enum does not compile. */
-#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && \
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || \
     __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0
 /**
  * enum net_device_flags - &struct net_device flags
@@ -99,7 +99,7 @@ enum net_device_flags {
         IFF_ECHO                        = 1<<18, /* volatile */
 #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
 };
-#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */
 
 /* for compatibility with glibc net/if.h */
 #if __UAPI_DEF_IF_NET_DEVICE_FLAGS
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index d6d071fc3c56..3af60ee69053 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -640,7 +640,7 @@
  * Control a data application associated with the currently viewed channel,
  * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
  */
-#define KEY_DATA                        0x275
+#define KEY_DATA                        0x277
 
 #define BTN_TRIGGER_HAPPY               0x2c0
 #define BTN_TRIGGER_HAPPY1              0x2c0
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 300ef255d1e0..4ee67cb99143 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -972,12 +972,19 @@ struct kvm_irqfd {
         __u8  pad[16];
 };
 
+/* For KVM_CAP_ADJUST_CLOCK */
+
+/* Do not use 1, KVM_CHECK_EXTENSION returned it before we had flags.  */
+#define KVM_CLOCK_TSC_STABLE            2
+
 struct kvm_clock_data {
         __u64 clock;
         __u32 flags;
         __u32 pad[9];
 };
 
+/* For KVM_CAP_SW_TLB */
+
 #define KVM_MMU_FSL_BOOKE_NOHV          0
 #define KVM_MMU_FSL_BOOKE_HV            1
 
diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild
index cd26d7a0fd07..03f194aeadc5 100644
--- a/include/uapi/linux/netfilter/Kbuild
+++ b/include/uapi/linux/netfilter/Kbuild
@@ -5,6 +5,7 @@ header-y += nf_conntrack_ftp.h
 header-y += nf_conntrack_sctp.h
 header-y += nf_conntrack_tcp.h
 header-y += nf_conntrack_tuple_common.h
+header-y += nf_log.h
 header-y += nf_tables.h
 header-y += nf_tables_compat.h
 header-y += nf_nat.h
diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild
index e3969bd939e4..e3db7403296f 100644
--- a/include/uapi/linux/tc_act/Kbuild
+++ b/include/uapi/linux/tc_act/Kbuild
@@ -11,3 +11,5 @@ header-y += tc_vlan.h
 header-y += tc_bpf.h
 header-y += tc_connmark.h
 header-y += tc_ife.h
+header-y += tc_tunnel_key.h
+header-y += tc_skbmod.h
diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h
index 819d895edfdc..6702533c8bd8 100644
--- a/include/uapi/sound/asoc.h
+++ b/include/uapi/sound/asoc.h
@@ -33,6 +33,11 @@
  */
 #define SND_SOC_TPLG_STREAM_CONFIG_MAX  8
 
+/*
+ * Maximum number of physical link's hardware configs
+ */
+#define SND_SOC_TPLG_HW_CONFIG_MAX      8
+
 /* individual kcontrol info types - can be mixed with other types */
 #define SND_SOC_TPLG_CTL_VOLSW          1
 #define SND_SOC_TPLG_CTL_VOLSW_SX       2
@@ -77,7 +82,8 @@
 #define SND_SOC_TPLG_NUM_TEXTS          16
 
 /* ABI version */
-#define SND_SOC_TPLG_ABI_VERSION        0x5
+#define SND_SOC_TPLG_ABI_VERSION        0x5     /* current version */
+#define SND_SOC_TPLG_ABI_VERSION_MIN    0x4     /* oldest version supported */
 
 /* Max size of TLV data */
 #define SND_SOC_TPLG_TLV_SIZE           32
@@ -99,8 +105,8 @@
 #define SND_SOC_TPLG_TYPE_CODEC_LINK    9
 #define SND_SOC_TPLG_TYPE_BACKEND_LINK  10
 #define SND_SOC_TPLG_TYPE_PDATA         11
-#define SND_SOC_TPLG_TYPE_BE_DAI        12
-#define SND_SOC_TPLG_TYPE_MAX           SND_SOC_TPLG_TYPE_BE_DAI
+#define SND_SOC_TPLG_TYPE_DAI           12
+#define SND_SOC_TPLG_TYPE_MAX           SND_SOC_TPLG_TYPE_DAI
 
 /* vendor block IDs - please add new vendor types to end */
 #define SND_SOC_TPLG_TYPE_VENDOR_FW     1000
@@ -119,11 +125,32 @@
 #define SND_SOC_TPLG_TUPLE_TYPE_WORD    4
 #define SND_SOC_TPLG_TUPLE_TYPE_SHORT   5
 
-/* BE DAI flags */
+/* DAI flags */
 #define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_RATES         (1 << 0)
 #define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_CHANNELS      (1 << 1)
 #define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_SAMPLEBITS    (1 << 2)
 
+/* DAI physical PCM data formats.
+ * Add new formats to the end of the list.
+ */
+#define SND_SOC_DAI_FORMAT_I2S          1 /* I2S mode */
+#define SND_SOC_DAI_FORMAT_RIGHT_J      2 /* Right Justified mode */
+#define SND_SOC_DAI_FORMAT_LEFT_J       3 /* Left Justified mode */
+#define SND_SOC_DAI_FORMAT_DSP_A        4 /* L data MSB after FRM LRC */
+#define SND_SOC_DAI_FORMAT_DSP_B        5 /* L data MSB during FRM LRC */
+#define SND_SOC_DAI_FORMAT_AC97         6 /* AC97 */
+#define SND_SOC_DAI_FORMAT_PDM          7 /* Pulse density modulation */
+
+/* left and right justified also known as MSB and LSB respectively */
+#define SND_SOC_DAI_FORMAT_MSB          SND_SOC_DAI_FORMAT_LEFT_J
+#define SND_SOC_DAI_FORMAT_LSB          SND_SOC_DAI_FORMAT_RIGHT_J
+
+/* DAI link flags */
+#define SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_RATES         (1 << 0)
+#define SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_CHANNELS      (1 << 1)
+#define SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS    (1 << 2)
+#define SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP            (1 << 3)
+
 /*
  * Block Header.
  * This header precedes all object and object arrays below.
@@ -267,6 +294,35 @@ struct snd_soc_tplg_stream {
         __le32 channels;        /* channels */
 } __attribute__((packed));
 
+
+/*
+ * Describes a physical link's runtime supported hardware config,
+ * i.e. hardware audio formats.
+ */
+struct snd_soc_tplg_hw_config {
+        __le32 size;            /* in bytes of this structure */
+        __le32 id;              /* unique ID - - used to match */
+        __le32 fmt;             /* SND_SOC_DAI_FORMAT_ format value */
+        __u8 clock_gated;       /* 1 if clock can be gated to save power */
+        __u8 invert_bclk;       /* 1 for inverted BCLK, 0 for normal */
+        __u8 invert_fsync;      /* 1 for inverted frame clock, 0 for normal */
+        __u8 bclk_master;       /* 1 for master of BCLK, 0 for slave */
+        __u8 fsync_master;      /* 1 for master of FSYNC, 0 for slave */
+        __u8 mclk_direction;    /* 0 for input, 1 for output */
+        __le16 reserved;        /* for 32bit alignment */
+        __le32 mclk_rate;       /* MCLK or SYSCLK freqency in Hz */
+        __le32 bclk_rate;       /* BCLK freqency in Hz */
+        __le32 fsync_rate;      /* frame clock in Hz */
+        __le32 tdm_slots;       /* number of TDM slots in use */
+        __le32 tdm_slot_width;  /* width in bits for each slot */
+        __le32 tx_slots;        /* bit mask for active Tx slots */
+        __le32 rx_slots;        /* bit mask for active Rx slots */
+        __le32 tx_channels;     /* number of Tx channels */
+        __le32 tx_chanmap[SND_SOC_TPLG_MAX_CHAN]; /* array of slot number */
+        __le32 rx_channels;     /* number of Rx channels */
+        __le32 rx_chanmap[SND_SOC_TPLG_MAX_CHAN]; /* array of slot number */
+} __attribute__((packed));
+
 /*
  * Manifest. List totals for each payload type. Not used in parsing, but will
  * be passed to the component driver before any other objects in order for any
@@ -286,7 +342,7 @@ struct snd_soc_tplg_manifest {
         __le32 graph_elems;     /* number of graph elements */
         __le32 pcm_elems;       /* number of PCM elements */
         __le32 dai_link_elems;  /* number of DAI link elements */
-        __le32 be_dai_elems;    /* number of BE DAI elements */
+        __le32 dai_elems;       /* number of physical DAI elements */
         __le32 reserved[20];    /* reserved for new ABI element types */
         struct snd_soc_tplg_private priv;
 } __attribute__((packed));
@@ -434,13 +490,16 @@ struct snd_soc_tplg_pcm {
         struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* for DAI link */
         __le32 num_streams;     /* number of streams */
         struct snd_soc_tplg_stream_caps caps[2]; /* playback and capture for DAI */
+        __le32 flag_mask;       /* bitmask of flags to configure */
+        __le32 flags;           /* SND_SOC_TPLG_LNK_FLGBIT_* flag value */
+        struct snd_soc_tplg_private priv;
 } __attribute__((packed));
 
 
 /*
- * Describes the BE or CC link runtime supported configs or params
+ * Describes the physical link runtime supported configs or params
  *
- * File block representation for BE/CC link config :-
+ * File block representation for physical link config :-
  * +-----------------------------------+-----+
  * | struct snd_soc_tplg_hdr           |  1  |
  * +-----------------------------------+-----+
@@ -450,21 +509,30 @@ struct snd_soc_tplg_pcm {
 struct snd_soc_tplg_link_config {
         __le32 size;            /* in bytes of this structure */
         __le32 id;              /* unique ID - used to match */
+        char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* name - used to match */
+        char stream_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* stream name - used to match */
         struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* supported configs playback and captrure */
         __le32 num_streams;     /* number of streams */
+        struct snd_soc_tplg_hw_config hw_config[SND_SOC_TPLG_HW_CONFIG_MAX]; /* hw configs */
+        __le32 num_hw_configs;         /* number of hw configs */
+        __le32 default_hw_config_id;   /* default hw config ID for init */
+        __le32 flag_mask;       /* bitmask of flags to configure */
+        __le32 flags;           /* SND_SOC_TPLG_LNK_FLGBIT_* flag value */
+        struct snd_soc_tplg_private priv;
 } __attribute__((packed));
 
 /*
- * Describes SW/FW specific features of BE DAI.
+ * Describes SW/FW specific features of physical DAI.
+ * It can be used to configure backend DAIs for DPCM.
  *
- * File block representation for BE DAI :-
+ * File block representation for physical DAI :-
  * +-----------------------------------+-----+
  * | struct snd_soc_tplg_hdr           |  1  |
  * +-----------------------------------+-----+
- * | struct snd_soc_tplg_be_dai        |  N  |
+ * | struct snd_soc_tplg_dai           |  N  |
  * +-----------------------------------+-----+
  */
-struct snd_soc_tplg_be_dai {
+struct snd_soc_tplg_dai {
         __le32 size;            /* in bytes of this structure */
         char dai_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* name - used to match */
         __le32 dai_id;          /* unique ID - used to match */
diff --git a/include/uapi/sound/snd_sst_tokens.h b/include/uapi/sound/snd_sst_tokens.h
index 1ee2e943d66a..93392bedcc58 100644
--- a/include/uapi/sound/snd_sst_tokens.h
+++ b/include/uapi/sound/snd_sst_tokens.h
@@ -157,6 +157,10 @@
  *
  * %SKL_TKN_STR_LIB_NAME:       Specifies the library name
  *
+ * %SKL_TKN_U32_PMODE:          Specifies the power mode for pipe
+ *
+ * %SKL_TKL_U32_D0I3_CAPS:      Specifies the D0i3 capability for module
+ *
  * module_id and loadable flags dont have tokens as these values will be
  * read from the DSP FW manifest
  */
@@ -208,7 +212,9 @@ enum SKL_TKNS {
         SKL_TKN_U32_PROC_DOMAIN,
         SKL_TKN_U32_LIB_COUNT,
         SKL_TKN_STR_LIB_NAME,
-        SKL_TKN_MAX = SKL_TKN_STR_LIB_NAME,
+        SKL_TKN_U32_PMODE,
+        SKL_TKL_U32_D0I3_CAPS,
+        SKL_TKN_MAX = SKL_TKL_U32_D0I3_CAPS,
 };
 
 #endif
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 8a09b32e07d6..dd4104c9aa12 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -272,7 +272,7 @@ int __init rd_load_image(char *from)
                 sys_write(out_fd, buf, BLOCK_SIZE);
 #if !defined(CONFIG_S390)
                 if (!(i % 16)) {
-                        printk("%c\b", rotator[rotate & 0x3]);
+                        pr_cont("%c\b", rotator[rotate & 0x3]);
                         rotate++;
                 }
 #endif
diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c
index 570eeca7bdfa..ad1bc67aff1b 100644
--- a/kernel/bpf/hashtab.c
+++ b/kernel/bpf/hashtab.c
@@ -687,7 +687,8 @@ static void delete_all_elements(struct bpf_htab *htab)
 
                 hlist_for_each_entry_safe(l, n, head, hash_node) {
                         hlist_del_rcu(&l->hash_node);
-                        htab_elem_free(htab, l);
+                        if (l->state != HTAB_EXTRA_ELEM_USED)
+                                htab_elem_free(htab, l);
                 }
         }
 }
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 228f962447a5..237f3d6a7ddc 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -194,7 +194,7 @@ static int map_create(union bpf_attr *attr)
 
         err = bpf_map_charge_memlock(map);
         if (err)
-                goto free_map;
+                goto free_map_nouncharge;
 
         err = bpf_map_new_fd(map);
         if (err < 0)
@@ -204,6 +204,8 @@ static int map_create(union bpf_attr *attr)
         return err;
 
 free_map:
+        bpf_map_uncharge_memlock(map);
+free_map_nouncharge:
         map->ops->map_free(map);
         return err;
 }
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 99a7e5b388f2..8199821f54cf 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -216,8 +216,8 @@ static void print_verifier_state(struct bpf_verifier_state *state)
                                 reg->map_ptr->key_size,
                                 reg->map_ptr->value_size);
                 if (reg->min_value != BPF_REGISTER_MIN_RANGE)
-                        verbose(",min_value=%llu",
-                                (unsigned long long)reg->min_value);
+                        verbose(",min_value=%lld",
+                                (long long)reg->min_value);
                 if (reg->max_value != BPF_REGISTER_MAX_RANGE)
                         verbose(",max_value=%llu",
                                 (unsigned long long)reg->max_value);
@@ -758,7 +758,7 @@ static int check_mem_access(struct bpf_verifier_env *env, u32 regno, int off,
                          * index'es we need to make sure that whatever we use
                          * will have a set floor within our range.
                          */
-                        if ((s64)reg->min_value < 0) {
+                        if (reg->min_value < 0) {
                                 verbose("R%d min value is negative, either use unsigned index or do a if (index >=0) check.\n",
                                         regno);
                                 return -EACCES;
@@ -1468,7 +1468,8 @@ static void check_reg_overflow(struct bpf_reg_state *reg)
 {
         if (reg->max_value > BPF_REGISTER_MAX_RANGE)
                 reg->max_value = BPF_REGISTER_MAX_RANGE;
-        if ((s64)reg->min_value < BPF_REGISTER_MIN_RANGE)
+        if (reg->min_value < BPF_REGISTER_MIN_RANGE ||
+            reg->min_value > BPF_REGISTER_MAX_RANGE)
                 reg->min_value = BPF_REGISTER_MIN_RANGE;
 }
 
@@ -1476,7 +1477,8 @@ static void adjust_reg_min_max_vals(struct bpf_verifier_env *env,
                                     struct bpf_insn *insn)
 {
         struct bpf_reg_state *regs = env->cur_state.regs, *dst_reg;
-        u64 min_val = BPF_REGISTER_MIN_RANGE, max_val = BPF_REGISTER_MAX_RANGE;
+        s64 min_val = BPF_REGISTER_MIN_RANGE;
+        u64 max_val = BPF_REGISTER_MAX_RANGE;
         bool min_set = false, max_set = false;
         u8 opcode = BPF_OP(insn->code);
 
@@ -1512,22 +1514,43 @@ static void adjust_reg_min_max_vals(struct bpf_verifier_env *env,
                 return;
         }
 
+        /* If one of our values was at the end of our ranges then we can't just
+         * do our normal operations to the register, we need to set the values
+         * to the min/max since they are undefined.
+         */
+        if (min_val == BPF_REGISTER_MIN_RANGE)
+                dst_reg->min_value = BPF_REGISTER_MIN_RANGE;
+        if (max_val == BPF_REGISTER_MAX_RANGE)
+                dst_reg->max_value = BPF_REGISTER_MAX_RANGE;
+
         switch (opcode) {
         case BPF_ADD:
-                dst_reg->min_value += min_val;
-                dst_reg->max_value += max_val;
+                if (dst_reg->min_value != BPF_REGISTER_MIN_RANGE)
+                        dst_reg->min_value += min_val;
+                if (dst_reg->max_value != BPF_REGISTER_MAX_RANGE)
+                        dst_reg->max_value += max_val;
                 break;
         case BPF_SUB:
-                dst_reg->min_value -= min_val;
-                dst_reg->max_value -= max_val;
+                if (dst_reg->min_value != BPF_REGISTER_MIN_RANGE)
+                        dst_reg->min_value -= min_val;
+                if (dst_reg->max_value != BPF_REGISTER_MAX_RANGE)
+                        dst_reg->max_value -= max_val;
                 break;
         case BPF_MUL:
-                dst_reg->min_value *= min_val;
-                dst_reg->max_value *= max_val;
+                if (dst_reg->min_value != BPF_REGISTER_MIN_RANGE)
+                        dst_reg->min_value *= min_val;
+                if (dst_reg->max_value != BPF_REGISTER_MAX_RANGE)
+                        dst_reg->max_value *= max_val;
                 break;
         case BPF_AND:
-                /* & is special since it could end up with 0 bits set. */
-                dst_reg->min_value &= min_val;
+                /* Disallow AND'ing of negative numbers, ain't nobody got time
+                 * for that.  Otherwise the minimum is 0 and the max is the max
+                 * value we could AND against.
+                 */
+                if (min_val < 0)
+                        dst_reg->min_value = BPF_REGISTER_MIN_RANGE;
+                else
+                        dst_reg->min_value = 0;
                 dst_reg->max_value = max_val;
                 break;
         case BPF_LSH:
@@ -1537,24 +1560,25 @@ static void adjust_reg_min_max_vals(struct bpf_verifier_env *env,
                  */
                 if (min_val > ilog2(BPF_REGISTER_MAX_RANGE))
                         dst_reg->min_value = BPF_REGISTER_MIN_RANGE;
-                else
+                else if (dst_reg->min_value != BPF_REGISTER_MIN_RANGE)
                         dst_reg->min_value <<= min_val;
 
                 if (max_val > ilog2(BPF_REGISTER_MAX_RANGE))
                         dst_reg->max_value = BPF_REGISTER_MAX_RANGE;
-                else
+                else if (dst_reg->max_value != BPF_REGISTER_MAX_RANGE)
                         dst_reg->max_value <<= max_val;
                 break;
         case BPF_RSH:
-                dst_reg->min_value >>= min_val;
-                dst_reg->max_value >>= max_val;
-                break;
-        case BPF_MOD:
-                /* % is special since it is an unsigned modulus, so the floor
-                 * will always be 0.
+                /* RSH by a negative number is undefined, and the BPF_RSH is an
+                 * unsigned shift, so make the appropriate casts.
                  */
-                dst_reg->min_value = 0;
-                dst_reg->max_value = max_val - 1;
+                if (min_val < 0 || dst_reg->min_value < 0)
+                        dst_reg->min_value = BPF_REGISTER_MIN_RANGE;
+                else
+                        dst_reg->min_value =
+                                (u64)(dst_reg->min_value) >> min_val;
+                if (dst_reg->max_value != BPF_REGISTER_MAX_RANGE)
+                        dst_reg->max_value >>= max_val;
                 break;
         default:
                 reset_reg_range_values(regs, insn->dst_reg);
@@ -2430,6 +2454,7 @@ static bool states_equal(struct bpf_verifier_env *env,
                          struct bpf_verifier_state *old,
                          struct bpf_verifier_state *cur)
 {
+        bool varlen_map_access = env->varlen_map_value_access;
         struct bpf_reg_state *rold, *rcur;
         int i;
 
@@ -2443,12 +2468,17 @@ static bool states_equal(struct bpf_verifier_env *env,
                 /* If the ranges were not the same, but everything else was and
                  * we didn't do a variable access into a map then we are a-ok.
                  */
-                if (!env->varlen_map_value_access &&
+                if (!varlen_map_access &&
                     rold->type == rcur->type && rold->imm == rcur->imm)
                         continue;
 
+                /* If we didn't map access then again we don't care about the
+                 * mismatched range values and it's ok if our old type was
+                 * UNKNOWN and we didn't go to a NOT_INIT'ed reg.
+                 */
                 if (rold->type == NOT_INIT ||
-                    (rold->type == UNKNOWN_VALUE && rcur->type != NOT_INIT))
+                    (!varlen_map_access && rold->type == UNKNOWN_VALUE &&
+                     rcur->type != NOT_INIT))
                         continue;
 
                 if (rold->type == PTR_TO_PACKET && rcur->type == PTR_TO_PACKET &&
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 0e292132efac..02c8421f8c01 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -902,7 +902,15 @@ list_update_cgroup_event(struct perf_event *event,
          * this will always be called from the right CPU.
          */
         cpuctx = __get_cpu_context(ctx);
-        cpuctx->cgrp = add ? event->cgrp : NULL;
+
+        /*
+         * cpuctx->cgrp is NULL until a cgroup event is sched in or
+         * ctx->nr_cgroup == 0 .
+         */
+        if (add && perf_cgroup_from_task(current, ctx) == event->cgrp)
+                cpuctx->cgrp = event->cgrp;
+        else if (!add)
+                cpuctx->cgrp = NULL;
 }
 
 #else /* !CONFIG_CGROUP_PERF */
@@ -8018,6 +8026,7 @@ restart:
  * if <size> is not specified, the range is treated as a single address.
  */
 enum {
+        IF_ACT_NONE = -1,
         IF_ACT_FILTER,
         IF_ACT_START,
         IF_ACT_STOP,
@@ -8041,6 +8050,7 @@ static const match_table_t if_tokens = {
         { IF_SRC_KERNEL,        "%u/%u" },
         { IF_SRC_FILEADDR,      "%u@%s" },
         { IF_SRC_KERNELADDR,    "%u" },
+        { IF_ACT_NONE,          NULL },
 };
 
 /*
diff --git a/kernel/exit.c b/kernel/exit.c
index 9d68c45ebbe3..3076f3089919 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -836,6 +836,7 @@ void __noreturn do_exit(long code)
          */
         perf_event_exit_task(tsk);
 
+        sched_autogroup_exit_task(tsk);
         cgroup_exit(tsk);
 
         /*
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 9c4d30483264..6b669593e7eb 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1341,12 +1341,12 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
 
         } else if (new->flags & IRQF_TRIGGER_MASK) {
                 unsigned int nmsk = new->flags & IRQF_TRIGGER_MASK;
-                unsigned int omsk = irq_settings_get_trigger_mask(desc);
+                unsigned int omsk = irqd_get_trigger_type(&desc->irq_data);
 
                 if (nmsk != omsk)
                         /* hope the handler works with current  trigger mode */
                         pr_warn("irq %d uses trigger mode %u; requested %u\n",
-                                irq, nmsk, omsk);
+                                irq, omsk, nmsk);
         }
 
         *old_ptr = new;
diff --git a/kernel/kcov.c b/kernel/kcov.c
index 30e6d05aa5a9..3cbb0c879705 100644
--- a/kernel/kcov.c
+++ b/kernel/kcov.c
@@ -7,6 +7,7 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/printk.h>
+#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/vmalloc.h>
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 589d763a49b3..4d7ffc0a0d00 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -506,13 +506,13 @@ static void __print_lock_name(struct lock_class *class)
         name = class->name;
         if (!name) {
                 name = __get_key_name(class->key, str);
-                printk("%s", name);
+                printk(KERN_CONT "%s", name);
         } else {
-                printk("%s", name);
+                printk(KERN_CONT "%s", name);
                 if (class->name_version > 1)
-                        printk("#%d", class->name_version);
+                        printk(KERN_CONT "#%d", class->name_version);
                 if (class->subclass)
-                        printk("/%d", class->subclass);
+                        printk(KERN_CONT "/%d", class->subclass);
         }
 }
 
@@ -522,9 +522,9 @@ static void print_lock_name(struct lock_class *class)
 
         get_usage_chars(class, usage);
 
-        printk(" (");
+        printk(KERN_CONT " (");
         __print_lock_name(class);
-        printk("){%s}", usage);
+        printk(KERN_CONT "){%s}", usage);
 }
 
 static void print_lockdep_cache(struct lockdep_map *lock)
@@ -536,7 +536,7 @@ static void print_lockdep_cache(struct lockdep_map *lock)
         if (!name)
                 name = __get_key_name(lock->key->subkeys, str);
 
-        printk("%s", name);
+        printk(KERN_CONT "%s", name);
 }
 
 static void print_lock(struct held_lock *hlock)
@@ -551,13 +551,13 @@ static void print_lock(struct held_lock *hlock)
         barrier();
 
         if (!class_idx || (class_idx - 1) >= MAX_LOCKDEP_KEYS) {
-                printk("<RELEASED>\n");
+                printk(KERN_CONT "<RELEASED>\n");
                 return;
         }
 
         print_lock_name(lock_classes + class_idx - 1);
-        printk(", at: ");
-        print_ip_sym(hlock->acquire_ip);
+        printk(KERN_CONT ", at: [<%p>] %pS\n",
+                (void *)hlock->acquire_ip, (void *)hlock->acquire_ip);
 }
 
 static void lockdep_print_held_locks(struct task_struct *curr)
@@ -792,8 +792,8 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
 
                 printk("\nnew class %p: %s", class->key, class->name);
                 if (class->name_version > 1)
-                        printk("#%d", class->name_version);
-                printk("\n");
+                        printk(KERN_CONT "#%d", class->name_version);
+                printk(KERN_CONT "\n");
                 dump_stack();
 
                 if (!graph_lock()) {
@@ -1071,7 +1071,7 @@ print_circular_bug_entry(struct lock_list *target, int depth)
                 return 0;
         printk("\n-> #%u", depth);
         print_lock_name(target->class);
-        printk(":\n");
+        printk(KERN_CONT ":\n");
         print_stack_trace(&target->trace, 6);
 
         return 0;
@@ -1102,11 +1102,11 @@ print_circular_lock_scenario(struct held_lock *src,
         if (parent != source) {
                 printk("Chain exists of:\n  ");
                 __print_lock_name(source);
-                printk(" --> ");
+                printk(KERN_CONT " --> ");
                 __print_lock_name(parent);
-                printk(" --> ");
+                printk(KERN_CONT " --> ");
                 __print_lock_name(target);
-                printk("\n\n");
+                printk(KERN_CONT "\n\n");
         }
 
         printk(" Possible unsafe locking scenario:\n\n");
@@ -1114,16 +1114,16 @@ print_circular_lock_scenario(struct held_lock *src,
         printk("       ----                    ----\n");
         printk("  lock(");
         __print_lock_name(target);
-        printk(");\n");
+        printk(KERN_CONT ");\n");
         printk("                               lock(");
         __print_lock_name(parent);
-        printk(");\n");
+        printk(KERN_CONT ");\n");
         printk("                               lock(");
         __print_lock_name(target);
-        printk(");\n");
+        printk(KERN_CONT ");\n");
         printk("  lock(");
         __print_lock_name(source);
-        printk(");\n");
+        printk(KERN_CONT ");\n");
         printk("\n *** DEADLOCK ***\n\n");
 }
 
@@ -1359,22 +1359,22 @@ static void print_lock_class_header(struct lock_class *class, int depth)
 
         printk("%*s->", depth, "");
         print_lock_name(class);
-        printk(" ops: %lu", class->ops);
-        printk(" {\n");
+        printk(KERN_CONT " ops: %lu", class->ops);
+        printk(KERN_CONT " {\n");
 
         for (bit = 0; bit < LOCK_USAGE_STATES; bit++) {
                 if (class->usage_mask & (1 << bit)) {
                         int len = depth;
 
                         len += printk("%*s   %s", depth, "", usage_str[bit]);
-                        len += printk(" at:\n");
+                        len += printk(KERN_CONT " at:\n");
                         print_stack_trace(class->usage_traces + bit, len);
                 }
         }
         printk("%*s }\n", depth, "");
 
-        printk("%*s ... key      at: ",depth,"");
-        print_ip_sym((unsigned long)class->key);
+        printk("%*s ... key      at: [<%p>] %pS\n",
+                depth, "", class->key, class->key);
 }
 
 /*
@@ -1437,11 +1437,11 @@ print_irq_lock_scenario(struct lock_list *safe_entry,
         if (middle_class != unsafe_class) {
                 printk("Chain exists of:\n  ");
                 __print_lock_name(safe_class);
-                printk(" --> ");
+                printk(KERN_CONT " --> ");
                 __print_lock_name(middle_class);
-                printk(" --> ");
+                printk(KERN_CONT " --> ");
                 __print_lock_name(unsafe_class);
-                printk("\n\n");
+                printk(KERN_CONT "\n\n");
         }
 
         printk(" Possible interrupt unsafe locking scenario:\n\n");
@@ -1449,18 +1449,18 @@ print_irq_lock_scenario(struct lock_list *safe_entry,
         printk("       ----                    ----\n");
         printk("  lock(");
         __print_lock_name(unsafe_class);
-        printk(");\n");
+        printk(KERN_CONT ");\n");
         printk("                               local_irq_disable();\n");
         printk("                               lock(");
         __print_lock_name(safe_class);
-        printk(");\n");
+        printk(KERN_CONT ");\n");
         printk("                               lock(");
         __print_lock_name(middle_class);
-        printk(");\n");
+        printk(KERN_CONT ");\n");
         printk("  <Interrupt>\n");
         printk("    lock(");
         __print_lock_name(safe_class);
-        printk(");\n");
+        printk(KERN_CONT ");\n");
         printk("\n *** DEADLOCK ***\n\n");
 }
 
@@ -1497,9 +1497,9 @@ print_bad_irq_dependency(struct task_struct *curr,
         print_lock(prev);
         printk("which would create a new lock dependency:\n");
         print_lock_name(hlock_class(prev));
-        printk(" ->");
+        printk(KERN_CONT " ->");
         print_lock_name(hlock_class(next));
-        printk("\n");
+        printk(KERN_CONT "\n");
 
         printk("\nbut this new dependency connects a %s-irq-safe lock:\n",
                 irqclass);
@@ -1521,8 +1521,7 @@ print_bad_irq_dependency(struct task_struct *curr,
 
         lockdep_print_held_locks(curr);
 
-        printk("\nthe dependencies between %s-irq-safe lock", irqclass);
-        printk(" and the holding lock:\n");
+        printk("\nthe dependencies between %s-irq-safe lock and the holding lock:\n", irqclass);
         if (!save_trace(&prev_root->trace))
                 return 0;
         print_shortest_lock_dependencies(backwards_entry, prev_root);
@@ -1694,10 +1693,10 @@ print_deadlock_scenario(struct held_lock *nxt,
         printk("       ----\n");
         printk("  lock(");
         __print_lock_name(prev);
-        printk(");\n");
+        printk(KERN_CONT ");\n");
         printk("  lock(");
         __print_lock_name(next);
-        printk(");\n");
+        printk(KERN_CONT ");\n");
         printk("\n *** DEADLOCK ***\n\n");
         printk(" May be due to missing lock nesting notation\n\n");
 }
@@ -1891,9 +1890,9 @@ check_prev_add(struct task_struct *curr, struct held_lock *prev,
                 graph_unlock();
                 printk("\n new dependency: ");
                 print_lock_name(hlock_class(prev));
-                printk(" => ");
+                printk(KERN_CONT " => ");
                 print_lock_name(hlock_class(next));
-                printk("\n");
+                printk(KERN_CONT "\n");
                 dump_stack();
                 return graph_lock();
         }
@@ -2343,11 +2342,11 @@ print_usage_bug_scenario(struct held_lock *lock)
         printk("       ----\n");
         printk("  lock(");
         __print_lock_name(class);
-        printk(");\n");
+        printk(KERN_CONT ");\n");
         printk("  <Interrupt>\n");
         printk("    lock(");
         __print_lock_name(class);
-        printk(");\n");
+        printk(KERN_CONT ");\n");
         printk("\n *** DEADLOCK ***\n\n");
 }
 
@@ -2522,14 +2521,18 @@ check_usage_backwards(struct task_struct *curr, struct held_lock *this,
 void print_irqtrace_events(struct task_struct *curr)
 {
         printk("irq event stamp: %u\n", curr->irq_events);
-        printk("hardirqs last  enabled at (%u): ", curr->hardirq_enable_event);
-        print_ip_sym(curr->hardirq_enable_ip);
-        printk("hardirqs last disabled at (%u): ", curr->hardirq_disable_event);
-        print_ip_sym(curr->hardirq_disable_ip);
-        printk("softirqs last  enabled at (%u): ", curr->softirq_enable_event);
-        print_ip_sym(curr->softirq_enable_ip);
-        printk("softirqs last disabled at (%u): ", curr->softirq_disable_event);
-        print_ip_sym(curr->softirq_disable_ip);
+        printk("hardirqs last  enabled at (%u): [<%p>] %pS\n",
+                curr->hardirq_enable_event, (void *)curr->hardirq_enable_ip,
+                (void *)curr->hardirq_enable_ip);
+        printk("hardirqs last disabled at (%u): [<%p>] %pS\n",
+                curr->hardirq_disable_event, (void *)curr->hardirq_disable_ip,
+                (void *)curr->hardirq_disable_ip);
+        printk("softirqs last  enabled at (%u): [<%p>] %pS\n",
+                curr->softirq_enable_event, (void *)curr->softirq_enable_ip,
+                (void *)curr->softirq_enable_ip);
+        printk("softirqs last disabled at (%u): [<%p>] %pS\n",
+                curr->softirq_disable_event, (void *)curr->softirq_disable_ip,
+                (void *)curr->softirq_disable_ip);
 }
 
 static int HARDIRQ_verbose(struct lock_class *class)
@@ -3235,8 +3238,8 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
         if (very_verbose(class)) {
                 printk("\nacquire class [%p] %s", class->key, class->name);
                 if (class->name_version > 1)
-                        printk("#%d", class->name_version);
-                printk("\n");
+                        printk(KERN_CONT "#%d", class->name_version);
+                printk(KERN_CONT "\n");
                 dump_stack();
         }
 
@@ -3378,7 +3381,7 @@ print_unlock_imbalance_bug(struct task_struct *curr, struct lockdep_map *lock,
         printk("%s/%d is trying to release lock (",
                 curr->comm, task_pid_nr(curr));
         print_lockdep_cache(lock);
-        printk(") at:\n");
+        printk(KERN_CONT ") at:\n");
         print_ip_sym(ip);
         printk("but there are no more locks to release!\n");
         printk("\nother info that might help us debug this:\n");
@@ -3871,7 +3874,7 @@ print_lock_contention_bug(struct task_struct *curr, struct lockdep_map *lock,
         printk("%s/%d is trying to contend lock (",
                 curr->comm, task_pid_nr(curr));
         print_lockdep_cache(lock);
-        printk(") at:\n");
+        printk(KERN_CONT ") at:\n");
         print_ip_sym(ip);
         printk("but there are no locks held!\n");
         printk("\nother info that might help us debug this:\n");
diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h
index 51c4b24b6328..c2b88490d857 100644
--- a/kernel/locking/lockdep_internals.h
+++ b/kernel/locking/lockdep_internals.h
@@ -46,6 +46,14 @@ enum {
                 (LOCKF_USED_IN_HARDIRQ_READ | LOCKF_USED_IN_SOFTIRQ_READ)
 
 /*
+ * CONFIG_PROVE_LOCKING_SMALL is defined for sparc. Sparc requires .text,
+ * .data and .bss to fit in required 32MB limit for the kernel. With
+ * PROVE_LOCKING we could go over this limit and cause system boot-up problems.
+ * So, reduce the static allocations for lockdeps related structures so that
+ * everything fits in current required size limit.
+ */
+#ifdef CONFIG_PROVE_LOCKING_SMALL
+/*
  * MAX_LOCKDEP_ENTRIES is the maximum number of lock dependencies
  * we track.
  *
@@ -54,18 +62,24 @@ enum {
  * table (if it's not there yet), and we check it for lock order
  * conflicts and deadlocks.
  */
+#define MAX_LOCKDEP_ENTRIES     16384UL
+#define MAX_LOCKDEP_CHAINS_BITS 15
+#define MAX_STACK_TRACE_ENTRIES 262144UL
+#else
 #define MAX_LOCKDEP_ENTRIES     32768UL
 
 #define MAX_LOCKDEP_CHAINS_BITS 16
-#define MAX_LOCKDEP_CHAINS      (1UL << MAX_LOCKDEP_CHAINS_BITS)
-
-#define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*5)
 
 /*
  * Stack-trace: tightly packed array of stack backtrace
  * addresses. Protected by the hash_lock.
  */
 #define MAX_STACK_TRACE_ENTRIES 524288UL
+#endif
+
+#define MAX_LOCKDEP_CHAINS      (1UL << MAX_LOCKDEP_CHAINS_BITS)
+
+#define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*5)
 
 extern struct list_head all_lock_classes;
 extern struct lock_chain lock_chains[];
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index 1ec0f48962b3..2c49d76f96c3 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -65,8 +65,72 @@ static inline void clear_rt_mutex_waiters(struct rt_mutex *lock)
 
 static void fixup_rt_mutex_waiters(struct rt_mutex *lock)
 {
-        if (!rt_mutex_has_waiters(lock))
-                clear_rt_mutex_waiters(lock);
+        unsigned long owner, *p = (unsigned long *) &lock->owner;
+
+        if (rt_mutex_has_waiters(lock))
+                return;
+
+        /*
+         * The rbtree has no waiters enqueued, now make sure that the
+         * lock->owner still has the waiters bit set, otherwise the
+         * following can happen:
+         *
+         * CPU 0        CPU 1           CPU2
+         * l->owner=T1
+         *              rt_mutex_lock(l)
+         *              lock(l->lock)
+         *              l->owner = T1 | HAS_WAITERS;
+         *              enqueue(T2)
+         *              boost()
+         *                unlock(l->lock)
+         *              block()
+         *
+         *                              rt_mutex_lock(l)
+         *                              lock(l->lock)
+         *                              l->owner = T1 | HAS_WAITERS;
+         *                              enqueue(T3)
+         *                              boost()
+         *                                unlock(l->lock)
+         *                              block()
+         *              signal(->T2)    signal(->T3)
+         *              lock(l->lock)
+         *              dequeue(T2)
+         *              deboost()
+         *                unlock(l->lock)
+         *                              lock(l->lock)
+         *                              dequeue(T3)
+         *                               ==> wait list is empty
+         *                              deboost()
+         *                               unlock(l->lock)
+         *              lock(l->lock)
+         *              fixup_rt_mutex_waiters()
+         *                if (wait_list_empty(l) {
+         *                  l->owner = owner
+         *                  owner = l->owner & ~HAS_WAITERS;
+         *                    ==> l->owner = T1
+         *                }
+         *                              lock(l->lock)
+         * rt_mutex_unlock(l)           fixup_rt_mutex_waiters()
+         *                                if (wait_list_empty(l) {
+         *                                  owner = l->owner & ~HAS_WAITERS;
+         * cmpxchg(l->owner, T1, NULL)
+         *  ===> Success (l->owner = NULL)
+         *
+         *                                  l->owner = owner
+         *                                    ==> l->owner = T1
+         *                                }
+         *
+         * With the check for the waiter bit in place T3 on CPU2 will not
+         * overwrite. All tasks fiddling with the waiters bit are
+         * serialized by l->lock, so nothing else can modify the waiters
+         * bit. If the bit is set then nothing can change l->owner either
+         * so the simple RMW is safe. The cmpxchg() will simply fail if it
+         * happens in the middle of the RMW because the waiters bit is
+         * still set.
+         */
+        owner = READ_ONCE(*p);
+        if (owner & RT_MUTEX_HAS_WAITERS)
+                WRITE_ONCE(*p, owner & ~RT_MUTEX_HAS_WAITERS);
 }
 
 /*
diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h
index 4f5f83c7d2d3..e317e1cbb3eb 100644
--- a/kernel/locking/rtmutex_common.h
+++ b/kernel/locking/rtmutex_common.h
@@ -75,8 +75,9 @@ task_top_pi_waiter(struct task_struct *p)
 
 static inline struct task_struct *rt_mutex_owner(struct rt_mutex *lock)
 {
-        return (struct task_struct *)
-                ((unsigned long)lock->owner & ~RT_MUTEX_OWNER_MASKALL);
+        unsigned long owner = (unsigned long) READ_ONCE(lock->owner);
+
+        return (struct task_struct *) (owner & ~RT_MUTEX_OWNER_MASKALL);
 }
 
 /*
diff --git a/kernel/module.c b/kernel/module.c
index f57dd63186e6..0e54d5bf0097 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1301,8 +1301,9 @@ static int check_version(Elf_Shdr *sechdrs,
                 goto bad_version;
         }
 
-        pr_warn("%s: no symbol version for %s\n", mod->name, symname);
-        return 0;
+        /* Broken toolchain. Warn once, then let it go.. */
+        pr_warn_once("%s: no symbol version for %s\n", mod->name, symname);
+        return 1;
 
 bad_version:
         pr_warn("%s: disagrees about version of symbol %s\n",
diff --git a/kernel/power/suspend_test.c b/kernel/power/suspend_test.c
index 084452e34a12..bdff5ed57f10 100644
--- a/kernel/power/suspend_test.c
+++ b/kernel/power/suspend_test.c
@@ -203,8 +203,10 @@ static int __init test_suspend(void)
 
         /* RTCs have initialized by now too ... can we use one? */
         dev = class_find_device(rtc_class, NULL, NULL, has_wakealarm);
-        if (dev)
+        if (dev) {
                 rtc = rtc_class_open(dev_name(dev));
+                put_device(dev);
+        }
         if (!rtc) {
                 printk(warn_no_rtc);
                 return 0;
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index de08fc90baaf..f7a55e9ff2f7 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -253,17 +253,6 @@ static int preferred_console = -1;
 int console_set_on_cmdline;
 EXPORT_SYMBOL(console_set_on_cmdline);
 
-#ifdef CONFIG_OF
-static bool of_specified_console;
-
-void console_set_by_of(void)
-{
-        of_specified_console = true;
-}
-#else
-# define of_specified_console false
-#endif
-
 /* Flag: console code may call schedule() */
 static int console_may_schedule;
 
@@ -794,8 +783,6 @@ static ssize_t devkmsg_write(struct kiocb *iocb, struct iov_iter *from)
         return ret;
 }
 
-static void cont_flush(void);
-
 static ssize_t devkmsg_read(struct file *file, char __user *buf,
                             size_t count, loff_t *ppos)
 {
@@ -811,7 +798,6 @@ static ssize_t devkmsg_read(struct file *file, char __user *buf,
         if (ret)
                 return ret;
         raw_spin_lock_irq(&logbuf_lock);
-        cont_flush();
         while (user->seq == log_next_seq) {
                 if (file->f_flags & O_NONBLOCK) {
                         ret = -EAGAIN;
@@ -874,7 +860,6 @@ static loff_t devkmsg_llseek(struct file *file, loff_t offset, int whence)
                 return -ESPIPE;
 
         raw_spin_lock_irq(&logbuf_lock);
-        cont_flush();
         switch (whence) {
         case SEEK_SET:
                 /* the first record */
@@ -913,7 +898,6 @@ static unsigned int devkmsg_poll(struct file *file, poll_table *wait)
         poll_wait(file, &log_wait, wait);
 
         raw_spin_lock_irq(&logbuf_lock);
-        cont_flush();
         if (user->seq < log_next_seq) {
                 /* return error when data has vanished underneath us */
                 if (user->seq < log_first_seq)
@@ -1300,7 +1284,6 @@ static int syslog_print(char __user *buf, int size)
                 size_t skip;
 
                 raw_spin_lock_irq(&logbuf_lock);
-                cont_flush();
                 if (syslog_seq < log_first_seq) {
                         /* messages are gone, move to first one */
                         syslog_seq = log_first_seq;
@@ -1360,7 +1343,6 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
                 return -ENOMEM;
 
         raw_spin_lock_irq(&logbuf_lock);
-        cont_flush();
         if (buf) {
                 u64 next_seq;
                 u64 seq;
@@ -1522,7 +1504,6 @@ int do_syslog(int type, char __user *buf, int len, int source)
         /* Number of chars in the log buffer */
         case SYSLOG_ACTION_SIZE_UNREAD:
                 raw_spin_lock_irq(&logbuf_lock);
-                cont_flush();
                 if (syslog_seq < log_first_seq) {
                         /* messages are gone, move to first one */
                         syslog_seq = log_first_seq;
@@ -2657,7 +2638,7 @@ void register_console(struct console *newcon)
          *      didn't select a console we take the first one
          *      that registers here.
          */
-        if (preferred_console < 0 && !of_specified_console) {
+        if (preferred_console < 0) {
                 if (newcon->index < 0)
                         newcon->index = 0;
                 if (newcon->setup == NULL ||
@@ -3039,7 +3020,6 @@ void kmsg_dump(enum kmsg_dump_reason reason)
                 dumper->active = true;
 
                 raw_spin_lock_irqsave(&logbuf_lock, flags);
-                cont_flush();
                 dumper->cur_seq = clear_seq;
                 dumper->cur_idx = clear_idx;
                 dumper->next_seq = log_next_seq;
@@ -3130,7 +3110,6 @@ bool kmsg_dump_get_line(struct kmsg_dumper *dumper, bool syslog,
         bool ret;
 
         raw_spin_lock_irqsave(&logbuf_lock, flags);
-        cont_flush();
         ret = kmsg_dump_get_line_nolock(dumper, syslog, line, size, len);
         raw_spin_unlock_irqrestore(&logbuf_lock, flags);
 
@@ -3173,7 +3152,6 @@ bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog,
                 goto out;
 
         raw_spin_lock_irqsave(&logbuf_lock, flags);
-        cont_flush();
         if (dumper->cur_seq < log_first_seq) {
                 /* messages are gone, move to first available one */
                 dumper->cur_seq = log_first_seq;
diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
index a5d966cb8891..da39489d2d80 100644
--- a/kernel/sched/auto_group.c
+++ b/kernel/sched/auto_group.c
@@ -111,10 +111,13 @@ bool task_wants_autogroup(struct task_struct *p, struct task_group *tg)
 {
         if (tg != &root_task_group)
                 return false;
-
         /*
-         * We can only assume the task group can't go away on us if
-         * autogroup_move_group() can see us on ->thread_group list.
+         * If we race with autogroup_move_group() the caller can use the old
+         * value of signal->autogroup but in this case sched_move_task() will
+         * be called again before autogroup_kref_put().
+         *
+         * However, there is no way sched_autogroup_exit_task() could tell us
+         * to avoid autogroup->tg, so we abuse PF_EXITING flag for this case.
          */
         if (p->flags & PF_EXITING)
                 return false;
@@ -122,6 +125,16 @@ bool task_wants_autogroup(struct task_struct *p, struct task_group *tg)
         return true;
 }
 
+void sched_autogroup_exit_task(struct task_struct *p)
+{
+        /*
+         * We are going to call exit_notify() and autogroup_move_group() can't
+         * see this thread after that: we can no longer use signal->autogroup.
+         * See the PF_EXITING check in task_wants_autogroup().
+         */
+        sched_move_task(p);
+}
+
 static void
 autogroup_move_group(struct task_struct *p, struct autogroup *ag)
 {
@@ -138,13 +151,20 @@ autogroup_move_group(struct task_struct *p, struct autogroup *ag)
         }
 
         p->signal->autogroup = autogroup_kref_get(ag);
-
-        if (!READ_ONCE(sysctl_sched_autogroup_enabled))
-                goto out;
-
+        /*
+         * We can't avoid sched_move_task() after we changed signal->autogroup,
+         * this process can already run with task_group() == prev->tg or we can
+         * race with cgroup code which can read autogroup = prev under rq->lock.
+         * In the latter case for_each_thread() can not miss a migrating thread,
+         * cpu_cgroup_attach() must not be possible after cgroup_exit() and it
+         * can't be removed from thread list, we hold ->siglock.
+         *
+         * If an exiting thread was already removed from thread list we rely on
+         * sched_autogroup_exit_task().
+         */
         for_each_thread(p, t)
                 sched_move_task(t);
-out:
+
         unlock_task_sighand(p, &flags);
         autogroup_kref_put(prev);
 }
@@ -192,6 +212,7 @@ int proc_sched_autogroup_set_nice(struct task_struct *p, int nice)
 {
         static unsigned long next = INITIAL_JIFFIES;
         struct autogroup *ag;
+        unsigned long shares;
         int err;
 
         if (nice < MIN_NICE || nice > MAX_NICE)
@@ -210,9 +231,10 @@ int proc_sched_autogroup_set_nice(struct task_struct *p, int nice)
 
         next = HZ / 10 + jiffies;
         ag = autogroup_task_get(p);
+        shares = scale_load(sched_prio_to_weight[nice + 20]);
 
         down_write(&ag->lock);
-        err = sched_group_set_shares(ag->tg, sched_prio_to_weight[nice + 20]);
+        err = sched_group_set_shares(ag->tg, shares);
         if (!err)
                 ag->nice = nice;
         up_write(&ag->lock);
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index b3f05ee20d18..cbb387a265db 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -54,7 +54,11 @@ static const struct nla_policy taskstats_cmd_get_policy[TASKSTATS_CMD_ATTR_MAX+1
         [TASKSTATS_CMD_ATTR_REGISTER_CPUMASK] = { .type = NLA_STRING },
         [TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK] = { .type = NLA_STRING },};
 
-static const struct nla_policy cgroupstats_cmd_get_policy[CGROUPSTATS_CMD_ATTR_MAX+1] = {
+/*
+ * We have to use TASKSTATS_CMD_ATTR_MAX here, it is the maxattr in the family.
+ * Make sure they are always aligned.
+ */
+static const struct nla_policy cgroupstats_cmd_get_policy[TASKSTATS_CMD_ATTR_MAX+1] = {
         [CGROUPSTATS_CMD_ATTR_FD] = { .type = NLA_U32 },
 };
 
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 2050a7652a86..da87b3cba5b3 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1862,6 +1862,10 @@ static int __ftrace_hash_update_ipmodify(struct ftrace_ops *ops,
 
         /* Update rec->flags */
         do_for_each_ftrace_rec(pg, rec) {
+
+                if (rec->flags & FTRACE_FL_DISABLED)
+                        continue;
+
                 /* We need to update only differences of filter_hash */
                 in_old = !!ftrace_lookup_ip(old_hash, rec->ip);
                 in_new = !!ftrace_lookup_ip(new_hash, rec->ip);
@@ -1884,6 +1888,10 @@ rollback:
 
         /* Roll back what we did above */
         do_for_each_ftrace_rec(pg, rec) {
+
+                if (rec->flags & FTRACE_FL_DISABLED)
+                        continue;
+
                 if (rec == end)
                         goto err_out;
 
@@ -2397,6 +2405,10 @@ void __weak ftrace_replace_code(int enable)
                 return;
 
         do_for_each_ftrace_rec(pg, rec) {
+
+                if (rec->flags & FTRACE_FL_DISABLED)
+                        continue;
+
                 failed = __ftrace_replace_code(rec, enable);
                 if (failed) {
                         ftrace_bug(failed, rec);
@@ -2763,7 +2775,7 @@ static int ftrace_shutdown(struct ftrace_ops *ops, int command)
                 struct dyn_ftrace *rec;
 
                 do_for_each_ftrace_rec(pg, rec) {
-                        if (FTRACE_WARN_ON_ONCE(rec->flags))
+                        if (FTRACE_WARN_ON_ONCE(rec->flags & ~FTRACE_FL_DISABLED))
                                 pr_warn("  %pS flags:%lx\n",
                                         (void *)rec->ip, rec->flags);
                 } while_for_each_ftrace_rec();
@@ -3598,6 +3610,10 @@ match_records(struct ftrace_hash *hash, char *func, int len, char *mod)
                 goto out_unlock;
 
         do_for_each_ftrace_rec(pg, rec) {
+
+                if (rec->flags & FTRACE_FL_DISABLED)
+                        continue;
+
                 if (ftrace_match_record(rec, &func_g, mod_match, exclude_mod)) {
                         ret = enter_record(hash, rec, clear_filter);
                         if (ret < 0) {
@@ -3793,6 +3809,9 @@ register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
 
         do_for_each_ftrace_rec(pg, rec) {
 
+                if (rec->flags & FTRACE_FL_DISABLED)
+                        continue;
+
                 if (!ftrace_match_record(rec, &func_g, NULL, 0))
                         continue;
 
@@ -4685,6 +4704,9 @@ ftrace_set_func(unsigned long *array, int *idx, int size, char *buffer)
 
         do_for_each_ftrace_rec(pg, rec) {
 
+                if (rec->flags & FTRACE_FL_DISABLED)
+                        continue;
+
                 if (ftrace_match_record(rec, &func_g, NULL, 0)) {
                         /* if it is in the array */
                         exists = false;
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index b01e547d4d04..a6c8db1d62f6 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1085,6 +1085,9 @@ config PROVE_LOCKING
 
          For more details, see Documentation/locking/lockdep-design.txt.
 
+config PROVE_LOCKING_SMALL
+        bool
+
 config LOCKDEP
         bool
         depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index a8e12601eb37..056052dc8e91 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -362,6 +362,7 @@ void debug_object_init(void *addr, struct debug_obj_descr *descr)
 
         __debug_object_init(addr, descr, 0);
 }
+EXPORT_SYMBOL_GPL(debug_object_init);
 
 /**
  * debug_object_init_on_stack - debug checks when an object on stack is
@@ -376,6 +377,7 @@ void debug_object_init_on_stack(void *addr, struct debug_obj_descr *descr)
 
         __debug_object_init(addr, descr, 1);
 }
+EXPORT_SYMBOL_GPL(debug_object_init_on_stack);
 
 /**
  * debug_object_activate - debug checks when an object is activated
@@ -449,6 +451,7 @@ int debug_object_activate(void *addr, struct debug_obj_descr *descr)
         }
         return 0;
 }
+EXPORT_SYMBOL_GPL(debug_object_activate);
 
 /**
  * debug_object_deactivate - debug checks when an object is deactivated
@@ -496,6 +499,7 @@ void debug_object_deactivate(void *addr, struct debug_obj_descr *descr)
 
         raw_spin_unlock_irqrestore(&db->lock, flags);
 }
+EXPORT_SYMBOL_GPL(debug_object_deactivate);
 
 /**
  * debug_object_destroy - debug checks when an object is destroyed
@@ -542,6 +546,7 @@ void debug_object_destroy(void *addr, struct debug_obj_descr *descr)
 out_unlock:
         raw_spin_unlock_irqrestore(&db->lock, flags);
 }
+EXPORT_SYMBOL_GPL(debug_object_destroy);
 
 /**
  * debug_object_free - debug checks when an object is freed
@@ -582,6 +587,7 @@ void debug_object_free(void *addr, struct debug_obj_descr *descr)
 out_unlock:
         raw_spin_unlock_irqrestore(&db->lock, flags);
 }
+EXPORT_SYMBOL_GPL(debug_object_free);
 
 /**
  * debug_object_assert_init - debug checks when object should be init-ed
@@ -626,6 +632,7 @@ void debug_object_assert_init(void *addr, struct debug_obj_descr *descr)
 
         raw_spin_unlock_irqrestore(&db->lock, flags);
 }
+EXPORT_SYMBOL_GPL(debug_object_assert_init);
 
 /**
  * debug_object_active_state - debug checks object usage state machine
@@ -673,6 +680,7 @@ debug_object_active_state(void *addr, struct debug_obj_descr *descr,
 
         raw_spin_unlock_irqrestore(&db->lock, flags);
 }
+EXPORT_SYMBOL_GPL(debug_object_active_state);
 
 #ifdef CONFIG_DEBUG_OBJECTS_FREE
 static void __debug_check_no_obj_freed(const void *address, unsigned long size)
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index f0c7f1481bae..f2bd21b93dfc 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -683,10 +683,11 @@ static void pipe_advance(struct iov_iter *i, size_t size)
         struct pipe_inode_info *pipe = i->pipe;
         struct pipe_buffer *buf;
         int idx = i->idx;
-        size_t off = i->iov_offset;
+        size_t off = i->iov_offset, orig_sz;
         
         if (unlikely(i->count < size))
                 size = i->count;
+        orig_sz = size;
 
         if (size) {
                 if (off) /* make it relative to the beginning of buffer */
@@ -713,6 +714,7 @@ static void pipe_advance(struct iov_iter *i, size_t size)
                         pipe->nrbufs--;
                 }
         }
+        i->count -= orig_sz;
 }
 
 void iov_iter_advance(struct iov_iter *i, size_t size)
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 872a15a2a637..f3a217ea0388 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -980,23 +980,23 @@ static void dotest(void (*testcase_fn)(void), int expected, int lockclass_mask)
 #ifndef CONFIG_PROVE_LOCKING
         if (expected == FAILURE && debug_locks) {
                 expected_testcase_failures++;
-                printk("failed|");
+                pr_cont("failed|");
         }
         else
 #endif
         if (debug_locks != expected) {
                 unexpected_testcase_failures++;
-                printk("FAILED|");
+                pr_cont("FAILED|");
 
                 dump_stack();
         } else {
                 testcase_successes++;
-                printk("  ok  |");
+                pr_cont("  ok  |");
         }
         testcase_total++;
 
         if (debug_locks_verbose)
-                printk(" lockclass mask: %x, debug_locks: %d, expected: %d\n",
+                pr_cont(" lockclass mask: %x, debug_locks: %d, expected: %d\n",
                         lockclass_mask, debug_locks, expected);
         /*
          * Some tests (e.g. double-unlock) might corrupt the preemption
@@ -1021,26 +1021,26 @@ static inline void print_testname(const char *testname)
 #define DO_TESTCASE_1(desc, name, nr)                           \
         print_testname(desc"/"#nr);                             \
         dotest(name##_##nr, SUCCESS, LOCKTYPE_RWLOCK);          \
-        printk("\n");
+        pr_cont("\n");
 
 #define DO_TESTCASE_1B(desc, name, nr)                          \
         print_testname(desc"/"#nr);                             \
         dotest(name##_##nr, FAILURE, LOCKTYPE_RWLOCK);          \
-        printk("\n");
+        pr_cont("\n");
 
 #define DO_TESTCASE_3(desc, name, nr)                           \
         print_testname(desc"/"#nr);                             \
         dotest(name##_spin_##nr, FAILURE, LOCKTYPE_SPIN);       \
         dotest(name##_wlock_##nr, FAILURE, LOCKTYPE_RWLOCK);    \
         dotest(name##_rlock_##nr, SUCCESS, LOCKTYPE_RWLOCK);    \
-        printk("\n");
+        pr_cont("\n");
 
 #define DO_TESTCASE_3RW(desc, name, nr)                         \
         print_testname(desc"/"#nr);                             \
         dotest(name##_spin_##nr, FAILURE, LOCKTYPE_SPIN|LOCKTYPE_RWLOCK);\
         dotest(name##_wlock_##nr, FAILURE, LOCKTYPE_RWLOCK);    \
         dotest(name##_rlock_##nr, SUCCESS, LOCKTYPE_RWLOCK);    \
-        printk("\n");
+        pr_cont("\n");
 
 #define DO_TESTCASE_6(desc, name)                               \
         print_testname(desc);                                   \
@@ -1050,7 +1050,7 @@ static inline void print_testname(const char *testname)
         dotest(name##_mutex, FAILURE, LOCKTYPE_MUTEX);          \
         dotest(name##_wsem, FAILURE, LOCKTYPE_RWSEM);           \
         dotest(name##_rsem, FAILURE, LOCKTYPE_RWSEM);           \
-        printk("\n");
+        pr_cont("\n");
 
 #define DO_TESTCASE_6_SUCCESS(desc, name)                       \
         print_testname(desc);                                   \
@@ -1060,7 +1060,7 @@ static inline void print_testname(const char *testname)
         dotest(name##_mutex, SUCCESS, LOCKTYPE_MUTEX);          \
         dotest(name##_wsem, SUCCESS, LOCKTYPE_RWSEM);           \
         dotest(name##_rsem, SUCCESS, LOCKTYPE_RWSEM);           \
-        printk("\n");
+        pr_cont("\n");
 
 /*
  * 'read' variant: rlocks must not trigger.
@@ -1073,7 +1073,7 @@ static inline void print_testname(const char *testname)
         dotest(name##_mutex, FAILURE, LOCKTYPE_MUTEX);          \
         dotest(name##_wsem, FAILURE, LOCKTYPE_RWSEM);           \
         dotest(name##_rsem, FAILURE, LOCKTYPE_RWSEM);           \
-        printk("\n");
+        pr_cont("\n");
 
 #define DO_TESTCASE_2I(desc, name, nr)                          \
         DO_TESTCASE_1("hard-"desc, name##_hard, nr);            \
@@ -1726,25 +1726,25 @@ static void ww_tests(void)
         dotest(ww_test_fail_acquire, SUCCESS, LOCKTYPE_WW);
         dotest(ww_test_normal, SUCCESS, LOCKTYPE_WW);
         dotest(ww_test_unneeded_slow, FAILURE, LOCKTYPE_WW);
-        printk("\n");
+        pr_cont("\n");
 
         print_testname("ww contexts mixing");
         dotest(ww_test_two_contexts, FAILURE, LOCKTYPE_WW);
         dotest(ww_test_diff_class, FAILURE, LOCKTYPE_WW);
-        printk("\n");
+        pr_cont("\n");
 
         print_testname("finishing ww context");
         dotest(ww_test_context_done_twice, FAILURE, LOCKTYPE_WW);
         dotest(ww_test_context_unlock_twice, FAILURE, LOCKTYPE_WW);
         dotest(ww_test_context_fini_early, FAILURE, LOCKTYPE_WW);
         dotest(ww_test_context_lock_after_done, FAILURE, LOCKTYPE_WW);
-        printk("\n");
+        pr_cont("\n");
 
         print_testname("locking mismatches");
         dotest(ww_test_object_unlock_twice, FAILURE, LOCKTYPE_WW);
         dotest(ww_test_object_lock_unbalanced, FAILURE, LOCKTYPE_WW);
         dotest(ww_test_object_lock_stale_context, FAILURE, LOCKTYPE_WW);
-        printk("\n");
+        pr_cont("\n");
 
         print_testname("EDEADLK handling");
         dotest(ww_test_edeadlk_normal, SUCCESS, LOCKTYPE_WW);
@@ -1757,11 +1757,11 @@ static void ww_tests(void)
         dotest(ww_test_edeadlk_acquire_more_edeadlk_slow, FAILURE, LOCKTYPE_WW);
         dotest(ww_test_edeadlk_acquire_wrong, FAILURE, LOCKTYPE_WW);
         dotest(ww_test_edeadlk_acquire_wrong_slow, FAILURE, LOCKTYPE_WW);
-        printk("\n");
+        pr_cont("\n");
 
         print_testname("spinlock nest unlocked");
         dotest(ww_test_spin_nest_unlocked, FAILURE, LOCKTYPE_WW);
-        printk("\n");
+        pr_cont("\n");
 
         printk("  -----------------------------------------------------\n");
         printk("                                 |block | try  |context|\n");
@@ -1771,25 +1771,25 @@ static void ww_tests(void)
         dotest(ww_test_context_block, FAILURE, LOCKTYPE_WW);
         dotest(ww_test_context_try, SUCCESS, LOCKTYPE_WW);
         dotest(ww_test_context_context, SUCCESS, LOCKTYPE_WW);
-        printk("\n");
+        pr_cont("\n");
 
         print_testname("try");
         dotest(ww_test_try_block, FAILURE, LOCKTYPE_WW);
         dotest(ww_test_try_try, SUCCESS, LOCKTYPE_WW);
         dotest(ww_test_try_context, FAILURE, LOCKTYPE_WW);
-        printk("\n");
+        pr_cont("\n");
 
         print_testname("block");
         dotest(ww_test_block_block, FAILURE, LOCKTYPE_WW);
         dotest(ww_test_block_try, SUCCESS, LOCKTYPE_WW);
         dotest(ww_test_block_context, FAILURE, LOCKTYPE_WW);
-        printk("\n");
+        pr_cont("\n");
 
         print_testname("spinlock");
         dotest(ww_test_spin_block, FAILURE, LOCKTYPE_WW);
         dotest(ww_test_spin_try, SUCCESS, LOCKTYPE_WW);
         dotest(ww_test_spin_context, FAILURE, LOCKTYPE_WW);
-        printk("\n");
+        pr_cont("\n");
 }
 
 void locking_selftest(void)
@@ -1829,32 +1829,32 @@ void locking_selftest(void)
 
         printk("  --------------------------------------------------------------------------\n");
         print_testname("recursive read-lock");
-        printk("             |");
+        pr_cont("             |");
         dotest(rlock_AA1, SUCCESS, LOCKTYPE_RWLOCK);
-        printk("             |");
+        pr_cont("             |");
         dotest(rsem_AA1, FAILURE, LOCKTYPE_RWSEM);
-        printk("\n");
+        pr_cont("\n");
 
         print_testname("recursive read-lock #2");
-        printk("             |");
+        pr_cont("             |");
         dotest(rlock_AA1B, SUCCESS, LOCKTYPE_RWLOCK);
-        printk("             |");
+        pr_cont("             |");
         dotest(rsem_AA1B, FAILURE, LOCKTYPE_RWSEM);
-        printk("\n");
+        pr_cont("\n");
 
         print_testname("mixed read-write-lock");
-        printk("             |");
+        pr_cont("             |");
         dotest(rlock_AA2, FAILURE, LOCKTYPE_RWLOCK);
-        printk("             |");
+        pr_cont("             |");
         dotest(rsem_AA2, FAILURE, LOCKTYPE_RWSEM);
-        printk("\n");
+        pr_cont("\n");
 
         print_testname("mixed write-read-lock");
-        printk("             |");
+        pr_cont("             |");
         dotest(rlock_AA3, FAILURE, LOCKTYPE_RWLOCK);
-        printk("             |");
+        pr_cont("             |");
         dotest(rsem_AA3, FAILURE, LOCKTYPE_RWSEM);
-        printk("\n");
+        pr_cont("\n");
 
         printk("  --------------------------------------------------------------------------\n");
 
diff --git a/lib/mpi/mpi-pow.c b/lib/mpi/mpi-pow.c
index 5464c8744ea9..e24388a863a7 100644
--- a/lib/mpi/mpi-pow.c
+++ b/lib/mpi/mpi-pow.c
@@ -64,8 +64,13 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
         if (!esize) {
                 /* Exponent is zero, result is 1 mod MOD, i.e., 1 or 0
                  * depending on if MOD equals 1.  */
-                rp[0] = 1;
                 res->nlimbs = (msize == 1 && mod->d[0] == 1) ? 0 : 1;
+                if (res->nlimbs) {
+                        if (mpi_resize(res, 1) < 0)
+                                goto enomem;
+                        rp = res->d;
+                        rp[0] = 1;
+                }
                 res->sign = 0;
                 goto leave;
         }
diff --git a/lib/stackdepot.c b/lib/stackdepot.c
index 4d830e299989..f87d138e9672 100644
--- a/lib/stackdepot.c
+++ b/lib/stackdepot.c
@@ -192,6 +192,7 @@ void depot_fetch_stack(depot_stack_handle_t handle, struct stack_trace *trace)
         trace->entries = stack->entries;
         trace->skip = 0;
 }
+EXPORT_SYMBOL_GPL(depot_fetch_stack);
 
 /**
  * depot_save_stack - save stack in a stack depot.
@@ -283,3 +284,4 @@ exit:
 fast_exit:
         return retval;
 }
+EXPORT_SYMBOL_GPL(depot_save_stack);
diff --git a/lib/test_kasan.c b/lib/test_kasan.c
index 5e51872b3fc1..fbdf87920093 100644
--- a/lib/test_kasan.c
+++ b/lib/test_kasan.c
@@ -20,6 +20,11 @@
 #include <linux/uaccess.h>
 #include <linux/module.h>
 
+/*
+ * Note: test functions are marked noinline so that their names appear in
+ * reports.
+ */
+
 static noinline void __init kmalloc_oob_right(void)
 {
         char *ptr;
@@ -411,6 +416,29 @@ static noinline void __init copy_user_test(void)
         kfree(kmem);
 }
 
+static noinline void __init use_after_scope_test(void)
+{
+        volatile char *volatile p;
+
+        pr_info("use-after-scope on int\n");
+        {
+                int local = 0;
+
+                p = (char *)&local;
+        }
+        p[0] = 1;
+        p[3] = 1;
+
+        pr_info("use-after-scope on array\n");
+        {
+                char local[1024] = {0};
+
+                p = local;
+        }
+        p[0] = 1;
+        p[1023] = 1;
+}
+
 static int __init kmalloc_tests_init(void)
 {
         kmalloc_oob_right();
@@ -436,6 +464,7 @@ static int __init kmalloc_tests_init(void)
         kasan_global_oob();
         ksize_unpoisons_memory();
         copy_user_test();
+        use_after_scope_test();
         return -EAGAIN;
 }
 
diff --git a/mm/cma.c b/mm/cma.c
index 384c2cb51b56..c960459eda7e 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -385,6 +385,9 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align)
         bitmap_maxno = cma_bitmap_maxno(cma);
         bitmap_count = cma_bitmap_pages_to_bits(cma, count);
 
+        if (bitmap_count > bitmap_maxno)
+                return NULL;
+
         for (;;) {
                 mutex_lock(&cma->lock);
                 bitmap_no = bitmap_find_next_zero_area_off(cma->bitmap,
diff --git a/mm/filemap.c b/mm/filemap.c
index c7fe2f16503f..50b52fe51937 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1732,6 +1732,9 @@ find_page:
                         if (inode->i_blkbits == PAGE_SHIFT ||
                                         !mapping->a_ops->is_partially_uptodate)
                                 goto page_not_up_to_date;
+                        /* pipes can't handle partially uptodate pages */
+                        if (unlikely(iter->type & ITER_PIPE))
+                                goto page_not_up_to_date;
                         if (!trylock_page(page))
                                 goto page_not_up_to_date;
                         /* Did it get truncated before we got the lock? */
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index cdcd25cb30fe..d4a6e4001512 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1426,11 +1426,12 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
 
 bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr,
                   unsigned long new_addr, unsigned long old_end,
-                  pmd_t *old_pmd, pmd_t *new_pmd)
+                  pmd_t *old_pmd, pmd_t *new_pmd, bool *need_flush)
 {
         spinlock_t *old_ptl, *new_ptl;
         pmd_t pmd;
         struct mm_struct *mm = vma->vm_mm;
+        bool force_flush = false;
 
         if ((old_addr & ~HPAGE_PMD_MASK) ||
             (new_addr & ~HPAGE_PMD_MASK) ||
@@ -1456,6 +1457,8 @@ bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr,
                 if (new_ptl != old_ptl)
                         spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING);
                 pmd = pmdp_huge_get_and_clear(mm, old_addr, old_pmd);
+                if (pmd_present(pmd) && pmd_dirty(pmd))
+                        force_flush = true;
                 VM_BUG_ON(!pmd_none(*new_pmd));
 
                 if (pmd_move_must_withdraw(new_ptl, old_ptl) &&
@@ -1467,6 +1470,10 @@ bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr,
                 set_pmd_at(mm, new_addr, new_pmd, pmd_mksoft_dirty(pmd));
                 if (new_ptl != old_ptl)
                         spin_unlock(new_ptl);
+                if (force_flush)
+                        flush_tlb_range(vma, old_addr, old_addr + PMD_SIZE);
+                else
+                        *need_flush = true;
                 spin_unlock(old_ptl);
                 return true;
         }
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index ec49d9ef1eef..418bf01a50ed 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1826,11 +1826,17 @@ static void return_unused_surplus_pages(struct hstate *h,
  * is not the case is if a reserve map was changed between calls.  It
  * is the responsibility of the caller to notice the difference and
  * take appropriate action.
+ *
+ * vma_add_reservation is used in error paths where a reservation must
+ * be restored when a newly allocated huge page must be freed.  It is
+ * to be called after calling vma_needs_reservation to determine if a
+ * reservation exists.
  */
 enum vma_resv_mode {
         VMA_NEEDS_RESV,
         VMA_COMMIT_RESV,
         VMA_END_RESV,
+        VMA_ADD_RESV,
 };
 static long __vma_reservation_common(struct hstate *h,
                                 struct vm_area_struct *vma, unsigned long addr,
@@ -1856,6 +1862,14 @@ static long __vma_reservation_common(struct hstate *h,
                 region_abort(resv, idx, idx + 1);
                 ret = 0;
                 break;
+        case VMA_ADD_RESV:
+                if (vma->vm_flags & VM_MAYSHARE)
+                        ret = region_add(resv, idx, idx + 1);
+                else {
+                        region_abort(resv, idx, idx + 1);
+                        ret = region_del(resv, idx, idx + 1);
+                }
+                break;
         default:
                 BUG();
         }
@@ -1903,6 +1917,56 @@ static void vma_end_reservation(struct hstate *h,
         (void)__vma_reservation_common(h, vma, addr, VMA_END_RESV);
 }
 
+static long vma_add_reservation(struct hstate *h,
+                        struct vm_area_struct *vma, unsigned long addr)
+{
+        return __vma_reservation_common(h, vma, addr, VMA_ADD_RESV);
+}
+
+/*
+ * This routine is called to restore a reservation on error paths.  In the
+ * specific error paths, a huge page was allocated (via alloc_huge_page)
+ * and is about to be freed.  If a reservation for the page existed,
+ * alloc_huge_page would have consumed the reservation and set PagePrivate
+ * in the newly allocated page.  When the page is freed via free_huge_page,
+ * the global reservation count will be incremented if PagePrivate is set.
+ * However, free_huge_page can not adjust the reserve map.  Adjust the
+ * reserve map here to be consistent with global reserve count adjustments
+ * to be made by free_huge_page.
+ */
+static void restore_reserve_on_error(struct hstate *h,
+                        struct vm_area_struct *vma, unsigned long address,
+                        struct page *page)
+{
+        if (unlikely(PagePrivate(page))) {
+                long rc = vma_needs_reservation(h, vma, address);
+
+                if (unlikely(rc < 0)) {
+                        /*
+                         * Rare out of memory condition in reserve map
+                         * manipulation.  Clear PagePrivate so that
+                         * global reserve count will not be incremented
+                         * by free_huge_page.  This will make it appear
+                         * as though the reservation for this page was
+                         * consumed.  This may prevent the task from
+                         * faulting in the page at a later time.  This
+                         * is better than inconsistent global huge page
+                         * accounting of reserve counts.
+                         */
+                        ClearPagePrivate(page);
+                } else if (rc) {
+                        rc = vma_add_reservation(h, vma, address);
+                        if (unlikely(rc < 0))
+                                /*
+                                 * See above comment about rare out of
+                                 * memory condition.
+                                 */
+                                ClearPagePrivate(page);
+                } else
+                        vma_end_reservation(h, vma, address);
+        }
+}
+
 struct page *alloc_huge_page(struct vm_area_struct *vma,
                                     unsigned long addr, int avoid_reserve)
 {
@@ -3498,6 +3562,7 @@ retry_avoidcopy:
         spin_unlock(ptl);
         mmu_notifier_invalidate_range_end(mm, mmun_start, mmun_end);
 out_release_all:
+        restore_reserve_on_error(h, vma, address, new_page);
         put_page(new_page);
 out_release_old:
         put_page(old_page);
@@ -3680,6 +3745,7 @@ backout:
         spin_unlock(ptl);
 backout_unlocked:
         unlock_page(page);
+        restore_reserve_on_error(h, vma, address, page);
         put_page(page);
         goto out;
 }
diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c
index 70c009741aab..0e9505f66ec1 100644
--- a/mm/kasan/kasan.c
+++ b/mm/kasan/kasan.c
@@ -764,6 +764,25 @@ EXPORT_SYMBOL(__asan_storeN_noabort);
 void __asan_handle_no_return(void) {}
 EXPORT_SYMBOL(__asan_handle_no_return);
 
+/* Emitted by compiler to poison large objects when they go out of scope. */
+void __asan_poison_stack_memory(const void *addr, size_t size)
+{
+        /*
+         * Addr is KASAN_SHADOW_SCALE_SIZE-aligned and the object is surrounded
+         * by redzones, so we simply round up size to simplify logic.
+         */
+        kasan_poison_shadow(addr, round_up(size, KASAN_SHADOW_SCALE_SIZE),
+                            KASAN_USE_AFTER_SCOPE);
+}
+EXPORT_SYMBOL(__asan_poison_stack_memory);
+
+/* Emitted by compiler to unpoison large objects when they go into scope. */
+void __asan_unpoison_stack_memory(const void *addr, size_t size)
+{
+        kasan_unpoison_shadow(addr, size);
+}
+EXPORT_SYMBOL(__asan_unpoison_stack_memory);
+
 #ifdef CONFIG_MEMORY_HOTPLUG
 static int kasan_mem_notifier(struct notifier_block *nb,
                         unsigned long action, void *data)
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index e5c2181fee6f..1c260e6b3b3c 100644
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -21,6 +21,7 @@
 #define KASAN_STACK_MID         0xF2
 #define KASAN_STACK_RIGHT       0xF3
 #define KASAN_STACK_PARTIAL     0xF4
+#define KASAN_USE_AFTER_SCOPE   0xF8
 
 /* Don't break randconfig/all*config builds */
 #ifndef KASAN_ABI_VERSION
@@ -53,6 +54,9 @@ struct kasan_global {
 #if KASAN_ABI_VERSION >= 4
         struct kasan_source_location *location;
 #endif
+#if KASAN_ABI_VERSION >= 5
+        char *odr_indicator;
+#endif
 };
 
 /**
diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 24c1211fe9d5..073325aedc68 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -90,6 +90,9 @@ static void print_error_description(struct kasan_access_info *info)
         case KASAN_KMALLOC_FREE:
                 bug_type = "use-after-free";
                 break;
+        case KASAN_USE_AFTER_SCOPE:
+                bug_type = "use-after-scope";
+                break;
         }
 
         pr_err("BUG: KASAN: %s in %pS at addr %p\n",
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 728d7790dc2d..87e1a7ca3846 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -103,6 +103,7 @@ static struct khugepaged_scan khugepaged_scan = {
         .mm_head = LIST_HEAD_INIT(khugepaged_scan.mm_head),
 };
 
+#ifdef CONFIG_SYSFS
 static ssize_t scan_sleep_millisecs_show(struct kobject *kobj,
                                          struct kobj_attribute *attr,
                                          char *buf)
@@ -295,6 +296,7 @@ struct attribute_group khugepaged_attr_group = {
         .attrs = khugepaged_attr,
         .name = "khugepaged",
 };
+#endif /* CONFIG_SYSFS */
 
 #define VM_NO_KHUGEPAGED (VM_SPECIAL | VM_HUGETLB)
 
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index e5355a5b423f..d1380ed93fdf 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1414,6 +1414,7 @@ static void kmemleak_scan(void)
         /* data/bss scanning */
         scan_large_block(_sdata, _edata);
         scan_large_block(__bss_start, __bss_stop);
+        scan_large_block(__start_data_ro_after_init, __end_data_ro_after_init);
 
 #ifdef CONFIG_SMP
         /* per-cpu sections scanning */
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index de88f33519c0..19e796d36a62 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1112,10 +1112,10 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
         }
 
         if (!PageHuge(p) && PageTransHuge(hpage)) {
-                lock_page(hpage);
-                if (!PageAnon(hpage) || unlikely(split_huge_page(hpage))) {
-                        unlock_page(hpage);
-                        if (!PageAnon(hpage))
+                lock_page(p);
+                if (!PageAnon(p) || unlikely(split_huge_page(p))) {
+                        unlock_page(p);
+                        if (!PageAnon(p))
                                 pr_err("Memory failure: %#lx: non anonymous thp\n",
                                         pfn);
                         else
@@ -1126,9 +1126,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
                         put_hwpoison_page(p);
                         return -EBUSY;
                 }
-                unlock_page(hpage);
-                get_hwpoison_page(p);
-                put_hwpoison_page(hpage);
+                unlock_page(p);
                 VM_BUG_ON_PAGE(!page_count(p), p);
                 hpage = compound_head(p);
         }
diff --git a/mm/mlock.c b/mm/mlock.c
index 145a4258ddbc..cdbed8aaa426 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -190,10 +190,13 @@ unsigned int munlock_vma_page(struct page *page)
          */
         spin_lock_irq(zone_lru_lock(zone));
 
-        nr_pages = hpage_nr_pages(page);
-        if (!TestClearPageMlocked(page))
+        if (!TestClearPageMlocked(page)) {
+                /* Potentially, PTE-mapped THP: do not skip the rest PTEs */
+                nr_pages = 1;
                 goto unlock_out;
+        }
 
+        nr_pages = hpage_nr_pages(page);
         __mod_zone_page_state(zone, NR_MLOCK, -nr_pages);
 
         if (__munlock_isolate_lru_page(page, true)) {
diff --git a/mm/mremap.c b/mm/mremap.c
index da22ad2a5678..30d7d2482eea 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -104,11 +104,13 @@ static pte_t move_soft_dirty_pte(pte_t pte)
 static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
                 unsigned long old_addr, unsigned long old_end,
                 struct vm_area_struct *new_vma, pmd_t *new_pmd,
-                unsigned long new_addr, bool need_rmap_locks)
+                unsigned long new_addr, bool need_rmap_locks, bool *need_flush)
 {
         struct mm_struct *mm = vma->vm_mm;
         pte_t *old_pte, *new_pte, pte;
         spinlock_t *old_ptl, *new_ptl;
+        bool force_flush = false;
+        unsigned long len = old_end - old_addr;
 
         /*
          * When need_rmap_locks is true, we take the i_mmap_rwsem and anon_vma
@@ -146,7 +148,19 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
                                    new_pte++, new_addr += PAGE_SIZE) {
                 if (pte_none(*old_pte))
                         continue;
+
                 pte = ptep_get_and_clear(mm, old_addr, old_pte);
+                /*
+                 * If we are remapping a dirty PTE, make sure
+                 * to flush TLB before we drop the PTL for the
+                 * old PTE or we may race with page_mkclean().
+                 *
+                 * This check has to be done after we removed the
+                 * old PTE from page tables or another thread may
+                 * dirty it after the check and before the removal.
+                 */
+                if (pte_present(pte) && pte_dirty(pte))
+                        force_flush = true;
                 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
                 pte = move_soft_dirty_pte(pte);
                 set_pte_at(mm, new_addr, new_pte, pte);
@@ -156,6 +170,10 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
         if (new_ptl != old_ptl)
                 spin_unlock(new_ptl);
         pte_unmap(new_pte - 1);
+        if (force_flush)
+                flush_tlb_range(vma, old_end - len, old_end);
+        else
+                *need_flush = true;
         pte_unmap_unlock(old_pte - 1, old_ptl);
         if (need_rmap_locks)
                 drop_rmap_locks(vma);
@@ -201,13 +219,12 @@ unsigned long move_page_tables(struct vm_area_struct *vma,
                                 if (need_rmap_locks)
                                         take_rmap_locks(vma);
                                 moved = move_huge_pmd(vma, old_addr, new_addr,
-                                                    old_end, old_pmd, new_pmd);
+                                                    old_end, old_pmd, new_pmd,
+                                                    &need_flush);
                                 if (need_rmap_locks)
                                         drop_rmap_locks(vma);
-                                if (moved) {
-                                        need_flush = true;
+                                if (moved)
                                         continue;
-                                }
                         }
                         split_huge_pmd(vma, old_pmd, old_addr);
                         if (pmd_trans_unstable(old_pmd))
@@ -220,11 +237,10 @@ unsigned long move_page_tables(struct vm_area_struct *vma,
                         extent = next - new_addr;
                 if (extent > LATENCY_LIMIT)
                         extent = LATENCY_LIMIT;
-                move_ptes(vma, old_pmd, old_addr, old_addr + extent,
-                          new_vma, new_pmd, new_addr, need_rmap_locks);
-                need_flush = true;
+                move_ptes(vma, old_pmd, old_addr, old_addr + extent, new_vma,
+                          new_pmd, new_addr, need_rmap_locks, &need_flush);
         }
-        if (likely(need_flush))
+        if (need_flush)
                 flush_tlb_range(vma, old_end-len, old_addr);
 
         mmu_notifier_invalidate_range_end(vma->vm_mm, mmun_start, mmun_end);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 072d791dce2d..6de9440e3ae2 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3658,7 +3658,7 @@ retry:
         /* Make sure we know about allocations which stall for too long */
         if (time_after(jiffies, alloc_start + stall_timeout)) {
                 warn_alloc(gfp_mask,
-                        "page alloction stalls for %ums, order:%u\n",
+                        "page allocation stalls for %ums, order:%u",
                         jiffies_to_msecs(jiffies-alloc_start), order);
                 stall_timeout += 10 * HZ;
         }
diff --git a/mm/shmem.c b/mm/shmem.c
index ad7813d73ea7..9d32e1cb9f38 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1483,6 +1483,8 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp,
         copy_highpage(newpage, oldpage);
         flush_dcache_page(newpage);
 
+        __SetPageLocked(newpage);
+        __SetPageSwapBacked(newpage);
         SetPageUptodate(newpage);
         set_page_private(newpage, swap_index);
         SetPageSwapCache(newpage);
@@ -1846,6 +1848,18 @@ unlock:
         return error;
 }
 
+/*
+ * This is like autoremove_wake_function, but it removes the wait queue
+ * entry unconditionally - even if something else had already woken the
+ * target.
+ */
+static int synchronous_wake_function(wait_queue_t *wait, unsigned mode, int sync, void *key)
+{
+        int ret = default_wake_function(wait, mode, sync, key);
+        list_del_init(&wait->task_list);
+        return ret;
+}
+
 static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct inode *inode = file_inode(vma->vm_file);
@@ -1881,7 +1895,7 @@ static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                     vmf->pgoff >= shmem_falloc->start &&
                     vmf->pgoff < shmem_falloc->next) {
                         wait_queue_head_t *shmem_falloc_waitq;
-                        DEFINE_WAIT(shmem_fault_wait);
+                        DEFINE_WAIT_FUNC(shmem_fault_wait, synchronous_wake_function);
 
                         ret = VM_FAULT_NOPAGE;
                         if ((vmf->flags & FAULT_FLAG_ALLOW_RETRY) &&
@@ -2663,6 +2677,7 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,
                 spin_lock(&inode->i_lock);
                 inode->i_private = NULL;
                 wake_up_all(&shmem_falloc_waitq);
+                WARN_ON_ONCE(!list_empty(&shmem_falloc_waitq.task_list));
                 spin_unlock(&inode->i_lock);
                 error = 0;
                 goto out;
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 71f0b28a1bec..329b03843863 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -533,8 +533,8 @@ void memcg_create_kmem_cache(struct mem_cgroup *memcg,
 
         s = create_cache(cache_name, root_cache->object_size,
                          root_cache->size, root_cache->align,
-                         root_cache->flags, root_cache->ctor,
-                         memcg, root_cache);
+                         root_cache->flags & CACHE_CREATE_MASK,
+                         root_cache->ctor, memcg, root_cache);
         /*
          * If we could not create a memcg cache, do not complain, because
          * that's not critical at all as we can always proceed with the root
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 2210de290b54..f30438970cd1 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2224,6 +2224,8 @@ static unsigned long read_swap_header(struct swap_info_struct *p,
                 swab32s(&swap_header->info.version);
                 swab32s(&swap_header->info.last_page);
                 swab32s(&swap_header->info.nr_badpages);
+                if (swap_header->info.nr_badpages > MAX_SWAP_BADPAGES)
+                        return 0;
                 for (i = 0; i < swap_header->info.nr_badpages; i++)
                         swab32s(&swap_header->info.badpages[i]);
         }
diff --git a/mm/truncate.c b/mm/truncate.c
index a01cce450a26..8d8c62d89e6d 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -283,7 +283,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
 
                         if (!trylock_page(page))
                                 continue;
-                        WARN_ON(page_to_pgoff(page) != index);
+                        WARN_ON(page_to_index(page) != index);
                         if (PageWriteback(page)) {
                                 unlock_page(page);
                                 continue;
@@ -371,7 +371,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
                         }
 
                         lock_page(page);
-                        WARN_ON(page_to_pgoff(page) != index);
+                        WARN_ON(page_to_index(page) != index);
                         wait_on_page_writeback(page);
                         truncate_inode_page(mapping, page);
                         unlock_page(page);
@@ -492,7 +492,7 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping,
                         if (!trylock_page(page))
                                 continue;
 
-                        WARN_ON(page_to_pgoff(page) != index);
+                        WARN_ON(page_to_index(page) != index);
 
                         /* Middle of THP: skip */
                         if (PageTransTail(page)) {
@@ -612,7 +612,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
                         }
 
                         lock_page(page);
-                        WARN_ON(page_to_pgoff(page) != index);
+                        WARN_ON(page_to_index(page) != index);
                         if (page->mapping != mapping) {
                                 unlock_page(page);
                                 continue;
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 76fda2268148..d75cdf360730 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2354,6 +2354,8 @@ static void shrink_node_memcg(struct pglist_data *pgdat, struct mem_cgroup *memc
                         }
                 }
 
+                cond_resched();
+
                 if (nr_reclaimed < nr_to_reclaim || scan_adjusted)
                         continue;
 
diff --git a/mm/workingset.c b/mm/workingset.c
index 617475f529f4..fb1f9183d89a 100644
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -348,7 +348,7 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker,
         shadow_nodes = list_lru_shrink_count(&workingset_shadow_nodes, sc);
         local_irq_enable();
 
-        if (memcg_kmem_enabled()) {
+        if (sc->memcg) {
                 pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,
                                                      LRU_ALL_FILE);
         } else {
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index e034afbd1bb0..08ce36147c4c 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -652,6 +652,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
                         batadv_softif_destroy_sysfs(hard_iface->soft_iface);
         }
 
+        hard_iface->soft_iface = NULL;
         batadv_hardif_put(hard_iface);
 
 out:
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index 2333777f919d..8af1611b8ab2 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -837,6 +837,7 @@ static int batadv_tp_send(void *arg)
         primary_if = batadv_primary_if_get_selected(bat_priv);
         if (unlikely(!primary_if)) {
                 err = BATADV_TP_REASON_DST_UNREACHABLE;
+                tp_vars->reason = err;
                 goto out;
         }
 
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 7f663092f6de..0dc85eb1cb7a 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -3282,7 +3282,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
                                                              &tvlv_tt_data,
                                                              &tt_change,
                                                              &tt_len);
-                if (!tt_len)
+                if (!tt_len || !tvlv_len)
                         goto unlock;
 
                 /* Copy the last orig_node's OGM buffer */
@@ -3300,7 +3300,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv,
                                                              &tvlv_tt_data,
                                                              &tt_change,
                                                              &tt_len);
-                if (!tt_len)
+                if (!tt_len || !tvlv_len)
                         goto out;
 
                 /* fill the rest of the tvlv with the real TT entries */
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index d020299baba4..1904a93f47d5 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -1090,7 +1090,6 @@ static int get_l2cap_conn(char *buf, bdaddr_t *addr, u8 *addr_type,
 {
         struct hci_conn *hcon;
         struct hci_dev *hdev;
-        bdaddr_t *src = BDADDR_ANY;
         int n;
 
         n = sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx %hhu",
@@ -1101,7 +1100,8 @@ static int get_l2cap_conn(char *buf, bdaddr_t *addr, u8 *addr_type,
         if (n < 7)
                 return -EINVAL;
 
-        hdev = hci_get_route(addr, src);
+        /* The LE_PUBLIC address type is ignored because of BDADDR_ANY */
+        hdev = hci_get_route(addr, BDADDR_ANY, BDADDR_LE_PUBLIC);
         if (!hdev)
                 return -ENOENT;
 
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 3809617aa98d..dc59eae54717 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -613,7 +613,7 @@ int hci_conn_del(struct hci_conn *conn)
         return 0;
 }
 
-struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src)
+struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, uint8_t src_type)
 {
         int use_src = bacmp(src, BDADDR_ANY);
         struct hci_dev *hdev = NULL, *d;
@@ -634,7 +634,29 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src)
                  */
 
                 if (use_src) {
-                        if (!bacmp(&d->bdaddr, src)) {
+                        bdaddr_t id_addr;
+                        u8 id_addr_type;
+
+                        if (src_type == BDADDR_BREDR) {
+                                if (!lmp_bredr_capable(d))
+                                        continue;
+                                bacpy(&id_addr, &d->bdaddr);
+                                id_addr_type = BDADDR_BREDR;
+                        } else {
+                                if (!lmp_le_capable(d))
+                                        continue;
+
+                                hci_copy_identity_address(d, &id_addr,
+                                                          &id_addr_type);
+
+                                /* Convert from HCI to three-value type */
+                                if (id_addr_type == ADDR_LE_DEV_PUBLIC)
+                                        id_addr_type = BDADDR_LE_PUBLIC;
+                                else
+                                        id_addr_type = BDADDR_LE_RANDOM;
+                        }
+
+                        if (!bacmp(&id_addr, src) && id_addr_type == src_type) {
                                 hdev = d; break;
                         }
                 } else {
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index d4cad29b033f..577f1c01454a 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -7060,7 +7060,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
         BT_DBG("%pMR -> %pMR (type %u) psm 0x%2.2x", &chan->src, dst,
                dst_type, __le16_to_cpu(psm));
 
-        hdev = hci_get_route(dst, &chan->src);
+        hdev = hci_get_route(dst, &chan->src, chan->src_type);
         if (!hdev)
                 return -EHOSTUNREACH;
 
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 8e385a0ae60e..2f2cb5e27cdd 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -178,7 +178,7 @@ static void rfcomm_reparent_device(struct rfcomm_dev *dev)
         struct hci_dev *hdev;
         struct hci_conn *conn;
 
-        hdev = hci_get_route(&dev->dst, &dev->src);
+        hdev = hci_get_route(&dev->dst, &dev->src, BDADDR_BREDR);
         if (!hdev)
                 return;
 
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index f52bcbf2e58c..3125ce670c2f 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -219,7 +219,7 @@ static int sco_connect(struct sock *sk)
 
         BT_DBG("%pMR -> %pMR", &sco_pi(sk)->src, &sco_pi(sk)->dst);
 
-        hdev = hci_get_route(&sco_pi(sk)->dst, &sco_pi(sk)->src);
+        hdev = hci_get_route(&sco_pi(sk)->dst, &sco_pi(sk)->src, BDADDR_BREDR);
         if (!hdev)
                 return -EHOSTUNREACH;
 
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index e120307c6e36..f88c4df3f91e 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -898,6 +898,7 @@ int br_sysfs_addbr(struct net_device *dev)
         if (!br->ifobj) {
                 pr_info("%s: can't add kobject (directory) %s/%s\n",
                         __func__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR);
+                err = -ENOMEM;
                 goto out3;
         }
         return 0;
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index aa209b1066c9..92cbbd2afddb 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -1107,10 +1107,7 @@ static struct net_proto_family caif_family_ops = {
 
 static int __init caif_sktinit_module(void)
 {
-        int err = sock_register(&caif_family_ops);
-        if (!err)
-                return err;
-        return 0;
+        return sock_register(&caif_family_ops);
 }
 
 static void __exit caif_sktexit_module(void)
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 8e999ffdf28b..436a7537e6a9 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -77,7 +77,7 @@
                      (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \
                      (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))
 
-#define CAN_BCM_VERSION "20160617"
+#define CAN_BCM_VERSION "20161123"
 
 MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");
 MODULE_LICENSE("Dual BSD/GPL");
@@ -109,8 +109,9 @@ struct bcm_op {
         u32 count;
         u32 nframes;
         u32 currframe;
-        struct canfd_frame *frames;
-        struct canfd_frame *last_frames;
+        /* void pointers to arrays of struct can[fd]_frame */
+        void *frames;
+        void *last_frames;
         struct canfd_frame sframe;
         struct canfd_frame last_sframe;
         struct sock *sk;
@@ -681,7 +682,7 @@ static void bcm_rx_handler(struct sk_buff *skb, void *data)
 
         if (op->flags & RX_FILTER_ID) {
                 /* the easiest case */
-                bcm_rx_update_and_send(op, &op->last_frames[0], rxframe);
+                bcm_rx_update_and_send(op, op->last_frames, rxframe);
                 goto rx_starttimer;
         }
 
@@ -1068,7 +1069,7 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
 
                 if (msg_head->nframes) {
                         /* update CAN frames content */
-                        err = memcpy_from_msg((u8 *)op->frames, msg,
+                        err = memcpy_from_msg(op->frames, msg,
                                               msg_head->nframes * op->cfsiz);
                         if (err < 0)
                                 return err;
@@ -1118,7 +1119,7 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
                 }
 
                 if (msg_head->nframes) {
-                        err = memcpy_from_msg((u8 *)op->frames, msg,
+                        err = memcpy_from_msg(op->frames, msg,
                                               msg_head->nframes * op->cfsiz);
                         if (err < 0) {
                                 if (op->frames != &op->sframe)
@@ -1163,6 +1164,7 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
         /* check flags */
 
         if (op->flags & RX_RTR_FRAME) {
+                struct canfd_frame *frame0 = op->frames;
 
                 /* no timers in RTR-mode */
                 hrtimer_cancel(&op->thrtimer);
@@ -1174,8 +1176,8 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
                  * prevent a full-load-loopback-test ... ;-]
                  */
                 if ((op->flags & TX_CP_CAN_ID) ||
-                    (op->frames[0].can_id == op->can_id))
-                        op->frames[0].can_id = op->can_id & ~CAN_RTR_FLAG;
+                    (frame0->can_id == op->can_id))
+                        frame0->can_id = op->can_id & ~CAN_RTR_FLAG;
 
         } else {
                 if (op->flags & SETTIMER) {
@@ -1549,24 +1551,31 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,
         struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
         struct sock *sk = sock->sk;
         struct bcm_sock *bo = bcm_sk(sk);
+        int ret = 0;
 
         if (len < sizeof(*addr))
                 return -EINVAL;
 
-        if (bo->bound)
-                return -EISCONN;
+        lock_sock(sk);
+
+        if (bo->bound) {
+                ret = -EISCONN;
+                goto fail;
+        }
 
         /* bind a device to this socket */
         if (addr->can_ifindex) {
                 struct net_device *dev;
 
                 dev = dev_get_by_index(&init_net, addr->can_ifindex);
-                if (!dev)
-                        return -ENODEV;
-
+                if (!dev) {
+                        ret = -ENODEV;
+                        goto fail;
+                }
                 if (dev->type != ARPHRD_CAN) {
                         dev_put(dev);
-                        return -ENODEV;
+                        ret = -ENODEV;
+                        goto fail;
                 }
 
                 bo->ifindex = dev->ifindex;
@@ -1577,17 +1586,24 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,
                 bo->ifindex = 0;
         }
 
-        bo->bound = 1;
-
         if (proc_dir) {
                 /* unique socket address as filename */
                 sprintf(bo->procname, "%lu", sock_i_ino(sk));
                 bo->bcm_proc_read = proc_create_data(bo->procname, 0644,
                                                      proc_dir,
                                                      &bcm_proc_fops, sk);
+                if (!bo->bcm_proc_read) {
+                        ret = -ENOMEM;
+                        goto fail;
+                }
         }
 
-        return 0;
+        bo->bound = 1;
+
+fail:
+        release_sock(sk);
+
+        return ret;
 }
 
 static int bcm_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
diff --git a/net/can/raw.c b/net/can/raw.c
index 972c187d40ab..b075f028d7e2 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -499,6 +499,9 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
                 if (optlen % sizeof(struct can_filter) != 0)
                         return -EINVAL;
 
+                if (optlen > CAN_RAW_FILTER_MAX * sizeof(struct can_filter))
+                        return -EINVAL;
+
                 count = optlen / sizeof(struct can_filter);
 
                 if (count > 1) {
diff --git a/net/ceph/ceph_fs.c b/net/ceph/ceph_fs.c
index 7d54e944de5e..dcbe67ff3e2b 100644
--- a/net/ceph/ceph_fs.c
+++ b/net/ceph/ceph_fs.c
@@ -34,7 +34,8 @@ void ceph_file_layout_from_legacy(struct ceph_file_layout *fl,
         fl->stripe_count = le32_to_cpu(legacy->fl_stripe_count);
         fl->object_size = le32_to_cpu(legacy->fl_object_size);
         fl->pool_id = le32_to_cpu(legacy->fl_pg_pool);
-        if (fl->pool_id == 0)
+        if (fl->pool_id == 0 && fl->stripe_unit == 0 &&
+            fl->stripe_count == 0 && fl->object_size == 0)
                 fl->pool_id = -1;
 }
 EXPORT_SYMBOL(ceph_file_layout_from_legacy);
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index d9bf7a1d0a58..e6ae15bc41b7 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -4094,6 +4094,7 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client)
         osd_init(&osdc->homeless_osd);
         osdc->homeless_osd.o_osdc = osdc;
         osdc->homeless_osd.o_osd = CEPH_HOMELESS_OSD;
+        osdc->last_linger_id = CEPH_LINGER_ID_START;
         osdc->linger_requests = RB_ROOT;
         osdc->map_checks = RB_ROOT;
         osdc->linger_map_checks = RB_ROOT;
diff --git a/net/core/dev.c b/net/core/dev.c
index 820bac239738..6666b28b6815 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1766,19 +1766,14 @@ EXPORT_SYMBOL_GPL(is_skb_forwardable);
 
 int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
 {
-        if (skb_orphan_frags(skb, GFP_ATOMIC) ||
-            unlikely(!is_skb_forwardable(dev, skb))) {
-                atomic_long_inc(&dev->rx_dropped);
-                kfree_skb(skb);
-                return NET_RX_DROP;
-        }
+        int ret = ____dev_forward_skb(dev, skb);
 
-        skb_scrub_packet(skb, true);
-        skb->priority = 0;
-        skb->protocol = eth_type_trans(skb, dev);
-        skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
+        if (likely(!ret)) {
+                skb->protocol = eth_type_trans(skb, dev);
+                skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
+        }
 
-        return 0;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(__dev_forward_skb);
 
@@ -2484,7 +2479,7 @@ int skb_checksum_help(struct sk_buff *skb)
                         goto out;
         }
 
-        *(__sum16 *)(skb->data + offset) = csum_fold(csum);
+        *(__sum16 *)(skb->data + offset) = csum_fold(csum) ?: CSUM_MANGLED_0;
 out_set_summed:
         skb->ip_summed = CHECKSUM_NONE;
 out:
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 977489820eb9..047a1752ece1 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -2479,6 +2479,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
         case ETHTOOL_GET_TS_INFO:
         case ETHTOOL_GEEE:
         case ETHTOOL_GTUNABLE:
+        case ETHTOOL_GLINKSETTINGS:
                 break;
         default:
                 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
diff --git a/net/core/filter.c b/net/core/filter.c
index 00351cdf7d0c..b391209838ef 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1628,6 +1628,19 @@ static inline int __bpf_rx_skb(struct net_device *dev, struct sk_buff *skb)
         return dev_forward_skb(dev, skb);
 }
 
+static inline int __bpf_rx_skb_no_mac(struct net_device *dev,
+                                      struct sk_buff *skb)
+{
+        int ret = ____dev_forward_skb(dev, skb);
+
+        if (likely(!ret)) {
+                skb->dev = dev;
+                ret = netif_rx(skb);
+        }
+
+        return ret;
+}
+
 static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)
 {
         int ret;
@@ -1647,6 +1660,51 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)
         return ret;
 }
 
+static int __bpf_redirect_no_mac(struct sk_buff *skb, struct net_device *dev,
+                                 u32 flags)
+{
+        /* skb->mac_len is not set on normal egress */
+        unsigned int mlen = skb->network_header - skb->mac_header;
+
+        __skb_pull(skb, mlen);
+
+        /* At ingress, the mac header has already been pulled once.
+         * At egress, skb_pospull_rcsum has to be done in case that
+         * the skb is originated from ingress (i.e. a forwarded skb)
+         * to ensure that rcsum starts at net header.
+         */
+        if (!skb_at_tc_ingress(skb))
+                skb_postpull_rcsum(skb, skb_mac_header(skb), mlen);
+        skb_pop_mac_header(skb);
+        skb_reset_mac_len(skb);
+        return flags & BPF_F_INGRESS ?
+               __bpf_rx_skb_no_mac(dev, skb) : __bpf_tx_skb(dev, skb);
+}
+
+static int __bpf_redirect_common(struct sk_buff *skb, struct net_device *dev,
+                                 u32 flags)
+{
+        bpf_push_mac_rcsum(skb);
+        return flags & BPF_F_INGRESS ?
+               __bpf_rx_skb(dev, skb) : __bpf_tx_skb(dev, skb);
+}
+
+static int __bpf_redirect(struct sk_buff *skb, struct net_device *dev,
+                          u32 flags)
+{
+        switch (dev->type) {
+        case ARPHRD_TUNNEL:
+        case ARPHRD_TUNNEL6:
+        case ARPHRD_SIT:
+        case ARPHRD_IPGRE:
+        case ARPHRD_VOID:
+        case ARPHRD_NONE:
+                return __bpf_redirect_no_mac(skb, dev, flags);
+        default:
+                return __bpf_redirect_common(skb, dev, flags);
+        }
+}
+
 BPF_CALL_3(bpf_clone_redirect, struct sk_buff *, skb, u32, ifindex, u64, flags)
 {
         struct net_device *dev;
@@ -1675,10 +1733,7 @@ BPF_CALL_3(bpf_clone_redirect, struct sk_buff *, skb, u32, ifindex, u64, flags)
                 return -ENOMEM;
         }
 
-        bpf_push_mac_rcsum(clone);
-
-        return flags & BPF_F_INGRESS ?
-               __bpf_rx_skb(dev, clone) : __bpf_tx_skb(dev, clone);
+        return __bpf_redirect(clone, dev, flags);
 }
 
 static const struct bpf_func_proto bpf_clone_redirect_proto = {
@@ -1722,10 +1777,7 @@ int skb_do_redirect(struct sk_buff *skb)
                 return -EINVAL;
         }
 
-        bpf_push_mac_rcsum(skb);
-
-        return ri->flags & BPF_F_INGRESS ?
-               __bpf_rx_skb(dev, skb) : __bpf_tx_skb(dev, skb);
+        return __bpf_redirect(skb, dev, ri->flags);
 }
 
 static const struct bpf_func_proto bpf_redirect_proto = {
diff --git a/net/core/flow.c b/net/core/flow.c
index 3937b1b68d5b..18e8893d4be5 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -95,7 +95,6 @@ static void flow_cache_gc_task(struct work_struct *work)
         list_for_each_entry_safe(fce, n, &gc_list, u.gc_list) {
                 flow_entry_kill(fce, xfrm);
                 atomic_dec(&xfrm->flow_cache_gc_count);
-                WARN_ON(atomic_read(&xfrm->flow_cache_gc_count) < 0);
         }
 }
 
@@ -236,9 +235,8 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
                 if (fcp->hash_count > fc->high_watermark)
                         flow_cache_shrink(fc, fcp);
 
-                if (fcp->hash_count > 2 * fc->high_watermark ||
-                    atomic_read(&net->xfrm.flow_cache_gc_count) > fc->high_watermark) {
-                        atomic_inc(&net->xfrm.flow_cache_genid);
+                if (atomic_read(&net->xfrm.flow_cache_gc_count) >
+                    2 * num_online_cpus() * fc->high_watermark) {
                         flo = ERR_PTR(-ENOBUFS);
                         goto ret_object;
                 }
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index ab193e5def07..c6d8207ffa7e 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -122,7 +122,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
         struct flow_dissector_key_keyid *key_keyid;
         bool skip_vlan = false;
         u8 ip_proto = 0;
-        bool ret = false;
+        bool ret;
 
         if (!data) {
                 data = skb->data;
@@ -549,12 +549,17 @@ ip_proto_again:
 out_good:
         ret = true;
 
-out_bad:
+        key_control->thoff = (u16)nhoff;
+out:
         key_basic->n_proto = proto;
         key_basic->ip_proto = ip_proto;
-        key_control->thoff = (u16)nhoff;
 
         return ret;
+
+out_bad:
+        ret = false;
+        key_control->thoff = min_t(u16, nhoff, skb ? skb->len : hlen);
+        goto out;
 }
 EXPORT_SYMBOL(__skb_flow_dissect);
 
@@ -1008,4 +1013,4 @@ static int __init init_default_flow_dissectors(void)
         return 0;
 }
 
-late_initcall_sync(init_default_flow_dissectors);
+core_initcall(init_default_flow_dissectors);
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index f61c0e02a413..7001da910c6b 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -219,6 +219,8 @@ int peernet2id_alloc(struct net *net, struct net *peer)
         bool alloc;
         int id;
 
+        if (atomic_read(&net->count) == 0)
+                return NETNSA_NSID_NOT_ASSIGNED;
         spin_lock_irqsave(&net->nsid_lock, flags);
         alloc = atomic_read(&peer->count) == 0 ? false : true;
         id = __peernet2id_alloc(net, peer, &alloc);
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index fb7348f13501..a6196cf844f6 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -275,6 +275,7 @@ int rtnl_unregister(int protocol, int msgtype)
 
         rtnl_msg_handlers[protocol][msgindex].doit = NULL;
         rtnl_msg_handlers[protocol][msgindex].dumpit = NULL;
+        rtnl_msg_handlers[protocol][msgindex].calcit = NULL;
 
         return 0;
 }
@@ -839,18 +840,20 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev,
         if (dev->dev.parent && dev_is_pci(dev->dev.parent) &&
             (ext_filter_mask & RTEXT_FILTER_VF)) {
                 int num_vfs = dev_num_vf(dev->dev.parent);
-                size_t size = nla_total_size(sizeof(struct nlattr));
-                size += nla_total_size(num_vfs * sizeof(struct nlattr));
+                size_t size = nla_total_size(0);
                 size += num_vfs *
-                        (nla_total_size(sizeof(struct ifla_vf_mac)) +
-                         nla_total_size(MAX_VLAN_LIST_LEN *
-                                        sizeof(struct nlattr)) +
+                        (nla_total_size(0) +
+                         nla_total_size(sizeof(struct ifla_vf_mac)) +
+                         nla_total_size(sizeof(struct ifla_vf_vlan)) +
+                         nla_total_size(0) + /* nest IFLA_VF_VLAN_LIST */
                          nla_total_size(MAX_VLAN_LIST_LEN *
                                         sizeof(struct ifla_vf_vlan_info)) +
                          nla_total_size(sizeof(struct ifla_vf_spoofchk)) +
+                         nla_total_size(sizeof(struct ifla_vf_tx_rate)) +
                          nla_total_size(sizeof(struct ifla_vf_rate)) +
                          nla_total_size(sizeof(struct ifla_vf_link_state)) +
                          nla_total_size(sizeof(struct ifla_vf_rss_query_en)) +
+                         nla_total_size(0) + /* nest IFLA_VF_STATS */
                          /* IFLA_VF_STATS_RX_PACKETS */
                          nla_total_size_64bit(sizeof(__u64)) +
                          /* IFLA_VF_STATS_TX_PACKETS */
@@ -898,7 +901,8 @@ static size_t rtnl_port_size(const struct net_device *dev,
 
 static size_t rtnl_xdp_size(const struct net_device *dev)
 {
-        size_t xdp_size = nla_total_size(1);    /* XDP_ATTACHED */
+        size_t xdp_size = nla_total_size(0) +   /* nest IFLA_XDP */
+                          nla_total_size(1);    /* XDP_ATTACHED */
 
         if (!dev->netdev_ops->ndo_xdp)
                 return 0;
@@ -927,8 +931,8 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
                + nla_total_size(4) /* IFLA_PROMISCUITY */
                + nla_total_size(4) /* IFLA_NUM_TX_QUEUES */
                + nla_total_size(4) /* IFLA_NUM_RX_QUEUES */
-               + nla_total_size(4) /* IFLA_MAX_GSO_SEGS */
-               + nla_total_size(4) /* IFLA_MAX_GSO_SIZE */
+               + nla_total_size(4) /* IFLA_GSO_MAX_SEGS */
+               + nla_total_size(4) /* IFLA_GSO_MAX_SIZE */
                + nla_total_size(1) /* IFLA_OPERSTATE */
                + nla_total_size(1) /* IFLA_LINKMODE */
                + nla_total_size(4) /* IFLA_CARRIER_CHANGES */
@@ -1605,7 +1609,7 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
                 head = &net->dev_index_head[h];
                 hlist_for_each_entry(dev, head, index_hlist) {
                         if (link_dump_filtered(dev, master_idx, kind_ops))
-                                continue;
+                                goto cont;
                         if (idx < s_idx)
                                 goto cont;
                         err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
@@ -2733,7 +2737,7 @@ static u16 rtnl_calcit(struct sk_buff *skb, struct nlmsghdr *nlh)
                                                            ext_filter_mask));
         }
 
-        return min_ifinfo_dump_size;
+        return nlmsg_total_size(min_ifinfo_dump_size);
 }
 
 static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb)
@@ -2848,7 +2852,10 @@ nla_put_failure:
 
 static inline size_t rtnl_fdb_nlmsg_size(void)
 {
-        return NLMSG_ALIGN(sizeof(struct ndmsg)) + nla_total_size(ETH_ALEN);
+        return NLMSG_ALIGN(sizeof(struct ndmsg)) +
+               nla_total_size(ETH_ALEN) +       /* NDA_LLADDR */
+               nla_total_size(sizeof(u16)) +    /* NDA_VLAN */
+               0;
 }
 
 static void rtnl_fdb_notify(struct net_device *dev, u8 *addr, u16 vid, int type,
diff --git a/net/core/sock.c b/net/core/sock.c
index c73e28fc9c2a..00a074dbfe9b 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -453,7 +453,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 EXPORT_SYMBOL(sock_queue_rcv_skb);
 
 int __sk_receive_skb(struct sock *sk, struct sk_buff *skb,
-                     const int nested, unsigned int trim_cap)
+                     const int nested, unsigned int trim_cap, bool refcounted)
 {
         int rc = NET_RX_SUCCESS;
 
@@ -487,7 +487,8 @@ int __sk_receive_skb(struct sock *sk, struct sk_buff *skb,
 
         bh_unlock_sock(sk);
 out:
-        sock_put(sk);
+        if (refcounted)
+                sock_put(sk);
         return rc;
 discard_and_relse:
         kfree_skb(skb);
@@ -714,7 +715,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
                 val = min_t(u32, val, sysctl_wmem_max);
 set_sndbuf:
                 sk->sk_userlocks |= SOCK_SNDBUF_LOCK;
-                sk->sk_sndbuf = max_t(u32, val * 2, SOCK_MIN_SNDBUF);
+                sk->sk_sndbuf = max_t(int, val * 2, SOCK_MIN_SNDBUF);
                 /* Wake up sending tasks if we upped the value. */
                 sk->sk_write_space(sk);
                 break;
@@ -750,7 +751,7 @@ set_rcvbuf:
                  * returning the value we actually used in getsockopt
                  * is the most desirable behavior.
                  */
-                sk->sk_rcvbuf = max_t(u32, val * 2, SOCK_MIN_RCVBUF);
+                sk->sk_rcvbuf = max_t(int, val * 2, SOCK_MIN_RCVBUF);
                 break;
 
         case SO_RCVBUFFORCE:
@@ -1543,6 +1544,7 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
                 RCU_INIT_POINTER(newsk->sk_reuseport_cb, NULL);
 
                 newsk->sk_err      = 0;
+                newsk->sk_err_soft = 0;
                 newsk->sk_priority = 0;
                 newsk->sk_incoming_cpu = raw_smp_processor_id();
                 atomic64_set(&newsk->sk_cookie, 0);
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c
index 4f6c1862dfd2..3202d75329b5 100644
--- a/net/dcb/dcbnl.c
+++ b/net/dcb/dcbnl.c
@@ -1353,6 +1353,7 @@ static int dcbnl_cee_fill(struct sk_buff *skb, struct net_device *netdev)
 dcb_unlock:
         spin_unlock_bh(&dcb_lock);
 nla_put_failure:
+        err = -EMSGSIZE;
         return err;
 }
 
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 345a3aeb8c7e..edbe59d203ef 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -235,7 +235,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
 {
         const struct iphdr *iph = (struct iphdr *)skb->data;
         const u8 offset = iph->ihl << 2;
-        const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset);
+        const struct dccp_hdr *dh;
         struct dccp_sock *dp;
         struct inet_sock *inet;
         const int type = icmp_hdr(skb)->type;
@@ -245,11 +245,13 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
         int err;
         struct net *net = dev_net(skb->dev);
 
-        if (skb->len < offset + sizeof(*dh) ||
-            skb->len < offset + __dccp_basic_hdr_len(dh)) {
-                __ICMP_INC_STATS(net, ICMP_MIB_INERRORS);
-                return;
-        }
+        /* Only need dccph_dport & dccph_sport which are the first
+         * 4 bytes in dccp header.
+         * Our caller (icmp_socket_deliver()) already pulled 8 bytes for us.
+         */
+        BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_sport) > 8);
+        BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8);
+        dh = (struct dccp_hdr *)(skb->data + offset);
 
         sk = __inet_lookup_established(net, &dccp_hashinfo,
                                        iph->daddr, dh->dccph_dport,
@@ -698,6 +700,7 @@ int dccp_invalid_packet(struct sk_buff *skb)
 {
         const struct dccp_hdr *dh;
         unsigned int cscov;
+        u8 dccph_doff;
 
         if (skb->pkt_type != PACKET_HOST)
                 return 1;
@@ -719,18 +722,19 @@ int dccp_invalid_packet(struct sk_buff *skb)
         /*
          * If P.Data Offset is too small for packet type, drop packet and return
          */
-        if (dh->dccph_doff < dccp_hdr_len(skb) / sizeof(u32)) {
-                DCCP_WARN("P.Data Offset(%u) too small\n", dh->dccph_doff);
+        dccph_doff = dh->dccph_doff;
+        if (dccph_doff < dccp_hdr_len(skb) / sizeof(u32)) {
+                DCCP_WARN("P.Data Offset(%u) too small\n", dccph_doff);
                 return 1;
         }
         /*
          * If P.Data Offset is too too large for packet, drop packet and return
          */
-        if (!pskb_may_pull(skb, dh->dccph_doff * sizeof(u32))) {
-                DCCP_WARN("P.Data Offset(%u) too large\n", dh->dccph_doff);
+        if (!pskb_may_pull(skb, dccph_doff * sizeof(u32))) {
+                DCCP_WARN("P.Data Offset(%u) too large\n", dccph_doff);
                 return 1;
         }
-
+        dh = dccp_hdr(skb);
         /*
          * If P.type is not Data, Ack, or DataAck and P.X == 0 (the packet
          * has short sequence numbers), drop packet and return
@@ -868,7 +872,7 @@ lookup:
                 goto discard_and_relse;
         nf_reset(skb);
 
-        return __sk_receive_skb(sk, skb, 1, dh->dccph_doff * 4);
+        return __sk_receive_skb(sk, skb, 1, dh->dccph_doff * 4, refcounted);
 
 no_dccp_socket:
         if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 3828f94b234c..715e5d1dc107 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -70,7 +70,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                         u8 type, u8 code, int offset, __be32 info)
 {
         const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data;
-        const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset);
+        const struct dccp_hdr *dh;
         struct dccp_sock *dp;
         struct ipv6_pinfo *np;
         struct sock *sk;
@@ -78,12 +78,13 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         __u64 seq;
         struct net *net = dev_net(skb->dev);
 
-        if (skb->len < offset + sizeof(*dh) ||
-            skb->len < offset + __dccp_basic_hdr_len(dh)) {
-                __ICMP6_INC_STATS(net, __in6_dev_get(skb->dev),
-                                  ICMP6_MIB_INERRORS);
-                return;
-        }
+        /* Only need dccph_dport & dccph_sport which are the first
+         * 4 bytes in dccp header.
+         * Our caller (icmpv6_notify()) already pulled 8 bytes for us.
+         */
+        BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_sport) > 8);
+        BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8);
+        dh = (struct dccp_hdr *)(skb->data + offset);
 
         sk = __inet6_lookup_established(net, &dccp_hashinfo,
                                         &hdr->daddr, dh->dccph_dport,
@@ -738,7 +739,8 @@ lookup:
         if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
                 goto discard_and_relse;
 
-        return __sk_receive_skb(sk, skb, 1, dh->dccph_doff * 4) ? -1 : 0;
+        return __sk_receive_skb(sk, skb, 1, dh->dccph_doff * 4,
+                                refcounted) ? -1 : 0;
 
 no_dccp_socket:
         if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))
@@ -956,6 +958,7 @@ static const struct inet_connection_sock_af_ops dccp_ipv6_mapped = {
         .getsockopt        = ipv6_getsockopt,
         .addr2sockaddr     = inet6_csk_addr2sockaddr,
         .sockaddr_len      = sizeof(struct sockaddr_in6),
+        .bind_conflict     = inet6_csk_bind_conflict,
 #ifdef CONFIG_COMPAT
         .compat_setsockopt = compat_ipv6_setsockopt,
         .compat_getsockopt = compat_ipv6_getsockopt,
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 41e65804ddf5..9fe25bf63296 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -1009,6 +1009,10 @@ void dccp_close(struct sock *sk, long timeout)
                 __kfree_skb(skb);
         }
 
+        /* If socket has been already reset kill it. */
+        if (sk->sk_state == DCCP_CLOSED)
+                goto adjudge_to_death;
+
         if (data_was_unread) {
                 /* Unread data was tossed, send an appropriate Reset Code */
                 DCCP_WARN("ABORT with %u bytes unread\n", data_was_unread);
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index a6902c1e2f28..7899919cd9f0 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -233,6 +233,8 @@ int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev,
                 genphy_read_status(phydev);
                 if (ds->ops->adjust_link)
                         ds->ops->adjust_link(ds, port, phydev);
+
+                put_device(&phydev->mdio.dev);
         }
 
         return 0;
@@ -504,15 +506,8 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
 
 void dsa_cpu_dsa_destroy(struct device_node *port_dn)
 {
-        struct phy_device *phydev;
-
-        if (of_phy_is_fixed_link(port_dn)) {
-                phydev = of_phy_find_device(port_dn);
-                if (phydev) {
-                        phy_device_free(phydev);
-                        fixed_phy_unregister(phydev);
-                }
-        }
+        if (of_phy_is_fixed_link(port_dn))
+                of_phy_deregister_fixed_link(port_dn);
 }
 
 static void dsa_switch_destroy(struct dsa_switch *ds)
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index f8a7d9aab437..5fff951a0a49 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -28,8 +28,10 @@ static struct dsa_switch_tree *dsa_get_dst(u32 tree)
         struct dsa_switch_tree *dst;
 
         list_for_each_entry(dst, &dsa_switch_trees, list)
-                if (dst->tree == tree)
+                if (dst->tree == tree) {
+                        kref_get(&dst->refcount);
                         return dst;
+                }
         return NULL;
 }
 
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 6b1282c006b1..30e2e21d7619 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1125,7 +1125,7 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p,
         p->phy_interface = mode;
 
         phy_dn = of_parse_phandle(port_dn, "phy-handle", 0);
-        if (of_phy_is_fixed_link(port_dn)) {
+        if (!phy_dn && of_phy_is_fixed_link(port_dn)) {
                 /* In the case of a fixed PHY, the DT node associated
                  * to the fixed PHY is the Port DT node
                  */
@@ -1135,7 +1135,7 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p,
                         return ret;
                 }
                 phy_is_fixed = true;
-                phy_dn = port_dn;
+                phy_dn = of_node_get(port_dn);
         }
 
         if (ds->ops->get_phy_flags)
@@ -1154,6 +1154,7 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p,
                         ret = dsa_slave_phy_connect(p, slave_dev, phy_id);
                         if (ret) {
                                 netdev_err(slave_dev, "failed to connect to phy%d: %d\n", phy_id, ret);
+                                of_node_put(phy_dn);
                                 return ret;
                         }
                 } else {
@@ -1162,6 +1163,8 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p,
                                                 phy_flags,
                                                 p->phy_interface);
                 }
+
+                of_node_put(phy_dn);
         }
 
         if (p->phy && phy_is_fixed)
@@ -1174,6 +1177,8 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p,
                 ret = dsa_slave_phy_connect(p, slave_dev, p->port);
                 if (ret) {
                         netdev_err(slave_dev, "failed to connect to port %d: %d\n", p->port, ret);
+                        if (phy_is_fixed)
+                                of_phy_deregister_fixed_link(port_dn);
                         return ret;
                 }
         }
@@ -1289,10 +1294,18 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
 void dsa_slave_destroy(struct net_device *slave_dev)
 {
         struct dsa_slave_priv *p = netdev_priv(slave_dev);
+        struct dsa_switch *ds = p->parent;
+        struct device_node *port_dn;
+
+        port_dn = ds->ports[p->port].dn;
 
         netif_carrier_off(slave_dev);
-        if (p->phy)
+        if (p->phy) {
                 phy_disconnect(p->phy);
+
+                if (of_phy_is_fixed_link(port_dn))
+                        of_phy_deregister_fixed_link(port_dn);
+        }
         unregister_netdev(slave_dev);
         free_netdev(slave_dev);
 }
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 300b06888fdf..b54b3ca939db 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -715,6 +715,7 @@ config DEFAULT_TCP_CONG
         default "reno" if DEFAULT_RENO
         default "dctcp" if DEFAULT_DCTCP
         default "cdg" if DEFAULT_CDG
+        default "bbr" if DEFAULT_BBR
         default "cubic"
 
 config TCP_MD5SIG
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 9648c97e541f..215143246e4b 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -533,9 +533,9 @@ EXPORT_SYMBOL(inet_dgram_connect);
 
 static long inet_wait_for_connect(struct sock *sk, long timeo, int writebias)
 {
-        DEFINE_WAIT(wait);
+        DEFINE_WAIT_FUNC(wait, woken_wake_function);
 
-        prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+        add_wait_queue(sk_sleep(sk), &wait);
         sk->sk_write_pending += writebias;
 
         /* Basic assumption: if someone sets sk->sk_err, he _must_
@@ -545,13 +545,12 @@ static long inet_wait_for_connect(struct sock *sk, long timeo, int writebias)
          */
         while ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) {
                 release_sock(sk);
-                timeo = schedule_timeout(timeo);
+                timeo = wait_woken(&wait, TASK_INTERRUPTIBLE, timeo);
                 lock_sock(sk);
                 if (signal_pending(current) || !timeo)
                         break;
-                prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
         }
-        finish_wait(sk_sleep(sk), &wait);
+        remove_wait_queue(sk_sleep(sk), &wait);
         sk->sk_write_pending -= writebias;
         return timeo;
 }
@@ -1234,7 +1233,7 @@ struct sk_buff *inet_gso_segment(struct sk_buff *skb,
                 fixedid = !!(skb_shinfo(skb)->gso_type & SKB_GSO_TCP_FIXEDID);
 
                 /* fixed ID is invalid if DF bit is not set */
-                if (fixedid && !(iph->frag_off & htons(IP_DF)))
+                if (fixedid && !(ip_hdr(skb)->frag_off & htons(IP_DF)))
                         goto out;
         }
 
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index d95631d09248..20fb25e3027b 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -476,7 +476,7 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
                 esph = (void *)skb_push(skb, 4);
                 *seqhi = esph->spi;
                 esph->spi = esph->seq_no;
-                esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.input.hi);
+                esph->seq_no = XFRM_SKB_CB(skb)->seq.input.hi;
                 aead_request_set_callback(req, 0, esp_input_done_esn, skb);
         }
 
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index c3b80478226e..161fc0f0d752 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -151,7 +151,7 @@ static void fib_replace_table(struct net *net, struct fib_table *old,
 
 int fib_unmerge(struct net *net)
 {
-        struct fib_table *old, *new;
+        struct fib_table *old, *new, *main_table;
 
         /* attempt to fetch local table if it has been allocated */
         old = fib_get_table(net, RT_TABLE_LOCAL);
@@ -162,11 +162,21 @@ int fib_unmerge(struct net *net)
         if (!new)
                 return -ENOMEM;
 
+        /* table is already unmerged */
+        if (new == old)
+                return 0;
+
         /* replace merged table with clean table */
-        if (new != old) {
-                fib_replace_table(net, old, new);
-                fib_free_table(old);
-        }
+        fib_replace_table(net, old, new);
+        fib_free_table(old);
+
+        /* attempt to fetch main table if it has been allocated */
+        main_table = fib_get_table(net, RT_TABLE_MAIN);
+        if (!main_table)
+                return 0;
+
+        /* flush local entries from main table */
+        fib_table_flush_external(main_table);
 
         return 0;
 }
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 31cef3602585..e3665bf7a7f3 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -719,6 +719,13 @@ static unsigned char update_suffix(struct key_vector *tn)
 {
         unsigned char slen = tn->pos;
         unsigned long stride, i;
+        unsigned char slen_max;
+
+        /* only vector 0 can have a suffix length greater than or equal to
+         * tn->pos + tn->bits, the second highest node will have a suffix
+         * length at most of tn->pos + tn->bits - 1
+         */
+        slen_max = min_t(unsigned char, tn->pos + tn->bits - 1, tn->slen);
 
         /* search though the list of children looking for nodes that might
          * have a suffix greater than the one we currently have.  This is
@@ -736,12 +743,8 @@ static unsigned char update_suffix(struct key_vector *tn)
                 slen = n->slen;
                 i &= ~(stride - 1);
 
-                /* if slen covers all but the last bit we can stop here
-                 * there will be nothing longer than that since only node
-                 * 0 and 1 << (bits - 1) could have that as their suffix
-                 * length.
-                 */
-                if ((slen + 1) >= (tn->pos + tn->bits))
+                /* stop searching if we have hit the maximum possible value */
+                if (slen >= slen_max)
                         break;
         }
 
@@ -913,39 +916,27 @@ static struct key_vector *resize(struct trie *t, struct key_vector *tn)
                 return collapse(t, tn);
 
         /* update parent in case halve failed */
-        tp = node_parent(tn);
-
-        /* Return if at least one deflate was run */
-        if (max_work != MAX_WORK)
-                return tp;
-
-        /* push the suffix length to the parent node */
-        if (tn->slen > tn->pos) {
-                unsigned char slen = update_suffix(tn);
-
-                if (slen > tp->slen)
-                        tp->slen = slen;
-        }
-
-        return tp;
+        return node_parent(tn);
 }
 
-static void leaf_pull_suffix(struct key_vector *tp, struct key_vector *l)
+static void node_pull_suffix(struct key_vector *tn, unsigned char slen)
 {
-        while ((tp->slen > tp->pos) && (tp->slen > l->slen)) {
-                if (update_suffix(tp) > l->slen)
+        unsigned char node_slen = tn->slen;
+
+        while ((node_slen > tn->pos) && (node_slen > slen)) {
+                slen = update_suffix(tn);
+                if (node_slen == slen)
                         break;
-                tp = node_parent(tp);
+
+                tn = node_parent(tn);
+                node_slen = tn->slen;
         }
 }
 
-static void leaf_push_suffix(struct key_vector *tn, struct key_vector *l)
+static void node_push_suffix(struct key_vector *tn, unsigned char slen)
 {
-        /* if this is a new leaf then tn will be NULL and we can sort
-         * out parent suffix lengths as a part of trie_rebalance
-         */
-        while (tn->slen < l->slen) {
-                tn->slen = l->slen;
+        while (tn->slen < slen) {
+                tn->slen = slen;
                 tn = node_parent(tn);
         }
 }
@@ -1066,6 +1057,7 @@ static int fib_insert_node(struct trie *t, struct key_vector *tp,
         }
 
         /* Case 3: n is NULL, and will just insert a new leaf */
+        node_push_suffix(tp, new->fa_slen);
         NODE_INIT_PARENT(l, tp);
         put_child_root(tp, key, l);
         trie_rebalance(t, tp);
@@ -1107,7 +1099,7 @@ static int fib_insert_alias(struct trie *t, struct key_vector *tp,
         /* if we added to the tail node then we need to update slen */
         if (l->slen < new->fa_slen) {
                 l->slen = new->fa_slen;
-                leaf_push_suffix(tp, l);
+                node_push_suffix(tp, new->fa_slen);
         }
 
         return 0;
@@ -1499,6 +1491,8 @@ static void fib_remove_alias(struct trie *t, struct key_vector *tp,
          * out parent suffix lengths as a part of trie_rebalance
          */
         if (hlist_empty(&l->leaf)) {
+                if (tp->slen == l->slen)
+                        node_pull_suffix(tp, tp->pos);
                 put_child_root(tp, l->key, NULL);
                 node_free(l);
                 trie_rebalance(t, tp);
@@ -1511,7 +1505,7 @@ static void fib_remove_alias(struct trie *t, struct key_vector *tp,
 
         /* update the trie with the latest suffix length */
         l->slen = fa->fa_slen;
-        leaf_pull_suffix(tp, l);
+        node_pull_suffix(tp, fa->fa_slen);
 }
 
 /* Caller must hold RTNL. */
@@ -1743,8 +1737,10 @@ struct fib_table *fib_trie_unmerge(struct fib_table *oldtb)
                                 local_l = fib_find_node(lt, &local_tp, l->key);
 
                         if (fib_insert_alias(lt, local_tp, local_l, new_fa,
-                                             NULL, l->key))
+                                             NULL, l->key)) {
+                                kmem_cache_free(fn_alias_kmem, new_fa);
                                 goto out;
+                        }
                 }
 
                 /* stop loop if key wrapped back to 0 */
@@ -1760,6 +1756,75 @@ out:
         return NULL;
 }
 
+/* Caller must hold RTNL */
+void fib_table_flush_external(struct fib_table *tb)
+{
+        struct trie *t = (struct trie *)tb->tb_data;
+        struct key_vector *pn = t->kv;
+        unsigned long cindex = 1;
+        struct hlist_node *tmp;
+        struct fib_alias *fa;
+
+        /* walk trie in reverse order */
+        for (;;) {
+                unsigned char slen = 0;
+                struct key_vector *n;
+
+                if (!(cindex--)) {
+                        t_key pkey = pn->key;
+
+                        /* cannot resize the trie vector */
+                        if (IS_TRIE(pn))
+                                break;
+
+                        /* update the suffix to address pulled leaves */
+                        if (pn->slen > pn->pos)
+                                update_suffix(pn);
+
+                        /* resize completed node */
+                        pn = resize(t, pn);
+                        cindex = get_index(pkey, pn);
+
+                        continue;
+                }
+
+                /* grab the next available node */
+                n = get_child(pn, cindex);
+                if (!n)
+                        continue;
+
+                if (IS_TNODE(n)) {
+                        /* record pn and cindex for leaf walking */
+                        pn = n;
+                        cindex = 1ul << n->bits;
+
+                        continue;
+                }
+
+                hlist_for_each_entry_safe(fa, tmp, &n->leaf, fa_list) {
+                        /* if alias was cloned to local then we just
+                         * need to remove the local copy from main
+                         */
+                        if (tb->tb_id != fa->tb_id) {
+                                hlist_del_rcu(&fa->fa_list);
+                                alias_free_mem_rcu(fa);
+                                continue;
+                        }
+
+                        /* record local slen */
+                        slen = fa->fa_slen;
+                }
+
+                /* update leaf slen */
+                n->slen = slen;
+
+                if (hlist_empty(&n->leaf)) {
+                        put_child_root(pn, n->key, NULL);
+                        node_free(n);
+                }
+        }
+}
+
 /* Caller must hold RTNL. */
 int fib_table_flush(struct net *net, struct fib_table *tb)
 {
@@ -1782,6 +1847,10 @@ int fib_table_flush(struct net *net, struct fib_table *tb)
                         if (IS_TRIE(pn))
                                 break;
 
+                        /* update the suffix to address pulled leaves */
+                        if (pn->slen > pn->pos)
+                                update_suffix(pn);
+
                         /* resize completed node */
                         pn = resize(t, pn);
                         cindex = get_index(pkey, pn);
@@ -2413,22 +2482,19 @@ static struct key_vector *fib_route_get_idx(struct fib_route_iter *iter,
         struct key_vector *l, **tp = &iter->tnode;
         t_key key;
 
-        /* use cache location of next-to-find key */
+        /* use cached location of previously found key */
         if (iter->pos > 0 && pos >= iter->pos) {
-                pos -= iter->pos;
                 key = iter->key;
         } else {
-                iter->pos = 0;
+                iter->pos = 1;
                 key = 0;
         }
 
-        while ((l = leaf_walk_rcu(tp, key)) != NULL) {
+        pos -= iter->pos;
+
+        while ((l = leaf_walk_rcu(tp, key)) && (pos-- > 0)) {
                 key = l->key + 1;
                 iter->pos++;
-
-                if (--pos <= 0)
-                        break;
-
                 l = NULL;
 
                 /* handle unlikely case of a key wrap */
@@ -2437,7 +2503,7 @@ static struct key_vector *fib_route_get_idx(struct fib_route_iter *iter,
         }
 
         if (l)
-                iter->key = key;        /* remember it */
+                iter->key = l->key;     /* remember it */
         else
                 iter->pos = 0;          /* forget it */
 
@@ -2465,7 +2531,7 @@ static void *fib_route_seq_start(struct seq_file *seq, loff_t *pos)
                 return fib_route_get_idx(iter, *pos);
 
         iter->pos = 0;
-        iter->key = 0;
+        iter->key = KEY_MAX;
 
         return SEQ_START_TOKEN;
 }
@@ -2474,7 +2540,7 @@ static void *fib_route_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
         struct fib_route_iter *iter = seq->private;
         struct key_vector *l = NULL;
-        t_key key = iter->key;
+        t_key key = iter->key + 1;
 
         ++*pos;
 
@@ -2483,7 +2549,7 @@ static void *fib_route_seq_next(struct seq_file *seq, void *v, loff_t *pos)
                 l = leaf_walk_rcu(&iter->tnode, key);
 
         if (l) {
-                iter->key = l->key + 1;
+                iter->key = l->key;
                 iter->pos++;
         } else {
                 iter->pos = 0;
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 38abe70e595f..48734ee6293f 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -477,7 +477,7 @@ static struct rtable *icmp_route_lookup(struct net *net,
         fl4->flowi4_proto = IPPROTO_ICMP;
         fl4->fl4_icmp_type = type;
         fl4->fl4_icmp_code = code;
-        fl4->flowi4_oif = l3mdev_master_ifindex(skb_in->dev);
+        fl4->flowi4_oif = l3mdev_master_ifindex(skb_dst(skb_in)->dev);
 
         security_skb_classify_flow(skb_in, flowi4_to_flowi(fl4));
         rt = __ip_route_output_key_hash(net, fl4,
@@ -502,7 +502,7 @@ static struct rtable *icmp_route_lookup(struct net *net,
         if (err)
                 goto relookup_failed;
 
-        if (inet_addr_type_dev_table(net, skb_in->dev,
+        if (inet_addr_type_dev_table(net, skb_dst(skb_in)->dev,
                                      fl4_dec.saddr) == RTN_LOCAL) {
                 rt2 = __ip_route_output_key(net, &fl4_dec);
                 if (IS_ERR(rt2))
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 606cc3e85d2b..15db786d50ed 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -162,7 +162,7 @@ static int unsolicited_report_interval(struct in_device *in_dev)
 }
 
 static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im);
-static void igmpv3_del_delrec(struct in_device *in_dev, __be32 multiaddr);
+static void igmpv3_del_delrec(struct in_device *in_dev, struct ip_mc_list *im);
 static void igmpv3_clear_delrec(struct in_device *in_dev);
 static int sf_setstate(struct ip_mc_list *pmc);
 static void sf_markstate(struct ip_mc_list *pmc);
@@ -1130,10 +1130,15 @@ static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im)
         spin_unlock_bh(&in_dev->mc_tomb_lock);
 }
 
-static void igmpv3_del_delrec(struct in_device *in_dev, __be32 multiaddr)
+/*
+ * restore ip_mc_list deleted records
+ */
+static void igmpv3_del_delrec(struct in_device *in_dev, struct ip_mc_list *im)
 {
         struct ip_mc_list *pmc, *pmc_prev;
-        struct ip_sf_list *psf, *psf_next;
+        struct ip_sf_list *psf;
+        struct net *net = dev_net(in_dev->dev);
+        __be32 multiaddr = im->multiaddr;
 
         spin_lock_bh(&in_dev->mc_tomb_lock);
         pmc_prev = NULL;
@@ -1149,16 +1154,26 @@ static void igmpv3_del_delrec(struct in_device *in_dev, __be32 multiaddr)
                         in_dev->mc_tomb = pmc->next;
         }
         spin_unlock_bh(&in_dev->mc_tomb_lock);
+
+        spin_lock_bh(&im->lock);
         if (pmc) {
-                for (psf = pmc->tomb; psf; psf = psf_next) {
-                        psf_next = psf->sf_next;
-                        kfree(psf);
+                im->interface = pmc->interface;
+                im->crcount = in_dev->mr_qrv ?: net->ipv4.sysctl_igmp_qrv;
+                im->sfmode = pmc->sfmode;
+                if (pmc->sfmode == MCAST_INCLUDE) {
+                        im->tomb = pmc->tomb;
+                        im->sources = pmc->sources;
+                        for (psf = im->sources; psf; psf = psf->sf_next)
+                                psf->sf_crcount = im->crcount;
                 }
                 in_dev_put(pmc->interface);
-                kfree(pmc);
         }
+        spin_unlock_bh(&im->lock);
 }
 
+/*
+ * flush ip_mc_list deleted records
+ */
 static void igmpv3_clear_delrec(struct in_device *in_dev)
 {
         struct ip_mc_list *pmc, *nextpmc;
@@ -1366,7 +1381,7 @@ void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
         ip_mc_hash_add(in_dev, im);
 
 #ifdef CONFIG_IP_MULTICAST
-        igmpv3_del_delrec(in_dev, im->multiaddr);
+        igmpv3_del_delrec(in_dev, im);
 #endif
         igmp_group_added(im);
         if (!in_dev->dead)
@@ -1626,8 +1641,12 @@ void ip_mc_remap(struct in_device *in_dev)
 
         ASSERT_RTNL();
 
-        for_each_pmc_rtnl(in_dev, pmc)
+        for_each_pmc_rtnl(in_dev, pmc) {
+#ifdef CONFIG_IP_MULTICAST
+                igmpv3_del_delrec(in_dev, pmc);
+#endif
                 igmp_group_added(pmc);
+        }
 }
 
 /* Device going down */
@@ -1648,7 +1667,6 @@ void ip_mc_down(struct in_device *in_dev)
         in_dev->mr_gq_running = 0;
         if (del_timer(&in_dev->mr_gq_timer))
                 __in_dev_put(in_dev);
-        igmpv3_clear_delrec(in_dev);
 #endif
 
         ip_mc_dec_group(in_dev, IGMP_ALL_HOSTS);
@@ -1688,8 +1706,12 @@ void ip_mc_up(struct in_device *in_dev)
 #endif
         ip_mc_inc_group(in_dev, IGMP_ALL_HOSTS);
 
-        for_each_pmc_rtnl(in_dev, pmc)
+        for_each_pmc_rtnl(in_dev, pmc) {
+#ifdef CONFIG_IP_MULTICAST
+                igmpv3_del_delrec(in_dev, pmc);
+#endif
                 igmp_group_added(pmc);
+        }
 }
 
 /*
@@ -1704,13 +1726,13 @@ void ip_mc_destroy_dev(struct in_device *in_dev)
 
         /* Deactivate timers */
         ip_mc_down(in_dev);
+#ifdef CONFIG_IP_MULTICAST
+        igmpv3_clear_delrec(in_dev);
+#endif
 
         while ((i = rtnl_dereference(in_dev->mc_list)) != NULL) {
                 in_dev->mc_list = i->next_rcu;
                 in_dev->mc_count--;
-
-                /* We've dropped the groups in ip_mc_down already */
-                ip_mc_clear_src(i);
                 ip_ma_put(i);
         }
 }
diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c
index 8b4ffd216839..9f0a7b96646f 100644
--- a/net/ipv4/ip_forward.c
+++ b/net/ipv4/ip_forward.c
@@ -117,7 +117,7 @@ int ip_forward(struct sk_buff *skb)
         if (opt->is_strictroute && rt->rt_uses_gateway)
                 goto sr_failed;
 
-        IPCB(skb)->flags |= IPSKB_FORWARDED | IPSKB_FRAG_SEGS;
+        IPCB(skb)->flags |= IPSKB_FORWARDED;
         mtu = ip_dst_mtu_maybe_forward(&rt->dst, true);
         if (ip_exceeds_mtu(skb, mtu)) {
                 IP_INC_STATS(net, IPSTATS_MIB_FRAGFAILS);
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 03e7f7310423..877bdb02e887 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -107,6 +107,8 @@ int __ip_local_out(struct net *net, struct sock *sk, struct sk_buff *skb)
         if (unlikely(!skb))
                 return 0;
 
+        skb->protocol = htons(ETH_P_IP);
+
         return nf_hook(NFPROTO_IPV4, NF_INET_LOCAL_OUT,
                        net, sk, skb, NULL, skb_dst(skb)->dev,
                        dst_output);
@@ -239,19 +241,23 @@ static int ip_finish_output_gso(struct net *net, struct sock *sk,
         struct sk_buff *segs;
         int ret = 0;
 
-        /* common case: fragmentation of segments is not allowed,
-         * or seglen is <= mtu
+        /* common case: seglen is <= mtu
          */
-        if (((IPCB(skb)->flags & IPSKB_FRAG_SEGS) == 0) ||
-              skb_gso_validate_mtu(skb, mtu))
+        if (skb_gso_validate_mtu(skb, mtu))
                 return ip_finish_output2(net, sk, skb);
 
-        /* Slowpath -  GSO segment length is exceeding the dst MTU.
+        /* Slowpath -  GSO segment length exceeds the egress MTU.
          *
-         * This can happen in two cases:
-         * 1) TCP GRO packet, DF bit not set
-         * 2) skb arrived via virtio-net, we thus get TSO/GSO skbs directly
-         * from host network stack.
+         * This can happen in several cases:
+         *  - Forwarding of a TCP GRO skb, when DF flag is not set.
+         *  - Forwarding of an skb that arrived on a virtualization interface
+         *    (virtio-net/vhost/tap) with TSO/GSO size set by other network
+         *    stack.
+         *  - Local GSO skb transmitted on an NETIF_F_TSO tunnel stacked over an
+         *    interface with a smaller MTU.
+         *  - Arriving GRO skb (or GSO skb in a virtualized environment) that is
+         *    bridged to a NETIF_F_TSO tunnel stacked over an interface with an
+         *    insufficent MTU.
          */
         features = netif_skb_features(skb);
         BUILD_BUG_ON(sizeof(*IPCB(skb)) > SKB_SGO_CB_OFFSET);
@@ -1579,7 +1585,8 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb,
         }
 
         oif = arg->bound_dev_if;
-        oif = oif ? : skb->skb_iif;
+        if (!oif && netif_index_is_l3_master(net, skb->skb_iif))
+                oif = skb->skb_iif;
 
         flowi4_init_output(&fl4, oif,
                            IP4_REPLY_MARK(net, skb->mark),
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 777bc1883870..fed3d29f9eb3 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -63,7 +63,6 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
         int pkt_len = skb->len - skb_inner_network_offset(skb);
         struct net *net = dev_net(rt->dst.dev);
         struct net_device *dev = skb->dev;
-        int skb_iif = skb->skb_iif;
         struct iphdr *iph;
         int err;
 
@@ -73,16 +72,6 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
         skb_dst_set(skb, &rt->dst);
         memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
 
-        if (skb_iif && !(df & htons(IP_DF))) {
-                /* Arrived from an ingress interface, got encapsulated, with
-                 * fragmentation of encapulating frames allowed.
-                 * If skb is gso, the resulting encapsulated network segments
-                 * may exceed dst mtu.
-                 * Allow IP Fragmentation of segments.
-                 */
-                IPCB(skb)->flags |= IPSKB_FRAG_SEGS;
-        }
-
         /* Push down and install the IP header. */
         skb_push(skb, sizeof(struct iphdr));
         skb_reset_network_header(skb);
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 5f006e13de56..27089f5ebbb1 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1749,7 +1749,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,
                 vif->dev->stats.tx_bytes += skb->len;
         }
 
-        IPCB(skb)->flags |= IPSKB_FORWARDED | IPSKB_FRAG_SEGS;
+        IPCB(skb)->flags |= IPSKB_FORWARDED;
 
         /* RFC1584 teaches, that DVMRP/PIM router must deliver packets locally
          * not only before forwarding, but after forwarding on all output
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index c3776ff6749f..b3cc1335adbc 100644
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -24,10 +24,11 @@ int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_t
         struct flowi4 fl4 = {};
         __be32 saddr = iph->saddr;
         __u8 flags = skb->sk ? inet_sk_flowi_flags(skb->sk) : 0;
+        struct net_device *dev = skb_dst(skb)->dev;
         unsigned int hh_len;
 
         if (addr_type == RTN_UNSPEC)
-                addr_type = inet_addr_type(net, saddr);
+                addr_type = inet_addr_type_dev_table(net, dev, saddr);
         if (addr_type == RTN_LOCAL || addr_type == RTN_UNICAST)
                 flags |= FLOWI_FLAG_ANYSRC;
         else
@@ -40,6 +41,8 @@ int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_t
         fl4.saddr = saddr;
         fl4.flowi4_tos = RT_TOS(iph->tos);
         fl4.flowi4_oif = skb->sk ? skb->sk->sk_bound_dev_if : 0;
+        if (!fl4.flowi4_oif)
+                fl4.flowi4_oif = l3mdev_master_ifindex(dev);
         fl4.flowi4_mark = skb->mark;
         fl4.flowi4_flags = flags;
         rt = ip_route_output_key(net, &fl4);
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index b31df597fd37..697538464e6e 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -1201,8 +1201,8 @@ static int translate_compat_table(struct xt_table_info **pinfo,
 
         newinfo->number = compatr->num_entries;
         for (i = 0; i < NF_ARP_NUMHOOKS; i++) {
-                newinfo->hook_entry[i] = info->hook_entry[i];
-                newinfo->underflow[i] = info->underflow[i];
+                newinfo->hook_entry[i] = compatr->hook_entry[i];
+                newinfo->underflow[i] = compatr->underflow[i];
         }
         entry1 = newinfo->entries;
         pos = entry1;
diff --git a/net/ipv4/netfilter/nft_dup_ipv4.c b/net/ipv4/netfilter/nft_dup_ipv4.c
index bf855e64fc45..0c01a270bf9f 100644
--- a/net/ipv4/netfilter/nft_dup_ipv4.c
+++ b/net/ipv4/netfilter/nft_dup_ipv4.c
@@ -28,7 +28,7 @@ static void nft_dup_ipv4_eval(const struct nft_expr *expr,
         struct in_addr gw = {
                 .s_addr = (__force __be32)regs->data[priv->sreg_addr],
         };
-        int oif = regs->data[priv->sreg_dev];
+        int oif = priv->sreg_dev ? regs->data[priv->sreg_dev] : -1;
 
         nf_dup_ipv4(pkt->net, pkt->skb, pkt->hook, &gw, oif);
 }
@@ -59,7 +59,9 @@ static int nft_dup_ipv4_dump(struct sk_buff *skb, const struct nft_expr *expr)
 {
         struct nft_dup_ipv4 *priv = nft_expr_priv(expr);
 
-        if (nft_dump_register(skb, NFTA_DUP_SREG_ADDR, priv->sreg_addr) ||
+        if (nft_dump_register(skb, NFTA_DUP_SREG_ADDR, priv->sreg_addr))
+                goto nla_put_failure;
+        if (priv->sreg_dev &&
             nft_dump_register(skb, NFTA_DUP_SREG_DEV, priv->sreg_dev))
                 goto nla_put_failure;
 
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 205e2000d395..96b8e2b95731 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -657,6 +657,10 @@ int ping_common_sendmsg(int family, struct msghdr *msg, size_t len,
         if (len > 0xFFFF)
                 return -EMSGSIZE;
 
+        /* Must have at least a full ICMP header. */
+        if (len < icmph_len)
+                return -EINVAL;
+
         /*
          *      Check the flags.
          */
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 62d4d90c1389..2a57566e6e91 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -753,7 +753,9 @@ static void __ip_do_redirect(struct rtable *rt, struct sk_buff *skb, struct flow
                         goto reject_redirect;
         }
 
-        n = ipv4_neigh_lookup(&rt->dst, NULL, &new_gw);
+        n = __ipv4_neigh_lookup(rt->dst.dev, new_gw);
+        if (!n)
+                n = neigh_create(&arp_tbl, &new_gw, rt->dst.dev);
         if (!IS_ERR(n)) {
                 if (!(n->nud_state & NUD_VALID)) {
                         neigh_event_send(n, NULL);
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 3251fe71f39f..814af89c1bd3 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1164,7 +1164,7 @@ restart:
 
         err = -EPIPE;
         if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
-                goto out_err;
+                goto do_error;
 
         sg = !!(sk->sk_route_caps & NETIF_F_SG);
 
@@ -1241,7 +1241,7 @@ new_segment:
 
                         if (!skb_can_coalesce(skb, i, pfrag->page,
                                               pfrag->offset)) {
-                                if (i == sysctl_max_skb_frags || !sg) {
+                                if (i >= sysctl_max_skb_frags || !sg) {
                                         tcp_mark_push(tp, skb);
                                         goto new_segment;
                                 }
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
index 1294af4e0127..f9038d6b109e 100644
--- a/net/ipv4/tcp_cong.c
+++ b/net/ipv4/tcp_cong.c
@@ -200,8 +200,10 @@ static void tcp_reinit_congestion_control(struct sock *sk,
         icsk->icsk_ca_ops = ca;
         icsk->icsk_ca_setsockopt = 1;
 
-        if (sk->sk_state != TCP_CLOSE)
+        if (sk->sk_state != TCP_CLOSE) {
+                memset(icsk->icsk_ca_priv, 0, sizeof(icsk->icsk_ca_priv));
                 tcp_init_congestion_control(sk);
+        }
 }
 
 /* Manage refcounts on socket close. */
diff --git a/net/ipv4/tcp_dctcp.c b/net/ipv4/tcp_dctcp.c
index 10d728b6804c..ab37c6775630 100644
--- a/net/ipv4/tcp_dctcp.c
+++ b/net/ipv4/tcp_dctcp.c
@@ -56,6 +56,7 @@ struct dctcp {
         u32 next_seq;
         u32 ce_state;
         u32 delayed_ack_reserved;
+        u32 loss_cwnd;
 };
 
 static unsigned int dctcp_shift_g __read_mostly = 4; /* g = 1/2^4 */
@@ -96,6 +97,7 @@ static void dctcp_init(struct sock *sk)
                 ca->dctcp_alpha = min(dctcp_alpha_on_init, DCTCP_MAX_ALPHA);
 
                 ca->delayed_ack_reserved = 0;
+                ca->loss_cwnd = 0;
                 ca->ce_state = 0;
 
                 dctcp_reset(tp, ca);
@@ -111,9 +113,10 @@ static void dctcp_init(struct sock *sk)
 
 static u32 dctcp_ssthresh(struct sock *sk)
 {
-        const struct dctcp *ca = inet_csk_ca(sk);
+        struct dctcp *ca = inet_csk_ca(sk);
         struct tcp_sock *tp = tcp_sk(sk);
 
+        ca->loss_cwnd = tp->snd_cwnd;
         return max(tp->snd_cwnd - ((tp->snd_cwnd * ca->dctcp_alpha) >> 11U), 2U);
 }
 
@@ -308,12 +311,20 @@ static size_t dctcp_get_info(struct sock *sk, u32 ext, int *attr,
         return 0;
 }
 
+static u32 dctcp_cwnd_undo(struct sock *sk)
+{
+        const struct dctcp *ca = inet_csk_ca(sk);
+
+        return max(tcp_sk(sk)->snd_cwnd, ca->loss_cwnd);
+}
+
 static struct tcp_congestion_ops dctcp __read_mostly = {
         .init           = dctcp_init,
         .in_ack_event   = dctcp_update_alpha,
         .cwnd_event     = dctcp_cwnd_event,
         .ssthresh       = dctcp_ssthresh,
         .cong_avoid     = tcp_reno_cong_avoid,
+        .undo_cwnd      = dctcp_cwnd_undo,
         .set_state      = dctcp_state,
         .get_info       = dctcp_get_info,
         .flags          = TCP_CONG_NEEDS_ECN,
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index a27b9c0e27c0..c71d49ce0c93 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -128,6 +128,23 @@ int sysctl_tcp_invalid_ratelimit __read_mostly = HZ/2;
 #define REXMIT_LOST     1 /* retransmit packets marked lost */
 #define REXMIT_NEW      2 /* FRTO-style transmit of unsent/new packets */
 
+static void tcp_gro_dev_warn(struct sock *sk, const struct sk_buff *skb)
+{
+        static bool __once __read_mostly;
+
+        if (!__once) {
+                struct net_device *dev;
+
+                __once = true;
+
+                rcu_read_lock();
+                dev = dev_get_by_index_rcu(sock_net(sk), skb->skb_iif);
+                pr_warn("%s: Driver has suspect GRO implementation, TCP performance may be compromised.\n",
+                        dev ? dev->name : "Unknown driver");
+                rcu_read_unlock();
+        }
+}
+
 /* Adapt the MSS value used to make delayed ack decision to the
  * real world.
  */
@@ -144,7 +161,10 @@ static void tcp_measure_rcv_mss(struct sock *sk, const struct sk_buff *skb)
          */
         len = skb_shinfo(skb)->gso_size ? : skb->len;
         if (len >= icsk->icsk_ack.rcv_mss) {
-                icsk->icsk_ack.rcv_mss = len;
+                icsk->icsk_ack.rcv_mss = min_t(unsigned int, len,
+                                               tcp_sk(sk)->advmss);
+                if (unlikely(icsk->icsk_ack.rcv_mss != len))
+                        tcp_gro_dev_warn(sk, skb);
         } else {
                 /* Otherwise, we make more careful check taking into account,
                  * that SACKs block is variable.
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 61b7be303eec..2259114c7242 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1564,6 +1564,21 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb)
 }
 EXPORT_SYMBOL(tcp_add_backlog);
 
+int tcp_filter(struct sock *sk, struct sk_buff *skb)
+{
+        struct tcphdr *th = (struct tcphdr *)skb->data;
+        unsigned int eaten = skb->len;
+        int err;
+
+        err = sk_filter_trim_cap(sk, skb, th->doff * 4);
+        if (!err) {
+                eaten -= skb->len;
+                TCP_SKB_CB(skb)->end_seq -= eaten;
+        }
+        return err;
+}
+EXPORT_SYMBOL(tcp_filter);
+
 /*
  *      From tcp_input.c
  */
@@ -1676,8 +1691,10 @@ process:
 
         nf_reset(skb);
 
-        if (sk_filter(sk, skb))
+        if (tcp_filter(sk, skb))
                 goto discard_and_relse;
+        th = (const struct tcphdr *)skb->data;
+        iph = ip_hdr(skb);
 
         skb->dev = NULL;
 
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index d123d68f4d1d..5bab6c3f7a2f 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1455,7 +1455,7 @@ static void udp_v4_rehash(struct sock *sk)
         udp_lib_rehash(sk, new_hash);
 }
 
-static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
         int rc;
 
@@ -1652,10 +1652,10 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
 
         if (use_hash2) {
                 hash2_any = udp4_portaddr_hash(net, htonl(INADDR_ANY), hnum) &
-                            udp_table.mask;
-                hash2 = udp4_portaddr_hash(net, daddr, hnum) & udp_table.mask;
+                            udptable->mask;
+                hash2 = udp4_portaddr_hash(net, daddr, hnum) & udptable->mask;
 start_lookup:
-                hslot = &udp_table.hash2[hash2];
+                hslot = &udptable->hash2[hash2];
                 offset = offsetof(typeof(*sk), __sk_common.skc_portaddr_node);
         }
 
diff --git a/net/ipv4/udp_impl.h b/net/ipv4/udp_impl.h
index 7e0fe4bdd967..feb50a16398d 100644
--- a/net/ipv4/udp_impl.h
+++ b/net/ipv4/udp_impl.h
@@ -25,7 +25,7 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
                 int flags, int *addr_len);
 int udp_sendpage(struct sock *sk, struct page *page, int offset, size_t size,
                  int flags);
-int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
+int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
 void udp_destroy_sock(struct sock *sk);
 
 #ifdef CONFIG_PROC_FS
diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index af817158d830..ff450c2aad9b 100644
--- a/net/ipv4/udplite.c
+++ b/net/ipv4/udplite.c
@@ -50,7 +50,7 @@ struct proto 	udplite_prot = {
         .sendmsg           = udp_sendmsg,
         .recvmsg           = udp_recvmsg,
         .sendpage          = udp_sendpage,
-        .backlog_rcv       = udp_queue_rcv_skb,
+        .backlog_rcv       = __udp_queue_rcv_skb,
         .hash              = udp_lib_hash,
         .unhash            = udp_lib_unhash,
         .get_port          = udp_v4_get_port,
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 060dd9922018..4bc5ba3ae452 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -183,7 +183,7 @@ static struct rt6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,
 
 static void addrconf_dad_start(struct inet6_ifaddr *ifp);
 static void addrconf_dad_work(struct work_struct *w);
-static void addrconf_dad_completed(struct inet6_ifaddr *ifp);
+static void addrconf_dad_completed(struct inet6_ifaddr *ifp, bool bump_id);
 static void addrconf_dad_run(struct inet6_dev *idev);
 static void addrconf_rs_timer(unsigned long data);
 static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifa);
@@ -2898,6 +2898,7 @@ static void add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
                 spin_lock_bh(&ifp->lock);
                 ifp->flags &= ~IFA_F_TENTATIVE;
                 spin_unlock_bh(&ifp->lock);
+                rt_genid_bump_ipv6(dev_net(idev->dev));
                 ipv6_ifa_notify(RTM_NEWADDR, ifp);
                 in6_ifa_put(ifp);
         }
@@ -3740,7 +3741,7 @@ static void addrconf_dad_begin(struct inet6_ifaddr *ifp)
 {
         struct inet6_dev *idev = ifp->idev;
         struct net_device *dev = idev->dev;
-        bool notify = false;
+        bool bump_id, notify = false;
 
         addrconf_join_solict(dev, &ifp->addr);
 
@@ -3755,11 +3756,12 @@ static void addrconf_dad_begin(struct inet6_ifaddr *ifp)
             idev->cnf.accept_dad < 1 ||
             !(ifp->flags&IFA_F_TENTATIVE) ||
             ifp->flags & IFA_F_NODAD) {
+                bump_id = ifp->flags & IFA_F_TENTATIVE;
                 ifp->flags &= ~(IFA_F_TENTATIVE|IFA_F_OPTIMISTIC|IFA_F_DADFAILED);
                 spin_unlock(&ifp->lock);
                 read_unlock_bh(&idev->lock);
 
-                addrconf_dad_completed(ifp);
+                addrconf_dad_completed(ifp, bump_id);
                 return;
         }
 
@@ -3819,8 +3821,8 @@ static void addrconf_dad_work(struct work_struct *w)
                                                 struct inet6_ifaddr,
                                                 dad_work);
         struct inet6_dev *idev = ifp->idev;
+        bool bump_id, disable_ipv6 = false;
         struct in6_addr mcaddr;
-        bool disable_ipv6 = false;
 
         enum {
                 DAD_PROCESS,
@@ -3890,11 +3892,12 @@ static void addrconf_dad_work(struct work_struct *w)
                  * DAD was successful
                  */
 
+                bump_id = ifp->flags & IFA_F_TENTATIVE;
                 ifp->flags &= ~(IFA_F_TENTATIVE|IFA_F_OPTIMISTIC|IFA_F_DADFAILED);
                 spin_unlock(&ifp->lock);
                 write_unlock_bh(&idev->lock);
 
-                addrconf_dad_completed(ifp);
+                addrconf_dad_completed(ifp, bump_id);
 
                 goto out;
         }
@@ -3931,7 +3934,7 @@ static bool ipv6_lonely_lladdr(struct inet6_ifaddr *ifp)
         return true;
 }
 
-static void addrconf_dad_completed(struct inet6_ifaddr *ifp)
+static void addrconf_dad_completed(struct inet6_ifaddr *ifp, bool bump_id)
 {
         struct net_device *dev = ifp->idev->dev;
         struct in6_addr lladdr;
@@ -3983,6 +3986,9 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp)
                 spin_unlock(&ifp->lock);
                 write_unlock_bh(&ifp->idev->lock);
         }
+
+        if (bump_id)
+                rt_genid_bump_ipv6(dev_net(dev));
 }
 
 static void addrconf_dad_run(struct inet6_dev *idev)
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 37874e2f30ed..ccf40550c475 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -139,7 +139,8 @@ void ip6_datagram_release_cb(struct sock *sk)
 }
 EXPORT_SYMBOL_GPL(ip6_datagram_release_cb);
 
-static int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
+int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr,
+                           int addr_len)
 {
         struct sockaddr_in6     *usin = (struct sockaddr_in6 *) uaddr;
         struct inet_sock        *inet = inet_sk(sk);
@@ -252,6 +253,7 @@ ipv4_connected:
 out:
         return err;
 }
+EXPORT_SYMBOL_GPL(__ip6_datagram_connect);
 
 int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 {
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 060a60b2f8a6..111ba55fd512 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -418,7 +418,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
                 esph = (void *)skb_push(skb, 4);
                 *seqhi = esph->spi;
                 esph->spi = esph->seq_no;
-                esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.input.hi);
+                esph->seq_no = XFRM_SKB_CB(skb)->seq.input.hi;
                 aead_request_set_callback(req, 0, esp_input_done_esn, skb);
         }
 
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index bd59c343d35f..2772004ba5a1 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -447,8 +447,10 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,
 
         if (__ipv6_addr_needs_scope_id(addr_type))
                 iif = skb->dev->ifindex;
-        else
-                iif = l3mdev_master_ifindex(skb->dev);
+        else {
+                dst = skb_dst(skb);
+                iif = l3mdev_master_ifindex(dst ? dst->dev : skb->dev);
+        }
 
         /*
          *      Must not send error if the source does not uniquely
diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
index 1fcf61f1cbc3..89c59e656f44 100644
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
@@ -99,7 +99,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,
                 segs = ops->callbacks.gso_segment(skb, features);
         }
 
-        if (IS_ERR(segs))
+        if (IS_ERR_OR_NULL(segs))
                 goto out;
 
         gso_partial = !!(skb_shinfo(segs)->gso_type & SKB_GSO_PARTIAL);
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 6001e781164e..59eb4ed99ce8 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1366,7 +1366,7 @@ emsgsize:
         if (((length > mtu) ||
              (skb && skb_is_gso(skb))) &&
             (sk->sk_protocol == IPPROTO_UDP) &&
-            (rt->dst.dev->features & NETIF_F_UFO) &&
+            (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len &&
             (sk->sk_type == SOCK_DGRAM) && !udp_get_no_check6_tx(sk)) {
                 err = ip6_ufo_append_data(sk, queue, getfrag, from, length,
                                           hh_len, fragheaderlen, exthdrlen,
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 87784560dc46..d76674efe523 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1034,6 +1034,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
         int mtu;
         unsigned int psh_hlen = sizeof(struct ipv6hdr) + t->encap_hlen;
         unsigned int max_headroom = psh_hlen;
+        bool use_cache = false;
         u8 hop_limit;
         int err = -1;
 
@@ -1066,7 +1067,15 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
 
                 memcpy(&fl6->daddr, addr6, sizeof(fl6->daddr));
                 neigh_release(neigh);
-        } else if (!fl6->flowi6_mark)
+        } else if (!(t->parms.flags &
+                     (IP6_TNL_F_USE_ORIG_TCLASS | IP6_TNL_F_USE_ORIG_FWMARK))) {
+                /* enable the cache only only if the routing decision does
+                 * not depend on the current inner header value
+                 */
+                use_cache = true;
+        }
+
+        if (use_cache)
                 dst = dst_cache_get(&t->dst_cache);
 
         if (!ip6_tnl_xmit_ctl(t, &fl6->saddr, &fl6->daddr))
@@ -1150,7 +1159,7 @@ route_lookup:
                 if (t->encap.type != TUNNEL_ENCAP_NONE)
                         goto tx_err_dst_release;
         } else {
-                if (!fl6->flowi6_mark && ndst)
+                if (use_cache && ndst)
                         dst_cache_set_ip6(&t->dst_cache, ndst, &fl6->saddr);
         }
         skb_dst_set(skb, dst);
@@ -1172,7 +1181,6 @@ route_lookup:
         if (err)
                 return err;
 
-        skb->protocol = htons(ETH_P_IPV6);
         skb_push(skb, sizeof(struct ipv6hdr));
         skb_reset_network_header(skb);
         ipv6h = ipv6_hdr(skb);
diff --git a/net/ipv6/ip6_udp_tunnel.c b/net/ipv6/ip6_udp_tunnel.c
index a7520528ecd2..b283f293ee4a 100644
--- a/net/ipv6/ip6_udp_tunnel.c
+++ b/net/ipv6/ip6_udp_tunnel.c
@@ -88,9 +88,6 @@ int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,
 
         uh->len = htons(skb->len);
 
-        memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
-        IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED
-                            | IPSKB_REROUTED);
         skb_dst_set(skb, dst);
 
         udp6_set_csum(nocheck, skb, saddr, daddr, skb->len);
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 8a02ca8a11af..c299c1e2bbf0 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -1138,6 +1138,33 @@ static struct xfrm6_protocol vti_ipcomp6_protocol __read_mostly = {
         .priority       =       100,
 };
 
+static bool is_vti6_tunnel(const struct net_device *dev)
+{
+        return dev->netdev_ops == &vti6_netdev_ops;
+}
+
+static int vti6_device_event(struct notifier_block *unused,
+                             unsigned long event, void *ptr)
+{
+        struct net_device *dev = netdev_notifier_info_to_dev(ptr);
+        struct ip6_tnl *t = netdev_priv(dev);
+
+        if (!is_vti6_tunnel(dev))
+                return NOTIFY_DONE;
+
+        switch (event) {
+        case NETDEV_DOWN:
+                if (!net_eq(t->net, dev_net(dev)))
+                        xfrm_garbage_collect(t->net);
+                break;
+        }
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block vti6_notifier_block __read_mostly = {
+        .notifier_call = vti6_device_event,
+};
+
 /**
  * vti6_tunnel_init - register protocol and reserve needed resources
  *
@@ -1148,6 +1175,8 @@ static int __init vti6_tunnel_init(void)
         const char *msg;
         int err;
 
+        register_netdevice_notifier(&vti6_notifier_block);
+
         msg = "tunnel device";
         err = register_pernet_device(&vti6_net_ops);
         if (err < 0)
@@ -1180,6 +1209,7 @@ xfrm_proto_ah_failed:
 xfrm_proto_esp_failed:
         unregister_pernet_device(&vti6_net_ops);
 pernet_dev_failed:
+        unregister_netdevice_notifier(&vti6_notifier_block);
         pr_err("vti6 init: failed to register %s\n", msg);
         return err;
 }
@@ -1194,6 +1224,7 @@ static void __exit vti6_tunnel_cleanup(void)
         xfrm6_protocol_deregister(&vti_ah6_protocol, IPPROTO_AH);
         xfrm6_protocol_deregister(&vti_esp6_protocol, IPPROTO_ESP);
         unregister_pernet_device(&vti6_net_ops);
+        unregister_netdevice_notifier(&vti6_notifier_block);
 }
 
 module_init(vti6_tunnel_init);
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index e4347aeb2e65..9948b5ce52da 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -576,11 +576,11 @@ int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user)
         /* Jumbo payload inhibits frag. header */
         if (ipv6_hdr(skb)->payload_len == 0) {
                 pr_debug("payload len = 0\n");
-                return -EINVAL;
+                return 0;
         }
 
         if (find_prev_fhdr(skb, &prevhdr, &nhoff, &fhoff) < 0)
-                return -EINVAL;
+                return 0;
 
         if (!pskb_may_pull(skb, fhoff + sizeof(*fhdr)))
                 return -ENOMEM;
diff --git a/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c b/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
index f7aab5ab93a5..f06b0471f39f 100644
--- a/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
+++ b/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
@@ -69,7 +69,7 @@ static unsigned int ipv6_defrag(void *priv,
         if (err == -EINPROGRESS)
                 return NF_STOLEN;
 
-        return NF_ACCEPT;
+        return err == 0 ? NF_ACCEPT : NF_DROP;
 }
 
 static struct nf_hook_ops ipv6_defrag_ops[] = {
diff --git a/net/ipv6/netfilter/nf_reject_ipv6.c b/net/ipv6/netfilter/nf_reject_ipv6.c
index a5400223fd74..10090400c72f 100644
--- a/net/ipv6/netfilter/nf_reject_ipv6.c
+++ b/net/ipv6/netfilter/nf_reject_ipv6.c
@@ -156,6 +156,7 @@ void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook)
         fl6.daddr = oip6h->saddr;
         fl6.fl6_sport = otcph->dest;
         fl6.fl6_dport = otcph->source;
+        fl6.flowi6_oif = l3mdev_master_ifindex(skb_dst(oldskb)->dev);
         security_skb_classify_flow(oldskb, flowi6_to_flowi(&fl6));
         dst = ip6_route_output(net, NULL, &fl6);
         if (dst->error) {
diff --git a/net/ipv6/netfilter/nft_dup_ipv6.c b/net/ipv6/netfilter/nft_dup_ipv6.c
index 8bfd470cbe72..831f86e1ec08 100644
--- a/net/ipv6/netfilter/nft_dup_ipv6.c
+++ b/net/ipv6/netfilter/nft_dup_ipv6.c
@@ -26,7 +26,7 @@ static void nft_dup_ipv6_eval(const struct nft_expr *expr,
 {
         struct nft_dup_ipv6 *priv = nft_expr_priv(expr);
         struct in6_addr *gw = (struct in6_addr *)&regs->data[priv->sreg_addr];
-        int oif = regs->data[priv->sreg_dev];
+        int oif = priv->sreg_dev ? regs->data[priv->sreg_dev] : -1;
 
         nf_dup_ipv6(pkt->net, pkt->skb, pkt->hook, gw, oif);
 }
@@ -57,7 +57,9 @@ static int nft_dup_ipv6_dump(struct sk_buff *skb, const struct nft_expr *expr)
 {
         struct nft_dup_ipv6 *priv = nft_expr_priv(expr);
 
-        if (nft_dump_register(skb, NFTA_DUP_SREG_ADDR, priv->sreg_addr) ||
+        if (nft_dump_register(skb, NFTA_DUP_SREG_ADDR, priv->sreg_addr))
+                goto nla_put_failure;
+        if (priv->sreg_dev &&
             nft_dump_register(skb, NFTA_DUP_SREG_DEV, priv->sreg_dev))
                 goto nla_put_failure;
 
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
index 7cca8ac66fe9..cd4252346a32 100644
--- a/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@ -155,6 +155,8 @@ int __ip6_local_out(struct net *net, struct sock *sk, struct sk_buff *skb)
         if (unlikely(!skb))
                 return 0;
 
+        skb->protocol = htons(ETH_P_IPV6);
+
         return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT,
                        net, sk, skb, NULL, skb_dst(skb)->dev,
                        dst_output);
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 947ed1ded026..1b57e11e6e0d 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1364,6 +1364,9 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,
         if (rt6->rt6i_flags & RTF_LOCAL)
                 return;
 
+        if (dst_metric_locked(dst, RTAX_MTU))
+                return;
+
         dst_confirm(dst);
         mtu = max_t(u32, mtu, IPV6_MIN_MTU);
         if (mtu >= dst_mtu(dst))
@@ -2758,6 +2761,7 @@ static int rt6_mtu_change_route(struct rt6_info *rt, void *p_arg)
            PMTU discouvery.
          */
         if (rt->dst.dev == arg->dev &&
+            dst_metric_raw(&rt->dst, RTAX_MTU) &&
             !dst_metric_locked(&rt->dst, RTAX_MTU)) {
                 if (rt->rt6i_flags & RTF_CACHE) {
                         /* For RTF_CACHE with rt6i_pmtu == 0
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 5a27ab4eab39..b9f1fee9a886 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -818,8 +818,12 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32
         fl6.flowi6_proto = IPPROTO_TCP;
         if (rt6_need_strict(&fl6.daddr) && !oif)
                 fl6.flowi6_oif = tcp_v6_iif(skb);
-        else
-                fl6.flowi6_oif = oif ? : skb->skb_iif;
+        else {
+                if (!oif && netif_index_is_l3_master(net, skb->skb_iif))
+                        oif = skb->skb_iif;
+
+                fl6.flowi6_oif = oif;
+        }
 
         fl6.flowi6_mark = IP6_REPLY_MARK(net, skb->mark);
         fl6.fl6_dport = t1->dest;
@@ -1225,7 +1229,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
         if (skb->protocol == htons(ETH_P_IP))
                 return tcp_v4_do_rcv(sk, skb);
 
-        if (sk_filter(sk, skb))
+        if (tcp_filter(sk, skb))
                 goto discard;
 
         /*
@@ -1453,8 +1457,10 @@ process:
         if (tcp_v6_inbound_md5_hash(sk, skb))
                 goto discard_and_relse;
 
-        if (sk_filter(sk, skb))
+        if (tcp_filter(sk, skb))
                 goto discard_and_relse;
+        th = (const struct tcphdr *)skb->data;
+        hdr = ipv6_hdr(skb);
 
         skb->dev = NULL;
 
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index b2ef061e6836..e4a8000d59ad 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -514,7 +514,7 @@ out:
         return;
 }
 
-static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
         int rc;
 
@@ -706,10 +706,10 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
 
         if (use_hash2) {
                 hash2_any = udp6_portaddr_hash(net, &in6addr_any, hnum) &
-                            udp_table.mask;
-                hash2 = udp6_portaddr_hash(net, daddr, hnum) & udp_table.mask;
+                            udptable->mask;
+                hash2 = udp6_portaddr_hash(net, daddr, hnum) & udptable->mask;
 start_lookup:
-                hslot = &udp_table.hash2[hash2];
+                hslot = &udptable->hash2[hash2];
                 offset = offsetof(typeof(*sk), __sk_common.skc_portaddr_node);
         }
 
diff --git a/net/ipv6/udp_impl.h b/net/ipv6/udp_impl.h
index f6eb1ab34f4b..e78bdc76dcc3 100644
--- a/net/ipv6/udp_impl.h
+++ b/net/ipv6/udp_impl.h
@@ -26,7 +26,7 @@ int compat_udpv6_getsockopt(struct sock *sk, int level, int optname,
 int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len);
 int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
                   int flags, int *addr_len);
-int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
+int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
 void udpv6_destroy_sock(struct sock *sk);
 
 #ifdef CONFIG_PROC_FS
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index 47d0d2b87106..2f5101a12283 100644
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -45,7 +45,7 @@ struct proto udplitev6_prot = {
         .getsockopt        = udpv6_getsockopt,
         .sendmsg           = udpv6_sendmsg,
         .recvmsg           = udpv6_recvmsg,
-        .backlog_rcv       = udpv6_queue_rcv_skb,
+        .backlog_rcv       = __udpv6_queue_rcv_skb,
         .hash              = udp_lib_hash,
         .unhash            = udp_lib_unhash,
         .get_port          = udp_v6_get_port,
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index fce25afb652a..8938b6ba57a0 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -61,7 +61,8 @@ static struct sock *__l2tp_ip_bind_lookup(struct net *net, __be32 laddr, int dif
                 if ((l2tp->conn_id == tunnel_id) &&
                     net_eq(sock_net(sk), net) &&
                     !(inet->inet_rcv_saddr && inet->inet_rcv_saddr != laddr) &&
-                    !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
+                    (!sk->sk_bound_dev_if || !dif ||
+                     sk->sk_bound_dev_if == dif))
                         goto found;
         }
 
@@ -182,15 +183,17 @@ pass_up:
                 struct iphdr *iph = (struct iphdr *) skb_network_header(skb);
 
                 read_lock_bh(&l2tp_ip_lock);
-                sk = __l2tp_ip_bind_lookup(net, iph->daddr, 0, tunnel_id);
+                sk = __l2tp_ip_bind_lookup(net, iph->daddr, inet_iif(skb),
+                                           tunnel_id);
+                if (!sk) {
+                        read_unlock_bh(&l2tp_ip_lock);
+                        goto discard;
+                }
+
+                sock_hold(sk);
                 read_unlock_bh(&l2tp_ip_lock);
         }
 
-        if (sk == NULL)
-                goto discard;
-
-        sock_hold(sk);
-
         if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
                 goto discard_put;
 
@@ -251,22 +254,17 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
         int ret;
         int chk_addr_ret;
 
-        if (!sock_flag(sk, SOCK_ZAPPED))
-                return -EINVAL;
         if (addr_len < sizeof(struct sockaddr_l2tpip))
                 return -EINVAL;
         if (addr->l2tp_family != AF_INET)
                 return -EINVAL;
 
-        ret = -EADDRINUSE;
-        read_lock_bh(&l2tp_ip_lock);
-        if (__l2tp_ip_bind_lookup(net, addr->l2tp_addr.s_addr,
-                                  sk->sk_bound_dev_if, addr->l2tp_conn_id))
-                goto out_in_use;
+        lock_sock(sk);
 
-        read_unlock_bh(&l2tp_ip_lock);
+        ret = -EINVAL;
+        if (!sock_flag(sk, SOCK_ZAPPED))
+                goto out;
 
-        lock_sock(sk);
         if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_l2tpip))
                 goto out;
 
@@ -280,14 +278,22 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
                 inet->inet_rcv_saddr = inet->inet_saddr = addr->l2tp_addr.s_addr;
         if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
                 inet->inet_saddr = 0;  /* Use device */
-        sk_dst_reset(sk);
 
+        write_lock_bh(&l2tp_ip_lock);
+        if (__l2tp_ip_bind_lookup(net, addr->l2tp_addr.s_addr,
+                                  sk->sk_bound_dev_if, addr->l2tp_conn_id)) {
+                write_unlock_bh(&l2tp_ip_lock);
+                ret = -EADDRINUSE;
+                goto out;
+        }
+
+        sk_dst_reset(sk);
         l2tp_ip_sk(sk)->conn_id = addr->l2tp_conn_id;
 
-        write_lock_bh(&l2tp_ip_lock);
         sk_add_bind_node(sk, &l2tp_ip_bind_table);
         sk_del_node_init(sk);
         write_unlock_bh(&l2tp_ip_lock);
+
         ret = 0;
         sock_reset_flag(sk, SOCK_ZAPPED);
 
@@ -295,11 +301,6 @@ out:
         release_sock(sk);
 
         return ret;
-
-out_in_use:
-        read_unlock_bh(&l2tp_ip_lock);
-
-        return ret;
 }
 
 static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
@@ -307,21 +308,24 @@ static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len
         struct sockaddr_l2tpip *lsa = (struct sockaddr_l2tpip *) uaddr;
         int rc;
 
-        if (sock_flag(sk, SOCK_ZAPPED)) /* Must bind first - autobinding does not work */
-                return -EINVAL;
-
         if (addr_len < sizeof(*lsa))
                 return -EINVAL;
 
         if (ipv4_is_multicast(lsa->l2tp_addr.s_addr))
                 return -EINVAL;
 
-        rc = ip4_datagram_connect(sk, uaddr, addr_len);
-        if (rc < 0)
-                return rc;
-
         lock_sock(sk);
 
+        /* Must bind first - autobinding does not work */
+        if (sock_flag(sk, SOCK_ZAPPED)) {
+                rc = -EINVAL;
+                goto out_sk;
+        }
+
+        rc = __ip4_datagram_connect(sk, uaddr, addr_len);
+        if (rc < 0)
+                goto out_sk;
+
         l2tp_ip_sk(sk)->peer_conn_id = lsa->l2tp_conn_id;
 
         write_lock_bh(&l2tp_ip_lock);
@@ -329,7 +333,9 @@ static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len
         sk_add_bind_node(sk, &l2tp_ip_bind_table);
         write_unlock_bh(&l2tp_ip_lock);
 
+out_sk:
         release_sock(sk);
+
         return rc;
 }
 
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index ad3468c32b53..aa821cb639e5 100644
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -72,8 +72,9 @@ static struct sock *__l2tp_ip6_bind_lookup(struct net *net,
 
                 if ((l2tp->conn_id == tunnel_id) &&
                     net_eq(sock_net(sk), net) &&
-                    !(addr && ipv6_addr_equal(addr, laddr)) &&
-                    !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
+                    (!addr || ipv6_addr_equal(addr, laddr)) &&
+                    (!sk->sk_bound_dev_if || !dif ||
+                     sk->sk_bound_dev_if == dif))
                         goto found;
         }
 
@@ -196,16 +197,17 @@ pass_up:
                 struct ipv6hdr *iph = ipv6_hdr(skb);
 
                 read_lock_bh(&l2tp_ip6_lock);
-                sk = __l2tp_ip6_bind_lookup(net, &iph->daddr,
-                                            0, tunnel_id);
+                sk = __l2tp_ip6_bind_lookup(net, &iph->daddr, inet6_iif(skb),
+                                            tunnel_id);
+                if (!sk) {
+                        read_unlock_bh(&l2tp_ip6_lock);
+                        goto discard;
+                }
+
+                sock_hold(sk);
                 read_unlock_bh(&l2tp_ip6_lock);
         }
 
-        if (sk == NULL)
-                goto discard;
-
-        sock_hold(sk);
-
         if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
                 goto discard_put;
 
@@ -266,11 +268,10 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
         struct sockaddr_l2tpip6 *addr = (struct sockaddr_l2tpip6 *) uaddr;
         struct net *net = sock_net(sk);
         __be32 v4addr = 0;
+        int bound_dev_if;
         int addr_type;
         int err;
 
-        if (!sock_flag(sk, SOCK_ZAPPED))
-                return -EINVAL;
         if (addr->l2tp_family != AF_INET6)
                 return -EINVAL;
         if (addr_len < sizeof(*addr))
@@ -286,41 +287,34 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
         if (addr_type & IPV6_ADDR_MULTICAST)
                 return -EADDRNOTAVAIL;
 
-        err = -EADDRINUSE;
-        read_lock_bh(&l2tp_ip6_lock);
-        if (__l2tp_ip6_bind_lookup(net, &addr->l2tp_addr,
-                                   sk->sk_bound_dev_if, addr->l2tp_conn_id))
-                goto out_in_use;
-        read_unlock_bh(&l2tp_ip6_lock);
-
         lock_sock(sk);
 
         err = -EINVAL;
+        if (!sock_flag(sk, SOCK_ZAPPED))
+                goto out_unlock;
+
         if (sk->sk_state != TCP_CLOSE)
                 goto out_unlock;
 
+        bound_dev_if = sk->sk_bound_dev_if;
+
         /* Check if the address belongs to the host. */
         rcu_read_lock();
         if (addr_type != IPV6_ADDR_ANY) {
                 struct net_device *dev = NULL;
 
                 if (addr_type & IPV6_ADDR_LINKLOCAL) {
-                        if (addr_len >= sizeof(struct sockaddr_in6) &&
-                            addr->l2tp_scope_id) {
-                                /* Override any existing binding, if another
-                                 * one is supplied by user.
-                                 */
-                                sk->sk_bound_dev_if = addr->l2tp_scope_id;
-                        }
+                        if (addr->l2tp_scope_id)
+                                bound_dev_if = addr->l2tp_scope_id;
 
                         /* Binding to link-local address requires an
-                           interface */
-                        if (!sk->sk_bound_dev_if)
+                         * interface.
+                         */
+                        if (!bound_dev_if)
                                 goto out_unlock_rcu;
 
                         err = -ENODEV;
-                        dev = dev_get_by_index_rcu(sock_net(sk),
-                                                   sk->sk_bound_dev_if);
+                        dev = dev_get_by_index_rcu(sock_net(sk), bound_dev_if);
                         if (!dev)
                                 goto out_unlock_rcu;
                 }
@@ -335,13 +329,22 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
         }
         rcu_read_unlock();
 
-        inet->inet_rcv_saddr = inet->inet_saddr = v4addr;
+        write_lock_bh(&l2tp_ip6_lock);
+        if (__l2tp_ip6_bind_lookup(net, &addr->l2tp_addr, bound_dev_if,
+                                   addr->l2tp_conn_id)) {
+                write_unlock_bh(&l2tp_ip6_lock);
+                err = -EADDRINUSE;
+                goto out_unlock;
+        }
+
+        inet->inet_saddr = v4addr;
+        inet->inet_rcv_saddr = v4addr;
+        sk->sk_bound_dev_if = bound_dev_if;
         sk->sk_v6_rcv_saddr = addr->l2tp_addr;
         np->saddr = addr->l2tp_addr;
 
         l2tp_ip6_sk(sk)->conn_id = addr->l2tp_conn_id;
 
-        write_lock_bh(&l2tp_ip6_lock);
         sk_add_bind_node(sk, &l2tp_ip6_bind_table);
         sk_del_node_init(sk);
         write_unlock_bh(&l2tp_ip6_lock);
@@ -354,10 +357,7 @@ out_unlock_rcu:
         rcu_read_unlock();
 out_unlock:
         release_sock(sk);
-        return err;
 
-out_in_use:
-        read_unlock_bh(&l2tp_ip6_lock);
         return err;
 }
 
@@ -370,9 +370,6 @@ static int l2tp_ip6_connect(struct sock *sk, struct sockaddr *uaddr,
         int     addr_type;
         int rc;
 
-        if (sock_flag(sk, SOCK_ZAPPED)) /* Must bind first - autobinding does not work */
-                return -EINVAL;
-
         if (addr_len < sizeof(*lsa))
                 return -EINVAL;
 
@@ -389,10 +386,18 @@ static int l2tp_ip6_connect(struct sock *sk, struct sockaddr *uaddr,
                         return -EINVAL;
         }
 
-        rc = ip6_datagram_connect(sk, uaddr, addr_len);
-
         lock_sock(sk);
 
+         /* Must bind first - autobinding does not work */
+        if (sock_flag(sk, SOCK_ZAPPED)) {
+                rc = -EINVAL;
+                goto out_sk;
+        }
+
+        rc = __ip6_datagram_connect(sk, uaddr, addr_len);
+        if (rc < 0)
+                goto out_sk;
+
         l2tp_ip6_sk(sk)->peer_conn_id = lsa->l2tp_conn_id;
 
         write_lock_bh(&l2tp_ip6_lock);
@@ -400,6 +405,7 @@ static int l2tp_ip6_connect(struct sock *sk, struct sockaddr *uaddr,
         sk_add_bind_node(sk, &l2tp_ip6_bind_table);
         write_unlock_bh(&l2tp_ip6_lock);
 
+out_sk:
         release_sock(sk);
 
         return rc;
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 78e9ecbc96e6..8e05032689f0 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -688,7 +688,7 @@ static void __sta_info_recalc_tim(struct sta_info *sta, bool ignore_pending)
         }
 
         /* No need to do anything if the driver does all */
-        if (!local->ops->set_tim)
+        if (ieee80211_hw_check(&local->hw, AP_LINK_PS))
                 return;
 
         if (sta->dead)
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 1c56abc49627..bd5f4be89435 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1501,7 +1501,6 @@ static bool ieee80211_queue_skb(struct ieee80211_local *local,
                                 struct sta_info *sta,
                                 struct sk_buff *skb)
 {
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         struct fq *fq = &local->fq;
         struct ieee80211_vif *vif;
         struct txq_info *txqi;
@@ -1526,8 +1525,6 @@ static bool ieee80211_queue_skb(struct ieee80211_local *local,
         if (!txqi)
                 return false;
 
-        info->control.vif = vif;
-
         spin_lock_bh(&fq->lock);
         ieee80211_txq_enqueue(local, txqi, skb);
         spin_unlock_bh(&fq->lock);
@@ -3213,7 +3210,6 @@ static void ieee80211_xmit_fast_finish(struct ieee80211_sub_if_data *sdata,
 
         if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) {
                 tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
-                *ieee80211_get_qos_ctl(hdr) = tid;
                 hdr->seq_ctrl = ieee80211_tx_next_seq(sta, tid);
         } else {
                 info->flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;
@@ -3338,6 +3334,11 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,
                       (tid_tx ? IEEE80211_TX_CTL_AMPDU : 0);
         info->control.flags = IEEE80211_TX_CTRL_FAST_XMIT;
 
+        if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) {
+                tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
+                *ieee80211_get_qos_ctl(hdr) = tid;
+        }
+
         __skb_queue_head_init(&tx.skbs);
 
         tx.flags = IEEE80211_TX_UNICAST;
@@ -3426,6 +3427,11 @@ begin:
                 goto begin;
         }
 
+        if (test_bit(IEEE80211_TXQ_AMPDU, &txqi->flags))
+                info->flags |= IEEE80211_TX_CTL_AMPDU;
+        else
+                info->flags &= ~IEEE80211_TX_CTL_AMPDU;
+
         if (info->control.flags & IEEE80211_TX_CTRL_FAST_XMIT) {
                 struct sta_info *sta = container_of(txq->sta, struct sta_info,
                                                     sta);
diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c
index ee715764a828..6832bf6ab69f 100644
--- a/net/mac80211/vht.c
+++ b/net/mac80211/vht.c
@@ -270,6 +270,22 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata,
                 vht_cap->vht_mcs.tx_mcs_map |= cpu_to_le16(peer_tx << i * 2);
         }
 
+        /*
+         * This is a workaround for VHT-enabled STAs which break the spec
+         * and have the VHT-MCS Rx map filled in with value 3 for all eight
+         * spacial streams, an example is AR9462.
+         *
+         * As per spec, in section 22.1.1 Introduction to the VHT PHY
+         * A VHT STA shall support at least single spactial stream VHT-MCSs
+         * 0 to 7 (transmit and receive) in all supported channel widths.
+         */
+        if (vht_cap->vht_mcs.rx_mcs_map == cpu_to_le16(0xFFFF)) {
+                vht_cap->vht_supported = false;
+                sdata_info(sdata, "Ignoring VHT IE from %pM due to invalid rx_mcs_map\n",
+                           sta->addr);
+                return;
+        }
+
         /* finally set up the bandwidth */
         switch (vht_cap->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) {
         case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ:
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index 0e4334cbde17..15fe97644ffe 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -1252,7 +1252,7 @@ static int rtm_to_route_config(struct sk_buff *skb,  struct nlmsghdr *nlh,
                 if (!nla)
                         continue;
 
-                switch(index) {
+                switch (index) {
                 case RTA_OIF:
                         cfg->rc_ifindex = nla_get_u32(nla);
                         break;
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index c3c809b2e712..a6e44ef2ec9a 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -2845,7 +2845,7 @@ static struct genl_family ip_vs_genl_family = {
         .hdrsize        = 0,
         .name           = IPVS_GENL_NAME,
         .version        = IPVS_GENL_VERSION,
-        .maxattr        = IPVS_CMD_MAX,
+        .maxattr        = IPVS_CMD_ATTR_MAX,
         .netnsok        = true,         /* Make ipvsadm to work on netns */
 };
 
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 1b07578bedf3..9350530c16c1 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -283,6 +283,7 @@ struct ip_vs_sync_buff {
  */
 static void ntoh_seq(struct ip_vs_seq *no, struct ip_vs_seq *ho)
 {
+        memset(ho, 0, sizeof(*ho));
         ho->init_seq       = get_unaligned_be32(&no->init_seq);
         ho->delta          = get_unaligned_be32(&no->delta);
         ho->previous_delta = get_unaligned_be32(&no->previous_delta);
@@ -917,8 +918,10 @@ static void ip_vs_proc_conn(struct netns_ipvs *ipvs, struct ip_vs_conn_param *pa
                         kfree(param->pe_data);
         }
 
-        if (opt)
-                memcpy(&cp->in_seq, opt, sizeof(*opt));
+        if (opt) {
+                cp->in_seq = opt->in_seq;
+                cp->out_seq = opt->out_seq;
+        }
         atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
         cp->state = state;
         cp->old_state = cp->state;
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index df2f5a3901df..0f87e5d21be7 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -76,6 +76,7 @@ struct conntrack_gc_work {
         struct delayed_work     dwork;
         u32                     last_bucket;
         bool                    exiting;
+        long                    next_gc_run;
 };
 
 static __read_mostly struct kmem_cache *nf_conntrack_cachep;
@@ -83,9 +84,11 @@ static __read_mostly spinlock_t nf_conntrack_locks_all_lock;
 static __read_mostly DEFINE_SPINLOCK(nf_conntrack_locks_all_lock);
 static __read_mostly bool nf_conntrack_locks_all;
 
+/* every gc cycle scans at most 1/GC_MAX_BUCKETS_DIV part of table */
 #define GC_MAX_BUCKETS_DIV      64u
-#define GC_MAX_BUCKETS          8192u
-#define GC_INTERVAL             (5 * HZ)
+/* upper bound of scan intervals */
+#define GC_INTERVAL_MAX         (2 * HZ)
+/* maximum conntracks to evict per gc run */
 #define GC_MAX_EVICTS           256u
 
 static struct conntrack_gc_work conntrack_gc_work;
@@ -936,13 +939,13 @@ static noinline int early_drop(struct net *net, unsigned int _hash)
 static void gc_worker(struct work_struct *work)
 {
         unsigned int i, goal, buckets = 0, expired_count = 0;
-        unsigned long next_run = GC_INTERVAL;
-        unsigned int ratio, scanned = 0;
         struct conntrack_gc_work *gc_work;
+        unsigned int ratio, scanned = 0;
+        unsigned long next_run;
 
         gc_work = container_of(work, struct conntrack_gc_work, dwork.work);
 
-        goal = min(nf_conntrack_htable_size / GC_MAX_BUCKETS_DIV, GC_MAX_BUCKETS);
+        goal = nf_conntrack_htable_size / GC_MAX_BUCKETS_DIV;
         i = gc_work->last_bucket;
 
         do {
@@ -982,17 +985,47 @@ static void gc_worker(struct work_struct *work)
         if (gc_work->exiting)
                 return;
 
+        /*
+         * Eviction will normally happen from the packet path, and not
+         * from this gc worker.
+         *
+         * This worker is only here to reap expired entries when system went
+         * idle after a busy period.
+         *
+         * The heuristics below are supposed to balance conflicting goals:
+         *
+         * 1. Minimize time until we notice a stale entry
+         * 2. Maximize scan intervals to not waste cycles
+         *
+         * Normally, expired_count will be 0, this increases the next_run time
+         * to priorize 2) above.
+         *
+         * As soon as a timed-out entry is found, move towards 1) and increase
+         * the scan frequency.
+         * In case we have lots of evictions next scan is done immediately.
+         */
         ratio = scanned ? expired_count * 100 / scanned : 0;
-        if (ratio >= 90 || expired_count == GC_MAX_EVICTS)
+        if (ratio >= 90 || expired_count == GC_MAX_EVICTS) {
+                gc_work->next_gc_run = 0;
                 next_run = 0;
+        } else if (expired_count) {
+                gc_work->next_gc_run /= 2U;
+                next_run = msecs_to_jiffies(1);
+        } else {
+                if (gc_work->next_gc_run < GC_INTERVAL_MAX)
+                        gc_work->next_gc_run += msecs_to_jiffies(1);
+
+                next_run = gc_work->next_gc_run;
+        }
 
         gc_work->last_bucket = i;
-        schedule_delayed_work(&gc_work->dwork, next_run);
+        queue_delayed_work(system_long_wq, &gc_work->dwork, next_run);
 }
 
 static void conntrack_gc_work_init(struct conntrack_gc_work *gc_work)
 {
         INIT_DELAYED_WORK(&gc_work->dwork, gc_worker);
+        gc_work->next_gc_run = GC_INTERVAL_MAX;
         gc_work->exiting = false;
 }
 
@@ -1885,7 +1918,7 @@ int nf_conntrack_init_start(void)
         nf_ct_untracked_status_or(IPS_CONFIRMED | IPS_UNTRACKED);
 
         conntrack_gc_work_init(&conntrack_gc_work);
-        schedule_delayed_work(&conntrack_gc_work.dwork, GC_INTERVAL);
+        queue_delayed_work(system_long_wq, &conntrack_gc_work.dwork, GC_INTERVAL_MAX);
 
         return 0;
 
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
index 336e21559e01..7341adf7059d 100644
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -138,9 +138,14 @@ __nf_conntrack_helper_find(const char *name, u16 l3num, u8 protonum)
 
         for (i = 0; i < nf_ct_helper_hsize; i++) {
                 hlist_for_each_entry_rcu(h, &nf_ct_helper_hash[i], hnode) {
-                        if (!strcmp(h->name, name) &&
-                            h->tuple.src.l3num == l3num &&
-                            h->tuple.dst.protonum == protonum)
+                        if (strcmp(h->name, name))
+                                continue;
+
+                        if (h->tuple.src.l3num != NFPROTO_UNSPEC &&
+                            h->tuple.src.l3num != l3num)
+                                continue;
+
+                        if (h->tuple.dst.protonum == protonum)
                                 return h;
                 }
         }
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 621b81c7bddc..c3fc14e021ec 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -1436,9 +1436,12 @@ static int process_sip_request(struct sk_buff *skb, unsigned int protoff,
                 handler = &sip_handlers[i];
                 if (handler->request == NULL)
                         continue;
-                if (*datalen < handler->len ||
+                if (*datalen < handler->len + 2 ||
                     strncasecmp(*dptr, handler->method, handler->len))
                         continue;
+                if ((*dptr)[handler->len] != ' ' ||
+                    !isalpha((*dptr)[handler->len+1]))
+                        continue;
 
                 if (ct_sip_get_header(ct, *dptr, 0, *datalen, SIP_HDR_CSEQ,
                                       &matchoff, &matchlen) <= 0) {
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index bbb8f3df79f7..5b9c884a452e 100644
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -42,7 +42,7 @@ struct nf_nat_conn_key {
         const struct nf_conntrack_zone *zone;
 };
 
-static struct rhashtable nf_nat_bysource_table;
+static struct rhltable nf_nat_bysource_table;
 
 inline const struct nf_nat_l3proto *
 __nf_nat_l3proto_find(u8 family)
@@ -193,9 +193,12 @@ static int nf_nat_bysource_cmp(struct rhashtable_compare_arg *arg,
         const struct nf_nat_conn_key *key = arg->key;
         const struct nf_conn *ct = obj;
 
-        return same_src(ct, key->tuple) &&
-               net_eq(nf_ct_net(ct), key->net) &&
-               nf_ct_zone_equal(ct, key->zone, IP_CT_DIR_ORIGINAL);
+        if (!same_src(ct, key->tuple) ||
+            !net_eq(nf_ct_net(ct), key->net) ||
+            !nf_ct_zone_equal(ct, key->zone, IP_CT_DIR_ORIGINAL))
+                return 1;
+
+        return 0;
 }
 
 static struct rhashtable_params nf_nat_bysource_params = {
@@ -204,7 +207,6 @@ static struct rhashtable_params nf_nat_bysource_params = {
         .obj_cmpfn = nf_nat_bysource_cmp,
         .nelem_hint = 256,
         .min_size = 1024,
-        .nulls_base = (1U << RHT_BASE_SHIFT),
 };
 
 /* Only called for SRC manip */
@@ -223,12 +225,15 @@ find_appropriate_src(struct net *net,
                 .tuple = tuple,
                 .zone = zone
         };
+        struct rhlist_head *hl;
 
-        ct = rhashtable_lookup_fast(&nf_nat_bysource_table, &key,
-                                    nf_nat_bysource_params);
-        if (!ct)
+        hl = rhltable_lookup(&nf_nat_bysource_table, &key,
+                             nf_nat_bysource_params);
+        if (!hl)
                 return 0;
 
+        ct = container_of(hl, typeof(*ct), nat_bysource);
+
         nf_ct_invert_tuplepr(result,
                              &ct->tuplehash[IP_CT_DIR_REPLY].tuple);
         result->dst = tuple->dst;
@@ -446,11 +451,17 @@ nf_nat_setup_info(struct nf_conn *ct,
         }
 
         if (maniptype == NF_NAT_MANIP_SRC) {
+                struct nf_nat_conn_key key = {
+                        .net = nf_ct_net(ct),
+                        .tuple = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple,
+                        .zone = nf_ct_zone(ct),
+                };
                 int err;
 
-                err = rhashtable_insert_fast(&nf_nat_bysource_table,
-                                             &ct->nat_bysource,
-                                             nf_nat_bysource_params);
+                err = rhltable_insert_key(&nf_nat_bysource_table,
+                                          &key,
+                                          &ct->nat_bysource,
+                                          nf_nat_bysource_params);
                 if (err)
                         return NF_DROP;
         }
@@ -567,8 +578,8 @@ static int nf_nat_proto_clean(struct nf_conn *ct, void *data)
          * will delete entry from already-freed table.
          */
         ct->status &= ~IPS_NAT_DONE_MASK;
-        rhashtable_remove_fast(&nf_nat_bysource_table, &ct->nat_bysource,
-                               nf_nat_bysource_params);
+        rhltable_remove(&nf_nat_bysource_table, &ct->nat_bysource,
+                        nf_nat_bysource_params);
 
         /* don't delete conntrack.  Although that would make things a lot
          * simpler, we'd end up flushing all conntracks on nat rmmod.
@@ -698,8 +709,8 @@ static void nf_nat_cleanup_conntrack(struct nf_conn *ct)
         if (!nat)
                 return;
 
-        rhashtable_remove_fast(&nf_nat_bysource_table, &ct->nat_bysource,
-                               nf_nat_bysource_params);
+        rhltable_remove(&nf_nat_bysource_table, &ct->nat_bysource,
+                        nf_nat_bysource_params);
 }
 
 static struct nf_ct_ext_type nat_extend __read_mostly = {
@@ -834,13 +845,13 @@ static int __init nf_nat_init(void)
 {
         int ret;
 
-        ret = rhashtable_init(&nf_nat_bysource_table, &nf_nat_bysource_params);
+        ret = rhltable_init(&nf_nat_bysource_table, &nf_nat_bysource_params);
         if (ret)
                 return ret;
 
         ret = nf_ct_extend_register(&nat_extend);
         if (ret < 0) {
-                rhashtable_destroy(&nf_nat_bysource_table);
+                rhltable_destroy(&nf_nat_bysource_table);
                 printk(KERN_ERR "nf_nat_core: Unable to register extension\n");
                 return ret;
         }
@@ -864,7 +875,7 @@ static int __init nf_nat_init(void)
         return 0;
 
  cleanup_extend:
-        rhashtable_destroy(&nf_nat_bysource_table);
+        rhltable_destroy(&nf_nat_bysource_table);
         nf_ct_extend_unregister(&nat_extend);
         return ret;
 }
@@ -883,7 +894,7 @@ static void __exit nf_nat_cleanup(void)
         for (i = 0; i < NFPROTO_NUMPROTO; i++)
                 kfree(nf_nat_l4protos[i]);
 
-        rhashtable_destroy(&nf_nat_bysource_table);
+        rhltable_destroy(&nf_nat_bysource_table);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 24db22257586..e5194f6f906c 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2570,7 +2570,8 @@ static int nf_tables_fill_set(struct sk_buff *skb, const struct nft_ctx *ctx,
         }
 
         if (set->timeout &&
-            nla_put_be64(skb, NFTA_SET_TIMEOUT, cpu_to_be64(set->timeout),
+            nla_put_be64(skb, NFTA_SET_TIMEOUT,
+                         cpu_to_be64(jiffies_to_msecs(set->timeout)),
                          NFTA_SET_PAD))
                 goto nla_put_failure;
         if (set->gc_int &&
@@ -2859,7 +2860,8 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk,
         if (nla[NFTA_SET_TIMEOUT] != NULL) {
                 if (!(flags & NFT_SET_TIMEOUT))
                         return -EINVAL;
-                timeout = be64_to_cpu(nla_get_be64(nla[NFTA_SET_TIMEOUT]));
+                timeout = msecs_to_jiffies(be64_to_cpu(nla_get_be64(
+                                                nla[NFTA_SET_TIMEOUT])));
         }
         gc_int = 0;
         if (nla[NFTA_SET_GC_INTERVAL] != NULL) {
@@ -2956,12 +2958,14 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk,
 
         err = nft_trans_set_add(&ctx, NFT_MSG_NEWSET, set);
         if (err < 0)
-                goto err2;
+                goto err3;
 
         list_add_tail_rcu(&set->list, &table->sets);
         table->use++;
         return 0;
 
+err3:
+        ops->destroy(set);
 err2:
         kfree(set);
 err1:
@@ -3176,7 +3180,8 @@ static int nf_tables_fill_setelem(struct sk_buff *skb,
 
         if (nft_set_ext_exists(ext, NFT_SET_EXT_TIMEOUT) &&
             nla_put_be64(skb, NFTA_SET_ELEM_TIMEOUT,
-                         cpu_to_be64(*nft_set_ext_timeout(ext)),
+                         cpu_to_be64(jiffies_to_msecs(
+                                                *nft_set_ext_timeout(ext))),
                          NFTA_SET_ELEM_PAD))
                 goto nla_put_failure;
 
@@ -3445,21 +3450,22 @@ void *nft_set_elem_init(const struct nft_set *set,
                 memcpy(nft_set_ext_data(ext), data, set->dlen);
         if (nft_set_ext_exists(ext, NFT_SET_EXT_EXPIRATION))
                 *nft_set_ext_expiration(ext) =
-                        jiffies + msecs_to_jiffies(timeout);
+                        jiffies + timeout;
         if (nft_set_ext_exists(ext, NFT_SET_EXT_TIMEOUT))
                 *nft_set_ext_timeout(ext) = timeout;
 
         return elem;
 }
 
-void nft_set_elem_destroy(const struct nft_set *set, void *elem)
+void nft_set_elem_destroy(const struct nft_set *set, void *elem,
+                          bool destroy_expr)
 {
         struct nft_set_ext *ext = nft_set_elem_ext(set, elem);
 
         nft_data_uninit(nft_set_ext_key(ext), NFT_DATA_VALUE);
         if (nft_set_ext_exists(ext, NFT_SET_EXT_DATA))
                 nft_data_uninit(nft_set_ext_data(ext), set->dtype);
-        if (nft_set_ext_exists(ext, NFT_SET_EXT_EXPR))
+        if (destroy_expr && nft_set_ext_exists(ext, NFT_SET_EXT_EXPR))
                 nf_tables_expr_destroy(NULL, nft_set_ext_expr(ext));
 
         kfree(elem);
@@ -3532,7 +3538,8 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
         if (nla[NFTA_SET_ELEM_TIMEOUT] != NULL) {
                 if (!(set->flags & NFT_SET_TIMEOUT))
                         return -EINVAL;
-                timeout = be64_to_cpu(nla_get_be64(nla[NFTA_SET_ELEM_TIMEOUT]));
+                timeout = msecs_to_jiffies(be64_to_cpu(nla_get_be64(
+                                        nla[NFTA_SET_ELEM_TIMEOUT])));
         } else if (set->flags & NFT_SET_TIMEOUT) {
                 timeout = set->timeout;
         }
@@ -3565,6 +3572,7 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
                 dreg = nft_type_to_reg(set->dtype);
                 list_for_each_entry(binding, &set->bindings, list) {
                         struct nft_ctx bind_ctx = {
+                                .net    = ctx->net,
                                 .afi    = ctx->afi,
                                 .table  = ctx->table,
                                 .chain  = (struct nft_chain *)binding->chain,
@@ -3812,7 +3820,7 @@ void nft_set_gc_batch_release(struct rcu_head *rcu)
 
         gcb = container_of(rcu, struct nft_set_gc_batch, head.rcu);
         for (i = 0; i < gcb->head.cnt; i++)
-                nft_set_elem_destroy(gcb->head.set, gcb->elems[i]);
+                nft_set_elem_destroy(gcb->head.set, gcb->elems[i], true);
         kfree(gcb);
 }
 EXPORT_SYMBOL_GPL(nft_set_gc_batch_release);
@@ -4030,7 +4038,7 @@ static void nf_tables_commit_release(struct nft_trans *trans)
                 break;
         case NFT_MSG_DELSETELEM:
                 nft_set_elem_destroy(nft_trans_elem_set(trans),
-                                     nft_trans_elem(trans).priv);
+                                     nft_trans_elem(trans).priv, true);
                 break;
         }
         kfree(trans);
@@ -4171,7 +4179,7 @@ static void nf_tables_abort_release(struct nft_trans *trans)
                 break;
         case NFT_MSG_NEWSETELEM:
                 nft_set_elem_destroy(nft_trans_elem_set(trans),
-                                     nft_trans_elem(trans).priv);
+                                     nft_trans_elem(trans).priv, true);
                 break;
         }
         kfree(trans);
@@ -4421,7 +4429,7 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx,
  *      Otherwise a 0 is returned and the attribute value is stored in the
  *      destination variable.
  */
-unsigned int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest)
+int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest)
 {
         u32 val;
 
diff --git a/net/netfilter/nft_dynset.c b/net/netfilter/nft_dynset.c
index 517f08767a3c..31ca94793aa9 100644
--- a/net/netfilter/nft_dynset.c
+++ b/net/netfilter/nft_dynset.c
@@ -44,18 +44,22 @@ static void *nft_dynset_new(struct nft_set *set, const struct nft_expr *expr,
                                  &regs->data[priv->sreg_key],
                                  &regs->data[priv->sreg_data],
                                  timeout, GFP_ATOMIC);
-        if (elem == NULL) {
-                if (set->size)
-                        atomic_dec(&set->nelems);
-                return NULL;
-        }
+        if (elem == NULL)
+                goto err1;
 
         ext = nft_set_elem_ext(set, elem);
         if (priv->expr != NULL &&
             nft_expr_clone(nft_set_ext_expr(ext), priv->expr) < 0)
-                return NULL;
+                goto err2;
 
         return elem;
+
+err2:
+        nft_set_elem_destroy(set, elem, false);
+err1:
+        if (set->size)
+                atomic_dec(&set->nelems);
+        return NULL;
 }
 
 static void nft_dynset_eval(const struct nft_expr *expr,
@@ -139,6 +143,9 @@ static int nft_dynset_init(const struct nft_ctx *ctx,
                         return PTR_ERR(set);
         }
 
+        if (set->ops->update == NULL)
+                return -EOPNOTSUPP;
+
         if (set->flags & NFT_SET_CONSTANT)
                 return -EBUSY;
 
diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c
index baf694de3935..d5447a22275c 100644
--- a/net/netfilter/nft_hash.c
+++ b/net/netfilter/nft_hash.c
@@ -53,6 +53,7 @@ static int nft_hash_init(const struct nft_ctx *ctx,
 {
         struct nft_hash *priv = nft_expr_priv(expr);
         u32 len;
+        int err;
 
         if (!tb[NFTA_HASH_SREG] ||
             !tb[NFTA_HASH_DREG] ||
@@ -67,8 +68,10 @@ static int nft_hash_init(const struct nft_ctx *ctx,
         priv->sreg = nft_parse_register(tb[NFTA_HASH_SREG]);
         priv->dreg = nft_parse_register(tb[NFTA_HASH_DREG]);
 
-        len = ntohl(nla_get_be32(tb[NFTA_HASH_LEN]));
-        if (len == 0 || len > U8_MAX)
+        err = nft_parse_u32_check(tb[NFTA_HASH_LEN], U8_MAX, &len);
+        if (err < 0)
+                return err;
+        if (len == 0)
                 return -ERANGE;
 
         priv->len = len;
diff --git a/net/netfilter/nft_range.c b/net/netfilter/nft_range.c
index fbc88009ca2e..8f0aaaea1376 100644
--- a/net/netfilter/nft_range.c
+++ b/net/netfilter/nft_range.c
@@ -59,6 +59,12 @@ static int nft_range_init(const struct nft_ctx *ctx, const struct nft_expr *expr
         int err;
         u32 op;
 
+        if (!tb[NFTA_RANGE_SREG]      ||
+            !tb[NFTA_RANGE_OP]        ||
+            !tb[NFTA_RANGE_FROM_DATA] ||
+            !tb[NFTA_RANGE_TO_DATA])
+                return -EINVAL;
+
         err = nft_data_init(NULL, &priv->data_from, sizeof(priv->data_from),
                             &desc_from, tb[NFTA_RANGE_FROM_DATA]);
         if (err < 0)
diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c
index 3794cb2fc788..a3dface3e6e6 100644
--- a/net/netfilter/nft_set_hash.c
+++ b/net/netfilter/nft_set_hash.c
@@ -98,7 +98,7 @@ static bool nft_hash_update(struct nft_set *set, const u32 *key,
                             const struct nft_set_ext **ext)
 {
         struct nft_hash *priv = nft_set_priv(set);
-        struct nft_hash_elem *he;
+        struct nft_hash_elem *he, *prev;
         struct nft_hash_cmp_arg arg = {
                 .genmask = NFT_GENMASK_ANY,
                 .set     = set,
@@ -112,15 +112,24 @@ static bool nft_hash_update(struct nft_set *set, const u32 *key,
         he = new(set, expr, regs);
         if (he == NULL)
                 goto err1;
-        if (rhashtable_lookup_insert_key(&priv->ht, &arg, &he->node,
-                                         nft_hash_params))
+
+        prev = rhashtable_lookup_get_insert_key(&priv->ht, &arg, &he->node,
+                                                nft_hash_params);
+        if (IS_ERR(prev))
                 goto err2;
+
+        /* Another cpu may race to insert the element with the same key */
+        if (prev) {
+                nft_set_elem_destroy(set, he, true);
+                he = prev;
+        }
+
 out:
         *ext = &he->ext;
         return true;
 
 err2:
-        nft_set_elem_destroy(set, he);
+        nft_set_elem_destroy(set, he, true);
 err1:
         return false;
 }
@@ -332,7 +341,7 @@ static int nft_hash_init(const struct nft_set *set,
 
 static void nft_hash_elem_destroy(void *ptr, void *arg)
 {
-        nft_set_elem_destroy((const struct nft_set *)arg, ptr);
+        nft_set_elem_destroy((const struct nft_set *)arg, ptr, true);
 }
 
 static void nft_hash_destroy(const struct nft_set *set)
diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
index 38b5bda242f8..36493a7cae88 100644
--- a/net/netfilter/nft_set_rbtree.c
+++ b/net/netfilter/nft_set_rbtree.c
@@ -266,7 +266,7 @@ static void nft_rbtree_destroy(const struct nft_set *set)
         while ((node = priv->root.rb_node) != NULL) {
                 rb_erase(node, &priv->root);
                 rbe = rb_entry(node, struct nft_rbtree_elem, node);
-                nft_set_elem_destroy(set, rbe);
+                nft_set_elem_destroy(set, rbe, true);
         }
 }
 
diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
index 69f78e96fdb4..b83e158e116a 100644
--- a/net/netfilter/xt_connmark.c
+++ b/net/netfilter/xt_connmark.c
@@ -44,7 +44,7 @@ connmark_tg(struct sk_buff *skb, const struct xt_action_param *par)
         u_int32_t newmark;
 
         ct = nf_ct_get(skb, &ctinfo);
-        if (ct == NULL)
+        if (ct == NULL || nf_ct_is_untracked(ct))
                 return XT_CONTINUE;
 
         switch (info->mode) {
@@ -97,7 +97,7 @@ connmark_mt(const struct sk_buff *skb, struct xt_action_param *par)
         const struct nf_conn *ct;
 
         ct = nf_ct_get(skb, &ctinfo);
-        if (ct == NULL)
+        if (ct == NULL || nf_ct_is_untracked(ct))
                 return false;
 
         return ((ct->mark & info->mask) == info->mark) ^ info->invert;
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 62bea4591054..246f29d365c0 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -329,7 +329,6 @@ static void netlink_sock_destruct(struct sock *sk)
         if (nlk->cb_running) {
                 if (nlk->cb.done)
                         nlk->cb.done(&nlk->cb);
-
                 module_put(nlk->cb.module);
                 kfree_skb(nlk->cb.skb);
         }
@@ -346,6 +345,14 @@ static void netlink_sock_destruct(struct sock *sk)
         WARN_ON(nlk_sk(sk)->groups);
 }
 
+static void netlink_sock_destruct_work(struct work_struct *work)
+{
+        struct netlink_sock *nlk = container_of(work, struct netlink_sock,
+                                                work);
+
+        sk_free(&nlk->sk);
+}
+
 /* This lock without WQ_FLAG_EXCLUSIVE is good on UP and it is _very_ bad on
  * SMP. Look, when several writers sleep and reader wakes them up, all but one
  * immediately hit write lock and grab all the cpus. Exclusive sleep solves
@@ -648,8 +655,18 @@ out_module:
 static void deferred_put_nlk_sk(struct rcu_head *head)
 {
         struct netlink_sock *nlk = container_of(head, struct netlink_sock, rcu);
+        struct sock *sk = &nlk->sk;
+
+        if (!atomic_dec_and_test(&sk->sk_refcnt))
+                return;
+
+        if (nlk->cb_running && nlk->cb.done) {
+                INIT_WORK(&nlk->work, netlink_sock_destruct_work);
+                schedule_work(&nlk->work);
+                return;
+        }
 
-        sock_put(&nlk->sk);
+        sk_free(sk);
 }
 
 static int netlink_release(struct socket *sock)
diff --git a/net/netlink/af_netlink.h b/net/netlink/af_netlink.h
index 3cfd6cc60504..4fdb38318977 100644
--- a/net/netlink/af_netlink.h
+++ b/net/netlink/af_netlink.h
@@ -3,6 +3,7 @@
 
 #include <linux/rhashtable.h>
 #include <linux/atomic.h>
+#include <linux/workqueue.h>
 #include <net/sock.h>
 
 #define NLGRPSZ(x)      (ALIGN(x, sizeof(unsigned long) * 8) / 8)
@@ -33,6 +34,7 @@ struct netlink_sock {
 
         struct rhash_head       node;
         struct rcu_head         rcu;
+        struct work_struct      work;
 };
 
 static inline struct netlink_sock *nlk_sk(struct sock *sk)
diff --git a/net/netlink/diag.c b/net/netlink/diag.c
index b2f0e986a6f4..a5546249fb10 100644
--- a/net/netlink/diag.c
+++ b/net/netlink/diag.c
@@ -178,11 +178,8 @@ static int netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
                 }
                 cb->args[1] = i;
         } else {
-                if (req->sdiag_protocol >= MAX_LINKS) {
-                        read_unlock(&nl_table_lock);
-                        rcu_read_unlock();
+                if (req->sdiag_protocol >= MAX_LINKS)
                         return -ENOENT;
-                }
 
                 err = __netlink_diag_dump(skb, cb, req->sdiag_protocol, s_num);
         }
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 23cc12639ba7..49c28e8ef01b 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -404,7 +404,7 @@ int __genl_register_family(struct genl_family *family)
 
         err = genl_validate_assign_mc_groups(family);
         if (err)
-                goto errout_locked;
+                goto errout_free;
 
         list_add_tail(&family->family_list, genl_family_chain(family->id));
         genl_unlock_all();
@@ -417,6 +417,8 @@ int __genl_register_family(struct genl_family *family)
 
         return 0;
 
+errout_free:
+        kfree(family->attrbuf);
 errout_locked:
         genl_unlock_all();
 errout:
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 31045ef44a82..fecefa2dc94e 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -370,8 +370,11 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key,
                 skb_orphan(skb);
                 memset(IP6CB(skb), 0, sizeof(struct inet6_skb_parm));
                 err = nf_ct_frag6_gather(net, skb, user);
-                if (err)
+                if (err) {
+                        if (err != -EINPROGRESS)
+                                kfree_skb(skb);
                         return err;
+                }
 
                 key->ip.proto = ipv6_hdr(skb)->nexthdr;
                 ovs_cb.mru = IP6CB(skb)->frag_max_size;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index d2238b204691..dd2332390c45 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3648,19 +3648,25 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv
 
                 if (optlen != sizeof(val))
                         return -EINVAL;
-                if (po->rx_ring.pg_vec || po->tx_ring.pg_vec)
-                        return -EBUSY;
                 if (copy_from_user(&val, optval, sizeof(val)))
                         return -EFAULT;
                 switch (val) {
                 case TPACKET_V1:
                 case TPACKET_V2:
                 case TPACKET_V3:
-                        po->tp_version = val;
-                        return 0;
+                        break;
                 default:
                         return -EINVAL;
                 }
+                lock_sock(sk);
+                if (po->rx_ring.pg_vec || po->tx_ring.pg_vec) {
+                        ret = -EBUSY;
+                } else {
+                        po->tp_version = val;
+                        ret = 0;
+                }
+                release_sock(sk);
+                return ret;
         }
         case PACKET_RESERVE:
         {
@@ -4164,6 +4170,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
         /* Added to avoid minimal code churn */
         struct tpacket_req *req = &req_u->req;
 
+        lock_sock(sk);
         /* Opening a Tx-ring is NOT supported in TPACKET_V3 */
         if (!closing && tx_ring && (po->tp_version > TPACKET_V2)) {
                 net_warn_ratelimited("Tx-ring is not supported.\n");
@@ -4245,7 +4252,6 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
                         goto out;
         }
 
-        lock_sock(sk);
 
         /* Detach socket from network */
         spin_lock(&po->bind_lock);
@@ -4294,11 +4300,11 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
                 if (!tx_ring)
                         prb_shutdown_retire_blk_timer(po, rb_queue);
         }
-        release_sock(sk);
 
         if (pg_vec)
                 free_pg_vec(pg_vec, order, req->tp_block_nr);
 out:
+        release_sock(sk);
         return err;
 }
 
diff --git a/net/rds/tcp.c b/net/rds/tcp.c
index fcddacc92e01..20e2923dc827 100644
--- a/net/rds/tcp.c
+++ b/net/rds/tcp.c
@@ -659,6 +659,8 @@ out_recv:
 out_pernet:
         unregister_pernet_subsys(&rds_tcp_net_ops);
 out_slab:
+        if (unregister_netdevice_notifier(&rds_tcp_dev_notifier))
+                pr_warn("could not unregister rds_tcp_dev_notifier\n");
         kmem_cache_destroy(rds_tcp_conn_slab);
 out:
         return ret;
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index b54d56d4959b..cf9b2fe8eac6 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -108,6 +108,17 @@ static void tcf_pedit_cleanup(struct tc_action *a, int bind)
         kfree(keys);
 }
 
+static bool offset_valid(struct sk_buff *skb, int offset)
+{
+        if (offset > 0 && offset > skb->len)
+                return false;
+
+        if  (offset < 0 && -offset > skb_headroom(skb))
+                return false;
+
+        return true;
+}
+
 static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
                      struct tcf_result *res)
 {
@@ -134,6 +145,11 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
                         if (tkey->offmask) {
                                 char *d, _d;
 
+                                if (!offset_valid(skb, off + tkey->at)) {
+                                        pr_info("tc filter pedit 'at' offset %d out of bounds\n",
+                                                off + tkey->at);
+                                        goto bad;
+                                }
                                 d = skb_header_pointer(skb, off + tkey->at, 1,
                                                        &_d);
                                 if (!d)
@@ -146,10 +162,10 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
                                         " offset must be on 32 bit boundaries\n");
                                 goto bad;
                         }
-                        if (offset > 0 && offset > skb->len) {
-                                pr_info("tc filter pedit"
-                                        " offset %d can't exceed pkt length %d\n",
-                                       offset, skb->len);
+
+                        if (!offset_valid(skb, off + offset)) {
+                                pr_info("tc filter pedit offset %d out of bounds\n",
+                                        offset);
                                 goto bad;
                         }
 
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 2b2a7974e4bb..b05d4a2155b0 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -430,7 +430,8 @@ static int tfilter_notify(struct net *net, struct sk_buff *oskb,
         if (!skb)
                 return -ENOBUFS;
 
-        if (tcf_fill_node(net, skb, tp, fh, portid, n->nlmsg_seq, 0, event) <= 0) {
+        if (tcf_fill_node(net, skb, tp, fh, portid, n->nlmsg_seq,
+                          n->nlmsg_flags, event) <= 0) {
                 kfree_skb(skb);
                 return -EINVAL;
         }
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index eb219b78cd49..5877f6061b57 100644
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -62,9 +62,6 @@ static unsigned long basic_get(struct tcf_proto *tp, u32 handle)
         struct basic_head *head = rtnl_dereference(tp->root);
         struct basic_filter *f;
 
-        if (head == NULL)
-                return 0UL;
-
         list_for_each_entry(f, &head->flist, link) {
                 if (f->handle == handle) {
                         l = (unsigned long) f;
@@ -109,7 +106,6 @@ static bool basic_destroy(struct tcf_proto *tp, bool force)
                 tcf_unbind_filter(tp, &f->res);
                 call_rcu(&f->rcu, basic_delete_filter);
         }
-        RCU_INIT_POINTER(tp->root, NULL);
         kfree_rcu(head, rcu);
         return true;
 }
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index bb1d5a487081..0a47ba5e6109 100644
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -292,7 +292,6 @@ static bool cls_bpf_destroy(struct tcf_proto *tp, bool force)
                 call_rcu(&prog->rcu, __cls_bpf_delete_prog);
         }
 
-        RCU_INIT_POINTER(tp->root, NULL);
         kfree_rcu(head, rcu);
         return true;
 }
@@ -303,9 +302,6 @@ static unsigned long cls_bpf_get(struct tcf_proto *tp, u32 handle)
         struct cls_bpf_prog *prog;
         unsigned long ret = 0UL;
 
-        if (head == NULL)
-                return 0UL;
-
         list_for_each_entry(prog, &head->plist, link) {
                 if (prog->handle == handle) {
                         ret = (unsigned long) prog;
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index 85233c470035..c1f20077837f 100644
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -137,11 +137,10 @@ static bool cls_cgroup_destroy(struct tcf_proto *tp, bool force)
 
         if (!force)
                 return false;
-
-        if (head) {
-                RCU_INIT_POINTER(tp->root, NULL);
+        /* Head can still be NULL due to cls_cgroup_init(). */
+        if (head)
                 call_rcu(&head->rcu, cls_cgroup_destroy_rcu);
-        }
+
         return true;
 }
 
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index e39672394c7b..6575aba87630 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -596,7 +596,6 @@ static bool flow_destroy(struct tcf_proto *tp, bool force)
                 list_del_rcu(&f->list);
                 call_rcu(&f->rcu, flow_destroy_filter);
         }
-        RCU_INIT_POINTER(tp->root, NULL);
         kfree_rcu(head, rcu);
         return true;
 }
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index f6f40fba599b..904442421db3 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -13,6 +13,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/rhashtable.h>
+#include <linux/workqueue.h>
 
 #include <linux/if_ether.h>
 #include <linux/in6.h>
@@ -64,7 +65,10 @@ struct cls_fl_head {
         bool mask_assigned;
         struct list_head filters;
         struct rhashtable_params ht_params;
-        struct rcu_head rcu;
+        union {
+                struct work_struct work;
+                struct rcu_head rcu;
+        };
 };
 
 struct cls_fl_filter {
@@ -269,6 +273,24 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f)
         dev->netdev_ops->ndo_setup_tc(dev, tp->q->handle, tp->protocol, &tc);
 }
 
+static void fl_destroy_sleepable(struct work_struct *work)
+{
+        struct cls_fl_head *head = container_of(work, struct cls_fl_head,
+                                                work);
+        if (head->mask_assigned)
+                rhashtable_destroy(&head->ht);
+        kfree(head);
+        module_put(THIS_MODULE);
+}
+
+static void fl_destroy_rcu(struct rcu_head *rcu)
+{
+        struct cls_fl_head *head = container_of(rcu, struct cls_fl_head, rcu);
+
+        INIT_WORK(&head->work, fl_destroy_sleepable);
+        schedule_work(&head->work);
+}
+
 static bool fl_destroy(struct tcf_proto *tp, bool force)
 {
         struct cls_fl_head *head = rtnl_dereference(tp->root);
@@ -282,10 +304,9 @@ static bool fl_destroy(struct tcf_proto *tp, bool force)
                 list_del_rcu(&f->list);
                 call_rcu(&f->rcu, fl_destroy_filter);
         }
-        RCU_INIT_POINTER(tp->root, NULL);
-        if (head->mask_assigned)
-                rhashtable_destroy(&head->ht);
-        kfree_rcu(head, rcu);
+
+        __module_get(THIS_MODULE);
+        call_rcu(&head->rcu, fl_destroy_rcu);
         return true;
 }
 
@@ -711,8 +732,9 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
                 goto errout;
 
         if (fold) {
-                rhashtable_remove_fast(&head->ht, &fold->ht_node,
-                                       head->ht_params);
+                if (!tc_skip_sw(fold->flags))
+                        rhashtable_remove_fast(&head->ht, &fold->ht_node,
+                                               head->ht_params);
                 fl_hw_destroy_filter(tp, (unsigned long)fold);
         }
 
@@ -739,8 +761,9 @@ static int fl_delete(struct tcf_proto *tp, unsigned long arg)
         struct cls_fl_head *head = rtnl_dereference(tp->root);
         struct cls_fl_filter *f = (struct cls_fl_filter *) arg;
 
-        rhashtable_remove_fast(&head->ht, &f->ht_node,
-                               head->ht_params);
+        if (!tc_skip_sw(f->flags))
+                rhashtable_remove_fast(&head->ht, &f->ht_node,
+                                       head->ht_params);
         list_del_rcu(&f->list);
         fl_hw_destroy_filter(tp, (unsigned long)f);
         tcf_unbind_filter(tp, &f->res);
diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index 25927b6c4436..f935429bd5ef 100644
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -114,7 +114,6 @@ static bool mall_destroy(struct tcf_proto *tp, bool force)
 
                 call_rcu(&f->rcu, mall_destroy_filter);
         }
-        RCU_INIT_POINTER(tp->root, NULL);
         kfree_rcu(head, rcu);
         return true;
 }
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index 4f05a19fb073..322438fb3ffc 100644
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -152,7 +152,8 @@ static int rsvp_classify(struct sk_buff *skb, const struct tcf_proto *tp,
                 return -1;
         nhptr = ip_hdr(skb);
 #endif
-
+        if (unlikely(!head))
+                return -1;
 restart:
 
 #if RSVP_DST_LEN == 4
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index 96144bdf30db..0751245a6ace 100644
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -543,7 +543,6 @@ static bool tcindex_destroy(struct tcf_proto *tp, bool force)
         walker.fn = tcindex_destroy_element;
         tcindex_walk(tp, &walker);
 
-        RCU_INIT_POINTER(tp->root, NULL);
         call_rcu(&p->rcu, __tcindex_destroy);
         return true;
 }
diff --git a/net/sctp/input.c b/net/sctp/input.c
index a2ea1d1cc06a..a01a56ec8b8c 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -181,9 +181,10 @@ int sctp_rcv(struct sk_buff *skb)
          * bound to another interface, via SO_BINDTODEVICE, treat it as OOTB
          */
         if (sk->sk_bound_dev_if && (sk->sk_bound_dev_if != af->skb_iif(skb))) {
-                if (asoc) {
-                        sctp_association_put(asoc);
+                if (transport) {
+                        sctp_transport_put(transport);
                         asoc = NULL;
+                        transport = NULL;
                 } else {
                         sctp_endpoint_put(ep);
                         ep = NULL;
@@ -269,8 +270,8 @@ int sctp_rcv(struct sk_buff *skb)
         bh_unlock_sock(sk);
 
         /* Release the asoc/ep ref we took in the lookup calls. */
-        if (asoc)
-                sctp_association_put(asoc);
+        if (transport)
+                sctp_transport_put(transport);
         else
                 sctp_endpoint_put(ep);
 
@@ -283,8 +284,8 @@ discard_it:
 
 discard_release:
         /* Release the asoc/ep ref we took in the lookup calls. */
-        if (asoc)
-                sctp_association_put(asoc);
+        if (transport)
+                sctp_transport_put(transport);
         else
                 sctp_endpoint_put(ep);
 
@@ -300,6 +301,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb)
 {
         struct sctp_chunk *chunk = SCTP_INPUT_CB(skb)->chunk;
         struct sctp_inq *inqueue = &chunk->rcvr->inqueue;
+        struct sctp_transport *t = chunk->transport;
         struct sctp_ep_common *rcvr = NULL;
         int backloged = 0;
 
@@ -351,7 +353,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb)
 done:
         /* Release the refs we took in sctp_add_backlog */
         if (SCTP_EP_TYPE_ASSOCIATION == rcvr->type)
-                sctp_association_put(sctp_assoc(rcvr));
+                sctp_transport_put(t);
         else if (SCTP_EP_TYPE_SOCKET == rcvr->type)
                 sctp_endpoint_put(sctp_ep(rcvr));
         else
@@ -363,6 +365,7 @@ done:
 static int sctp_add_backlog(struct sock *sk, struct sk_buff *skb)
 {
         struct sctp_chunk *chunk = SCTP_INPUT_CB(skb)->chunk;
+        struct sctp_transport *t = chunk->transport;
         struct sctp_ep_common *rcvr = chunk->rcvr;
         int ret;
 
@@ -373,7 +376,7 @@ static int sctp_add_backlog(struct sock *sk, struct sk_buff *skb)
                  * from us
                  */
                 if (SCTP_EP_TYPE_ASSOCIATION == rcvr->type)
-                        sctp_association_hold(sctp_assoc(rcvr));
+                        sctp_transport_hold(t);
                 else if (SCTP_EP_TYPE_SOCKET == rcvr->type)
                         sctp_endpoint_hold(sctp_ep(rcvr));
                 else
@@ -537,15 +540,15 @@ struct sock *sctp_err_lookup(struct net *net, int family, struct sk_buff *skb,
         return sk;
 
 out:
-        sctp_association_put(asoc);
+        sctp_transport_put(transport);
         return NULL;
 }
 
 /* Common cleanup code for icmp/icmpv6 error handler. */
-void sctp_err_finish(struct sock *sk, struct sctp_association *asoc)
+void sctp_err_finish(struct sock *sk, struct sctp_transport *t)
 {
         bh_unlock_sock(sk);
-        sctp_association_put(asoc);
+        sctp_transport_put(t);
 }
 
 /*
@@ -641,7 +644,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info)
         }
 
 out_unlock:
-        sctp_err_finish(sk, asoc);
+        sctp_err_finish(sk, transport);
 }
 
 /*
@@ -952,11 +955,8 @@ static struct sctp_association *__sctp_lookup_association(
                 goto out;
 
         asoc = t->asoc;
-        sctp_association_hold(asoc);
         *pt = t;
 
-        sctp_transport_put(t);
-
 out:
         return asoc;
 }
@@ -986,7 +986,7 @@ int sctp_has_association(struct net *net,
         struct sctp_transport *transport;
 
         if ((asoc = sctp_lookup_association(net, laddr, paddr, &transport))) {
-                sctp_association_put(asoc);
+                sctp_transport_put(transport);
                 return 1;
         }
 
@@ -1021,7 +1021,6 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct net *net,
         struct sctphdr *sh = sctp_hdr(skb);
         union sctp_params params;
         sctp_init_chunk_t *init;
-        struct sctp_transport *transport;
         struct sctp_af *af;
 
         /*
@@ -1052,7 +1051,7 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct net *net,
 
                 af->from_addr_param(paddr, params.addr, sh->source, 0);
 
-                asoc = __sctp_lookup_association(net, laddr, paddr, &transport);
+                asoc = __sctp_lookup_association(net, laddr, paddr, transportp);
                 if (asoc)
                         return asoc;
         }
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index f473779e8b1c..176af3080a2b 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -198,7 +198,7 @@ static void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         }
 
 out_unlock:
-        sctp_err_finish(sk, asoc);
+        sctp_err_finish(sk, transport);
 out:
         if (likely(idev != NULL))
                 in6_dev_put(idev);
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 9fbb6feb8c27..f23ad913dc7a 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -1214,9 +1214,12 @@ static int __sctp_connect(struct sock *sk,
 
         timeo = sock_sndtimeo(sk, f_flags & O_NONBLOCK);
 
-        err = sctp_wait_for_connect(asoc, &timeo);
-        if ((err == 0 || err == -EINPROGRESS) && assoc_id)
+        if (assoc_id)
                 *assoc_id = asoc->assoc_id;
+        err = sctp_wait_for_connect(asoc, &timeo);
+        /* Note: the asoc may be freed after the return of
+         * sctp_wait_for_connect.
+         */
 
         /* Don't free association on exit. */
         asoc = NULL;
@@ -4282,19 +4285,18 @@ static void sctp_shutdown(struct sock *sk, int how)
 {
         struct net *net = sock_net(sk);
         struct sctp_endpoint *ep;
-        struct sctp_association *asoc;
 
         if (!sctp_style(sk, TCP))
                 return;
 
-        if (how & SEND_SHUTDOWN) {
+        ep = sctp_sk(sk)->ep;
+        if (how & SEND_SHUTDOWN && !list_empty(&ep->asocs)) {
+                struct sctp_association *asoc;
+
                 sk->sk_state = SCTP_SS_CLOSING;
-                ep = sctp_sk(sk)->ep;
-                if (!list_empty(&ep->asocs)) {
-                        asoc = list_entry(ep->asocs.next,
-                                          struct sctp_association, asocs);
-                        sctp_primitive_SHUTDOWN(net, asoc, NULL);
-                }
+                asoc = list_entry(ep->asocs.next,
+                                  struct sctp_association, asocs);
+                sctp_primitive_SHUTDOWN(net, asoc, NULL);
         }
 }
 
@@ -4480,12 +4482,9 @@ int sctp_transport_lookup_process(int (*cb)(struct sctp_transport *, void *),
         if (!transport || !sctp_transport_hold(transport))
                 goto out;
 
-        sctp_association_hold(transport->asoc);
-        sctp_transport_put(transport);
-
         rcu_read_unlock();
         err = cb(transport, p);
-        sctp_association_put(transport->asoc);
+        sctp_transport_put(transport);
 
 out:
         return err;
diff --git a/net/socket.c b/net/socket.c
index 5a9bf5ee2464..73dc69f9681e 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -341,8 +341,23 @@ static const struct xattr_handler sockfs_xattr_handler = {
         .get = sockfs_xattr_get,
 };
 
+static int sockfs_security_xattr_set(const struct xattr_handler *handler,
+                                     struct dentry *dentry, struct inode *inode,
+                                     const char *suffix, const void *value,
+                                     size_t size, int flags)
+{
+        /* Handled by LSM. */
+        return -EAGAIN;
+}
+
+static const struct xattr_handler sockfs_security_xattr_handler = {
+        .prefix = XATTR_SECURITY_PREFIX,
+        .set = sockfs_security_xattr_set,
+};
+
 static const struct xattr_handler *sockfs_xattr_handlers[] = {
         &sockfs_xattr_handler,
+        &sockfs_security_xattr_handler,
         NULL
 };
 
@@ -2038,6 +2053,8 @@ int __sys_sendmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
                 if (err)
                         break;
                 ++datagrams;
+                if (msg_data_left(&msg_sys))
+                        break;
                 cond_resched();
         }
 
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 34dd7b26ee5f..62a482790937 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -2753,14 +2753,18 @@ EXPORT_SYMBOL_GPL(rpc_cap_max_reconnect_timeout);
 
 void rpc_clnt_xprt_switch_put(struct rpc_clnt *clnt)
 {
+        rcu_read_lock();
         xprt_switch_put(rcu_dereference(clnt->cl_xpi.xpi_xpswitch));
+        rcu_read_unlock();
 }
 EXPORT_SYMBOL_GPL(rpc_clnt_xprt_switch_put);
 
 void rpc_clnt_xprt_switch_add_xprt(struct rpc_clnt *clnt, struct rpc_xprt *xprt)
 {
+        rcu_read_lock();
         rpc_xprt_switch_add_xprt(rcu_dereference(clnt->cl_xpi.xpi_xpswitch),
                                  xprt);
+        rcu_read_unlock();
 }
 EXPORT_SYMBOL_GPL(rpc_clnt_xprt_switch_add_xprt);
 
@@ -2770,9 +2774,8 @@ bool rpc_clnt_xprt_switch_has_addr(struct rpc_clnt *clnt,
         struct rpc_xprt_switch *xps;
         bool ret;
 
-        xps = rcu_dereference(clnt->cl_xpi.xpi_xpswitch);
-
         rcu_read_lock();
+        xps = rcu_dereference(clnt->cl_xpi.xpi_xpswitch);
         ret = rpc_xprt_switch_has_addr(xps, sap);
         rcu_read_unlock();
         return ret;
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index c3f652395a80..3bc1d61694cb 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -1002,14 +1002,8 @@ static void svc_age_temp_xprts(unsigned long closure)
 void svc_age_temp_xprts_now(struct svc_serv *serv, struct sockaddr *server_addr)
 {
         struct svc_xprt *xprt;
-        struct svc_sock *svsk;
-        struct socket *sock;
         struct list_head *le, *next;
         LIST_HEAD(to_be_closed);
-        struct linger no_linger = {
-                .l_onoff = 1,
-                .l_linger = 0,
-        };
 
         spin_lock_bh(&serv->sv_lock);
         list_for_each_safe(le, next, &serv->sv_tempsocks) {
@@ -1027,10 +1021,7 @@ void svc_age_temp_xprts_now(struct svc_serv *serv, struct sockaddr *server_addr)
                 list_del_init(le);
                 xprt = list_entry(le, struct svc_xprt, xpt_list);
                 dprintk("svc_age_temp_xprts_now: closing %p\n", xprt);
-                svsk = container_of(xprt, struct svc_sock, sk_xprt);
-                sock = svsk->sk_sock;
-                kernel_setsockopt(sock, SOL_SOCKET, SO_LINGER,
-                                  (char *)&no_linger, sizeof(no_linger));
+                xprt->xpt_ops->xpo_kill_temp_xprt(xprt);
                 svc_close_xprt(xprt);
         }
 }
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 57625f64efd5..a4bc98265d88 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -438,6 +438,21 @@ static int svc_tcp_has_wspace(struct svc_xprt *xprt)
         return !test_bit(SOCK_NOSPACE, &svsk->sk_sock->flags);
 }
 
+static void svc_tcp_kill_temp_xprt(struct svc_xprt *xprt)
+{
+        struct svc_sock *svsk;
+        struct socket *sock;
+        struct linger no_linger = {
+                .l_onoff = 1,
+                .l_linger = 0,
+        };
+
+        svsk = container_of(xprt, struct svc_sock, sk_xprt);
+        sock = svsk->sk_sock;
+        kernel_setsockopt(sock, SOL_SOCKET, SO_LINGER,
+                          (char *)&no_linger, sizeof(no_linger));
+}
+
 /*
  * See net/ipv6/ip_sockglue.c : ip_cmsg_recv_pktinfo
  */
@@ -648,6 +663,10 @@ static struct svc_xprt *svc_udp_accept(struct svc_xprt *xprt)
         return NULL;
 }
 
+static void svc_udp_kill_temp_xprt(struct svc_xprt *xprt)
+{
+}
+
 static struct svc_xprt *svc_udp_create(struct svc_serv *serv,
                                        struct net *net,
                                        struct sockaddr *sa, int salen,
@@ -667,6 +686,7 @@ static struct svc_xprt_ops svc_udp_ops = {
         .xpo_has_wspace = svc_udp_has_wspace,
         .xpo_accept = svc_udp_accept,
         .xpo_secure_port = svc_sock_secure_port,
+        .xpo_kill_temp_xprt = svc_udp_kill_temp_xprt,
 };
 
 static struct svc_xprt_class svc_udp_class = {
@@ -1242,6 +1262,7 @@ static struct svc_xprt_ops svc_tcp_ops = {
         .xpo_has_wspace = svc_tcp_has_wspace,
         .xpo_accept = svc_tcp_accept,
         .xpo_secure_port = svc_sock_secure_port,
+        .xpo_kill_temp_xprt = svc_tcp_kill_temp_xprt,
 };
 
 static struct svc_xprt_class svc_tcp_class = {
diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c
index 210949562786..26b26beef2d4 100644
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@ -44,18 +44,20 @@
  * being done.
  *
  * When the underlying transport disconnects, MRs are left in one of
- * three states:
+ * four states:
  *
  * INVALID:     The MR was not in use before the QP entered ERROR state.
- *              (Or, the LOCAL_INV WR has not completed or flushed yet).
- *
- * STALE:       The MR was being registered or unregistered when the QP
- *              entered ERROR state, and the pending WR was flushed.
  *
  * VALID:       The MR was registered before the QP entered ERROR state.
  *
- * When frwr_op_map encounters STALE and VALID MRs, they are recovered
- * with ib_dereg_mr and then are re-initialized. Beause MR recovery
+ * FLUSHED_FR:  The MR was being registered when the QP entered ERROR
+ *              state, and the pending WR was flushed.
+ *
+ * FLUSHED_LI:  The MR was being invalidated when the QP entered ERROR
+ *              state, and the pending WR was flushed.
+ *
+ * When frwr_op_map encounters FLUSHED and VALID MRs, they are recovered
+ * with ib_dereg_mr and then are re-initialized. Because MR recovery
  * allocates fresh resources, it is deferred to a workqueue, and the
  * recovered MRs are placed back on the rb_mws list when recovery is
  * complete. frwr_op_map allocates another MR for the current RPC while
@@ -177,12 +179,15 @@ __frwr_reset_mr(struct rpcrdma_ia *ia, struct rpcrdma_mw *r)
 static void
 frwr_op_recover_mr(struct rpcrdma_mw *mw)
 {
+        enum rpcrdma_frmr_state state = mw->frmr.fr_state;
         struct rpcrdma_xprt *r_xprt = mw->mw_xprt;
         struct rpcrdma_ia *ia = &r_xprt->rx_ia;
         int rc;
 
         rc = __frwr_reset_mr(ia, mw);
-        ib_dma_unmap_sg(ia->ri_device, mw->mw_sg, mw->mw_nents, mw->mw_dir);
+        if (state != FRMR_FLUSHED_LI)
+                ib_dma_unmap_sg(ia->ri_device,
+                                mw->mw_sg, mw->mw_nents, mw->mw_dir);
         if (rc)
                 goto out_release;
 
@@ -262,10 +267,8 @@ frwr_op_maxpages(struct rpcrdma_xprt *r_xprt)
 }
 
 static void
-__frwr_sendcompletion_flush(struct ib_wc *wc, struct rpcrdma_frmr *frmr,
-                            const char *wr)
+__frwr_sendcompletion_flush(struct ib_wc *wc, const char *wr)
 {
-        frmr->fr_state = FRMR_IS_STALE;
         if (wc->status != IB_WC_WR_FLUSH_ERR)
                 pr_err("rpcrdma: %s: %s (%u/0x%x)\n",
                        wr, ib_wc_status_msg(wc->status),
@@ -288,7 +291,8 @@ frwr_wc_fastreg(struct ib_cq *cq, struct ib_wc *wc)
         if (wc->status != IB_WC_SUCCESS) {
                 cqe = wc->wr_cqe;
                 frmr = container_of(cqe, struct rpcrdma_frmr, fr_cqe);
-                __frwr_sendcompletion_flush(wc, frmr, "fastreg");
+                frmr->fr_state = FRMR_FLUSHED_FR;
+                __frwr_sendcompletion_flush(wc, "fastreg");
         }
 }
 
@@ -308,7 +312,8 @@ frwr_wc_localinv(struct ib_cq *cq, struct ib_wc *wc)
         if (wc->status != IB_WC_SUCCESS) {
                 cqe = wc->wr_cqe;
                 frmr = container_of(cqe, struct rpcrdma_frmr, fr_cqe);
-                __frwr_sendcompletion_flush(wc, frmr, "localinv");
+                frmr->fr_state = FRMR_FLUSHED_LI;
+                __frwr_sendcompletion_flush(wc, "localinv");
         }
 }
 
@@ -328,8 +333,10 @@ frwr_wc_localinv_wake(struct ib_cq *cq, struct ib_wc *wc)
         /* WARNING: Only wr_cqe and status are reliable at this point */
         cqe = wc->wr_cqe;
         frmr = container_of(cqe, struct rpcrdma_frmr, fr_cqe);
-        if (wc->status != IB_WC_SUCCESS)
-                __frwr_sendcompletion_flush(wc, frmr, "localinv");
+        if (wc->status != IB_WC_SUCCESS) {
+                frmr->fr_state = FRMR_FLUSHED_LI;
+                __frwr_sendcompletion_flush(wc, "localinv");
+        }
         complete(&frmr->fr_linv_done);
 }
 
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 6864fb967038..1334de2715c2 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -67,6 +67,7 @@ static void svc_rdma_detach(struct svc_xprt *xprt);
 static void svc_rdma_free(struct svc_xprt *xprt);
 static int svc_rdma_has_wspace(struct svc_xprt *xprt);
 static int svc_rdma_secure_port(struct svc_rqst *);
+static void svc_rdma_kill_temp_xprt(struct svc_xprt *);
 
 static struct svc_xprt_ops svc_rdma_ops = {
         .xpo_create = svc_rdma_create,
@@ -79,6 +80,7 @@ static struct svc_xprt_ops svc_rdma_ops = {
         .xpo_has_wspace = svc_rdma_has_wspace,
         .xpo_accept = svc_rdma_accept,
         .xpo_secure_port = svc_rdma_secure_port,
+        .xpo_kill_temp_xprt = svc_rdma_kill_temp_xprt,
 };
 
 struct svc_xprt_class svc_rdma_class = {
@@ -1317,6 +1319,10 @@ static int svc_rdma_secure_port(struct svc_rqst *rqstp)
         return 1;
 }
 
+static void svc_rdma_kill_temp_xprt(struct svc_xprt *xprt)
+{
+}
+
 int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
 {
         struct ib_send_wr *bad_wr, *n_wr;
diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index 0d35b761c883..6e1bba358203 100644
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -216,7 +216,8 @@ struct rpcrdma_rep {
 enum rpcrdma_frmr_state {
         FRMR_IS_INVALID,        /* ready to be used */
         FRMR_IS_VALID,          /* in use */
-        FRMR_IS_STALE,          /* failed completion */
+        FRMR_FLUSHED_FR,        /* flushed FASTREG WR */
+        FRMR_FLUSHED_LI,        /* flushed LOCALINV WR */
 };
 
 struct rpcrdma_frmr {
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 975dbeb60ab0..52d74760fb68 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -421,6 +421,10 @@ int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b,
         dev = dev_get_by_name(net, driver_name);
         if (!dev)
                 return -ENODEV;
+        if (tipc_mtu_bad(dev, 0)) {
+                dev_put(dev);
+                return -EINVAL;
+        }
 
         /* Associate TIPC bearer with L2 bearer */
         rcu_assign_pointer(b->media_ptr, dev);
@@ -610,8 +614,6 @@ static int tipc_l2_device_event(struct notifier_block *nb, unsigned long evt,
         if (!b)
                 return NOTIFY_DONE;
 
-        b->mtu = dev->mtu;
-
         switch (evt) {
         case NETDEV_CHANGE:
                 if (netif_carrier_ok(dev))
@@ -624,6 +626,11 @@ static int tipc_l2_device_event(struct notifier_block *nb, unsigned long evt,
                 tipc_reset_bearer(net, b);
                 break;
         case NETDEV_CHANGEMTU:
+                if (tipc_mtu_bad(dev, 0)) {
+                        bearer_disable(net, b);
+                        break;
+                }
+                b->mtu = dev->mtu;
                 tipc_reset_bearer(net, b);
                 break;
         case NETDEV_CHANGEADDR:
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 78892e2f53e3..278ff7f616f9 100644
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -39,6 +39,7 @@
 
 #include "netlink.h"
 #include "core.h"
+#include "msg.h"
 #include <net/genetlink.h>
 
 #define MAX_MEDIA       3
@@ -59,6 +60,9 @@
 #define TIPC_MEDIA_TYPE_IB      2
 #define TIPC_MEDIA_TYPE_UDP     3
 
+/* minimum bearer MTU */
+#define TIPC_MIN_BEARER_MTU     (MAX_H_SIZE + INT_H_SIZE)
+
 /**
  * struct tipc_media_addr - destination address used by TIPC bearers
  * @value: address info (format defined by media)
@@ -215,4 +219,13 @@ void tipc_bearer_xmit(struct net *net, u32 bearer_id,
 void tipc_bearer_bc_xmit(struct net *net, u32 bearer_id,
                          struct sk_buff_head *xmitq);
 
+/* check if device MTU is too low for tipc headers */
+static inline bool tipc_mtu_bad(struct net_device *dev, unsigned int reserve)
+{
+        if (dev->mtu >= TIPC_MIN_BEARER_MTU + reserve)
+                return false;
+        netdev_warn(dev, "MTU too low for tipc bearer\n");
+        return true;
+}
+
 #endif  /* _TIPC_BEARER_H */
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 1055164c6232..bda89bf9f4ff 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -47,8 +47,8 @@
 #include <linux/pkt_sched.h>
 
 struct tipc_stats {
-        u32 sent_info;          /* used in counting # sent packets */
-        u32 recv_info;          /* used in counting # recv'd packets */
+        u32 sent_pkts;
+        u32 recv_pkts;
         u32 sent_states;
         u32 recv_states;
         u32 sent_probes;
@@ -857,7 +857,6 @@ void tipc_link_reset(struct tipc_link *l)
         l->acked = 0;
         l->silent_intv_cnt = 0;
         l->rst_cnt = 0;
-        l->stats.recv_info = 0;
         l->stale_count = 0;
         l->bc_peer_is_up = false;
         memset(&l->mon_state, 0, sizeof(l->mon_state));
@@ -888,6 +887,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
         struct sk_buff_head *transmq = &l->transmq;
         struct sk_buff_head *backlogq = &l->backlogq;
         struct sk_buff *skb, *_skb, *bskb;
+        int pkt_cnt = skb_queue_len(list);
 
         /* Match msg importance against this and all higher backlog limits: */
         if (!skb_queue_empty(backlogq)) {
@@ -901,6 +901,11 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
                 return -EMSGSIZE;
         }
 
+        if (pkt_cnt > 1) {
+                l->stats.sent_fragmented++;
+                l->stats.sent_fragments += pkt_cnt;
+        }
+
         /* Prepare each packet for sending, and add to relevant queue: */
         while (skb_queue_len(list)) {
                 skb = skb_peek(list);
@@ -920,6 +925,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
                         __skb_queue_tail(xmitq, _skb);
                         TIPC_SKB_CB(skb)->ackers = l->ackers;
                         l->rcv_unacked = 0;
+                        l->stats.sent_pkts++;
                         seqno++;
                         continue;
                 }
@@ -968,6 +974,7 @@ void tipc_link_advance_backlog(struct tipc_link *l, struct sk_buff_head *xmitq)
                 msg_set_ack(hdr, ack);
                 msg_set_bcast_ack(hdr, bc_ack);
                 l->rcv_unacked = 0;
+                l->stats.sent_pkts++;
                 seqno++;
         }
         l->snd_nxt = seqno;
@@ -1260,7 +1267,7 @@ int tipc_link_rcv(struct tipc_link *l, struct sk_buff *skb,
 
                 /* Deliver packet */
                 l->rcv_nxt++;
-                l->stats.recv_info++;
+                l->stats.recv_pkts++;
                 if (!tipc_data_input(l, skb, l->inputq))
                         rc |= tipc_link_input(l, skb, l->inputq);
                 if (unlikely(++l->rcv_unacked >= TIPC_MIN_LINK_WIN))
@@ -1492,8 +1499,9 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb,
                 if (in_range(peers_tol, TIPC_MIN_LINK_TOL, TIPC_MAX_LINK_TOL))
                         l->tolerance = peers_tol;
 
-                if (peers_prio && in_range(peers_prio, TIPC_MIN_LINK_PRI,
-                                           TIPC_MAX_LINK_PRI)) {
+                /* Update own prio if peer indicates a different value */
+                if ((peers_prio != l->priority) &&
+                    in_range(peers_prio, 1, TIPC_MAX_LINK_PRI)) {
                         l->priority = peers_prio;
                         rc = tipc_link_fsm_evt(l, LINK_FAILURE_EVT);
                 }
@@ -1799,10 +1807,6 @@ void tipc_link_set_queue_limits(struct tipc_link *l, u32 win)
 void tipc_link_reset_stats(struct tipc_link *l)
 {
         memset(&l->stats, 0, sizeof(l->stats));
-        if (!link_is_bc_sndlink(l)) {
-                l->stats.sent_info = l->snd_nxt;
-                l->stats.recv_info = l->rcv_nxt;
-        }
 }
 
 static void link_print(struct tipc_link *l, const char *str)
@@ -1866,12 +1870,12 @@ static int __tipc_nl_add_stats(struct sk_buff *skb, struct tipc_stats *s)
         };
 
         struct nla_map map[] = {
-                {TIPC_NLA_STATS_RX_INFO, s->recv_info},
+                {TIPC_NLA_STATS_RX_INFO, 0},
                 {TIPC_NLA_STATS_RX_FRAGMENTS, s->recv_fragments},
                 {TIPC_NLA_STATS_RX_FRAGMENTED, s->recv_fragmented},
                 {TIPC_NLA_STATS_RX_BUNDLES, s->recv_bundles},
                 {TIPC_NLA_STATS_RX_BUNDLED, s->recv_bundled},
-                {TIPC_NLA_STATS_TX_INFO, s->sent_info},
+                {TIPC_NLA_STATS_TX_INFO, 0},
                 {TIPC_NLA_STATS_TX_FRAGMENTS, s->sent_fragments},
                 {TIPC_NLA_STATS_TX_FRAGMENTED, s->sent_fragmented},
                 {TIPC_NLA_STATS_TX_BUNDLES, s->sent_bundles},
@@ -1946,9 +1950,9 @@ int __tipc_nl_add_link(struct net *net, struct tipc_nl_msg *msg,
                 goto attr_msg_full;
         if (nla_put_u32(msg->skb, TIPC_NLA_LINK_MTU, link->mtu))
                 goto attr_msg_full;
-        if (nla_put_u32(msg->skb, TIPC_NLA_LINK_RX, link->rcv_nxt))
+        if (nla_put_u32(msg->skb, TIPC_NLA_LINK_RX, link->stats.recv_pkts))
                 goto attr_msg_full;
-        if (nla_put_u32(msg->skb, TIPC_NLA_LINK_TX, link->snd_nxt))
+        if (nla_put_u32(msg->skb, TIPC_NLA_LINK_TX, link->stats.sent_pkts))
                 goto attr_msg_full;
 
         if (tipc_link_is_up(link))
@@ -2003,12 +2007,12 @@ static int __tipc_nl_add_bc_link_stat(struct sk_buff *skb,
         };
 
         struct nla_map map[] = {
-                {TIPC_NLA_STATS_RX_INFO, stats->recv_info},
+                {TIPC_NLA_STATS_RX_INFO, stats->recv_pkts},
                 {TIPC_NLA_STATS_RX_FRAGMENTS, stats->recv_fragments},
                 {TIPC_NLA_STATS_RX_FRAGMENTED, stats->recv_fragmented},
                 {TIPC_NLA_STATS_RX_BUNDLES, stats->recv_bundles},
                 {TIPC_NLA_STATS_RX_BUNDLED, stats->recv_bundled},
-                {TIPC_NLA_STATS_TX_INFO, stats->sent_info},
+                {TIPC_NLA_STATS_TX_INFO, stats->sent_pkts},
                 {TIPC_NLA_STATS_TX_FRAGMENTS, stats->sent_fragments},
                 {TIPC_NLA_STATS_TX_FRAGMENTED, stats->sent_fragmented},
                 {TIPC_NLA_STATS_TX_BUNDLES, stats->sent_bundles},
@@ -2075,9 +2079,9 @@ int tipc_nl_add_bc_link(struct net *net, struct tipc_nl_msg *msg)
                 goto attr_msg_full;
         if (nla_put_string(msg->skb, TIPC_NLA_LINK_NAME, bcl->name))
                 goto attr_msg_full;
-        if (nla_put_u32(msg->skb, TIPC_NLA_LINK_RX, bcl->rcv_nxt))
+        if (nla_put_u32(msg->skb, TIPC_NLA_LINK_RX, 0))
                 goto attr_msg_full;
-        if (nla_put_u32(msg->skb, TIPC_NLA_LINK_TX, bcl->snd_nxt))
+        if (nla_put_u32(msg->skb, TIPC_NLA_LINK_TX, 0))
                 goto attr_msg_full;
 
         prop = nla_nest_start(msg->skb, TIPC_NLA_LINK_PROP);
diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c
index ed97a5876ebe..9e109bb1a207 100644
--- a/net/tipc/monitor.c
+++ b/net/tipc/monitor.c
@@ -455,14 +455,14 @@ void tipc_mon_rcv(struct net *net, void *data, u16 dlen, u32 addr,
         int i, applied_bef;
 
         state->probing = false;
-        if (!dlen)
-                return;
 
         /* Sanity check received domain record */
-        if ((dlen < new_dlen) || ntohs(arrv_dom->len) != new_dlen) {
-                pr_warn_ratelimited("Received illegal domain record\n");
+        if (dlen < dom_rec_len(arrv_dom, 0))
+                return;
+        if (dlen != dom_rec_len(arrv_dom, new_member_cnt))
+                return;
+        if ((dlen < new_dlen) || ntohs(arrv_dom->len) != new_dlen)
                 return;
-        }
 
         /* Synch generation numbers with peer if link just came up */
         if (!state->synched) {
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index f9f5f3c3dab5..41f013888f07 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1,7 +1,7 @@
 /*
  * net/tipc/socket.c: TIPC socket API
  *
- * Copyright (c) 2001-2007, 2012-2015, Ericsson AB
+ * Copyright (c) 2001-2007, 2012-2016, Ericsson AB
  * Copyright (c) 2004-2008, 2010-2013, Wind River Systems
  * All rights reserved.
  *
@@ -129,54 +129,8 @@ static const struct proto_ops packet_ops;
 static const struct proto_ops stream_ops;
 static const struct proto_ops msg_ops;
 static struct proto tipc_proto;
-
 static const struct rhashtable_params tsk_rht_params;
 
-/*
- * Revised TIPC socket locking policy:
- *
- * Most socket operations take the standard socket lock when they start
- * and hold it until they finish (or until they need to sleep).  Acquiring
- * this lock grants the owner exclusive access to the fields of the socket
- * data structures, with the exception of the backlog queue.  A few socket
- * operations can be done without taking the socket lock because they only
- * read socket information that never changes during the life of the socket.
- *
- * Socket operations may acquire the lock for the associated TIPC port if they
- * need to perform an operation on the port.  If any routine needs to acquire
- * both the socket lock and the port lock it must take the socket lock first
- * to avoid the risk of deadlock.
- *
- * The dispatcher handling incoming messages cannot grab the socket lock in
- * the standard fashion, since invoked it runs at the BH level and cannot block.
- * Instead, it checks to see if the socket lock is currently owned by someone,
- * and either handles the message itself or adds it to the socket's backlog
- * queue; in the latter case the queued message is processed once the process
- * owning the socket lock releases it.
- *
- * NOTE: Releasing the socket lock while an operation is sleeping overcomes
- * the problem of a blocked socket operation preventing any other operations
- * from occurring.  However, applications must be careful if they have
- * multiple threads trying to send (or receive) on the same socket, as these
- * operations might interfere with each other.  For example, doing a connect
- * and a receive at the same time might allow the receive to consume the
- * ACK message meant for the connect.  While additional work could be done
- * to try and overcome this, it doesn't seem to be worthwhile at the present.
- *
- * NOTE: Releasing the socket lock while an operation is sleeping also ensures
- * that another operation that must be performed in a non-blocking manner is
- * not delayed for very long because the lock has already been taken.
- *
- * NOTE: This code assumes that certain fields of a port/socket pair are
- * constant over its lifetime; such fields can be examined without taking
- * the socket lock and/or port lock, and do not need to be re-read even
- * after resuming processing after waiting.  These fields include:
- *   - socket type
- *   - pointer to socket sk structure (aka tipc_sock structure)
- *   - pointer to port structure
- *   - port reference
- */
-
 static u32 tsk_own_node(struct tipc_sock *tsk)
 {
         return msg_prevnode(&tsk->phdr);
@@ -232,7 +186,7 @@ static struct tipc_sock *tipc_sk(const struct sock *sk)
 
 static bool tsk_conn_cong(struct tipc_sock *tsk)
 {
-        return tsk->snt_unacked >= tsk->snd_win;
+        return tsk->snt_unacked > tsk->snd_win;
 }
 
 /* tsk_blocks(): translate a buffer size in bytes to number of
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
index 78cab9c5a445..b58dc95f3d35 100644
--- a/net/tipc/udp_media.c
+++ b/net/tipc/udp_media.c
@@ -697,6 +697,11 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b,
                 udp_conf.local_ip.s_addr = htonl(INADDR_ANY);
                 udp_conf.use_udp_checksums = false;
                 ub->ifindex = dev->ifindex;
+                if (tipc_mtu_bad(dev, sizeof(struct iphdr) +
+                                      sizeof(struct udphdr))) {
+                        err = -EINVAL;
+                        goto err;
+                }
                 b->mtu = dev->mtu - sizeof(struct iphdr)
                         - sizeof(struct udphdr);
 #if IS_ENABLED(CONFIG_IPV6)
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 145082e2ba36..2358f2690ec5 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2199,7 +2199,8 @@ out:
  *      Sleep until more data has arrived. But check for races..
  */
 static long unix_stream_data_wait(struct sock *sk, long timeo,
-                                  struct sk_buff *last, unsigned int last_len)
+                                  struct sk_buff *last, unsigned int last_len,
+                                  bool freezable)
 {
         struct sk_buff *tail;
         DEFINE_WAIT(wait);
@@ -2220,7 +2221,10 @@ static long unix_stream_data_wait(struct sock *sk, long timeo,
 
                 sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);
                 unix_state_unlock(sk);
-                timeo = freezable_schedule_timeout(timeo);
+                if (freezable)
+                        timeo = freezable_schedule_timeout(timeo);
+                else
+                        timeo = schedule_timeout(timeo);
                 unix_state_lock(sk);
 
                 if (sock_flag(sk, SOCK_DEAD))
@@ -2250,7 +2254,8 @@ struct unix_stream_read_state {
         unsigned int splice_flags;
 };
 
-static int unix_stream_read_generic(struct unix_stream_read_state *state)
+static int unix_stream_read_generic(struct unix_stream_read_state *state,
+                                    bool freezable)
 {
         struct scm_cookie scm;
         struct socket *sock = state->socket;
@@ -2330,7 +2335,7 @@ again:
                         mutex_unlock(&u->iolock);
 
                         timeo = unix_stream_data_wait(sk, timeo, last,
-                                                      last_len);
+                                                      last_len, freezable);
 
                         if (signal_pending(current)) {
                                 err = sock_intr_errno(timeo);
@@ -2472,7 +2477,7 @@ static int unix_stream_recvmsg(struct socket *sock, struct msghdr *msg,
                 .flags = flags
         };
 
-        return unix_stream_read_generic(&state);
+        return unix_stream_read_generic(&state, true);
 }
 
 static int unix_stream_splice_actor(struct sk_buff *skb,
@@ -2503,7 +2508,7 @@ static ssize_t unix_stream_splice_read(struct socket *sock,  loff_t *ppos,
             flags & SPLICE_F_NONBLOCK)
                 state.flags = MSG_DONTWAIT;
 
-        return unix_stream_read_generic(&state);
+        return unix_stream_read_generic(&state, false);
 }
 
 static int unix_shutdown(struct socket *sock, int mode)
@@ -2812,7 +2817,8 @@ static int unix_seq_show(struct seq_file *seq, void *v)
                                 i++;
                         }
                         for ( ; i < len; i++)
-                                seq_putc(seq, u->addr->name->sun_path[i]);
+                                seq_putc(seq, u->addr->name->sun_path[i] ?:
+                                         '@');
                 }
                 unix_state_unlock(s);
                 seq_putc(seq, '\n');
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 08d2e948c9ad..f0c0c8a48c92 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -71,6 +71,7 @@ struct cfg80211_registered_device {
         struct list_head bss_list;
         struct rb_root bss_tree;
         u32 bss_generation;
+        u32 bss_entries;
         struct cfg80211_scan_request *scan_req; /* protected by RTNL */
         struct sk_buff *scan_msg;
         struct cfg80211_sched_scan_request __rcu *sched_scan_req;
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index b5bd58d0f731..35ad69fd0838 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -57,6 +57,19 @@
  * also linked into the probe response struct.
  */
 
+/*
+ * Limit the number of BSS entries stored in mac80211. Each one is
+ * a bit over 4k at most, so this limits to roughly 4-5M of memory.
+ * If somebody wants to really attack this though, they'd likely
+ * use small beacons, and only one type of frame, limiting each of
+ * the entries to a much smaller size (in order to generate more
+ * entries in total, so overhead is bigger.)
+ */
+static int bss_entries_limit = 1000;
+module_param(bss_entries_limit, int, 0644);
+MODULE_PARM_DESC(bss_entries_limit,
+                 "limit to number of scan BSS entries (per wiphy, default 1000)");
+
 #define IEEE80211_SCAN_RESULT_EXPIRE    (30 * HZ)
 
 static void bss_free(struct cfg80211_internal_bss *bss)
@@ -137,6 +150,10 @@ static bool __cfg80211_unlink_bss(struct cfg80211_registered_device *rdev,
 
         list_del_init(&bss->list);
         rb_erase(&bss->rbn, &rdev->bss_tree);
+        rdev->bss_entries--;
+        WARN_ONCE((rdev->bss_entries == 0) ^ list_empty(&rdev->bss_list),
+                  "rdev bss entries[%d]/list[empty:%d] corruption\n",
+                  rdev->bss_entries, list_empty(&rdev->bss_list));
         bss_ref_put(rdev, bss);
         return true;
 }
@@ -163,6 +180,40 @@ static void __cfg80211_bss_expire(struct cfg80211_registered_device *rdev,
                 rdev->bss_generation++;
 }
 
+static bool cfg80211_bss_expire_oldest(struct cfg80211_registered_device *rdev)
+{
+        struct cfg80211_internal_bss *bss, *oldest = NULL;
+        bool ret;
+
+        lockdep_assert_held(&rdev->bss_lock);
+
+        list_for_each_entry(bss, &rdev->bss_list, list) {
+                if (atomic_read(&bss->hold))
+                        continue;
+
+                if (!list_empty(&bss->hidden_list) &&
+                    !bss->pub.hidden_beacon_bss)
+                        continue;
+
+                if (oldest && time_before(oldest->ts, bss->ts))
+                        continue;
+                oldest = bss;
+        }
+
+        if (WARN_ON(!oldest))
+                return false;
+
+        /*
+         * The callers make sure to increase rdev->bss_generation if anything
+         * gets removed (and a new entry added), so there's no need to also do
+         * it here.
+         */
+
+        ret = __cfg80211_unlink_bss(rdev, oldest);
+        WARN_ON(!ret);
+        return ret;
+}
+
 void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev,
                            bool send_message)
 {
@@ -689,6 +740,7 @@ static bool cfg80211_combine_bsses(struct cfg80211_registered_device *rdev,
         const u8 *ie;
         int i, ssidlen;
         u8 fold = 0;
+        u32 n_entries = 0;
 
         ies = rcu_access_pointer(new->pub.beacon_ies);
         if (WARN_ON(!ies))
@@ -712,6 +764,12 @@ static bool cfg80211_combine_bsses(struct cfg80211_registered_device *rdev,
         /* This is the bad part ... */
 
         list_for_each_entry(bss, &rdev->bss_list, list) {
+                /*
+                 * we're iterating all the entries anyway, so take the
+                 * opportunity to validate the list length accounting
+                 */
+                n_entries++;
+
                 if (!ether_addr_equal(bss->pub.bssid, new->pub.bssid))
                         continue;
                 if (bss->pub.channel != new->pub.channel)
@@ -740,6 +798,10 @@ static bool cfg80211_combine_bsses(struct cfg80211_registered_device *rdev,
                                    new->pub.beacon_ies);
         }
 
+        WARN_ONCE(n_entries != rdev->bss_entries,
+                  "rdev bss entries[%d]/list[len:%d] corruption\n",
+                  rdev->bss_entries, n_entries);
+
         return true;
 }
 
@@ -894,7 +956,14 @@ cfg80211_bss_update(struct cfg80211_registered_device *rdev,
                         }
                 }
 
+                if (rdev->bss_entries >= bss_entries_limit &&
+                    !cfg80211_bss_expire_oldest(rdev)) {
+                        kfree(new);
+                        goto drop;
+                }
+
                 list_add_tail(&new->list, &rdev->bss_list);
+                rdev->bss_entries++;
                 rb_insert_bss(rdev, new);
                 found = new;
         }
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 5ea12afc7706..659b507b347d 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1158,7 +1158,8 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate)
                    58500000,
                    65000000,
                    78000000,
-                   0,
+                /* not in the spec, but some devices use this: */
+                   86500000,
                 },
                 {  13500000,
                    27000000,
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index fd6986634e6f..5bf7e1bfeac7 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1268,12 +1268,14 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir,
                         err = security_xfrm_policy_lookup(pol->security,
                                                       fl->flowi_secid,
                                                       policy_to_flow_dir(dir));
-                        if (!err && !xfrm_pol_hold_rcu(pol))
-                                goto again;
-                        else if (err == -ESRCH)
+                        if (!err) {
+                                if (!xfrm_pol_hold_rcu(pol))
+                                        goto again;
+                        } else if (err == -ESRCH) {
                                 pol = NULL;
-                        else
+                        } else {
                                 pol = ERR_PTR(err);
+                        }
                 } else
                         pol = NULL;
         }
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 08892091cfe3..671a1d0333f0 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -2450,7 +2450,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 
 #ifdef CONFIG_COMPAT
         if (in_compat_syscall())
-                return -ENOTSUPP;
+                return -EOPNOTSUPP;
 #endif
 
         type = nlh->nlmsg_type;
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile
index 12b7304d55dc..72c58675973e 100644
--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@ -27,6 +27,7 @@ hostprogs-y += xdp2
 hostprogs-y += test_current_task_under_cgroup
 hostprogs-y += trace_event
 hostprogs-y += sampleip
+hostprogs-y += tc_l2_redirect
 
 test_verifier-objs := test_verifier.o libbpf.o
 test_maps-objs := test_maps.o libbpf.o
@@ -56,6 +57,7 @@ test_current_task_under_cgroup-objs := bpf_load.o libbpf.o \
                                        test_current_task_under_cgroup_user.o
 trace_event-objs := bpf_load.o libbpf.o trace_event_user.o
 sampleip-objs := bpf_load.o libbpf.o sampleip_user.o
+tc_l2_redirect-objs := bpf_load.o libbpf.o tc_l2_redirect_user.o
 
 # Tell kbuild to always build the programs
 always := $(hostprogs-y)
@@ -72,6 +74,7 @@ always += test_probe_write_user_kern.o
 always += trace_output_kern.o
 always += tcbpf1_kern.o
 always += tcbpf2_kern.o
+always += tc_l2_redirect_kern.o
 always += lathist_kern.o
 always += offwaketime_kern.o
 always += spintest_kern.o
@@ -111,6 +114,7 @@ HOSTLOADLIBES_xdp2 += -lelf
 HOSTLOADLIBES_test_current_task_under_cgroup += -lelf
 HOSTLOADLIBES_trace_event += -lelf
 HOSTLOADLIBES_sampleip += -lelf
+HOSTLOADLIBES_tc_l2_redirect += -l elf
 
 # Allows pointing LLC/CLANG to a LLVM backend with bpf support, redefine on cmdline:
 #  make samples/bpf/ LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang
diff --git a/samples/bpf/bpf_helpers.h b/samples/bpf/bpf_helpers.h
index 90f44bd2045e..dadd5161bd91 100644
--- a/samples/bpf/bpf_helpers.h
+++ b/samples/bpf/bpf_helpers.h
@@ -113,7 +113,7 @@ static int (*bpf_skb_under_cgroup)(void *ctx, void *map, int index) =
 #define PT_REGS_FP(x) ((x)->gprs[11]) /* Works only with CONFIG_FRAME_POINTER */
 #define PT_REGS_RC(x) ((x)->gprs[2])
 #define PT_REGS_SP(x) ((x)->gprs[15])
-#define PT_REGS_IP(x) ((x)->ip)
+#define PT_REGS_IP(x) ((x)->psw.addr)
 
 #elif defined(__aarch64__)
 
diff --git a/samples/bpf/sampleip_kern.c b/samples/bpf/sampleip_kern.c
index 774a681f374a..ceabf31079cf 100644
--- a/samples/bpf/sampleip_kern.c
+++ b/samples/bpf/sampleip_kern.c
@@ -25,7 +25,7 @@ int do_sample(struct bpf_perf_event_data *ctx)
         u64 ip;
         u32 *value, init_val = 1;
 
-        ip = ctx->regs.ip;
+        ip = PT_REGS_IP(&ctx->regs);
         value = bpf_map_lookup_elem(&ip_map, &ip);
         if (value)
                 *value += 1;
diff --git a/samples/bpf/tc_l2_redirect.sh b/samples/bpf/tc_l2_redirect.sh
new file mode 100755
index 000000000000..80a05591a140
--- /dev/null
+++ b/samples/bpf/tc_l2_redirect.sh
@@ -0,0 +1,173 @@
+#!/bin/bash
+
+[[ -z $TC ]] && TC='tc'
+[[ -z $IP ]] && IP='ip'
+
+REDIRECT_USER='./tc_l2_redirect'
+REDIRECT_BPF='./tc_l2_redirect_kern.o'
+
+RP_FILTER=$(< /proc/sys/net/ipv4/conf/all/rp_filter)
+IPV6_FORWARDING=$(< /proc/sys/net/ipv6/conf/all/forwarding)
+
+function config_common {
+        local tun_type=$1
+
+        $IP netns add ns1
+        $IP netns add ns2
+        $IP link add ve1 type veth peer name vens1
+        $IP link add ve2 type veth peer name vens2
+        $IP link set dev ve1 up
+        $IP link set dev ve2 up
+        $IP link set dev ve1 mtu 1500
+        $IP link set dev ve2 mtu 1500
+        $IP link set dev vens1 netns ns1
+        $IP link set dev vens2 netns ns2
+
+        $IP -n ns1 link set dev lo up
+        $IP -n ns1 link set dev vens1 up
+        $IP -n ns1 addr add 10.1.1.101/24 dev vens1
+        $IP -n ns1 addr add 2401:db01::65/64 dev vens1 nodad
+        $IP -n ns1 route add default via 10.1.1.1 dev vens1
+        $IP -n ns1 route add default via 2401:db01::1 dev vens1
+
+        $IP -n ns2 link set dev lo up
+        $IP -n ns2 link set dev vens2 up
+        $IP -n ns2 addr add 10.2.1.102/24 dev vens2
+        $IP -n ns2 addr add 2401:db02::66/64 dev vens2 nodad
+        $IP -n ns2 addr add 10.10.1.102 dev lo
+        $IP -n ns2 addr add 2401:face::66/64 dev lo nodad
+        $IP -n ns2 link add ipt2 type ipip local 10.2.1.102 remote 10.2.1.1
+        $IP -n ns2 link add ip6t2 type ip6tnl mode any local 2401:db02::66 remote 2401:db02::1
+        $IP -n ns2 link set dev ipt2 up
+        $IP -n ns2 link set dev ip6t2 up
+        $IP netns exec ns2 $TC qdisc add dev vens2 clsact
+        $IP netns exec ns2 $TC filter add dev vens2 ingress bpf da obj $REDIRECT_BPF sec drop_non_tun_vip
+        if [[ $tun_type == "ipip" ]]; then
+                $IP -n ns2 route add 10.1.1.0/24 dev ipt2
+                $IP netns exec ns2 sysctl -q -w net.ipv4.conf.all.rp_filter=0
+                $IP netns exec ns2 sysctl -q -w net.ipv4.conf.ipt2.rp_filter=0
+        else
+                $IP -n ns2 route add 10.1.1.0/24 dev ip6t2
+                $IP -n ns2 route add 2401:db01::/64 dev ip6t2
+                $IP netns exec ns2 sysctl -q -w net.ipv4.conf.all.rp_filter=0
+                $IP netns exec ns2 sysctl -q -w net.ipv4.conf.ip6t2.rp_filter=0
+        fi
+
+        $IP addr add 10.1.1.1/24 dev ve1
+        $IP addr add 2401:db01::1/64 dev ve1 nodad
+        $IP addr add 10.2.1.1/24 dev ve2
+        $IP addr add 2401:db02::1/64 dev ve2 nodad
+
+        $TC qdisc add dev ve2 clsact
+        $TC filter add dev ve2 ingress bpf da obj $REDIRECT_BPF sec l2_to_iptun_ingress_forward
+
+        sysctl -q -w net.ipv4.conf.all.rp_filter=0
+        sysctl -q -w net.ipv6.conf.all.forwarding=1
+}
+
+function cleanup {
+        set +e
+        [[ -z $DEBUG ]] || set +x
+        $IP netns delete ns1 >& /dev/null
+        $IP netns delete ns2 >& /dev/null
+        $IP link del ve1 >& /dev/null
+        $IP link del ve2 >& /dev/null
+        $IP link del ipt >& /dev/null
+        $IP link del ip6t >& /dev/null
+        sysctl -q -w net.ipv4.conf.all.rp_filter=$RP_FILTER
+        sysctl -q -w net.ipv6.conf.all.forwarding=$IPV6_FORWARDING
+        rm -f /sys/fs/bpf/tc/globals/tun_iface
+        [[ -z $DEBUG ]] || set -x
+        set -e
+}
+
+function l2_to_ipip {
+        echo -n "l2_to_ipip $1: "
+
+        local dir=$1
+
+        config_common ipip
+
+        $IP link add ipt type ipip external
+        $IP link set dev ipt up
+        sysctl -q -w net.ipv4.conf.ipt.rp_filter=0
+        sysctl -q -w net.ipv4.conf.ipt.forwarding=1
+
+        if [[ $dir == "egress" ]]; then
+                $IP route add 10.10.1.0/24 via 10.2.1.102 dev ve2
+                $TC filter add dev ve2 egress bpf da obj $REDIRECT_BPF sec l2_to_iptun_ingress_redirect
+                sysctl -q -w net.ipv4.conf.ve1.forwarding=1
+        else
+                $TC qdisc add dev ve1 clsact
+                $TC filter add dev ve1 ingress bpf da obj $REDIRECT_BPF sec l2_to_iptun_ingress_redirect
+        fi
+
+        $REDIRECT_USER -U /sys/fs/bpf/tc/globals/tun_iface -i $(< /sys/class/net/ipt/ifindex)
+
+        $IP netns exec ns1 ping -c1 10.10.1.102 >& /dev/null
+
+        if [[ $dir == "egress" ]]; then
+                # test direct egress to ve2 (i.e. not forwarding from
+                # ve1 to ve2).
+                ping -c1 10.10.1.102 >& /dev/null
+        fi
+
+        cleanup
+
+        echo "OK"
+}
+
+function l2_to_ip6tnl {
+        echo -n "l2_to_ip6tnl $1: "
+
+        local dir=$1
+
+        config_common ip6tnl
+
+        $IP link add ip6t type ip6tnl mode any external
+        $IP link set dev ip6t up
+        sysctl -q -w net.ipv4.conf.ip6t.rp_filter=0
+        sysctl -q -w net.ipv4.conf.ip6t.forwarding=1
+
+        if [[ $dir == "egress" ]]; then
+                $IP route add 10.10.1.0/24 via 10.2.1.102 dev ve2
+                $IP route add 2401:face::/64 via 2401:db02::66 dev ve2
+                $TC filter add dev ve2 egress bpf da obj $REDIRECT_BPF sec l2_to_ip6tun_ingress_redirect
+                sysctl -q -w net.ipv4.conf.ve1.forwarding=1
+        else
+                $TC qdisc add dev ve1 clsact
+                $TC filter add dev ve1 ingress bpf da obj $REDIRECT_BPF sec l2_to_ip6tun_ingress_redirect
+        fi
+
+        $REDIRECT_USER -U /sys/fs/bpf/tc/globals/tun_iface -i $(< /sys/class/net/ip6t/ifindex)
+
+        $IP netns exec ns1 ping -c1 10.10.1.102 >& /dev/null
+        $IP netns exec ns1 ping -6 -c1 2401:face::66 >& /dev/null
+
+        if [[ $dir == "egress" ]]; then
+                # test direct egress to ve2 (i.e. not forwarding from
+                # ve1 to ve2).
+                ping -c1 10.10.1.102 >& /dev/null
+                ping -6 -c1 2401:face::66 >& /dev/null
+        fi
+
+        cleanup
+
+        echo "OK"
+}
+
+cleanup
+test_names="l2_to_ipip l2_to_ip6tnl"
+test_dirs="ingress egress"
+if [[ $# -ge 2 ]]; then
+        test_names=$1
+        test_dirs=$2
+elif [[ $# -ge 1 ]]; then
+        test_names=$1
+fi
+
+for t in $test_names; do
+        for d in $test_dirs; do
+                $t $d
+        done
+done
diff --git a/samples/bpf/tc_l2_redirect_kern.c b/samples/bpf/tc_l2_redirect_kern.c
new file mode 100644
index 000000000000..92a44729dbe4
--- /dev/null
+++ b/samples/bpf/tc_l2_redirect_kern.c
@@ -0,0 +1,236 @@
+/* Copyright (c) 2016 Facebook
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+#include <uapi/linux/bpf.h>
+#include <uapi/linux/if_ether.h>
+#include <uapi/linux/if_packet.h>
+#include <uapi/linux/ip.h>
+#include <uapi/linux/ipv6.h>
+#include <uapi/linux/in.h>
+#include <uapi/linux/tcp.h>
+#include <uapi/linux/filter.h>
+#include <uapi/linux/pkt_cls.h>
+#include <net/ipv6.h>
+#include "bpf_helpers.h"
+
+#define _htonl __builtin_bswap32
+
+#define PIN_GLOBAL_NS           2
+struct bpf_elf_map {
+        __u32 type;
+        __u32 size_key;
+        __u32 size_value;
+        __u32 max_elem;
+        __u32 flags;
+        __u32 id;
+        __u32 pinning;
+};
+
+/* copy of 'struct ethhdr' without __packed */
+struct eth_hdr {
+        unsigned char   h_dest[ETH_ALEN];
+        unsigned char   h_source[ETH_ALEN];
+        unsigned short  h_proto;
+};
+
+struct bpf_elf_map SEC("maps") tun_iface = {
+        .type = BPF_MAP_TYPE_ARRAY,
+        .size_key = sizeof(int),
+        .size_value = sizeof(int),
+        .pinning = PIN_GLOBAL_NS,
+        .max_elem = 1,
+};
+
+static __always_inline bool is_vip_addr(__be16 eth_proto, __be32 daddr)
+{
+        if (eth_proto == htons(ETH_P_IP))
+                return (_htonl(0xffffff00) & daddr) == _htonl(0x0a0a0100);
+        else if (eth_proto == htons(ETH_P_IPV6))
+                return (daddr == _htonl(0x2401face));
+
+        return false;
+}
+
+SEC("l2_to_iptun_ingress_forward")
+int _l2_to_iptun_ingress_forward(struct __sk_buff *skb)
+{
+        struct bpf_tunnel_key tkey = {};
+        void *data = (void *)(long)skb->data;
+        struct eth_hdr *eth = data;
+        void *data_end = (void *)(long)skb->data_end;
+        int key = 0, *ifindex;
+
+        int ret;
+
+        if (data + sizeof(*eth) > data_end)
+                return TC_ACT_OK;
+
+        ifindex = bpf_map_lookup_elem(&tun_iface, &key);
+        if (!ifindex)
+                return TC_ACT_OK;
+
+        if (eth->h_proto == htons(ETH_P_IP)) {
+                char fmt4[] = "ingress forward to ifindex:%d daddr4:%x\n";
+                struct iphdr *iph = data + sizeof(*eth);
+
+                if (data + sizeof(*eth) + sizeof(*iph) > data_end)
+                        return TC_ACT_OK;
+
+                if (iph->protocol != IPPROTO_IPIP)
+                        return TC_ACT_OK;
+
+                bpf_trace_printk(fmt4, sizeof(fmt4), *ifindex,
+                                 _htonl(iph->daddr));
+                return bpf_redirect(*ifindex, BPF_F_INGRESS);
+        } else if (eth->h_proto == htons(ETH_P_IPV6)) {
+                char fmt6[] = "ingress forward to ifindex:%d daddr6:%x::%x\n";
+                struct ipv6hdr *ip6h = data + sizeof(*eth);
+
+                if (data + sizeof(*eth) + sizeof(*ip6h) > data_end)
+                        return TC_ACT_OK;
+
+                if (ip6h->nexthdr != IPPROTO_IPIP &&
+                    ip6h->nexthdr != IPPROTO_IPV6)
+                        return TC_ACT_OK;
+
+                bpf_trace_printk(fmt6, sizeof(fmt6), *ifindex,
+                                 _htonl(ip6h->daddr.s6_addr32[0]),
+                                 _htonl(ip6h->daddr.s6_addr32[3]));
+                return bpf_redirect(*ifindex, BPF_F_INGRESS);
+        }
+
+        return TC_ACT_OK;
+}
+
+SEC("l2_to_iptun_ingress_redirect")
+int _l2_to_iptun_ingress_redirect(struct __sk_buff *skb)
+{
+        struct bpf_tunnel_key tkey = {};
+        void *data = (void *)(long)skb->data;
+        struct eth_hdr *eth = data;
+        void *data_end = (void *)(long)skb->data_end;
+        int key = 0, *ifindex;
+
+        int ret;
+
+        if (data + sizeof(*eth) > data_end)
+                return TC_ACT_OK;
+
+        ifindex = bpf_map_lookup_elem(&tun_iface, &key);
+        if (!ifindex)
+                return TC_ACT_OK;
+
+        if (eth->h_proto == htons(ETH_P_IP)) {
+                char fmt4[] = "e/ingress redirect daddr4:%x to ifindex:%d\n";
+                struct iphdr *iph = data + sizeof(*eth);
+                __be32 daddr = iph->daddr;
+
+                if (data + sizeof(*eth) + sizeof(*iph) > data_end)
+                        return TC_ACT_OK;
+
+                if (!is_vip_addr(eth->h_proto, daddr))
+                        return TC_ACT_OK;
+
+                bpf_trace_printk(fmt4, sizeof(fmt4), _htonl(daddr), *ifindex);
+        } else {
+                return TC_ACT_OK;
+        }
+
+        tkey.tunnel_id = 10000;
+        tkey.tunnel_ttl = 64;
+        tkey.remote_ipv4 = 0x0a020166; /* 10.2.1.102 */
+        bpf_skb_set_tunnel_key(skb, &tkey, sizeof(tkey), 0);
+        return bpf_redirect(*ifindex, 0);
+}
+
+SEC("l2_to_ip6tun_ingress_redirect")
+int _l2_to_ip6tun_ingress_redirect(struct __sk_buff *skb)
+{
+        struct bpf_tunnel_key tkey = {};
+        void *data = (void *)(long)skb->data;
+        struct eth_hdr *eth = data;
+        void *data_end = (void *)(long)skb->data_end;
+        int key = 0, *ifindex;
+
+        if (data + sizeof(*eth) > data_end)
+                return TC_ACT_OK;
+
+        ifindex = bpf_map_lookup_elem(&tun_iface, &key);
+        if (!ifindex)
+                return TC_ACT_OK;
+
+        if (eth->h_proto == htons(ETH_P_IP)) {
+                char fmt4[] = "e/ingress redirect daddr4:%x to ifindex:%d\n";
+                struct iphdr *iph = data + sizeof(*eth);
+
+                if (data + sizeof(*eth) + sizeof(*iph) > data_end)
+                        return TC_ACT_OK;
+
+                if (!is_vip_addr(eth->h_proto, iph->daddr))
+                        return TC_ACT_OK;
+
+                bpf_trace_printk(fmt4, sizeof(fmt4), _htonl(iph->daddr),
+                                 *ifindex);
+        } else if (eth->h_proto == htons(ETH_P_IPV6)) {
+                char fmt6[] = "e/ingress redirect daddr6:%x to ifindex:%d\n";
+                struct ipv6hdr *ip6h = data + sizeof(*eth);
+
+                if (data + sizeof(*eth) + sizeof(*ip6h) > data_end)
+                        return TC_ACT_OK;
+
+                if (!is_vip_addr(eth->h_proto, ip6h->daddr.s6_addr32[0]))
+                        return TC_ACT_OK;
+
+                bpf_trace_printk(fmt6, sizeof(fmt6),
+                                 _htonl(ip6h->daddr.s6_addr32[0]), *ifindex);
+        } else {
+                return TC_ACT_OK;
+        }
+
+        tkey.tunnel_id = 10000;
+        tkey.tunnel_ttl = 64;
+        /* 2401:db02:0:0:0:0:0:66 */
+        tkey.remote_ipv6[0] = _htonl(0x2401db02);
+        tkey.remote_ipv6[1] = 0;
+        tkey.remote_ipv6[2] = 0;
+        tkey.remote_ipv6[3] = _htonl(0x00000066);
+        bpf_skb_set_tunnel_key(skb, &tkey, sizeof(tkey), BPF_F_TUNINFO_IPV6);
+        return bpf_redirect(*ifindex, 0);
+}
+
+SEC("drop_non_tun_vip")
+int _drop_non_tun_vip(struct __sk_buff *skb)
+{
+        struct bpf_tunnel_key tkey = {};
+        void *data = (void *)(long)skb->data;
+        struct eth_hdr *eth = data;
+        void *data_end = (void *)(long)skb->data_end;
+
+        if (data + sizeof(*eth) > data_end)
+                return TC_ACT_OK;
+
+        if (eth->h_proto == htons(ETH_P_IP)) {
+                struct iphdr *iph = data + sizeof(*eth);
+
+                if (data + sizeof(*eth) + sizeof(*iph) > data_end)
+                        return TC_ACT_OK;
+
+                if (is_vip_addr(eth->h_proto, iph->daddr))
+                        return TC_ACT_SHOT;
+        } else if (eth->h_proto == htons(ETH_P_IPV6)) {
+                struct ipv6hdr *ip6h = data + sizeof(*eth);
+
+                if (data + sizeof(*eth) + sizeof(*ip6h) > data_end)
+                        return TC_ACT_OK;
+
+                if (is_vip_addr(eth->h_proto, ip6h->daddr.s6_addr32[0]))
+                        return TC_ACT_SHOT;
+        }
+
+        return TC_ACT_OK;
+}
+
+char _license[] SEC("license") = "GPL";
diff --git a/samples/bpf/tc_l2_redirect_user.c b/samples/bpf/tc_l2_redirect_user.c
new file mode 100644
index 000000000000..4013c5337b91
--- /dev/null
+++ b/samples/bpf/tc_l2_redirect_user.c
@@ -0,0 +1,73 @@
+/* Copyright (c) 2016 Facebook
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ */
+#include <linux/unistd.h>
+#include <linux/bpf.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+#include "libbpf.h"
+
+static void usage(void)
+{
+        printf("Usage: tc_l2_ipip_redirect [...]\n");
+        printf("       -U <file>   Update an already pinned BPF array\n");
+        printf("       -i <ifindex> Interface index\n");
+        printf("       -h          Display this help\n");
+}
+
+int main(int argc, char **argv)
+{
+        const char *pinned_file = NULL;
+        int ifindex = -1;
+        int array_key = 0;
+        int array_fd = -1;
+        int ret = -1;
+        int opt;
+
+        while ((opt = getopt(argc, argv, "F:U:i:")) != -1) {
+                switch (opt) {
+                /* General args */
+                case 'U':
+                        pinned_file = optarg;
+                        break;
+                case 'i':
+                        ifindex = atoi(optarg);
+                        break;
+                default:
+                        usage();
+                        goto out;
+                }
+        }
+
+        if (ifindex < 0 || !pinned_file) {
+                usage();
+                goto out;
+        }
+
+        array_fd = bpf_obj_get(pinned_file);
+        if (array_fd < 0) {
+                fprintf(stderr, "bpf_obj_get(%s): %s(%d)\n",
+                        pinned_file, strerror(errno), errno);
+                goto out;
+        }
+
+        /* bpf_tunnel_key.remote_ipv4 expects host byte orders */
+        ret = bpf_update_elem(array_fd, &array_key, &ifindex, 0);
+        if (ret) {
+                perror("bpf_update_elem");
+                goto out;
+        }
+
+out:
+        if (array_fd != -1)
+                close(array_fd);
+        return ret;
+}
diff --git a/samples/bpf/trace_event_kern.c b/samples/bpf/trace_event_kern.c
index 71a8ed32823e..41b6115a32eb 100644
--- a/samples/bpf/trace_event_kern.c
+++ b/samples/bpf/trace_event_kern.c
@@ -50,7 +50,7 @@ int bpf_prog1(struct bpf_perf_event_data *ctx)
         key.userstack = bpf_get_stackid(ctx, &stackmap, USER_STACKID_FLAGS);
         if ((int)key.kernstack < 0 && (int)key.userstack < 0) {
                 bpf_trace_printk(fmt, sizeof(fmt), cpu, ctx->sample_period,
-                                 ctx->regs.ip);
+                                 PT_REGS_IP(&ctx->regs));
                 return 0;
         }
 
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index de46ab03f063..7675d11ee65e 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -159,7 +159,8 @@ cmd_cpp_i_c       = $(CPP) $(c_flags) -o $@ $<
 $(obj)/%.i: $(src)/%.c FORCE
         $(call if_changed_dep,cpp_i_c)
 
-cmd_gensymtypes =                                                           \
+# These mirror gensymtypes_S and co below, keep them in synch.
+cmd_gensymtypes_c =                                                         \
     $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \
     $(GENKSYMS) $(if $(1), -T $(2))                                         \
      $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))             \
@@ -169,7 +170,7 @@ cmd_gensymtypes =                                                           \
 quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
 cmd_cc_symtypes_c =                                                         \
     set -e;                                                                 \
-    $(call cmd_gensymtypes,true,$@) >/dev/null;                             \
+    $(call cmd_gensymtypes_c,true,$@) >/dev/null;                           \
     test -s $@ || rm -f $@
 
 $(obj)/%.symtypes : $(src)/%.c FORCE
@@ -198,9 +199,10 @@ else
 #   the actual value of the checksum generated by genksyms
 
 cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
-cmd_modversions =                                                               \
+
+cmd_modversions_c =                                                             \
         if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then             \
-                $(call cmd_gensymtypes,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))    \
+                $(call cmd_gensymtypes_c,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))  \
                     > $(@D)/.tmp_$(@F:.o=.ver);                                 \
                                                                                 \
                 $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)                      \
@@ -268,13 +270,14 @@ endif # CONFIG_STACK_VALIDATION
 define rule_cc_o_c
         $(call echo-cmd,checksrc) $(cmd_checksrc)                         \
         $(call cmd_and_fixdep,cc_o_c)                                     \
-        $(cmd_modversions)                                                \
+        $(cmd_modversions_c)                                              \
         $(cmd_objtool)                                                    \
         $(call echo-cmd,record_mcount) $(cmd_record_mcount)
 endef
 
 define rule_as_o_S
         $(call cmd_and_fixdep,as_o_S)                                     \
+        $(cmd_modversions_S)                                              \
         $(cmd_objtool)
 endef
 
@@ -314,6 +317,39 @@ modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL)
 $(real-objs-m)      : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
 $(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
 
+# .S file exports must have their C prototypes defined in asm/asm-prototypes.h
+# or a file that it includes, in order to get versioned symbols. We build a
+# dummy C file that includes asm-prototypes and the EXPORT_SYMBOL lines from
+# the .S file (with trailing ';'), and run genksyms on that, to extract vers.
+#
+# This is convoluted. The .S file must first be preprocessed to run guards and
+# expand names, then the resulting exports must be constructed into plain
+# EXPORT_SYMBOL(symbol); to build our dummy C file, and that gets preprocessed
+# to make the genksyms input.
+#
+# These mirror gensymtypes_c and co above, keep them in synch.
+cmd_gensymtypes_S =                                                         \
+    (echo "\#include <linux/kernel.h>" ;                                    \
+     echo "\#include <asm/asm-prototypes.h>" ;                              \
+    $(CPP) $(a_flags) $< |                                                  \
+     grep "\<___EXPORT_SYMBOL\>" |                                          \
+     sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ) | \
+    $(CPP) -D__GENKSYMS__ $(c_flags) -xc - |                                \
+    $(GENKSYMS) $(if $(1), -T $(2))                                         \
+     $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))             \
+     $(if $(KBUILD_PRESERVE),-p)                                            \
+     -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
+
+quiet_cmd_cc_symtypes_S = SYM $(quiet_modtag) $@
+cmd_cc_symtypes_S =                                                         \
+    set -e;                                                                 \
+    $(call cmd_gensymtypes_S,true,$@) >/dev/null;                           \
+    test -s $@ || rm -f $@
+
+$(obj)/%.symtypes : $(src)/%.S FORCE
+        $(call cmd,cc_symtypes_S)
+
+
 quiet_cmd_cpp_s_S = CPP $(quiet_modtag) $@
 cmd_cpp_s_S       = $(CPP) $(a_flags) -o $@ $<
 
@@ -321,7 +357,37 @@ $(obj)/%.s: $(src)/%.S FORCE
         $(call if_changed_dep,cpp_s_S)
 
 quiet_cmd_as_o_S = AS $(quiet_modtag)  $@
-cmd_as_o_S       = $(CC) $(a_flags) -c -o $@ $<
+
+ifndef CONFIG_MODVERSIONS
+cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
+
+else
+
+ASM_PROTOTYPES := $(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/asm-prototypes.h)
+
+ifeq ($(ASM_PROTOTYPES),)
+cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
+
+else
+
+# versioning matches the C process described above, with difference that
+# we parse asm-prototypes.h C header to get function definitions.
+
+cmd_as_o_S = $(CC) $(a_flags) -c -o $(@D)/.tmp_$(@F) $<
+
+cmd_modversions_S =                                                             \
+        if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then             \
+                $(call cmd_gensymtypes_S,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))  \
+                    > $(@D)/.tmp_$(@F:.o=.ver);                                 \
+                                                                                \
+                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)                      \
+                        -T $(@D)/.tmp_$(@F:.o=.ver);                            \
+                rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);                \
+        else                                                                    \
+                mv -f $(@D)/.tmp_$(@F) $@;                                      \
+        fi;
+endif
+endif
 
 $(obj)/%.o: $(src)/%.S $(objtool_obj) FORCE
         $(call if_changed_rule,as_o_S)
@@ -430,6 +496,9 @@ cmd_export_list = $(OBJDUMP) -h $< | \
 
 $(obj)/lib-ksyms.o: $(lib-target) FORCE
         $(call if_changed,export_list)
+
+targets += $(obj)/lib-ksyms.o
+
 endif
 
 #
diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn
index 53449a6ff6aa..7c321a603b07 100644
--- a/scripts/Makefile.extrawarn
+++ b/scripts/Makefile.extrawarn
@@ -36,6 +36,7 @@ warning-2 += -Wshadow
 warning-2 += $(call cc-option, -Wlogical-op)
 warning-2 += $(call cc-option, -Wmissing-field-initializers)
 warning-2 += $(call cc-option, -Wsign-compare)
+warning-2 += $(call cc-option, -Wmaybe-uninitialized)
 
 warning-3 := -Wbad-function-cast
 warning-3 += -Wcast-qual
diff --git a/scripts/Makefile.ubsan b/scripts/Makefile.ubsan
index dd779c40c8e6..3b1b13818d59 100644
--- a/scripts/Makefile.ubsan
+++ b/scripts/Makefile.ubsan
@@ -17,4 +17,8 @@ endif
 ifdef CONFIG_UBSAN_NULL
       CFLAGS_UBSAN += $(call cc-option, -fsanitize=null)
 endif
+
+      # -fsanitize=* options makes GCC less smart than usual and
+      # increase number of 'maybe-uninitialized false-positives
+      CFLAGS_UBSAN += $(call cc-option, -Wno-maybe-uninitialized)
 endif
diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index 19f5adfd877d..d9ff038c1b28 100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -8,6 +8,9 @@
 # of the GNU General Public License, incorporated herein by reference.
 
 import sys, os, re
+from signal import signal, SIGPIPE, SIG_DFL
+
+signal(SIGPIPE, SIG_DFL)
 
 if len(sys.argv) != 3:
     sys.stderr.write("usage: %s file1 file2\n" % sys.argv[0])
diff --git a/scripts/gcc-x86_64-has-stack-protector.sh b/scripts/gcc-x86_64-has-stack-protector.sh
index 973e8c141567..17867e723a51 100755
--- a/scripts/gcc-x86_64-has-stack-protector.sh
+++ b/scripts/gcc-x86_64-has-stack-protector.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -O0 -mcmodel=kernel -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
+echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
 if [ "$?" -eq "0" ] ; then
         echo y
 else
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index ebced77deb9c..90a091b6ae4d 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -35,6 +35,8 @@ nconfig: $(obj)/nconf
 
 silentoldconfig: $(obj)/conf
         $(Q)mkdir -p include/config include/generated
+        $(Q)test -e include/generated/autoksyms.h || \
+            touch   include/generated/autoksyms.h
         $< $(silent) --$@ $(Kconfig)
 
 localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index fc3036b34e51..a4d90aa1045a 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -621,8 +621,8 @@ int aa_change_hat(const char *hats[], int count, u64 token, bool permtest)
         /* released below */
         cred = get_current_cred();
         cxt = cred_cxt(cred);
-        profile = aa_cred_profile(cred);
-        previous_profile = cxt->previous;
+        profile = aa_get_newest_profile(aa_cred_profile(cred));
+        previous_profile = aa_get_newest_profile(cxt->previous);
 
         if (unconfined(profile)) {
                 info = "unconfined";
@@ -718,6 +718,8 @@ audit:
 out:
         aa_put_profile(hat);
         kfree(name);
+        aa_put_profile(profile);
+        aa_put_profile(previous_profile);
         put_cred(cred);
 
         return error;
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig
index 22aec9a1e9a4..4a56f3dfba51 100644
--- a/sound/soc/atmel/Kconfig
+++ b/sound/soc/atmel/Kconfig
@@ -78,4 +78,14 @@ config SND_ATMEL_SOC_PDMIC
         help
           Say Y if you want to add support for Atmel ASoC driver for boards using
           PDMIC.
+
+config SND_ATMEL_SOC_TSE850_PCM5142
+        tristate "ASoC driver for the Axentia TSE-850"
+        depends on ARCH_AT91 && OF
+        depends on ATMEL_SSC && I2C
+        select SND_ATMEL_SOC_SSC_DMA
+        select SND_SOC_PCM512x_I2C
+        help
+          Say Y if you want to add support for the ASoC driver for the
+          Axentia TSE-850 with a PCM5142 codec.
 endif
diff --git a/sound/soc/atmel/Makefile b/sound/soc/atmel/Makefile
index a2b127bd9c87..67e10cbd4ed7 100644
--- a/sound/soc/atmel/Makefile
+++ b/sound/soc/atmel/Makefile
@@ -13,9 +13,11 @@ snd-atmel-soc-wm8904-objs := atmel_wm8904.o
 snd-soc-sam9x5-wm8731-objs := sam9x5_wm8731.o
 snd-atmel-soc-classd-objs := atmel-classd.o
 snd-atmel-soc-pdmic-objs := atmel-pdmic.o
+snd-atmel-soc-tse850-pcm5142-objs := tse850-pcm5142.o
 
 obj-$(CONFIG_SND_AT91_SOC_SAM9G20_WM8731) += snd-soc-sam9g20-wm8731.o
 obj-$(CONFIG_SND_ATMEL_SOC_WM8904) += snd-atmel-soc-wm8904.o
 obj-$(CONFIG_SND_AT91_SOC_SAM9X5_WM8731) += snd-soc-sam9x5-wm8731.o
 obj-$(CONFIG_SND_ATMEL_SOC_CLASSD) += snd-atmel-soc-classd.o
 obj-$(CONFIG_SND_ATMEL_SOC_PDMIC) += snd-atmel-soc-pdmic.o
+obj-$(CONFIG_SND_ATMEL_SOC_TSE850_PCM5142) += snd-atmel-soc-tse850-pcm5142.o
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index 16e459aedffe..a1e2c5682dcd 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -380,6 +380,7 @@ static void atmel_ssc_shutdown(struct snd_pcm_substream *substream,
                 ssc_writel(ssc_p->ssc->regs, CR, SSC_BIT(CR_SWRST));
                 /* Clear the SSC dividers */
                 ssc_p->cmr_div = ssc_p->tcmr_period = ssc_p->rcmr_period = 0;
+                ssc_p->forced_divider = 0;
         }
         spin_unlock_irq(&ssc_p->lock);
 
@@ -426,14 +427,17 @@ static int atmel_ssc_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
                 else
                         if (div != ssc_p->cmr_div)
                                 return -EBUSY;
+                ssc_p->forced_divider |= BIT(ATMEL_SSC_CMR_DIV);
                 break;
 
         case ATMEL_SSC_TCMR_PERIOD:
                 ssc_p->tcmr_period = div;
+                ssc_p->forced_divider |= BIT(ATMEL_SSC_TCMR_PERIOD);
                 break;
 
         case ATMEL_SSC_RCMR_PERIOD:
                 ssc_p->rcmr_period = div;
+                ssc_p->forced_divider |= BIT(ATMEL_SSC_RCMR_PERIOD);
                 break;
 
         default:
@@ -443,6 +447,28 @@ static int atmel_ssc_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
         return 0;
 }
 
+/* Is the cpu-dai master of the frame clock? */
+static int atmel_ssc_cfs(struct atmel_ssc_info *ssc_p)
+{
+        switch (ssc_p->daifmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBM_CFS:
+        case SND_SOC_DAIFMT_CBS_CFS:
+                return 1;
+        }
+        return 0;
+}
+
+/* Is the cpu-dai master of the bit clock? */
+static int atmel_ssc_cbs(struct atmel_ssc_info *ssc_p)
+{
+        switch (ssc_p->daifmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBS_CFM:
+        case SND_SOC_DAIFMT_CBS_CFS:
+                return 1;
+        }
+        return 0;
+}
+
 /*
  * Configure the SSC.
  */
@@ -459,6 +485,9 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
         u32 tfmr, rfmr, tcmr, rcmr;
         int ret;
         int fslen, fslen_ext;
+        u32 cmr_div;
+        u32 tcmr_period;
+        u32 rcmr_period;
 
         /*
          * Currently, there is only one set of dma params for
@@ -470,6 +499,46 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
         else
                 dir = 1;
 
+        /*
+         * If the cpu dai should provide BCLK, but noone has provided the
+         * divider needed for that to work, fall back to something sensible.
+         */
+        cmr_div = ssc_p->cmr_div;
+        if (!(ssc_p->forced_divider & BIT(ATMEL_SSC_CMR_DIV)) &&
+            atmel_ssc_cbs(ssc_p)) {
+                int bclk_rate = snd_soc_params_to_bclk(params);
+
+                if (bclk_rate < 0) {
+                        dev_err(dai->dev, "unable to calculate cmr_div: %d\n",
+                                bclk_rate);
+                        return bclk_rate;
+                }
+
+                cmr_div = DIV_ROUND_CLOSEST(ssc_p->mck_rate, 2 * bclk_rate);
+        }
+
+        /*
+         * If the cpu dai should provide LRCLK, but noone has provided the
+         * dividers needed for that to work, fall back to something sensible.
+         */
+        tcmr_period = ssc_p->tcmr_period;
+        rcmr_period = ssc_p->rcmr_period;
+        if (atmel_ssc_cfs(ssc_p)) {
+                int frame_size = snd_soc_params_to_frame_size(params);
+
+                if (frame_size < 0) {
+                        dev_err(dai->dev,
+                                "unable to calculate tx/rx cmr_period: %d\n",
+                                frame_size);
+                        return frame_size;
+                }
+
+                if (!(ssc_p->forced_divider & BIT(ATMEL_SSC_TCMR_PERIOD)))
+                        tcmr_period = frame_size / 2 - 1;
+                if (!(ssc_p->forced_divider & BIT(ATMEL_SSC_RCMR_PERIOD)))
+                        rcmr_period = frame_size / 2 - 1;
+        }
+
         dma_params = ssc_p->dma_params[dir];
 
         channels = params_channels(params);
@@ -524,7 +593,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                 fslen_ext = (bits - 1) / 16;
                 fslen = (bits - 1) % 16;
 
-                rcmr =    SSC_BF(RCMR_PERIOD, ssc_p->rcmr_period)
+                rcmr =    SSC_BF(RCMR_PERIOD, rcmr_period)
                         | SSC_BF(RCMR_STTDLY, START_DELAY)
                         | SSC_BF(RCMR_START, SSC_START_FALLING_RF)
                         | SSC_BF(RCMR_CKI, SSC_CKI_RISING)
@@ -540,7 +609,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                         | SSC_BF(RFMR_LOOP, 0)
                         | SSC_BF(RFMR_DATLEN, (bits - 1));
 
-                tcmr =    SSC_BF(TCMR_PERIOD, ssc_p->tcmr_period)
+                tcmr =    SSC_BF(TCMR_PERIOD, tcmr_period)
                         | SSC_BF(TCMR_STTDLY, START_DELAY)
                         | SSC_BF(TCMR_START, SSC_START_FALLING_RF)
                         | SSC_BF(TCMR_CKI, SSC_CKI_FALLING)
@@ -606,7 +675,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                 fslen_ext = (bits - 1) / 16;
                 fslen = (bits - 1) % 16;
 
-                rcmr =    SSC_BF(RCMR_PERIOD, ssc_p->rcmr_period)
+                rcmr =    SSC_BF(RCMR_PERIOD, rcmr_period)
                         | SSC_BF(RCMR_STTDLY, START_DELAY)
                         | SSC_BF(RCMR_START, SSC_START_FALLING_RF)
                         | SSC_BF(RCMR_CKI, SSC_CKI_RISING)
@@ -623,7 +692,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                         | SSC_BF(RFMR_LOOP, 0)
                         | SSC_BF(RFMR_DATLEN, (bits - 1));
 
-                tcmr =    SSC_BF(TCMR_PERIOD, ssc_p->tcmr_period)
+                tcmr =    SSC_BF(TCMR_PERIOD, tcmr_period)
                         | SSC_BF(TCMR_STTDLY, START_DELAY)
                         | SSC_BF(TCMR_START, SSC_START_FALLING_RF)
                         | SSC_BF(TCMR_CKI, SSC_CKI_FALLING)
@@ -650,7 +719,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                  * MCK divider, and the BCLK signal is output
                  * on the SSC TK line.
                  */
-                rcmr =    SSC_BF(RCMR_PERIOD, ssc_p->rcmr_period)
+                rcmr =    SSC_BF(RCMR_PERIOD, rcmr_period)
                         | SSC_BF(RCMR_STTDLY, 1)
                         | SSC_BF(RCMR_START, SSC_START_RISING_RF)
                         | SSC_BF(RCMR_CKI, SSC_CKI_RISING)
@@ -665,7 +734,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
                         | SSC_BF(RFMR_LOOP, 0)
                         | SSC_BF(RFMR_DATLEN, (bits - 1));
 
-                tcmr =    SSC_BF(TCMR_PERIOD, ssc_p->tcmr_period)
+                tcmr =    SSC_BF(TCMR_PERIOD, tcmr_period)
                         | SSC_BF(TCMR_STTDLY, 1)
                         | SSC_BF(TCMR_START, SSC_START_RISING_RF)
                         | SSC_BF(TCMR_CKI, SSC_CKI_FALLING)
@@ -760,7 +829,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream,
         }
 
         /* set SSC clock mode register */
-        ssc_writel(ssc_p->ssc->regs, CMR, ssc_p->cmr_div);
+        ssc_writel(ssc_p->ssc->regs, CMR, cmr_div);
 
         /* set receive clock mode and format */
         ssc_writel(ssc_p->ssc->regs, RCMR, rcmr);
diff --git a/sound/soc/atmel/atmel_ssc_dai.h b/sound/soc/atmel/atmel_ssc_dai.h
index 80b153857a88..75194f582131 100644
--- a/sound/soc/atmel/atmel_ssc_dai.h
+++ b/sound/soc/atmel/atmel_ssc_dai.h
@@ -113,6 +113,7 @@ struct atmel_ssc_info {
         unsigned short cmr_div;
         unsigned short tcmr_period;
         unsigned short rcmr_period;
+        unsigned int forced_divider;
         struct atmel_pcm_dma_params *dma_params[2];
         struct atmel_ssc_state ssc_state;
         unsigned long mck_rate;
diff --git a/sound/soc/atmel/atmel_wm8904.c b/sound/soc/atmel/atmel_wm8904.c
index fdd28ed3e0b9..fbc10f61eb55 100644
--- a/sound/soc/atmel/atmel_wm8904.c
+++ b/sound/soc/atmel/atmel_wm8904.c
@@ -53,7 +53,7 @@ static int atmel_asoc_wm8904_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static struct snd_soc_ops atmel_asoc_wm8904_ops = {
+static const struct snd_soc_ops atmel_asoc_wm8904_ops = {
         .hw_params = atmel_asoc_wm8904_hw_params,
 };
 
diff --git a/sound/soc/atmel/tse850-pcm5142.c b/sound/soc/atmel/tse850-pcm5142.c
new file mode 100644
index 000000000000..ac6a814c8ecf
--- /dev/null
+++ b/sound/soc/atmel/tse850-pcm5142.c
@@ -0,0 +1,472 @@
+/*
+ * TSE-850 audio - ASoC driver for the Axentia TSE-850 with a PCM5142 codec
+ *
+ * Copyright (C) 2016 Axentia Technologies AB
+ *
+ * Author: Peter Rosin <peda@axentia.se>
+ *
+ * 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.
+ */
+
+/*
+ *               loop1 relays
+ *   IN1 +---o  +------------+  o---+ OUT1
+ *            \                /
+ *             +              +
+ *             |   /          |
+ *             +--o  +--.     |
+ *             |  add   |     |
+ *             |        V     |
+ *             |      .---.   |
+ *   DAC +----------->|Sum|---+
+ *             |      '---'   |
+ *             |              |
+ *             +              +
+ *
+ *   IN2 +---o--+------------+--o---+ OUT2
+ *               loop2 relays
+ *
+ * The 'loop1' gpio pin controlls two relays, which are either in loop
+ * position, meaning that input and output are directly connected, or
+ * they are in mixer position, meaning that the signal is passed through
+ * the 'Sum' mixer. Similarly for 'loop2'.
+ *
+ * In the above, the 'loop1' relays are inactive, thus feeding IN1 to the
+ * mixer (if 'add' is active) and feeding the mixer output to OUT1. The
+ * 'loop2' relays are active, short-cutting the TSE-850 from channel 2.
+ * IN1, IN2, OUT1 and OUT2 are TSE-850 connectors and DAC is the PCB name
+ * of the (filtered) output from the PCM5142 codec.
+ */
+
+#include <linux/clk.h>
+#include <linux/gpio.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
+#include <linux/regulator/consumer.h>
+
+#include <sound/soc.h>
+#include <sound/pcm_params.h>
+
+#include "atmel_ssc_dai.h"
+
+struct tse850_priv {
+        int ssc_id;
+
+        struct gpio_desc *add;
+        struct gpio_desc *loop1;
+        struct gpio_desc *loop2;
+
+        struct regulator *ana;
+
+        int add_cache;
+        int loop1_cache;
+        int loop2_cache;
+};
+
+static int tse850_get_mux1(struct snd_kcontrol *kctrl,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);
+        struct snd_soc_card *card = dapm->card;
+        struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
+
+        ucontrol->value.enumerated.item[0] = tse850->loop1_cache;
+
+        return 0;
+}
+
+static int tse850_put_mux1(struct snd_kcontrol *kctrl,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);
+        struct snd_soc_card *card = dapm->card;
+        struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
+        struct soc_enum *e = (struct soc_enum *)kctrl->private_value;
+        unsigned int val = ucontrol->value.enumerated.item[0];
+
+        if (val >= e->items)
+                return -EINVAL;
+
+        gpiod_set_value_cansleep(tse850->loop1, val);
+        tse850->loop1_cache = val;
+
+        return snd_soc_dapm_put_enum_double(kctrl, ucontrol);
+}
+
+static int tse850_get_mux2(struct snd_kcontrol *kctrl,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);
+        struct snd_soc_card *card = dapm->card;
+        struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
+
+        ucontrol->value.enumerated.item[0] = tse850->loop2_cache;
+
+        return 0;
+}
+
+static int tse850_put_mux2(struct snd_kcontrol *kctrl,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);
+        struct snd_soc_card *card = dapm->card;
+        struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
+        struct soc_enum *e = (struct soc_enum *)kctrl->private_value;
+        unsigned int val = ucontrol->value.enumerated.item[0];
+
+        if (val >= e->items)
+                return -EINVAL;
+
+        gpiod_set_value_cansleep(tse850->loop2, val);
+        tse850->loop2_cache = val;
+
+        return snd_soc_dapm_put_enum_double(kctrl, ucontrol);
+}
+
+int tse850_get_mix(struct snd_kcontrol *kctrl,
+                   struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);
+        struct snd_soc_card *card = dapm->card;
+        struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
+
+        ucontrol->value.enumerated.item[0] = tse850->add_cache;
+
+        return 0;
+}
+
+int tse850_put_mix(struct snd_kcontrol *kctrl,
+                   struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);
+        struct snd_soc_card *card = dapm->card;
+        struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
+        int connect = !!ucontrol->value.integer.value[0];
+
+        if (tse850->add_cache == connect)
+                return 0;
+
+        /*
+         * Hmmm, this gpiod_set_value_cansleep call should probably happen
+         * inside snd_soc_dapm_mixer_update_power in the loop.
+         */
+        gpiod_set_value_cansleep(tse850->add, connect);
+        tse850->add_cache = connect;
+
+        snd_soc_dapm_mixer_update_power(dapm, kctrl, connect, NULL);
+        return 1;
+}
+
+int tse850_get_ana(struct snd_kcontrol *kctrl,
+                   struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);
+        struct snd_soc_card *card = dapm->card;
+        struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
+        int ret;
+
+        ret = regulator_get_voltage(tse850->ana);
+        if (ret < 0)
+                return ret;
+
+        /*
+         * Map regulator output values like so:
+         *      -11.5V to "Low" (enum 0)
+         * 11.5V-12.5V to "12V" (enum 1)
+         * 12.5V-13.5V to "13V" (enum 2)
+         *     ...
+         * 18.5V-19.5V to "19V" (enum 8)
+         * 19.5V-      to "20V" (enum 9)
+         */
+        if (ret < 11000000)
+                ret = 11000000;
+        else if (ret > 20000000)
+                ret = 20000000;
+        ret -= 11000000;
+        ret = (ret + 500000) / 1000000;
+
+        ucontrol->value.enumerated.item[0] = ret;
+
+        return 0;
+}
+
+int tse850_put_ana(struct snd_kcontrol *kctrl,
+                   struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);
+        struct snd_soc_card *card = dapm->card;
+        struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
+        struct soc_enum *e = (struct soc_enum *)kctrl->private_value;
+        unsigned int uV = ucontrol->value.enumerated.item[0];
+        int ret;
+
+        if (uV >= e->items)
+                return -EINVAL;
+
+        /*
+         * Map enum zero (Low) to 2 volts on the regulator, do this since
+         * the ana regulator is supplied by the system 12V voltage and
+         * requesting anything below the system voltage causes the system
+         * voltage to be passed through the regulator. Also, the ana
+         * regulator induces noise when requesting voltages near the
+         * system voltage. So, by mapping Low to 2V, that noise is
+         * eliminated when all that is needed is 12V (the system voltage).
+         */
+        if (uV)
+                uV = 11000000 + (1000000 * uV);
+        else
+                uV = 2000000;
+
+        ret = regulator_set_voltage(tse850->ana, uV, uV);
+        if (ret < 0)
+                return ret;
+
+        return snd_soc_dapm_put_enum_double(kctrl, ucontrol);
+}
+
+static const char * const mux_text[] = { "Mixer", "Loop" };
+
+static const struct soc_enum mux_enum =
+        SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, 2, mux_text);
+
+static const struct snd_kcontrol_new mux1 =
+        SOC_DAPM_ENUM_EXT("MUX1", mux_enum, tse850_get_mux1, tse850_put_mux1);
+
+static const struct snd_kcontrol_new mux2 =
+        SOC_DAPM_ENUM_EXT("MUX2", mux_enum, tse850_get_mux2, tse850_put_mux2);
+
+#define TSE850_DAPM_SINGLE_EXT(xname, reg, shift, max, invert, xget, xput) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .info = snd_soc_info_volsw, \
+        .get = xget, \
+        .put = xput, \
+        .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) }
+
+static const struct snd_kcontrol_new mix[] = {
+        TSE850_DAPM_SINGLE_EXT("IN Switch", SND_SOC_NOPM, 0, 1, 0,
+                               tse850_get_mix, tse850_put_mix),
+};
+
+static const char * const ana_text[] = {
+        "Low", "12V", "13V", "14V", "15V", "16V", "17V", "18V", "19V", "20V"
+};
+
+static const struct soc_enum ana_enum =
+        SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, 9, ana_text);
+
+static const struct snd_kcontrol_new out =
+        SOC_DAPM_ENUM_EXT("ANA", ana_enum, tse850_get_ana, tse850_put_ana);
+
+static const struct snd_soc_dapm_widget tse850_dapm_widgets[] = {
+        SND_SOC_DAPM_LINE("OUT1", NULL),
+        SND_SOC_DAPM_LINE("OUT2", NULL),
+        SND_SOC_DAPM_LINE("IN1", NULL),
+        SND_SOC_DAPM_LINE("IN2", NULL),
+        SND_SOC_DAPM_INPUT("DAC"),
+        SND_SOC_DAPM_AIF_IN("AIFINL", "Playback", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("AIFINR", "Playback", 1, SND_SOC_NOPM, 0, 0),
+        SOC_MIXER_ARRAY("MIX", SND_SOC_NOPM, 0, 0, mix),
+        SND_SOC_DAPM_MUX("MUX1", SND_SOC_NOPM, 0, 0, &mux1),
+        SND_SOC_DAPM_MUX("MUX2", SND_SOC_NOPM, 0, 0, &mux2),
+        SND_SOC_DAPM_OUT_DRV("OUT", SND_SOC_NOPM, 0, 0, &out, 1),
+};
+
+/*
+ * These connections are not entirely correct, since both IN1 and IN2
+ * are always fed to MIX (if the "IN switch" is set so), i.e. without
+ * regard to the loop1 and loop2 relays that according to this only
+ * control MUX1 and MUX2 but in fact also control how the input signals
+ * are routed.
+ * But, 1) I don't know how to do it right, and 2) it doesn't seem to
+ * matter in practice since nothing is powered in those sections anyway.
+ */
+static const struct snd_soc_dapm_route tse850_intercon[] = {
+        { "OUT1", NULL, "MUX1" },
+        { "OUT2", NULL, "MUX2" },
+
+        { "MUX1", "Loop",  "IN1" },
+        { "MUX1", "Mixer", "OUT" },
+
+        { "MUX2", "Loop",  "IN2" },
+        { "MUX2", "Mixer", "OUT" },
+
+        { "OUT", NULL, "MIX" },
+
+        { "MIX", NULL, "DAC" },
+        { "MIX", "IN Switch", "IN1" },
+        { "MIX", "IN Switch", "IN2" },
+
+        /* connect board input to the codec left channel output pin */
+        { "DAC", NULL, "OUTL" },
+};
+
+static struct snd_soc_dai_link tse850_dailink = {
+        .name = "TSE-850",
+        .stream_name = "TSE-850-PCM",
+        .codec_dai_name = "pcm512x-hifi",
+        .dai_fmt = SND_SOC_DAIFMT_I2S
+                 | SND_SOC_DAIFMT_NB_NF
+                 | SND_SOC_DAIFMT_CBM_CFS,
+};
+
+static struct snd_soc_card tse850_card = {
+        .name = "TSE-850-ASoC",
+        .owner = THIS_MODULE,
+        .dai_link = &tse850_dailink,
+        .num_links = 1,
+        .dapm_widgets = tse850_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(tse850_dapm_widgets),
+        .dapm_routes = tse850_intercon,
+        .num_dapm_routes = ARRAY_SIZE(tse850_intercon),
+        .fully_routed = true,
+};
+
+static int tse850_dt_init(struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        struct device_node *codec_np, *cpu_np;
+        struct snd_soc_card *card = &tse850_card;
+        struct snd_soc_dai_link *dailink = &tse850_dailink;
+        struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
+
+        if (!np) {
+                dev_err(&pdev->dev, "only device tree supported\n");
+                return -EINVAL;
+        }
+
+        cpu_np = of_parse_phandle(np, "axentia,ssc-controller", 0);
+        if (!cpu_np) {
+                dev_err(&pdev->dev, "failed to get dai and pcm info\n");
+                return -EINVAL;
+        }
+        dailink->cpu_of_node = cpu_np;
+        dailink->platform_of_node = cpu_np;
+        tse850->ssc_id = of_alias_get_id(cpu_np, "ssc");
+        of_node_put(cpu_np);
+
+        codec_np = of_parse_phandle(np, "axentia,audio-codec", 0);
+        if (!codec_np) {
+                dev_err(&pdev->dev, "failed to get codec info\n");
+                return -EINVAL;
+        }
+        dailink->codec_of_node = codec_np;
+        of_node_put(codec_np);
+
+        return 0;
+}
+
+static int tse850_probe(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = &tse850_card;
+        struct device *dev = card->dev = &pdev->dev;
+        struct tse850_priv *tse850;
+        int ret;
+
+        tse850 = devm_kzalloc(dev, sizeof(*tse850), GFP_KERNEL);
+        if (!tse850)
+                return -ENOMEM;
+
+        snd_soc_card_set_drvdata(card, tse850);
+
+        ret = tse850_dt_init(pdev);
+        if (ret) {
+                dev_err(dev, "failed to init dt info\n");
+                return ret;
+        }
+
+        tse850->add = devm_gpiod_get(dev, "axentia,add", GPIOD_OUT_HIGH);
+        if (IS_ERR(tse850->add)) {
+                if (PTR_ERR(tse850->add) != -EPROBE_DEFER)
+                        dev_err(dev, "failed to get 'add' gpio\n");
+                return PTR_ERR(tse850->add);
+        }
+        tse850->add_cache = 1;
+
+        tse850->loop1 = devm_gpiod_get(dev, "axentia,loop1", GPIOD_OUT_HIGH);
+        if (IS_ERR(tse850->loop1)) {
+                if (PTR_ERR(tse850->loop1) != -EPROBE_DEFER)
+                        dev_err(dev, "failed to get 'loop1' gpio\n");
+                return PTR_ERR(tse850->loop1);
+        }
+        tse850->loop1_cache = 1;
+
+        tse850->loop2 = devm_gpiod_get(dev, "axentia,loop2", GPIOD_OUT_HIGH);
+        if (IS_ERR(tse850->loop2)) {
+                if (PTR_ERR(tse850->loop2) != -EPROBE_DEFER)
+                        dev_err(dev, "failed to get 'loop2' gpio\n");
+                return PTR_ERR(tse850->loop2);
+        }
+        tse850->loop2_cache = 1;
+
+        tse850->ana = devm_regulator_get(dev, "axentia,ana");
+        if (IS_ERR(tse850->ana)) {
+                if (PTR_ERR(tse850->ana) != -EPROBE_DEFER)
+                        dev_err(dev, "failed to get 'ana' regulator\n");
+                return PTR_ERR(tse850->ana);
+        }
+
+        ret = regulator_enable(tse850->ana);
+        if (ret < 0) {
+                dev_err(dev, "failed to enable the 'ana' regulator\n");
+                return ret;
+        }
+
+        ret = atmel_ssc_set_audio(tse850->ssc_id);
+        if (ret != 0) {
+                dev_err(dev,
+                        "failed to set SSC %d for audio\n", tse850->ssc_id);
+                goto err_disable_ana;
+        }
+
+        ret = snd_soc_register_card(card);
+        if (ret) {
+                dev_err(dev, "snd_soc_register_card failed\n");
+                goto err_put_audio;
+        }
+
+        return 0;
+
+err_put_audio:
+        atmel_ssc_put_audio(tse850->ssc_id);
+err_disable_ana:
+        regulator_disable(tse850->ana);
+        return ret;
+}
+
+static int tse850_remove(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+        struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
+
+        snd_soc_unregister_card(card);
+        atmel_ssc_put_audio(tse850->ssc_id);
+        regulator_disable(tse850->ana);
+
+        return 0;
+}
+
+static const struct of_device_id tse850_dt_ids[] = {
+        { .compatible = "axentia,tse850-pcm5142", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, tse850_dt_ids);
+
+static struct platform_driver tse850_driver = {
+        .driver = {
+                .name = "axentia-tse850-pcm5142",
+                .of_match_table = of_match_ptr(tse850_dt_ids),
+        },
+        .probe = tse850_probe,
+        .remove = tse850_remove,
+};
+
+module_platform_driver(tse850_driver);
+
+/* Module information */
+MODULE_AUTHOR("Peter Rosin <peda@axentia.se>");
+MODULE_DESCRIPTION("ALSA SoC driver for TSE-850 with PCM5142 codec");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
index d528aaceaad9..edf367100ebd 100644
--- a/sound/soc/bcm/Kconfig
+++ b/sound/soc/bcm/Kconfig
@@ -11,6 +11,7 @@ config SND_BCM2835_SOC_I2S
 config SND_SOC_CYGNUS
         tristate "SoC platform audio for Broadcom Cygnus chips"
         depends on ARCH_BCM_CYGNUS || COMPILE_TEST
+        depends on HAS_DMA
         help
           Say Y if you want to add support for ASoC audio on Broadcom
           Cygnus chips (bcm958300, bcm958305, bcm911360)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index c67667bb970f..9e1718a8cb1c 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -48,6 +48,8 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
         select SND_SOC_CS35L32 if I2C
         select SND_SOC_CS35L33 if I2C
+        select SND_SOC_CS35L34 if I2C
+        select SND_SOC_CS42L42 if I2C
         select SND_SOC_CS42L51_I2C if I2C
         select SND_SOC_CS42L52 if I2C && INPUT
         select SND_SOC_CS42L56 if I2C && INPUT
@@ -83,6 +85,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_MAX98095 if I2C
         select SND_SOC_MAX98357A if GPIOLIB
         select SND_SOC_MAX98371 if I2C
+        select SND_SOC_MAX98504 if I2C
         select SND_SOC_MAX9867 if I2C
         select SND_SOC_MAX98925 if I2C
         select SND_SOC_MAX98926 if I2C
@@ -114,6 +117,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_RT5651 if I2C
         select SND_SOC_RT5659 if I2C
         select SND_SOC_RT5660 if I2C
+        select SND_SOC_RT5665 if I2C
         select SND_SOC_RT5663 if I2C
         select SND_SOC_RT5670 if I2C
         select SND_SOC_RT5677 if I2C && SPI_MASTER
@@ -399,6 +403,14 @@ config SND_SOC_CS35L33
         tristate "Cirrus Logic CS35L33 CODEC"
         depends on I2C
 
+config SND_SOC_CS35L34
+        tristate "Cirrus Logic CS35L34 CODEC"
+        depends on I2C
+
+config SND_SOC_CS42L42
+        tristate "Cirrus Logic CS42L42 CODEC"
+        depends on I2C
+
 config SND_SOC_CS42L51
         tristate
 
@@ -581,6 +593,13 @@ config SND_SOC_MAX9860
         depends on I2C
         select REGMAP_I2C
 
+config SND_SOC_MSM8916_WCD_ANALOG
+        tristate "Qualcomm MSM8916 WCD Analog Codec"
+        depends on SPMI || COMPILE_TEST
+
+config SND_SOC_MSM8916_WCD_DIGITAL
+        tristate "Qualcomm MSM8916 WCD DIGITAL Codec"
+
 config SND_SOC_PCM1681
         tristate "Texas Instruments PCM1681 CODEC"
         depends on I2C
@@ -649,6 +668,7 @@ config SND_SOC_RL6231
         default y if SND_SOC_RT5651=y
         default y if SND_SOC_RT5659=y
         default y if SND_SOC_RT5660=y
+        default y if SND_SOC_RT5665=y
         default y if SND_SOC_RT5663=y
         default y if SND_SOC_RT5670=y
         default y if SND_SOC_RT5677=y
@@ -659,6 +679,7 @@ config SND_SOC_RL6231
         default m if SND_SOC_RT5651=m
         default m if SND_SOC_RT5659=m
         default m if SND_SOC_RT5660=m
+        default m if SND_SOC_RT5665=m
         default m if SND_SOC_RT5663=m
         default m if SND_SOC_RT5670=m
         default m if SND_SOC_RT5677=m
@@ -672,7 +693,6 @@ config SND_SOC_RL6347A
 
 config SND_SOC_RT286
         tristate
-        select SND_SOC_RT5663
         depends on I2C
 
 config SND_SOC_RT298
@@ -708,6 +728,9 @@ config SND_SOC_RT5659
 config SND_SOC_RT5660
         tristate
 
+config SND_SOC_RT5665
+        tristate
+
 config SND_SOC_RT5663
         tristate
 
@@ -874,6 +897,7 @@ config SND_SOC_UDA134X
 
 config SND_SOC_UDA1380
         tristate
+        depends on I2C
 
 config SND_SOC_WL1273
         tristate
@@ -914,7 +938,7 @@ config SND_SOC_WM8523
         depends on I2C
 
 config SND_SOC_WM8580
-        tristate "Wolfson Microelectronics WM8523 CODEC"
+        tristate "Wolfson Microelectronics WM8580 and WM8581 CODECs"
         depends on I2C
 
 config SND_SOC_WM8711
@@ -1048,15 +1072,18 @@ config SND_SOC_WM8998
 
 config SND_SOC_WM9081
         tristate
+        depends on I2C
 
 config SND_SOC_WM9090
         tristate
 
 config SND_SOC_WM9705
         tristate
+        select REGMAP_AC97
 
 config SND_SOC_WM9712
         tristate
+        select REGMAP_AC97
 
 config SND_SOC_WM9713
         tristate
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 958cd4912fbc..7e1dad79610b 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -38,6 +38,8 @@ snd-soc-bt-sco-objs := bt-sco.o
 snd-soc-cq93vc-objs := cq93vc.o
 snd-soc-cs35l32-objs := cs35l32.o
 snd-soc-cs35l33-objs := cs35l33.o
+snd-soc-cs35l34-objs := cs35l34.o
+snd-soc-cs42l42-objs := cs42l42.o
 snd-soc-cs42l51-objs := cs42l51.o
 snd-soc-cs42l51-i2c-objs := cs42l51-i2c.o
 snd-soc-cs42l52-objs := cs42l52.o
@@ -86,6 +88,8 @@ snd-soc-max9850-objs := max9850.o
 snd-soc-max9860-objs := max9860.o
 snd-soc-mc13783-objs := mc13783.o
 snd-soc-ml26124-objs := ml26124.o
+snd-soc-msm8916-analog-objs := msm8916-wcd-analog.o
+snd-soc-msm8916-digital-objs := msm8916-wcd-digital.o
 snd-soc-nau8810-objs := nau8810.o
 snd-soc-nau8825-objs := nau8825.o
 snd-soc-hdmi-codec-objs := hdmi-codec.o
@@ -114,6 +118,7 @@ snd-soc-rt5645-objs := rt5645.o
 snd-soc-rt5651-objs := rt5651.o
 snd-soc-rt5659-objs := rt5659.o
 snd-soc-rt5660-objs := rt5660.o
+snd-soc-rt5665-objs := rt5665.o
 snd-soc-rt5663-objs := rt5663.o
 snd-soc-rt5670-objs := rt5670.o
 snd-soc-rt5677-objs := rt5677.o
@@ -214,7 +219,6 @@ snd-soc-wm9705-objs := wm9705.o
 snd-soc-wm9712-objs := wm9712.o
 snd-soc-wm9713-objs := wm9713.o
 snd-soc-wm-hubs-objs := wm_hubs.o
-
 # Amp
 snd-soc-max9877-objs := max9877.o
 snd-soc-max98504-objs := max98504.o
@@ -263,6 +267,8 @@ obj-$(CONFIG_SND_SOC_BT_SCO)	+= snd-soc-bt-sco.o
 obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-soc-cq93vc.o
 obj-$(CONFIG_SND_SOC_CS35L32)   += snd-soc-cs35l32.o
 obj-$(CONFIG_SND_SOC_CS35L33)   += snd-soc-cs35l33.o
+obj-$(CONFIG_SND_SOC_CS35L34)   += snd-soc-cs35l34.o
+obj-$(CONFIG_SND_SOC_CS42L42)   += snd-soc-cs42l42.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
@@ -310,6 +316,8 @@ obj-$(CONFIG_SND_SOC_MAX9850)	+= snd-soc-max9850.o
 obj-$(CONFIG_SND_SOC_MAX9860)   += snd-soc-max9860.o
 obj-$(CONFIG_SND_SOC_MC13783)   += snd-soc-mc13783.o
 obj-$(CONFIG_SND_SOC_ML26124)   += snd-soc-ml26124.o
+obj-$(CONFIG_SND_SOC_MSM8916_WCD_ANALOG) +=snd-soc-msm8916-analog.o
+obj-$(CONFIG_SND_SOC_MSM8916_WCD_DIGITAL) +=snd-soc-msm8916-digital.o
 obj-$(CONFIG_SND_SOC_NAU8810)   += snd-soc-nau8810.o
 obj-$(CONFIG_SND_SOC_NAU8825)   += snd-soc-nau8825.o
 obj-$(CONFIG_SND_SOC_HDMI_CODEC)        += snd-soc-hdmi-codec.o
@@ -338,6 +346,7 @@ obj-$(CONFIG_SND_SOC_RT5645)	+= snd-soc-rt5645.o
 obj-$(CONFIG_SND_SOC_RT5651)    += snd-soc-rt5651.o
 obj-$(CONFIG_SND_SOC_RT5659)    += snd-soc-rt5659.o
 obj-$(CONFIG_SND_SOC_RT5660)    += snd-soc-rt5660.o
+obj-$(CONFIG_SND_SOC_RT5665)    += snd-soc-rt5665.o
 obj-$(CONFIG_SND_SOC_RT5663)    += snd-soc-rt5663.o
 obj-$(CONFIG_SND_SOC_RT5670)    += snd-soc-rt5670.o
 obj-$(CONFIG_SND_SOC_RT5677)    += snd-soc-rt5677.o
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 935ff7cb71c5..312b2a11abb6 100644
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -2587,8 +2587,6 @@ static struct platform_driver ab8500_codec_platform_driver = {
         },
         .probe          = ab8500_codec_driver_probe,
         .remove         = ab8500_codec_driver_remove,
-        .suspend        = NULL,
-        .resume         = NULL,
 };
 module_platform_driver(ab8500_codec_platform_driver);
 
diff --git a/sound/soc/codecs/adau17x1.c b/sound/soc/codecs/adau17x1.c
index 439aa3ff1f99..b36511d965c8 100644
--- a/sound/soc/codecs/adau17x1.c
+++ b/sound/soc/codecs/adau17x1.c
@@ -160,7 +160,7 @@ static int adau17x1_dsp_mux_enum_put(struct snd_kcontrol *kcontrol,
         struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
         struct adau *adau = snd_soc_codec_get_drvdata(codec);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
-        struct snd_soc_dapm_update update;
+        struct snd_soc_dapm_update update = { 0 };
         unsigned int stream = e->shift_l;
         unsigned int val, change;
         int reg;
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c
index c91717d08513..ebdaf56c1d61 100644
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
@@ -27,7 +27,27 @@
 #include <sound/tlv.h>
 #include <sound/ak4641.h>
 
-#include "ak4641.h"
+/* AK4641 register space */
+#define AK4641_PM1              0x00
+#define AK4641_PM2              0x01
+#define AK4641_SIG1             0x02
+#define AK4641_SIG2             0x03
+#define AK4641_MODE1            0x04
+#define AK4641_MODE2            0x05
+#define AK4641_DAC              0x06
+#define AK4641_MIC              0x07
+#define AK4641_TIMER            0x08
+#define AK4641_ALC1             0x09
+#define AK4641_ALC2             0x0a
+#define AK4641_PGA              0x0b
+#define AK4641_LATT             0x0c
+#define AK4641_RATT             0x0d
+#define AK4641_VOL              0x0e
+#define AK4641_STATUS           0x0f
+#define AK4641_EQLO             0x10
+#define AK4641_EQMID            0x11
+#define AK4641_EQHI             0x12
+#define AK4641_BTIF             0x13
 
 /* codec private data */
 struct ak4641_priv {
diff --git a/sound/soc/codecs/ak4641.h b/sound/soc/codecs/ak4641.h
deleted file mode 100644
index 4a263248efea..000000000000
--- a/sound/soc/codecs/ak4641.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * ak4641.h  --  AK4641 SoC Audio driver
- *
- * Copyright 2008 Harald Welte <laforge@gnufiish.org>
- *
- * Based on ak4535.h
- *
- * 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 _AK4641_H
-#define _AK4641_H
-
-/* AK4641 register space */
-
-#define AK4641_PM1              0x00
-#define AK4641_PM2              0x01
-#define AK4641_SIG1             0x02
-#define AK4641_SIG2             0x03
-#define AK4641_MODE1            0x04
-#define AK4641_MODE2            0x05
-#define AK4641_DAC              0x06
-#define AK4641_MIC              0x07
-#define AK4641_TIMER            0x08
-#define AK4641_ALC1             0x09
-#define AK4641_ALC2             0x0a
-#define AK4641_PGA              0x0b
-#define AK4641_LATT             0x0c
-#define AK4641_RATT             0x0d
-#define AK4641_VOL              0x0e
-#define AK4641_STATUS           0x0f
-#define AK4641_EQLO             0x10
-#define AK4641_EQMID            0x11
-#define AK4641_EQHI             0x12
-#define AK4641_BTIF             0x13
-
-#define AK4641_CACHEREGNUM      0x14
-
-
-
-#define AK4641_DAI_HIFI         0
-#define AK4641_DAI_VOICE        1
-
-
-#endif
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 846ca079845f..0a734d910850 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -191,6 +191,14 @@ int arizona_init_spk(struct snd_soc_codec *codec)
                 break;
         }
 
+        return 0;
+}
+EXPORT_SYMBOL_GPL(arizona_init_spk);
+
+int arizona_init_spk_irqs(struct arizona *arizona)
+{
+        int ret;
+
         ret = arizona_request_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT_WARN,
                                   "Thermal warning", arizona_thermal_warn,
                                   arizona);
@@ -209,19 +217,16 @@ int arizona_init_spk(struct snd_soc_codec *codec)
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(arizona_init_spk);
+EXPORT_SYMBOL_GPL(arizona_init_spk_irqs);
 
-int arizona_free_spk(struct snd_soc_codec *codec)
+int arizona_free_spk_irqs(struct arizona *arizona)
 {
-        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
-        struct arizona *arizona = priv->arizona;
-
         arizona_free_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT_WARN, arizona);
         arizona_free_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT, arizona);
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(arizona_free_spk);
+EXPORT_SYMBOL_GPL(arizona_free_spk_irqs);
 
 static const struct snd_soc_dapm_route arizona_mono_routes[] = {
         { "OUT1R", NULL, "OUT1L" },
@@ -252,6 +257,7 @@ EXPORT_SYMBOL_GPL(arizona_init_mono);
 int arizona_init_gpio(struct snd_soc_codec *codec)
 {
         struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
+        struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
         struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
         struct arizona *arizona = priv->arizona;
         int i;
@@ -259,21 +265,24 @@ int arizona_init_gpio(struct snd_soc_codec *codec)
         switch (arizona->type) {
         case WM5110:
         case WM8280:
-                snd_soc_dapm_disable_pin(dapm, "DRC2 Signal Activity");
+                snd_soc_component_disable_pin(component,
+                                              "DRC2 Signal Activity");
                 break;
         default:
                 break;
         }
 
-        snd_soc_dapm_disable_pin(dapm, "DRC1 Signal Activity");
+        snd_soc_component_disable_pin(component, "DRC1 Signal Activity");
 
         for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {
                 switch (arizona->pdata.gpio_defaults[i] & ARIZONA_GPN_FN_MASK) {
                 case ARIZONA_GP_FN_DRC1_SIGNAL_DETECT:
-                        snd_soc_dapm_enable_pin(dapm, "DRC1 Signal Activity");
+                        snd_soc_component_enable_pin(component,
+                                                     "DRC1 Signal Activity");
                         break;
                 case ARIZONA_GP_FN_DRC2_SIGNAL_DETECT:
-                        snd_soc_dapm_enable_pin(dapm, "DRC2 Signal Activity");
+                        snd_soc_component_enable_pin(component,
+                                                     "DRC2 Signal Activity");
                         break;
                 default:
                         break;
@@ -1233,6 +1242,46 @@ static int arizona_set_opclk(struct snd_soc_codec *codec, unsigned int clk,
         return -EINVAL;
 }
 
+int arizona_clk_ev(struct snd_soc_dapm_widget *w,
+                   struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
+        unsigned int val;
+        int clk_idx;
+        int ret;
+
+        ret = regmap_read(arizona->regmap, w->reg, &val);
+        if (ret) {
+                dev_err(codec->dev, "Failed to check clock source: %d\n", ret);
+                return ret;
+        }
+
+        val = (val & ARIZONA_SYSCLK_SRC_MASK) >> ARIZONA_SYSCLK_SRC_SHIFT;
+
+        switch (val) {
+        case ARIZONA_CLK_SRC_MCLK1:
+                clk_idx = ARIZONA_MCLK1;
+                break;
+        case ARIZONA_CLK_SRC_MCLK2:
+                clk_idx = ARIZONA_MCLK2;
+                break;
+        default:
+                return 0;
+        }
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                return clk_prepare_enable(arizona->mclk[clk_idx]);
+        case SND_SOC_DAPM_POST_PMD:
+                clk_disable_unprepare(arizona->mclk[clk_idx]);
+                return 0;
+        default:
+                return 0;
+        }
+}
+EXPORT_SYMBOL_GPL(arizona_clk_ev);
+
 int arizona_set_sysclk(struct snd_soc_codec *codec, int clk_id,
                        int source, unsigned int freq, int dir)
 {
@@ -2242,6 +2291,42 @@ static int arizona_is_enabled_fll(struct arizona_fll *fll, int base)
         return reg & ARIZONA_FLL1_ENA;
 }
 
+static int arizona_set_fll_clks(struct arizona_fll *fll, int base, bool ena)
+{
+        struct arizona *arizona = fll->arizona;
+        unsigned int val;
+        struct clk *clk;
+        int ret;
+
+        ret = regmap_read(arizona->regmap, base + 6, &val);
+        if (ret != 0) {
+                arizona_fll_err(fll, "Failed to read current source: %d\n",
+                                ret);
+                return ret;
+        }
+
+        val &= ARIZONA_FLL1_CLK_REF_SRC_MASK;
+        val >>= ARIZONA_FLL1_CLK_REF_SRC_SHIFT;
+
+        switch (val) {
+        case ARIZONA_FLL_SRC_MCLK1:
+                clk = arizona->mclk[ARIZONA_MCLK1];
+                break;
+        case ARIZONA_FLL_SRC_MCLK2:
+                clk = arizona->mclk[ARIZONA_MCLK2];
+                break;
+        default:
+                return 0;
+        }
+
+        if (ena) {
+                return clk_prepare_enable(clk);
+        } else {
+                clk_disable_unprepare(clk);
+                return 0;
+        }
+}
+
 static int arizona_enable_fll(struct arizona_fll *fll)
 {
         struct arizona *arizona = fll->arizona;
@@ -2264,6 +2349,10 @@ static int arizona_enable_fll(struct arizona_fll *fll)
                 udelay(32);
                 regmap_update_bits_async(fll->arizona->regmap, fll->base + 0x9,
                                          ARIZONA_FLL1_GAIN_MASK, 0);
+
+                if (arizona_is_enabled_fll(fll, fll->base + 0x10) > 0)
+                        arizona_set_fll_clks(fll, fll->base + 0x10, false);
+                arizona_set_fll_clks(fll, fll->base, false);
         }
 
         /*
@@ -2318,10 +2407,13 @@ static int arizona_enable_fll(struct arizona_fll *fll)
         if (!already_enabled)
                 pm_runtime_get_sync(arizona->dev);
 
-        if (use_sync)
+        if (use_sync) {
+                arizona_set_fll_clks(fll, fll->base + 0x10, true);
                 regmap_update_bits_async(arizona->regmap, fll->base + 0x11,
                                          ARIZONA_FLL1_SYNC_ENA,
                                          ARIZONA_FLL1_SYNC_ENA);
+        }
+        arizona_set_fll_clks(fll, fll->base, true);
         regmap_update_bits_async(arizona->regmap, fll->base + 1,
                                  ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA);
 
@@ -2354,19 +2446,24 @@ static int arizona_enable_fll(struct arizona_fll *fll)
 static void arizona_disable_fll(struct arizona_fll *fll)
 {
         struct arizona *arizona = fll->arizona;
-        bool change;
+        bool ref_change, sync_change;
 
         regmap_update_bits_async(arizona->regmap, fll->base + 1,
                                  ARIZONA_FLL1_FREERUN, ARIZONA_FLL1_FREERUN);
         regmap_update_bits_check(arizona->regmap, fll->base + 1,
-                                 ARIZONA_FLL1_ENA, 0, &change);
-        regmap_update_bits(arizona->regmap, fll->base + 0x11,
-                           ARIZONA_FLL1_SYNC_ENA, 0);
+                                 ARIZONA_FLL1_ENA, 0, &ref_change);
+        regmap_update_bits_check(arizona->regmap, fll->base + 0x11,
+                                 ARIZONA_FLL1_SYNC_ENA, 0, &sync_change);
         regmap_update_bits_async(arizona->regmap, fll->base + 1,
                                  ARIZONA_FLL1_FREERUN, 0);
 
-        if (change)
+        if (sync_change)
+                arizona_set_fll_clks(fll, fll->base + 0x10, false);
+
+        if (ref_change) {
+                arizona_set_fll_clks(fll, fll->base, false);
                 pm_runtime_put_autosuspend(arizona->dev);
+        }
 }
 
 int arizona_set_fll_refclk(struct arizona_fll *fll, int source,
@@ -2598,30 +2695,6 @@ int arizona_lhpf_coeff_put(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_GPL(arizona_lhpf_coeff_put);
 
-int arizona_register_notifier(struct snd_soc_codec *codec,
-                              struct notifier_block *nb,
-                              int (*notify)(struct notifier_block *nb,
-                                            unsigned long action, void *data))
-{
-        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
-        struct arizona *arizona = priv->arizona;
-
-        nb->notifier_call = notify;
-
-        return blocking_notifier_chain_register(&arizona->notifier, nb);
-}
-EXPORT_SYMBOL_GPL(arizona_register_notifier);
-
-int arizona_unregister_notifier(struct snd_soc_codec *codec,
-                                struct notifier_block *nb)
-{
-        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
-        struct arizona *arizona = priv->arizona;
-
-        return blocking_notifier_chain_unregister(&arizona->notifier, nb);
-}
-EXPORT_SYMBOL_GPL(arizona_unregister_notifier);
-
 MODULE_DESCRIPTION("ASoC Wolfson Arizona class device support");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 850aa338ba29..56707860657c 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -14,6 +14,8 @@
 #define _ASOC_ARIZONA_H
 
 #include <linux/completion.h>
+#include <linux/notifier.h>
+#include <linux/mfd/arizona/core.h>
 
 #include <sound/soc.h>
 
@@ -66,7 +68,6 @@
 /* Notifier events */
 #define ARIZONA_NOTIFY_VOICE_TRIGGER   0x1
 
-struct arizona;
 struct wm_adsp;
 
 struct arizona_dai_priv {
@@ -255,26 +256,24 @@ extern const struct soc_enum arizona_output_anc_src[];
 
 extern const struct snd_kcontrol_new arizona_voice_trigger_switch[];
 
-extern int arizona_in_ev(struct snd_soc_dapm_widget *w,
-                         struct snd_kcontrol *kcontrol,
-                         int event);
-extern int arizona_out_ev(struct snd_soc_dapm_widget *w,
-                          struct snd_kcontrol *kcontrol,
-                          int event);
-extern int arizona_hp_ev(struct snd_soc_dapm_widget *w,
-                         struct snd_kcontrol *kcontrol,
-                         int event);
-extern int arizona_anc_ev(struct snd_soc_dapm_widget *w,
-                          struct snd_kcontrol *kcontrol,
-                          int event);
-
-extern int arizona_eq_coeff_put(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_value *ucontrol);
-extern int arizona_lhpf_coeff_put(struct snd_kcontrol *kcontrol,
-                                  struct snd_ctl_elem_value *ucontrol);
-
-extern int arizona_set_sysclk(struct snd_soc_codec *codec, int clk_id,
-                              int source, unsigned int freq, int dir);
+int arizona_in_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
+                  int event);
+int arizona_out_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
+                   int event);
+int arizona_hp_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
+                  int event);
+int arizona_anc_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
+                   int event);
+
+int arizona_eq_coeff_put(struct snd_kcontrol *kcontrol,
+                         struct snd_ctl_elem_value *ucontrol);
+int arizona_lhpf_coeff_put(struct snd_kcontrol *kcontrol,
+                           struct snd_ctl_elem_value *ucontrol);
+
+int arizona_clk_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
+                   int event);
+int arizona_set_sysclk(struct snd_soc_codec *codec, int clk_id, int source,
+                       unsigned int freq, int dir);
 
 extern const struct snd_soc_dai_ops arizona_dai_ops;
 extern const struct snd_soc_dai_ops arizona_simple_dai_ops;
@@ -297,41 +296,57 @@ struct arizona_fll {
         char clock_ok_name[ARIZONA_FLL_NAME_LEN];
 };
 
-extern int arizona_dvfs_up(struct snd_soc_codec *codec, unsigned int flags);
-extern int arizona_dvfs_down(struct snd_soc_codec *codec, unsigned int flags);
-extern int arizona_dvfs_sysclk_ev(struct snd_soc_dapm_widget *w,
-                                  struct snd_kcontrol *kcontrol, int event);
-extern void arizona_init_dvfs(struct arizona_priv *priv);
-
-extern int arizona_init_fll(struct arizona *arizona, int id, int base,
-                            int lock_irq, int ok_irq, struct arizona_fll *fll);
-extern int arizona_set_fll_refclk(struct arizona_fll *fll, int source,
-                                  unsigned int Fref, unsigned int Fout);
-extern int arizona_set_fll(struct arizona_fll *fll, int source,
+int arizona_dvfs_up(struct snd_soc_codec *codec, unsigned int flags);
+int arizona_dvfs_down(struct snd_soc_codec *codec, unsigned int flags);
+int arizona_dvfs_sysclk_ev(struct snd_soc_dapm_widget *w,
+                           struct snd_kcontrol *kcontrol, int event);
+void arizona_init_dvfs(struct arizona_priv *priv);
+
+int arizona_init_fll(struct arizona *arizona, int id, int base,
+                     int lock_irq, int ok_irq, struct arizona_fll *fll);
+int arizona_set_fll_refclk(struct arizona_fll *fll, int source,
                            unsigned int Fref, unsigned int Fout);
+int arizona_set_fll(struct arizona_fll *fll, int source,
+                    unsigned int Fref, unsigned int Fout);
 
-extern int arizona_init_spk(struct snd_soc_codec *codec);
-extern int arizona_init_gpio(struct snd_soc_codec *codec);
-extern int arizona_init_mono(struct snd_soc_codec *codec);
-extern int arizona_init_notifiers(struct snd_soc_codec *codec);
+int arizona_init_spk(struct snd_soc_codec *codec);
+int arizona_init_gpio(struct snd_soc_codec *codec);
+int arizona_init_mono(struct snd_soc_codec *codec);
+int arizona_init_notifiers(struct snd_soc_codec *codec);
 
-extern int arizona_free_spk(struct snd_soc_codec *codec);
+int arizona_init_spk_irqs(struct arizona *arizona);
+int arizona_free_spk_irqs(struct arizona *arizona);
 
-extern int arizona_init_dai(struct arizona_priv *priv, int dai);
+int arizona_init_dai(struct arizona_priv *priv, int dai);
 
 int arizona_set_output_mode(struct snd_soc_codec *codec, int output,
                             bool diff);
 
-extern bool arizona_input_analog(struct snd_soc_codec *codec, int shift);
+bool arizona_input_analog(struct snd_soc_codec *codec, int shift);
+
+const char *arizona_sample_rate_val_to_name(unsigned int rate_val);
+
+static inline int arizona_register_notifier(struct snd_soc_codec *codec,
+                                            struct notifier_block *nb,
+                                            int (*notify)
+                                            (struct notifier_block *nb,
+                                            unsigned long action, void *data))
+{
+        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
+        struct arizona *arizona = priv->arizona;
+
+        nb->notifier_call = notify;
+
+        return blocking_notifier_chain_register(&arizona->notifier, nb);
+}
 
-extern const char *arizona_sample_rate_val_to_name(unsigned int rate_val);
+static inline int arizona_unregister_notifier(struct snd_soc_codec *codec,
+                                              struct notifier_block *nb)
+{
+        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
+        struct arizona *arizona = priv->arizona;
 
-extern int arizona_register_notifier(struct snd_soc_codec *codec,
-                                     struct notifier_block *nb,
-                                     int (*notify)(struct notifier_block *nb,
-                                                   unsigned long action,
-                                                   void *data));
-extern int arizona_unregister_notifier(struct snd_soc_codec *codec,
-                                       struct notifier_block *nb);
+        return blocking_notifier_chain_unregister(&arizona->notifier, nb);
+}
 
 #endif
diff --git a/sound/soc/codecs/cs35l34.c b/sound/soc/codecs/cs35l34.c
new file mode 100644
index 000000000000..7c5d1510cf2c
--- /dev/null
+++ b/sound/soc/codecs/cs35l34.c
@@ -0,0 +1,1251 @@
+/*
+ * cs35l34.c -- CS35l34 ALSA SoC audio driver
+ *
+ * Copyright 2016 Cirrus Logic, Inc.
+ *
+ * Author: Paul Handrigan <Paul.Handrigan@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/i2c.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+#include <linux/regulator/machine.h>
+#include <linux/pm_runtime.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
+#include <linux/of_irq.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
+#include <sound/initval.h>
+#include <sound/tlv.h>
+#include <sound/cs35l34.h>
+
+#include "cs35l34.h"
+
+#define PDN_DONE_ATTEMPTS 10
+#define CS35L34_START_DELAY 50
+
+struct  cs35l34_private {
+        struct snd_soc_codec *codec;
+        struct cs35l34_platform_data pdata;
+        struct regmap *regmap;
+        struct regulator_bulk_data core_supplies[2];
+        int num_core_supplies;
+        int mclk_int;
+        bool tdm_mode;
+        struct gpio_desc *reset_gpio;   /* Active-low reset GPIO */
+};
+
+static const struct reg_default cs35l34_reg[] = {
+        {CS35L34_PWRCTL1, 0x01},
+        {CS35L34_PWRCTL2, 0x19},
+        {CS35L34_PWRCTL3, 0x01},
+        {CS35L34_ADSP_CLK_CTL, 0x08},
+        {CS35L34_MCLK_CTL, 0x11},
+        {CS35L34_AMP_INP_DRV_CTL, 0x01},
+        {CS35L34_AMP_DIG_VOL_CTL, 0x12},
+        {CS35L34_AMP_DIG_VOL, 0x00},
+        {CS35L34_AMP_ANLG_GAIN_CTL, 0x0F},
+        {CS35L34_PROTECT_CTL, 0x06},
+        {CS35L34_AMP_KEEP_ALIVE_CTL, 0x04},
+        {CS35L34_BST_CVTR_V_CTL, 0x00},
+        {CS35L34_BST_PEAK_I, 0x10},
+        {CS35L34_BST_RAMP_CTL, 0x87},
+        {CS35L34_BST_CONV_COEF_1, 0x24},
+        {CS35L34_BST_CONV_COEF_2, 0x24},
+        {CS35L34_BST_CONV_SLOPE_COMP, 0x4E},
+        {CS35L34_BST_CONV_SW_FREQ, 0x08},
+        {CS35L34_CLASS_H_CTL, 0x0D},
+        {CS35L34_CLASS_H_HEADRM_CTL, 0x0D},
+        {CS35L34_CLASS_H_RELEASE_RATE, 0x08},
+        {CS35L34_CLASS_H_FET_DRIVE_CTL, 0x41},
+        {CS35L34_CLASS_H_STATUS, 0x05},
+        {CS35L34_VPBR_CTL, 0x0A},
+        {CS35L34_VPBR_VOL_CTL, 0x90},
+        {CS35L34_VPBR_TIMING_CTL, 0x6A},
+        {CS35L34_PRED_MAX_ATTEN_SPK_LOAD, 0x95},
+        {CS35L34_PRED_BROWNOUT_THRESH, 0x1C},
+        {CS35L34_PRED_BROWNOUT_VOL_CTL, 0x00},
+        {CS35L34_PRED_BROWNOUT_RATE_CTL, 0x10},
+        {CS35L34_PRED_WAIT_CTL, 0x10},
+        {CS35L34_PRED_ZVP_INIT_IMP_CTL, 0x08},
+        {CS35L34_PRED_MAN_SAFE_VPI_CTL, 0x80},
+        {CS35L34_VPBR_ATTEN_STATUS, 0x00},
+        {CS35L34_PRED_BRWNOUT_ATT_STATUS, 0x00},
+        {CS35L34_SPKR_MON_CTL, 0xC6},
+        {CS35L34_ADSP_I2S_CTL, 0x00},
+        {CS35L34_ADSP_TDM_CTL, 0x00},
+        {CS35L34_TDM_TX_CTL_1_VMON, 0x00},
+        {CS35L34_TDM_TX_CTL_2_IMON, 0x04},
+        {CS35L34_TDM_TX_CTL_3_VPMON, 0x03},
+        {CS35L34_TDM_TX_CTL_4_VBSTMON, 0x07},
+        {CS35L34_TDM_TX_CTL_5_FLAG1, 0x08},
+        {CS35L34_TDM_TX_CTL_6_FLAG2, 0x09},
+        {CS35L34_TDM_TX_SLOT_EN_1, 0x00},
+        {CS35L34_TDM_TX_SLOT_EN_2, 0x00},
+        {CS35L34_TDM_TX_SLOT_EN_3, 0x00},
+        {CS35L34_TDM_TX_SLOT_EN_4, 0x00},
+        {CS35L34_TDM_RX_CTL_1_AUDIN, 0x40},
+        {CS35L34_TDM_RX_CTL_3_ALIVE, 0x04},
+        {CS35L34_MULT_DEV_SYNCH1, 0x00},
+        {CS35L34_MULT_DEV_SYNCH2, 0x80},
+        {CS35L34_PROT_RELEASE_CTL, 0x00},
+        {CS35L34_DIAG_MODE_REG_LOCK, 0x00},
+        {CS35L34_DIAG_MODE_CTL_1, 0x00},
+        {CS35L34_DIAG_MODE_CTL_2, 0x00},
+        {CS35L34_INT_MASK_1, 0xFF},
+        {CS35L34_INT_MASK_2, 0xFF},
+        {CS35L34_INT_MASK_3, 0xFF},
+        {CS35L34_INT_MASK_4, 0xFF},
+        {CS35L34_INT_STATUS_1, 0x30},
+        {CS35L34_INT_STATUS_2, 0x05},
+        {CS35L34_INT_STATUS_3, 0x00},
+        {CS35L34_INT_STATUS_4, 0x00},
+        {CS35L34_OTP_TRIM_STATUS, 0x00},
+};
+
+static bool cs35l34_volatile_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case CS35L34_DEVID_AB:
+        case CS35L34_DEVID_CD:
+        case CS35L34_DEVID_E:
+        case CS35L34_FAB_ID:
+        case CS35L34_REV_ID:
+        case CS35L34_INT_STATUS_1:
+        case CS35L34_INT_STATUS_2:
+        case CS35L34_INT_STATUS_3:
+        case CS35L34_INT_STATUS_4:
+        case CS35L34_CLASS_H_STATUS:
+        case CS35L34_VPBR_ATTEN_STATUS:
+        case CS35L34_OTP_TRIM_STATUS:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static bool cs35l34_readable_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case    CS35L34_DEVID_AB:
+        case    CS35L34_DEVID_CD:
+        case    CS35L34_DEVID_E:
+        case    CS35L34_FAB_ID:
+        case    CS35L34_REV_ID:
+        case    CS35L34_PWRCTL1:
+        case    CS35L34_PWRCTL2:
+        case    CS35L34_PWRCTL3:
+        case    CS35L34_ADSP_CLK_CTL:
+        case    CS35L34_MCLK_CTL:
+        case    CS35L34_AMP_INP_DRV_CTL:
+        case    CS35L34_AMP_DIG_VOL_CTL:
+        case    CS35L34_AMP_DIG_VOL:
+        case    CS35L34_AMP_ANLG_GAIN_CTL:
+        case    CS35L34_PROTECT_CTL:
+        case    CS35L34_AMP_KEEP_ALIVE_CTL:
+        case    CS35L34_BST_CVTR_V_CTL:
+        case    CS35L34_BST_PEAK_I:
+        case    CS35L34_BST_RAMP_CTL:
+        case    CS35L34_BST_CONV_COEF_1:
+        case    CS35L34_BST_CONV_COEF_2:
+        case    CS35L34_BST_CONV_SLOPE_COMP:
+        case    CS35L34_BST_CONV_SW_FREQ:
+        case    CS35L34_CLASS_H_CTL:
+        case    CS35L34_CLASS_H_HEADRM_CTL:
+        case    CS35L34_CLASS_H_RELEASE_RATE:
+        case    CS35L34_CLASS_H_FET_DRIVE_CTL:
+        case    CS35L34_CLASS_H_STATUS:
+        case    CS35L34_VPBR_CTL:
+        case    CS35L34_VPBR_VOL_CTL:
+        case    CS35L34_VPBR_TIMING_CTL:
+        case    CS35L34_PRED_MAX_ATTEN_SPK_LOAD:
+        case    CS35L34_PRED_BROWNOUT_THRESH:
+        case    CS35L34_PRED_BROWNOUT_VOL_CTL:
+        case    CS35L34_PRED_BROWNOUT_RATE_CTL:
+        case    CS35L34_PRED_WAIT_CTL:
+        case    CS35L34_PRED_ZVP_INIT_IMP_CTL:
+        case    CS35L34_PRED_MAN_SAFE_VPI_CTL:
+        case    CS35L34_VPBR_ATTEN_STATUS:
+        case    CS35L34_PRED_BRWNOUT_ATT_STATUS:
+        case    CS35L34_SPKR_MON_CTL:
+        case    CS35L34_ADSP_I2S_CTL:
+        case    CS35L34_ADSP_TDM_CTL:
+        case    CS35L34_TDM_TX_CTL_1_VMON:
+        case    CS35L34_TDM_TX_CTL_2_IMON:
+        case    CS35L34_TDM_TX_CTL_3_VPMON:
+        case    CS35L34_TDM_TX_CTL_4_VBSTMON:
+        case    CS35L34_TDM_TX_CTL_5_FLAG1:
+        case    CS35L34_TDM_TX_CTL_6_FLAG2:
+        case    CS35L34_TDM_TX_SLOT_EN_1:
+        case    CS35L34_TDM_TX_SLOT_EN_2:
+        case    CS35L34_TDM_TX_SLOT_EN_3:
+        case    CS35L34_TDM_TX_SLOT_EN_4:
+        case    CS35L34_TDM_RX_CTL_1_AUDIN:
+        case    CS35L34_TDM_RX_CTL_3_ALIVE:
+        case    CS35L34_MULT_DEV_SYNCH1:
+        case    CS35L34_MULT_DEV_SYNCH2:
+        case    CS35L34_PROT_RELEASE_CTL:
+        case    CS35L34_DIAG_MODE_REG_LOCK:
+        case    CS35L34_DIAG_MODE_CTL_1:
+        case    CS35L34_DIAG_MODE_CTL_2:
+        case    CS35L34_INT_MASK_1:
+        case    CS35L34_INT_MASK_2:
+        case    CS35L34_INT_MASK_3:
+        case    CS35L34_INT_MASK_4:
+        case    CS35L34_INT_STATUS_1:
+        case    CS35L34_INT_STATUS_2:
+        case    CS35L34_INT_STATUS_3:
+        case    CS35L34_INT_STATUS_4:
+        case    CS35L34_OTP_TRIM_STATUS:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static bool cs35l34_precious_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case CS35L34_INT_STATUS_1:
+        case CS35L34_INT_STATUS_2:
+        case CS35L34_INT_STATUS_3:
+        case CS35L34_INT_STATUS_4:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static int cs35l34_sdin_event(struct snd_soc_dapm_widget *w,
+                struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct cs35l34_private *priv = snd_soc_codec_get_drvdata(codec);
+        int ret;
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                if (priv->tdm_mode)
+                        regmap_update_bits(priv->regmap, CS35L34_PWRCTL3,
+                                                CS35L34_PDN_TDM, 0x00);
+
+                ret = regmap_update_bits(priv->regmap, CS35L34_PWRCTL1,
+                                                CS35L34_PDN_ALL, 0);
+                if (ret < 0) {
+                        dev_err(codec->dev, "Cannot set Power bits %d\n", ret);
+                        return ret;
+                }
+                usleep_range(5000, 5100);
+        break;
+        case SND_SOC_DAPM_POST_PMD:
+                if (priv->tdm_mode) {
+                        regmap_update_bits(priv->regmap, CS35L34_PWRCTL3,
+                                        CS35L34_PDN_TDM, CS35L34_PDN_TDM);
+                }
+                ret = regmap_update_bits(priv->regmap, CS35L34_PWRCTL1,
+                                        CS35L34_PDN_ALL, CS35L34_PDN_ALL);
+        break;
+        default:
+                pr_err("Invalid event = 0x%x\n", event);
+        }
+        return 0;
+}
+
+static int cs35l34_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;
+        struct cs35l34_private *priv = snd_soc_codec_get_drvdata(codec);
+        unsigned int reg, bit_pos;
+        int slot, slot_num;
+
+        if (slot_width != 8)
+                return -EINVAL;
+
+        priv->tdm_mode = true;
+        /* scan rx_mask for aud slot */
+        slot = ffs(rx_mask) - 1;
+        if (slot >= 0)
+                snd_soc_update_bits(codec, CS35L34_TDM_RX_CTL_1_AUDIN,
+                                        CS35L34_X_LOC, slot);
+
+        /* scan tx_mask: vmon(2 slots); imon (2 slots); vpmon (1 slot)
+         * vbstmon (1 slot)
+         */
+        slot = ffs(tx_mask) - 1;
+        slot_num = 0;
+
+        /* disable vpmon/vbstmon: enable later if set in tx_mask */
+        snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_3_VPMON,
+                                CS35L34_X_STATE | CS35L34_X_LOC,
+                                CS35L34_X_STATE | CS35L34_X_LOC);
+        snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_4_VBSTMON,
+                                CS35L34_X_STATE | CS35L34_X_LOC,
+                                CS35L34_X_STATE | CS35L34_X_LOC);
+
+        /* disconnect {vp,vbst}_mon routes: eanble later if set in tx_mask*/
+        while (slot >= 0) {
+                /* configure VMON_TX_LOC */
+                if (slot_num == 0)
+                        snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_1_VMON,
+                                        CS35L34_X_STATE | CS35L34_X_LOC, slot);
+
+                /* configure IMON_TX_LOC */
+                if (slot_num == 4) {
+                        snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_2_IMON,
+                                        CS35L34_X_STATE | CS35L34_X_LOC, slot);
+                }
+                /* configure VPMON_TX_LOC */
+                if (slot_num == 3) {
+                        snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_3_VPMON,
+                                        CS35L34_X_STATE | CS35L34_X_LOC, slot);
+                }
+                /* configure VBSTMON_TX_LOC */
+                if (slot_num == 7) {
+                        snd_soc_update_bits(codec,
+                                CS35L34_TDM_TX_CTL_4_VBSTMON,
+                                CS35L34_X_STATE | CS35L34_X_LOC, slot);
+                }
+
+                /* Enable the relevant tx slot */
+                reg = CS35L34_TDM_TX_SLOT_EN_4 - (slot/8);
+                bit_pos = slot - ((slot / 8) * (8));
+                snd_soc_update_bits(codec, reg,
+                        1 << bit_pos, 1 << bit_pos);
+
+                tx_mask &= ~(1 << slot);
+                slot = ffs(tx_mask) - 1;
+                slot_num++;
+        }
+
+        return 0;
+}
+
+static int cs35l34_main_amp_event(struct snd_soc_dapm_widget *w,
+                struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct cs35l34_private *priv = snd_soc_codec_get_drvdata(codec);
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                regmap_update_bits(priv->regmap, CS35L34_BST_CVTR_V_CTL,
+                                CS35L34_BST_CVTL_MASK, priv->pdata.boost_vtge);
+                usleep_range(5000, 5100);
+                regmap_update_bits(priv->regmap, CS35L34_PROTECT_CTL,
+                                                CS35L34_MUTE, 0);
+                break;
+        case SND_SOC_DAPM_POST_PMD:
+                regmap_update_bits(priv->regmap, CS35L34_BST_CVTR_V_CTL,
+                        CS35L34_BST_CVTL_MASK, 0);
+                regmap_update_bits(priv->regmap, CS35L34_PROTECT_CTL,
+                        CS35L34_MUTE, CS35L34_MUTE);
+                usleep_range(5000, 5100);
+                break;
+        default:
+                pr_err("Invalid event = 0x%x\n", event);
+        }
+        return 0;
+}
+
+static DECLARE_TLV_DB_SCALE(dig_vol_tlv, -10200, 50, 0);
+
+static DECLARE_TLV_DB_SCALE(amp_gain_tlv, 300, 100, 0);
+
+
+static const struct snd_kcontrol_new cs35l34_snd_controls[] = {
+        SOC_SINGLE_SX_TLV("Digital Volume", CS35L34_AMP_DIG_VOL,
+                      0, 0x34, 0xE4, dig_vol_tlv),
+        SOC_SINGLE_TLV("Amp Gain Volume", CS35L34_AMP_ANLG_GAIN_CTL,
+                      0, 0xF, 0, amp_gain_tlv),
+};
+
+
+static int cs35l34_mclk_event(struct snd_soc_dapm_widget *w,
+                struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct cs35l34_private *priv = snd_soc_codec_get_drvdata(codec);
+        int ret, i;
+        unsigned int reg;
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMD:
+                ret = regmap_read(priv->regmap, CS35L34_AMP_DIG_VOL_CTL,
+                        &reg);
+                if (ret != 0) {
+                        pr_err("%s regmap read failure %d\n", __func__, ret);
+                        return ret;
+                }
+                if (reg & CS35L34_AMP_DIGSFT)
+                        msleep(40);
+                else
+                        usleep_range(2000, 2100);
+
+                for (i = 0; i < PDN_DONE_ATTEMPTS; i++) {
+                        ret = regmap_read(priv->regmap, CS35L34_INT_STATUS_2,
+                                &reg);
+                        if (ret != 0) {
+                                pr_err("%s regmap read failure %d\n",
+                                        __func__, ret);
+                                return ret;
+                        }
+                        if (reg & CS35L34_PDN_DONE)
+                                break;
+
+                        usleep_range(5000, 5100);
+                }
+                if (i == PDN_DONE_ATTEMPTS)
+                        pr_err("%s Device did not power down properly\n",
+                                __func__);
+                break;
+        default:
+                pr_err("Invalid event = 0x%x\n", event);
+                break;
+        }
+        return 0;
+}
+
+static const struct snd_soc_dapm_widget cs35l34_dapm_widgets[] = {
+        SND_SOC_DAPM_AIF_IN_E("SDIN", NULL, 0, CS35L34_PWRCTL3,
+                                        1, 1, cs35l34_sdin_event,
+                                        SND_SOC_DAPM_PRE_PMU |
+                                        SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_AIF_OUT("SDOUT", NULL, 0, CS35L34_PWRCTL3, 2, 1),
+
+        SND_SOC_DAPM_SUPPLY("EXTCLK", CS35L34_PWRCTL3, 7, 1,
+                cs35l34_mclk_event, SND_SOC_DAPM_PRE_PMD),
+
+        SND_SOC_DAPM_OUTPUT("SPK"),
+
+        SND_SOC_DAPM_INPUT("VP"),
+        SND_SOC_DAPM_INPUT("VPST"),
+        SND_SOC_DAPM_INPUT("ISENSE"),
+        SND_SOC_DAPM_INPUT("VSENSE"),
+
+        SND_SOC_DAPM_ADC("VMON ADC", NULL, CS35L34_PWRCTL2, 7, 1),
+        SND_SOC_DAPM_ADC("IMON ADC", NULL, CS35L34_PWRCTL2, 6, 1),
+        SND_SOC_DAPM_ADC("VPMON ADC", NULL, CS35L34_PWRCTL3, 3, 1),
+        SND_SOC_DAPM_ADC("VBSTMON ADC", NULL, CS35L34_PWRCTL3, 4, 1),
+        SND_SOC_DAPM_ADC("CLASS H", NULL, CS35L34_PWRCTL2, 5, 1),
+        SND_SOC_DAPM_ADC("BOOST", NULL, CS35L34_PWRCTL2, 2, 1),
+
+        SND_SOC_DAPM_OUT_DRV_E("Main AMP", CS35L34_PWRCTL2, 0, 1, NULL, 0,
+                cs35l34_main_amp_event, SND_SOC_DAPM_POST_PMU |
+                        SND_SOC_DAPM_POST_PMD),
+};
+
+static const struct snd_soc_dapm_route cs35l34_audio_map[] = {
+        {"SDIN", NULL, "AMP Playback"},
+        {"BOOST", NULL, "SDIN"},
+        {"CLASS H", NULL, "BOOST"},
+        {"Main AMP", NULL, "CLASS H"},
+        {"SPK", NULL, "Main AMP"},
+
+        {"VPMON ADC", NULL, "CLASS H"},
+        {"VBSTMON ADC", NULL, "CLASS H"},
+        {"SPK", NULL, "VPMON ADC"},
+        {"SPK", NULL, "VBSTMON ADC"},
+
+        {"IMON ADC", NULL, "ISENSE"},
+        {"VMON ADC", NULL, "VSENSE"},
+        {"SDOUT", NULL, "IMON ADC"},
+        {"SDOUT", NULL, "VMON ADC"},
+        {"AMP Capture", NULL, "SDOUT"},
+
+        {"SDIN", NULL, "EXTCLK"},
+        {"SDOUT", NULL, "EXTCLK"},
+};
+
+struct cs35l34_mclk_div {
+        int mclk;
+        int srate;
+        u8 adsp_rate;
+};
+
+static struct cs35l34_mclk_div cs35l34_mclk_coeffs[] = {
+
+        /* MCLK, Sample Rate, adsp_rate */
+
+        {5644800, 11025, 0x1},
+        {5644800, 22050, 0x4},
+        {5644800, 44100, 0x7},
+
+        {6000000,  8000, 0x0},
+        {6000000, 11025, 0x1},
+        {6000000, 12000, 0x2},
+        {6000000, 16000, 0x3},
+        {6000000, 22050, 0x4},
+        {6000000, 24000, 0x5},
+        {6000000, 32000, 0x6},
+        {6000000, 44100, 0x7},
+        {6000000, 48000, 0x8},
+
+        {6144000,  8000, 0x0},
+        {6144000, 11025, 0x1},
+        {6144000, 12000, 0x2},
+        {6144000, 16000, 0x3},
+        {6144000, 22050, 0x4},
+        {6144000, 24000, 0x5},
+        {6144000, 32000, 0x6},
+        {6144000, 44100, 0x7},
+        {6144000, 48000, 0x8},
+};
+
+static int cs35l34_get_mclk_coeff(int mclk, int srate)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(cs35l34_mclk_coeffs); i++) {
+                if (cs35l34_mclk_coeffs[i].mclk == mclk &&
+                        cs35l34_mclk_coeffs[i].srate == srate)
+                        return i;
+        }
+        return -EINVAL;
+}
+
+static int cs35l34_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct cs35l34_private *priv = snd_soc_codec_get_drvdata(codec);
+
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBM_CFM:
+                regmap_update_bits(priv->regmap, CS35L34_ADSP_CLK_CTL,
+                                    0x80, 0x80);
+                break;
+        case SND_SOC_DAIFMT_CBS_CFS:
+                regmap_update_bits(priv->regmap, CS35L34_ADSP_CLK_CTL,
+                                    0x80, 0x00);
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int cs35l34_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 cs35l34_private *priv = snd_soc_codec_get_drvdata(codec);
+        int srate = params_rate(params);
+        int ret;
+
+        int coeff = cs35l34_get_mclk_coeff(priv->mclk_int, srate);
+
+        if (coeff < 0) {
+                dev_err(codec->dev, "ERROR: Invalid mclk %d and/or srate %d\n",
+                        priv->mclk_int, srate);
+                return coeff;
+        }
+
+        ret = regmap_update_bits(priv->regmap, CS35L34_ADSP_CLK_CTL,
+                CS35L34_ADSP_RATE, cs35l34_mclk_coeffs[coeff].adsp_rate);
+        if (ret != 0)
+                dev_err(codec->dev, "Failed to set clock state %d\n", ret);
+
+        return ret;
+}
+
+static unsigned int cs35l34_src_rates[] = {
+        8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000
+};
+
+
+static struct snd_pcm_hw_constraint_list cs35l34_constraints = {
+        .count  = ARRAY_SIZE(cs35l34_src_rates),
+        .list   = cs35l34_src_rates,
+};
+
+static int cs35l34_pcm_startup(struct snd_pcm_substream *substream,
+                               struct snd_soc_dai *dai)
+{
+
+        snd_pcm_hw_constraint_list(substream->runtime, 0,
+                                SNDRV_PCM_HW_PARAM_RATE, &cs35l34_constraints);
+        return 0;
+}
+
+
+static int cs35l34_set_tristate(struct snd_soc_dai *dai, int tristate)
+{
+
+        struct snd_soc_codec *codec = dai->codec;
+
+        if (tristate)
+                snd_soc_update_bits(codec, CS35L34_PWRCTL3,
+                                        CS35L34_PDN_SDOUT, CS35L34_PDN_SDOUT);
+        else
+                snd_soc_update_bits(codec, CS35L34_PWRCTL3,
+                                        CS35L34_PDN_SDOUT, 0);
+        return 0;
+}
+
+static int cs35l34_dai_set_sysclk(struct snd_soc_dai *dai,
+                                int clk_id, unsigned int freq, int dir)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct cs35l34_private *cs35l34 = snd_soc_codec_get_drvdata(codec);
+        unsigned int value;
+
+        switch (freq) {
+        case CS35L34_MCLK_5644:
+                value = CS35L34_MCLK_RATE_5P6448;
+                cs35l34->mclk_int = freq;
+        break;
+        case CS35L34_MCLK_6:
+                value = CS35L34_MCLK_RATE_6P0000;
+                cs35l34->mclk_int = freq;
+        break;
+        case CS35L34_MCLK_6144:
+                value = CS35L34_MCLK_RATE_6P1440;
+                cs35l34->mclk_int = freq;
+        break;
+        case CS35L34_MCLK_11289:
+                value = CS35L34_MCLK_DIV | CS35L34_MCLK_RATE_5P6448;
+                cs35l34->mclk_int = freq / 2;
+        break;
+        case CS35L34_MCLK_12:
+                value = CS35L34_MCLK_DIV | CS35L34_MCLK_RATE_6P0000;
+                cs35l34->mclk_int = freq / 2;
+        break;
+        case CS35L34_MCLK_12288:
+                value = CS35L34_MCLK_DIV | CS35L34_MCLK_RATE_6P1440;
+                cs35l34->mclk_int = freq / 2;
+        break;
+        default:
+                dev_err(codec->dev, "ERROR: Invalid Frequency %d\n", freq);
+                cs35l34->mclk_int = 0;
+                return -EINVAL;
+        }
+        regmap_update_bits(cs35l34->regmap, CS35L34_MCLK_CTL,
+                        CS35L34_MCLK_DIV | CS35L34_MCLK_RATE_MASK, value);
+        return 0;
+}
+
+static const struct snd_soc_dai_ops cs35l34_ops = {
+        .startup = cs35l34_pcm_startup,
+        .set_tristate = cs35l34_set_tristate,
+        .set_fmt = cs35l34_set_dai_fmt,
+        .hw_params = cs35l34_pcm_hw_params,
+        .set_sysclk = cs35l34_dai_set_sysclk,
+        .set_tdm_slot = cs35l34_set_tdm_slot,
+};
+
+static struct snd_soc_dai_driver cs35l34_dai = {
+                .name = "cs35l34",
+                .id = 0,
+                .playback = {
+                        .stream_name = "AMP Playback",
+                        .channels_min = 1,
+                        .channels_max = 8,
+                        .rates = CS35L34_RATES,
+                        .formats = CS35L34_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AMP Capture",
+                        .channels_min = 1,
+                        .channels_max = 8,
+                        .rates = CS35L34_RATES,
+                        .formats = CS35L34_FORMATS,
+                },
+                .ops = &cs35l34_ops,
+                .symmetric_rates = 1,
+};
+
+static int cs35l34_boost_inductor(struct cs35l34_private *cs35l34,
+        unsigned int inductor)
+{
+        struct snd_soc_codec *codec = cs35l34->codec;
+
+        switch (inductor) {
+        case 1000: /* 1 uH */
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_COEF_1, 0x24);
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_COEF_2, 0x24);
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_SLOPE_COMP,
+                        0x4E);
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_SW_FREQ, 0);
+                break;
+        case 1200: /* 1.2 uH */
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_COEF_1, 0x20);
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_COEF_2, 0x20);
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_SLOPE_COMP,
+                        0x47);
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_SW_FREQ, 1);
+                break;
+        case 1500: /* 1.5uH */
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_COEF_1, 0x20);
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_COEF_2, 0x20);
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_SLOPE_COMP,
+                        0x3C);
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_SW_FREQ, 2);
+                break;
+        case 2200: /* 2.2uH */
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_COEF_1, 0x19);
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_COEF_2, 0x25);
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_SLOPE_COMP,
+                        0x23);
+                regmap_write(cs35l34->regmap, CS35L34_BST_CONV_SW_FREQ, 3);
+                break;
+        default:
+                dev_err(codec->dev, "%s Invalid Inductor Value %d uH\n",
+                        __func__, inductor);
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int cs35l34_probe(struct snd_soc_codec *codec)
+{
+        int ret = 0;
+        struct cs35l34_private *cs35l34 = snd_soc_codec_get_drvdata(codec);
+
+        pm_runtime_get_sync(codec->dev);
+
+        /* Set over temperature warning attenuation to 6 dB */
+        regmap_update_bits(cs35l34->regmap, CS35L34_PROTECT_CTL,
+                 CS35L34_OTW_ATTN_MASK, 0x8);
+
+        /* Set Power control registers 2 and 3 to have everything
+         * powered down at initialization
+         */
+        regmap_write(cs35l34->regmap, CS35L34_PWRCTL2, 0xFD);
+        regmap_write(cs35l34->regmap, CS35L34_PWRCTL3, 0x1F);
+
+        /* Set mute bit at startup */
+        regmap_update_bits(cs35l34->regmap, CS35L34_PROTECT_CTL,
+                                CS35L34_MUTE, CS35L34_MUTE);
+
+        /* Set Platform Data */
+        if (cs35l34->pdata.boost_peak)
+                regmap_update_bits(cs35l34->regmap, CS35L34_BST_PEAK_I,
+                                CS35L34_BST_PEAK_MASK,
+                                cs35l34->pdata.boost_peak);
+
+        if (cs35l34->pdata.gain_zc_disable)
+                regmap_update_bits(cs35l34->regmap, CS35L34_PROTECT_CTL,
+                        CS35L34_GAIN_ZC_MASK, 0);
+        else
+                regmap_update_bits(cs35l34->regmap, CS35L34_PROTECT_CTL,
+                        CS35L34_GAIN_ZC_MASK, CS35L34_GAIN_ZC_MASK);
+
+        if (cs35l34->pdata.aif_half_drv)
+                regmap_update_bits(cs35l34->regmap, CS35L34_ADSP_CLK_CTL,
+                        CS35L34_ADSP_DRIVE, 0);
+
+        if (cs35l34->pdata.digsft_disable)
+                regmap_update_bits(cs35l34->regmap, CS35L34_AMP_DIG_VOL_CTL,
+                        CS35L34_AMP_DIGSFT, 0);
+
+        if (cs35l34->pdata.amp_inv)
+                regmap_update_bits(cs35l34->regmap, CS35L34_AMP_DIG_VOL_CTL,
+                        CS35L34_INV, CS35L34_INV);
+
+        if (cs35l34->pdata.boost_ind)
+                ret = cs35l34_boost_inductor(cs35l34, cs35l34->pdata.boost_ind);
+
+        if (cs35l34->pdata.i2s_sdinloc)
+                regmap_update_bits(cs35l34->regmap, CS35L34_ADSP_I2S_CTL,
+                        CS35L34_I2S_LOC_MASK,
+                        cs35l34->pdata.i2s_sdinloc << CS35L34_I2S_LOC_SHIFT);
+
+        if (cs35l34->pdata.tdm_rising_edge)
+                regmap_update_bits(cs35l34->regmap, CS35L34_ADSP_TDM_CTL,
+                        1, 1);
+
+        pm_runtime_put_sync(codec->dev);
+
+        return ret;
+}
+
+
+static struct snd_soc_codec_driver soc_codec_dev_cs35l34 = {
+        .probe = cs35l34_probe,
+
+        .component_driver = {
+                .dapm_widgets = cs35l34_dapm_widgets,
+                .num_dapm_widgets = ARRAY_SIZE(cs35l34_dapm_widgets),
+                .dapm_routes = cs35l34_audio_map,
+                .num_dapm_routes = ARRAY_SIZE(cs35l34_audio_map),
+                .controls = cs35l34_snd_controls,
+                .num_controls = ARRAY_SIZE(cs35l34_snd_controls),
+        },
+};
+
+static struct regmap_config cs35l34_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
+
+        .max_register = CS35L34_MAX_REGISTER,
+        .reg_defaults = cs35l34_reg,
+        .num_reg_defaults = ARRAY_SIZE(cs35l34_reg),
+        .volatile_reg = cs35l34_volatile_register,
+        .readable_reg = cs35l34_readable_register,
+        .precious_reg = cs35l34_precious_register,
+        .cache_type = REGCACHE_RBTREE,
+};
+
+static int cs35l34_handle_of_data(struct i2c_client *i2c_client,
+                                struct cs35l34_platform_data *pdata)
+{
+        struct device_node *np = i2c_client->dev.of_node;
+        unsigned int val;
+
+        if (of_property_read_u32(np, "cirrus,boost-vtge-millivolt",
+                &val) >= 0) {
+                /* Boost Voltage has a maximum of 8V */
+                if (val > 8000 || (val < 3300 && val > 0)) {
+                        dev_err(&i2c_client->dev,
+                                "Invalid Boost Voltage %d mV\n", val);
+                        return -EINVAL;
+                }
+                if (val == 0)
+                        pdata->boost_vtge = 0; /* Use VP */
+                else
+                        pdata->boost_vtge = ((val - 3300)/100) + 1;
+        } else {
+                dev_warn(&i2c_client->dev,
+                        "Boost Voltage not specified. Using VP\n");
+        }
+
+        if (of_property_read_u32(np, "cirrus,boost-ind-nanohenry", &val) >= 0) {
+                pdata->boost_ind = val;
+        } else {
+                dev_err(&i2c_client->dev, "Inductor not specified.\n");
+                return -EINVAL;
+        }
+
+        if (of_property_read_u32(np, "cirrus,boost-peak-milliamp", &val) >= 0) {
+                if (val > 3840 || val < 1200) {
+                        dev_err(&i2c_client->dev,
+                                "Invalid Boost Peak Current %d mA\n", val);
+                        return -EINVAL;
+                }
+                pdata->boost_peak = ((val - 1200)/80) + 1;
+        }
+
+        pdata->aif_half_drv = of_property_read_bool(np,
+                "cirrus,aif-half-drv");
+        pdata->digsft_disable = of_property_read_bool(np,
+                "cirrus,digsft-disable");
+
+        pdata->gain_zc_disable = of_property_read_bool(np,
+                "cirrus,gain-zc-disable");
+        pdata->amp_inv = of_property_read_bool(np, "cirrus,amp-inv");
+
+        if (of_property_read_u32(np, "cirrus,i2s-sdinloc", &val) >= 0)
+                pdata->i2s_sdinloc = val;
+        if (of_property_read_u32(np, "cirrus,tdm-rising-edge", &val) >= 0)
+                pdata->tdm_rising_edge = val;
+
+        return 0;
+}
+
+static irqreturn_t cs35l34_irq_thread(int irq, void *data)
+{
+        struct cs35l34_private *cs35l34 = data;
+        struct snd_soc_codec *codec = cs35l34->codec;
+        unsigned int sticky1, sticky2, sticky3, sticky4;
+        unsigned int mask1, mask2, mask3, mask4, current1;
+
+
+        /* ack the irq by reading all status registers */
+        regmap_read(cs35l34->regmap, CS35L34_INT_STATUS_4, &sticky4);
+        regmap_read(cs35l34->regmap, CS35L34_INT_STATUS_3, &sticky3);
+        regmap_read(cs35l34->regmap, CS35L34_INT_STATUS_2, &sticky2);
+        regmap_read(cs35l34->regmap, CS35L34_INT_STATUS_1, &sticky1);
+
+        regmap_read(cs35l34->regmap, CS35L34_INT_MASK_4, &mask4);
+        regmap_read(cs35l34->regmap, CS35L34_INT_MASK_3, &mask3);
+        regmap_read(cs35l34->regmap, CS35L34_INT_MASK_2, &mask2);
+        regmap_read(cs35l34->regmap, CS35L34_INT_MASK_1, &mask1);
+
+        if (!(sticky1 & ~mask1) && !(sticky2 & ~mask2) && !(sticky3 & ~mask3)
+                && !(sticky4 & ~mask4))
+                return IRQ_NONE;
+
+        regmap_read(cs35l34->regmap, CS35L34_INT_STATUS_1, &current1);
+
+        if (sticky1 & CS35L34_CAL_ERR) {
+                dev_err(codec->dev, "Cal error\n");
+
+                /* error is no longer asserted; safe to reset */
+                if (!(current1 & CS35L34_CAL_ERR)) {
+                        dev_dbg(codec->dev, "Cal error release\n");
+                        regmap_update_bits(cs35l34->regmap,
+                                        CS35L34_PROT_RELEASE_CTL,
+                                        CS35L34_CAL_ERR_RLS, 0);
+                        regmap_update_bits(cs35l34->regmap,
+                                        CS35L34_PROT_RELEASE_CTL,
+                                        CS35L34_CAL_ERR_RLS,
+                                        CS35L34_CAL_ERR_RLS);
+                        regmap_update_bits(cs35l34->regmap,
+                                        CS35L34_PROT_RELEASE_CTL,
+                                        CS35L34_CAL_ERR_RLS, 0);
+                        /* note: amp will re-calibrate on next resume */
+                }
+        }
+
+        if (sticky1 & CS35L34_ALIVE_ERR)
+                dev_err(codec->dev, "Alive error\n");
+
+        if (sticky1 & CS35L34_AMP_SHORT) {
+                dev_crit(codec->dev, "Amp short error\n");
+
+                /* error is no longer asserted; safe to reset */
+                if (!(current1 & CS35L34_AMP_SHORT)) {
+                        dev_dbg(codec->dev,
+                                "Amp short error release\n");
+                        regmap_update_bits(cs35l34->regmap,
+                                        CS35L34_PROT_RELEASE_CTL,
+                                        CS35L34_SHORT_RLS, 0);
+                        regmap_update_bits(cs35l34->regmap,
+                                        CS35L34_PROT_RELEASE_CTL,
+                                        CS35L34_SHORT_RLS,
+                                        CS35L34_SHORT_RLS);
+                        regmap_update_bits(cs35l34->regmap,
+                                        CS35L34_PROT_RELEASE_CTL,
+                                        CS35L34_SHORT_RLS, 0);
+                }
+        }
+
+        if (sticky1 & CS35L34_OTW) {
+                dev_crit(codec->dev, "Over temperature warning\n");
+
+                /* error is no longer asserted; safe to reset */
+                if (!(current1 & CS35L34_OTW)) {
+                        dev_dbg(codec->dev,
+                                "Over temperature warning release\n");
+                        regmap_update_bits(cs35l34->regmap,
+                                        CS35L34_PROT_RELEASE_CTL,
+                                        CS35L34_OTW_RLS, 0);
+                        regmap_update_bits(cs35l34->regmap,
+                                        CS35L34_PROT_RELEASE_CTL,
+                                        CS35L34_OTW_RLS,
+                                        CS35L34_OTW_RLS);
+                        regmap_update_bits(cs35l34->regmap,
+                                        CS35L34_PROT_RELEASE_CTL,
+                                        CS35L34_OTW_RLS, 0);
+                }
+        }
+
+        if (sticky1 & CS35L34_OTE) {
+                dev_crit(codec->dev, "Over temperature error\n");
+
+                /* error is no longer asserted; safe to reset */
+                if (!(current1 & CS35L34_OTE)) {
+                        dev_dbg(codec->dev,
+                                "Over temperature error release\n");
+                        regmap_update_bits(cs35l34->regmap,
+                                        CS35L34_PROT_RELEASE_CTL,
+                                        CS35L34_OTE_RLS, 0);
+                        regmap_update_bits(cs35l34->regmap,
+                                        CS35L34_PROT_RELEASE_CTL,
+                                        CS35L34_OTE_RLS,
+                                        CS35L34_OTE_RLS);
+                        regmap_update_bits(cs35l34->regmap,
+                                        CS35L34_PROT_RELEASE_CTL,
+                                        CS35L34_OTE_RLS, 0);
+                }
+        }
+
+        if (sticky3 & CS35L34_BST_HIGH) {
+                dev_crit(codec->dev, "VBST too high error; powering off!\n");
+                regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL2,
+                                CS35L34_PDN_AMP, CS35L34_PDN_AMP);
+                regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL1,
+                                CS35L34_PDN_ALL, CS35L34_PDN_ALL);
+        }
+
+        if (sticky3 & CS35L34_LBST_SHORT) {
+                dev_crit(codec->dev, "LBST short error; powering off!\n");
+                regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL2,
+                                CS35L34_PDN_AMP, CS35L34_PDN_AMP);
+                regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL1,
+                                CS35L34_PDN_ALL, CS35L34_PDN_ALL);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static const char * const cs35l34_core_supplies[] = {
+        "VA",
+        "VP",
+};
+
+static int cs35l34_i2c_probe(struct i2c_client *i2c_client,
+                              const struct i2c_device_id *id)
+{
+        struct cs35l34_private *cs35l34;
+        struct cs35l34_platform_data *pdata =
+                dev_get_platdata(&i2c_client->dev);
+        int i;
+        int ret;
+        unsigned int devid = 0;
+        unsigned int reg;
+
+        cs35l34 = devm_kzalloc(&i2c_client->dev,
+                               sizeof(struct cs35l34_private),
+                               GFP_KERNEL);
+        if (!cs35l34) {
+                dev_err(&i2c_client->dev, "could not allocate codec\n");
+                return -ENOMEM;
+        }
+
+        i2c_set_clientdata(i2c_client, cs35l34);
+        cs35l34->regmap = devm_regmap_init_i2c(i2c_client, &cs35l34_regmap);
+        if (IS_ERR(cs35l34->regmap)) {
+                ret = PTR_ERR(cs35l34->regmap);
+                dev_err(&i2c_client->dev, "regmap_init() failed: %d\n", ret);
+                return ret;
+        }
+
+        cs35l34->num_core_supplies = ARRAY_SIZE(cs35l34_core_supplies);
+        for (i = 0; i < ARRAY_SIZE(cs35l34_core_supplies); i++)
+                cs35l34->core_supplies[i].supply = cs35l34_core_supplies[i];
+
+        ret = devm_regulator_bulk_get(&i2c_client->dev,
+                cs35l34->num_core_supplies,
+                cs35l34->core_supplies);
+        if (ret != 0) {
+                dev_err(&i2c_client->dev,
+                        "Failed to request core supplies %d\n", ret);
+                return ret;
+        }
+
+        ret = regulator_bulk_enable(cs35l34->num_core_supplies,
+                                        cs35l34->core_supplies);
+        if (ret != 0) {
+                dev_err(&i2c_client->dev,
+                        "Failed to enable core supplies: %d\n", ret);
+                return ret;
+        }
+
+        if (pdata) {
+                cs35l34->pdata = *pdata;
+        } else {
+                pdata = devm_kzalloc(&i2c_client->dev,
+                                sizeof(struct cs35l34_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 = cs35l34_handle_of_data(i2c_client, pdata);
+                        if (ret != 0)
+                                return ret;
+
+                }
+                cs35l34->pdata = *pdata;
+        }
+
+        ret = devm_request_threaded_irq(&i2c_client->dev, i2c_client->irq, NULL,
+                        cs35l34_irq_thread, IRQF_ONESHOT | IRQF_TRIGGER_LOW,
+                        "cs35l34", cs35l34);
+        if (ret != 0)
+                dev_err(&i2c_client->dev, "Failed to request IRQ: %d\n", ret);
+
+        cs35l34->reset_gpio = devm_gpiod_get_optional(&i2c_client->dev,
+                                "reset-gpios", GPIOD_OUT_LOW);
+        if (IS_ERR(cs35l34->reset_gpio))
+                return PTR_ERR(cs35l34->reset_gpio);
+
+        gpiod_set_value_cansleep(cs35l34->reset_gpio, 1);
+
+        msleep(CS35L34_START_DELAY);
+
+        ret = regmap_read(cs35l34->regmap, CS35L34_DEVID_AB, &reg);
+
+        devid = (reg & 0xFF) << 12;
+        ret = regmap_read(cs35l34->regmap, CS35L34_DEVID_CD, &reg);
+        devid |= (reg & 0xFF) << 4;
+        ret = regmap_read(cs35l34->regmap, CS35L34_DEVID_E, &reg);
+        devid |= (reg & 0xF0) >> 4;
+
+        if (devid != CS35L34_CHIP_ID) {
+                dev_err(&i2c_client->dev,
+                        "CS35l34 Device ID (%X). Expected ID %X\n",
+                        devid, CS35L34_CHIP_ID);
+                ret = -ENODEV;
+                goto err_regulator;
+        }
+
+        ret = regmap_read(cs35l34->regmap, CS35L34_REV_ID, &reg);
+        if (ret < 0) {
+                dev_err(&i2c_client->dev, "Get Revision ID failed\n");
+                goto err_regulator;
+        }
+
+        dev_info(&i2c_client->dev,
+                 "Cirrus Logic CS35l34 (%x), Revision: %02X\n", devid,
+                reg & 0xFF);
+
+        /* Unmask critical interrupts */
+        regmap_update_bits(cs35l34->regmap, CS35L34_INT_MASK_1,
+                                CS35L34_M_CAL_ERR | CS35L34_M_ALIVE_ERR |
+                                CS35L34_M_AMP_SHORT | CS35L34_M_OTW |
+                                CS35L34_M_OTE, 0);
+        regmap_update_bits(cs35l34->regmap, CS35L34_INT_MASK_3,
+                                CS35L34_M_BST_HIGH | CS35L34_M_LBST_SHORT, 0);
+
+        pm_runtime_set_autosuspend_delay(&i2c_client->dev, 100);
+        pm_runtime_use_autosuspend(&i2c_client->dev);
+        pm_runtime_set_active(&i2c_client->dev);
+        pm_runtime_enable(&i2c_client->dev);
+
+        ret =  snd_soc_register_codec(&i2c_client->dev,
+                        &soc_codec_dev_cs35l34, &cs35l34_dai, 1);
+        if (ret < 0) {
+                dev_err(&i2c_client->dev,
+                        "%s: Register codec failed\n", __func__);
+                goto err_regulator;
+        }
+
+        return 0;
+
+err_regulator:
+        regulator_bulk_disable(cs35l34->num_core_supplies,
+                cs35l34->core_supplies);
+
+        return ret;
+}
+
+static int cs35l34_i2c_remove(struct i2c_client *client)
+{
+        struct cs35l34_private *cs35l34 = i2c_get_clientdata(client);
+
+        snd_soc_unregister_codec(&client->dev);
+
+        if (cs35l34->reset_gpio)
+                gpiod_set_value_cansleep(cs35l34->reset_gpio, 0);
+
+        pm_runtime_disable(&client->dev);
+        regulator_bulk_disable(cs35l34->num_core_supplies,
+                cs35l34->core_supplies);
+
+        return 0;
+}
+
+static int __maybe_unused cs35l34_runtime_resume(struct device *dev)
+{
+        struct cs35l34_private *cs35l34 = dev_get_drvdata(dev);
+        int ret;
+
+        ret = regulator_bulk_enable(cs35l34->num_core_supplies,
+                cs35l34->core_supplies);
+
+        if (ret != 0) {
+                dev_err(dev, "Failed to enable core supplies: %d\n",
+                        ret);
+                return ret;
+        }
+
+        regcache_cache_only(cs35l34->regmap, false);
+
+        gpiod_set_value_cansleep(cs35l34->reset_gpio, 1);
+        msleep(CS35L34_START_DELAY);
+
+        ret = regcache_sync(cs35l34->regmap);
+        if (ret != 0) {
+                dev_err(dev, "Failed to restore register cache\n");
+                goto err;
+        }
+        return 0;
+err:
+        regcache_cache_only(cs35l34->regmap, true);
+        regulator_bulk_disable(cs35l34->num_core_supplies,
+                cs35l34->core_supplies);
+
+        return ret;
+}
+
+static int __maybe_unused cs35l34_runtime_suspend(struct device *dev)
+{
+        struct cs35l34_private *cs35l34 = dev_get_drvdata(dev);
+
+        regcache_cache_only(cs35l34->regmap, true);
+        regcache_mark_dirty(cs35l34->regmap);
+
+        gpiod_set_value_cansleep(cs35l34->reset_gpio, 0);
+
+        regulator_bulk_disable(cs35l34->num_core_supplies,
+                        cs35l34->core_supplies);
+
+        return 0;
+}
+
+static const struct dev_pm_ops cs35l34_pm_ops = {
+        SET_RUNTIME_PM_OPS(cs35l34_runtime_suspend,
+                           cs35l34_runtime_resume,
+                           NULL)
+};
+
+static const struct of_device_id cs35l34_of_match[] = {
+        {.compatible = "cirrus,cs35l34"},
+        {},
+};
+MODULE_DEVICE_TABLE(of, cs35l34_of_match);
+
+static const struct i2c_device_id cs35l34_id[] = {
+        {"cs35l34", 0},
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, cs35l34_id);
+
+static struct i2c_driver cs35l34_i2c_driver = {
+        .driver = {
+                .name = "cs35l34",
+                .pm = &cs35l34_pm_ops,
+                .of_match_table = cs35l34_of_match,
+
+                },
+        .id_table = cs35l34_id,
+        .probe = cs35l34_i2c_probe,
+        .remove = cs35l34_i2c_remove,
+
+};
+
+static int __init cs35l34_modinit(void)
+{
+        int ret;
+
+        ret = i2c_add_driver(&cs35l34_i2c_driver);
+        if (ret != 0) {
+                pr_err("Failed to register CS35l34 I2C driver: %d\n", ret);
+                return ret;
+        }
+        return 0;
+}
+module_init(cs35l34_modinit);
+
+static void __exit cs35l34_exit(void)
+{
+        i2c_del_driver(&cs35l34_i2c_driver);
+}
+module_exit(cs35l34_exit);
+
+MODULE_DESCRIPTION("ASoC CS35l34 driver");
+MODULE_AUTHOR("Paul Handrigan, Cirrus Logic Inc, <Paul.Handrigan@cirrus.com>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/cs35l34.h b/sound/soc/codecs/cs35l34.h
new file mode 100644
index 000000000000..bcd54f127559
--- /dev/null
+++ b/sound/soc/codecs/cs35l34.h
@@ -0,0 +1,269 @@
+/*
+ * cs35l34.h -- CS35L34 ALSA SoC audio driver
+ *
+ * Copyright 2016 Cirrus Logic, Inc.
+ *
+ * Author: Paul Handrigan <Paul.Handrigan@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 __CS35L34_H__
+#define __CS35L34_H__
+
+#define CS35L34_CHIP_ID                 0x00035A34
+#define CS35L34_DEVID_AB                0x01    /* Device ID A & B [RO] */
+#define CS35L34_DEVID_CD                0x02    /* Device ID C & D [RO] */
+#define CS35L34_DEVID_E                 0x03    /* Device ID E [RO] */
+#define CS35L34_FAB_ID                  0x04    /* Fab ID [RO] */
+#define CS35L34_REV_ID                  0x05    /* Revision ID [RO] */
+#define CS35L34_PWRCTL1                 0x06    /* Power Ctl 1 */
+#define CS35L34_PWRCTL2                 0x07    /* Power Ctl 2 */
+#define CS35L34_PWRCTL3                 0x08    /* Power Ctl 3 */
+#define CS35L34_ADSP_CLK_CTL            0x0A    /* (ADSP) Clock Ctl */
+#define CS35L34_MCLK_CTL                0x0B    /* Master Clocking Ctl */
+#define CS35L34_AMP_INP_DRV_CTL         0x14    /* Amp Input Drive Ctl */
+#define CS35L34_AMP_DIG_VOL_CTL         0x15    /* Amplifier Dig Volume Ctl */
+#define CS35L34_AMP_DIG_VOL             0x16    /* Amplifier Dig Volume */
+#define CS35L34_AMP_ANLG_GAIN_CTL       0x17    /* Amplifier Analog Gain Ctl */
+#define CS35L34_PROTECT_CTL             0x18    /* Amp Gain - Prot Ctl Param */
+#define CS35L34_AMP_KEEP_ALIVE_CTL      0x1A    /* Amplifier Keep Alive Ctl */
+#define CS35L34_BST_CVTR_V_CTL          0x1D    /* Boost Conv Voltage Ctl */
+#define CS35L34_BST_PEAK_I              0x1E    /* Boost Conv Peak Current */
+#define CS35L34_BST_RAMP_CTL            0x20    /* Boost Conv Soft Ramp Ctl */
+#define CS35L34_BST_CONV_COEF_1         0x21    /* Boost Conv Coefficients 1 */
+#define CS35L34_BST_CONV_COEF_2         0x22    /* Boost Conv Coefficients 2 */
+#define CS35L34_BST_CONV_SLOPE_COMP     0x23    /* Boost Conv Slope Comp */
+#define CS35L34_BST_CONV_SW_FREQ        0x24    /* Boost Conv L BST SW Freq */
+#define CS35L34_CLASS_H_CTL             0x30    /* CLS H Control */
+#define CS35L34_CLASS_H_HEADRM_CTL      0x31    /* CLS H Headroom Ctl */
+#define CS35L34_CLASS_H_RELEASE_RATE    0x32    /* CLS H Release Rate */
+#define CS35L34_CLASS_H_FET_DRIVE_CTL   0x33    /* CLS H Weak FET Drive Ctl */
+#define CS35L34_CLASS_H_STATUS          0x38    /* CLS H Status */
+#define CS35L34_VPBR_CTL                0x3A    /* VPBR Ctl */
+#define CS35L34_VPBR_VOL_CTL            0x3B    /* VPBR Volume Ctl */
+#define CS35L34_VPBR_TIMING_CTL         0x3C    /* VPBR Timing Ctl */
+#define CS35L34_PRED_MAX_ATTEN_SPK_LOAD 0x40    /* PRD Max Atten / Spkr Load */
+#define CS35L34_PRED_BROWNOUT_THRESH    0x41    /* PRD Brownout Threshold */
+#define CS35L34_PRED_BROWNOUT_VOL_CTL   0x42    /* PRD Brownout Volume Ctl */
+#define CS35L34_PRED_BROWNOUT_RATE_CTL  0x43    /* PRD Brownout Rate Ctl */
+#define CS35L34_PRED_WAIT_CTL           0x44    /* PRD Wait Ctl */
+#define CS35L34_PRED_ZVP_INIT_IMP_CTL   0x46    /* PRD ZVP Initial Imp Ctl */
+#define CS35L34_PRED_MAN_SAFE_VPI_CTL   0x47    /* PRD Manual Safe VPI Ctl */
+#define CS35L34_VPBR_ATTEN_STATUS       0x4B    /* VPBR Attenuation Status */
+#define CS35L34_PRED_BRWNOUT_ATT_STATUS 0x4C    /* PRD Brownout Atten Status */
+#define CS35L34_SPKR_MON_CTL            0x4E    /* Speaker Monitoring Ctl */
+#define CS35L34_ADSP_I2S_CTL            0x50    /* ADSP I2S Ctl */
+#define CS35L34_ADSP_TDM_CTL            0x51    /* ADSP TDM Ctl */
+#define CS35L34_TDM_TX_CTL_1_VMON       0x52    /* TDM TX Ctl 1 (VMON) */
+#define CS35L34_TDM_TX_CTL_2_IMON       0x53    /* TDM TX Ctl 2 (IMON) */
+#define CS35L34_TDM_TX_CTL_3_VPMON      0x54    /* TDM TX Ctl 3 (VPMON) */
+#define CS35L34_TDM_TX_CTL_4_VBSTMON    0x55    /* TDM TX Ctl 4 (VBSTMON) */
+#define CS35L34_TDM_TX_CTL_5_FLAG1      0x56    /* TDM TX Ctl 5 (FLAG1) */
+#define CS35L34_TDM_TX_CTL_6_FLAG2      0x57    /* TDM TX Ctl 6 (FLAG2) */
+#define CS35L34_TDM_TX_SLOT_EN_1        0x5A    /* TDM TX Slot Enable */
+#define CS35L34_TDM_TX_SLOT_EN_2        0x5B    /* TDM TX Slot Enable */
+#define CS35L34_TDM_TX_SLOT_EN_3        0x5C    /* TDM TX Slot Enable */
+#define CS35L34_TDM_TX_SLOT_EN_4        0x5D    /* TDM TX Slot Enable */
+#define CS35L34_TDM_RX_CTL_1_AUDIN      0x5E    /* TDM RX Ctl 1 */
+#define CS35L34_TDM_RX_CTL_3_ALIVE      0x60    /* TDM RX Ctl 3 (ALIVE) */
+#define CS35L34_MULT_DEV_SYNCH1         0x62    /* Multidevice Synch */
+#define CS35L34_MULT_DEV_SYNCH2         0x63    /* Multidevice Synch 2 */
+#define CS35L34_PROT_RELEASE_CTL        0x64    /* Protection Release Ctl */
+#define CS35L34_DIAG_MODE_REG_LOCK      0x68    /* Diagnostic Mode Reg Lock */
+#define CS35L34_DIAG_MODE_CTL_1         0x69    /* Diagnostic Mode Ctl 1 */
+#define CS35L34_DIAG_MODE_CTL_2         0x6A    /* Diagnostic Mode Ctl 2 */
+#define CS35L34_INT_MASK_1              0x70    /* Interrupt Mask 1 */
+#define CS35L34_INT_MASK_2              0x71    /* Interrupt Mask 2 */
+#define CS35L34_INT_MASK_3              0x72    /* Interrupt Mask 3 */
+#define CS35L34_INT_MASK_4              0x73    /* Interrupt Mask 4 */
+#define CS35L34_INT_STATUS_1            0x74    /* Interrupt Status 1 */
+#define CS35L34_INT_STATUS_2            0x75    /* Interrupt Status 2 */
+#define CS35L34_INT_STATUS_3            0x76    /* Interrupt Status 3 */
+#define CS35L34_INT_STATUS_4            0x77    /* Interrupt Status 4 */
+#define CS35L34_OTP_TRIM_STATUS         0x7E    /* OTP Trim Status */
+
+#define CS35L34_MAX_REGISTER            0x7F
+#define CS35L34_REGISTER_COUNT          0x4E
+
+#define CS35L34_MCLK_5644               5644800
+#define CS35L34_MCLK_6144               6144000
+#define CS35L34_MCLK_6                  6000000
+#define CS35L34_MCLK_11289              11289600
+#define CS35L34_MCLK_12                 12000000
+#define CS35L34_MCLK_12288              12288000
+
+/* CS35L34_PWRCTL1 */
+#define CS35L34_SFT_RST                 (1 << 7)
+#define CS35L34_DISCHG_FLT              (1 << 1)
+#define CS35L34_PDN_ALL                 1
+
+/* CS35L34_PWRCTL2 */
+#define CS35L34_PDN_VMON                (1 << 7)
+#define CS35L34_PDN_IMON                (1 << 6)
+#define CS35L34_PDN_CLASSH              (1 << 5)
+#define CS35L34_PDN_VPBR                (1 << 4)
+#define CS35L34_PDN_PRED                (1 << 3)
+#define CS35L34_PDN_BST                 (1 << 2)
+#define CS35L34_PDN_AMP                 1
+
+/* CS35L34_PWRCTL3 */
+#define CS35L34_MCLK_DIS                (1 << 7)
+#define CS35L34_PDN_VBSTMON_OUT         (1 << 4)
+#define CS35L34_PDN_VMON_OUT            (1 << 3)
+/* Tristate the ADSP SDOUT when in I2C mode */
+#define CS35L34_PDN_SDOUT               (1 << 2)
+#define CS35L34_PDN_SDIN                (1 << 1)
+#define CS35L34_PDN_TDM                 1
+
+/* CS35L34_ADSP_CLK_CTL */
+#define CS35L34_ADSP_RATE               0xF
+#define CS35L34_ADSP_DRIVE              (1 << 4)
+#define CS35L34_ADSP_M_S                (1 << 7)
+
+/* CS35L34_MCLK_CTL */
+#define CS35L34_MCLK_DIV                (1 << 4)
+#define CS35L34_MCLK_RATE_MASK          0x7
+#define CS35L34_MCLK_RATE_6P1440        0x2
+#define CS35L34_MCLK_RATE_6P0000        0x1
+#define CS35L34_MCLK_RATE_5P6448        0x0
+#define CS35L34_MCLKDIS                 (1 << 7)
+#define CS35L34_MCLKDIV2                (1 << 6)
+#define CS35L34_SDOUT_3ST_TDM           (1 << 5)
+#define CS35L34_INT_FS_RATE             (1 << 4)
+#define CS35L34_ADSP_FS                 0xF
+
+/* CS35L34_AMP_INP_DRV_CTL */
+#define CS35L34_DRV_STR_SRC             (1 << 1)
+#define CS35L34_DRV_STR                 1
+
+/* CS35L34_AMP_DIG_VOL_CTL */
+#define CS35L34_AMP_DSR_RATE_MASK       0xF0
+#define CS35L34_AMP_DSR_RATE_SHIFT      (1 << 4)
+#define CS35L34_NOTCH_DIS               (1 << 3)
+#define CS35L34_AMP_DIGSFT              (1 << 1)
+#define CS35L34_INV                     1
+
+/* CS35L34_PROTECT_CTL */
+#define CS35L34_OTW_ATTN_MASK           0xC
+#define CS35L34_OTW_THRD_MASK           0x3
+#define CS35L34_MUTE                    (1 << 5)
+#define CS35L34_GAIN_ZC                 (1 << 4)
+#define CS35L34_GAIN_ZC_MASK            0x10
+#define CS35L34_GAIN_ZC_SHIFT           4
+
+/* CS35L34_AMP_KEEP_ALIVE_CTL */
+#define CS35L34_ALIVE_WD_DIS            (1 << 2)
+
+/* CS35L34_BST_CVTR_V_CTL */
+#define CS35L34_BST_CVTL_MASK           0x3F
+
+/* CS35L34_BST_PEAK_I */
+#define CS35L34_BST_PEAK_MASK           0x3F
+
+/* CS35L34_ADSP_I2S_CTL */
+#define CS35L34_I2S_LOC_MASK            0xC
+#define CS35L34_I2S_LOC_SHIFT           2
+
+/* CS35L34_MULT_DEV_SYNCH2 */
+#define CS35L34_SYNC2_MASK              0xF
+
+/* CS35L34_PROT_RELEASE_CTL */
+#define CS35L34_CAL_ERR_RLS             (1 << 7)
+#define CS35L34_SHORT_RLS               (1 << 2)
+#define CS35L34_OTW_RLS                 (1 << 1)
+#define CS35L34_OTE_RLS                 1
+
+/* CS35L34_INT_MASK_1 */
+#define CS35L34_M_CAL_ERR_SHIFT         7
+#define CS35L34_M_CAL_ERR               (1 << CS35L34_M_CAL_ERR_SHIFT)
+#define CS35L34_M_ALIVE_ERR_SHIFT       5
+#define CS35L34_M_ALIVE_ERR             (1 << CS35L34_M_ALIVE_ERR_SHIFT)
+#define CS35L34_M_ADSP_CLK_SHIFT        4
+#define CS35L34_M_ADSP_CLK_ERR          (1 << CS35L34_M_ADSP_CLK_SHIFT)
+#define CS35L34_M_MCLK_SHIFT            3
+#define CS35L34_M_MCLK_ERR              (1 << CS35L34_M_MCLK_SHIFT)
+#define CS35L34_M_AMP_SHORT_SHIFT       2
+#define CS35L34_M_AMP_SHORT             (1 << CS35L34_M_AMP_SHORT_SHIFT)
+#define CS35L34_M_OTW_SHIFT             1
+#define CS35L34_M_OTW                   (1 << CS35L34_M_OTW_SHIFT)
+#define CS35L34_M_OTE_SHIFT             0
+#define CS35L34_M_OTE                   (1 << CS35L34_M_OTE_SHIFT)
+
+/* CS35L34_INT_MASK_2 */
+#define CS35L34_M_PDN_DONE_SHIFT        4
+#define CS35L34_M_PDN_DONE              (1 << CS35L34_M_PDN_DONE_SHIFT)
+#define CS35L34_M_PRED_SHIFT            3
+#define CS35L34_M_PRED_ERR              (1 << CS35L34_M_PRED_SHIFT)
+#define CS35L34_M_PRED_CLR_SHIFT        2
+#define CS35L34_M_PRED_CLR              (1 << CS35L34_M_PRED_CLR_SHIFT)
+#define CS35L34_M_VPBR_SHIFT            1
+#define CS35L34_M_VPBR_ERR              (1 << CS35L34_M_VPBR_SHIFT)
+#define CS35L34_M_VPBR_CLR_SHIFT        0
+#define CS35L34_M_VPBR_CLR              (1 << CS35L34_M_VPBR_CLR_SHIFT)
+
+/* CS35L34_INT_MASK_3 */
+#define CS35L34_M_BST_HIGH_SHIFT        4
+#define CS35L34_M_BST_HIGH              (1 << CS35L34_M_BST_HIGH_SHIFT)
+#define CS35L34_M_BST_HIGH_FLAG_SHIFT   3
+#define CS35L34_M_BST_HIGH_FLAG         (1 << CS35L34_M_BST_HIGH_FLAG_SHIFT)
+#define CS35L34_M_BST_IPK_FLAG_SHIFT    2
+#define CS35L34_M_BST_IPK_FLAG          (1 << CS35L34_M_BST_IPK_FLAG_SHIFT)
+#define CS35L34_M_LBST_SHORT_SHIFT      0
+#define CS35L34_M_LBST_SHORT            (1 << CS35L34_M_LBST_SHORT_SHIFT)
+
+/* CS35L34_INT_MASK_4 */
+#define CS35L34_M_VMON_OVFL_SHIFT       3
+#define CS35L34_M_VMON_OVFL             (1 << CS35L34_M_VMON_OVFL_SHIFT)
+#define CS35L34_M_IMON_OVFL_SHIFT       2
+#define CS35L34_M_IMON_OVFL             (1 << CS35L34_M_IMON_OVFL_SHIFT)
+#define CS35L34_M_VPMON_OVFL_SHIFT      1
+#define CS35L34_M_VPMON_OVFL            (1 << CS35L34_M_VPMON_OVFL_SHIFT)
+#define CS35L34_M_VBSTMON_OVFL_SHIFT    1
+#define CS35L34_M_VBSTMON_OVFL          (1 << CS35L34_M_VBSTMON_OVFL_SHIFT)
+
+/* CS35L34_INT_1 */
+#define CS35L34_CAL_ERR                 (1 << CS35L34_M_CAL_ERR_SHIFT)
+#define CS35L34_ALIVE_ERR               (1 << CS35L34_M_ALIVE_ERR_SHIFT)
+#define CS35L34_M_ADSP_CLK_ERR          (1 << CS35L34_M_ADSP_CLK_SHIFT)
+#define CS35L34_MCLK_ERR                (1 << CS35L34_M_MCLK_SHIFT)
+#define CS35L34_AMP_SHORT               (1 << CS35L34_M_AMP_SHORT_SHIFT)
+#define CS35L34_OTW                     (1 << CS35L34_M_OTW_SHIFT)
+#define CS35L34_OTE                     (1 << CS35L34_M_OTE_SHIFT)
+
+/* CS35L34_INT_2 */
+#define CS35L34_PDN_DONE                (1 << CS35L34_M_PDN_DONE_SHIFT)
+#define CS35L34_PRED_ERR                (1 << CS35L34_M_PRED_SHIFT)
+#define CS35L34_PRED_CLR                (1 << CS35L34_M_PRED_CLR_SHIFT)
+#define CS35L34_VPBR_ERR                (1 << CS35L34_M_VPBR_SHIFT)
+#define CS35L34_VPBR_CLR                (1 << CS35L34_M_VPBR_CLR_SHIFT)
+
+/* CS35L34_INT_3 */
+#define CS35L34_BST_HIGH                (1 << CS35L34_M_BST_HIGH_SHIFT)
+#define CS35L34_BST_HIGH_FLAG           (1 << CS35L34_M_BST_HIGH_FLAG_SHIFT)
+#define CS35L34_BST_IPK_FLAG            (1 << CS35L34_M_BST_IPK_FLAG_SHIFT)
+#define CS35L34_LBST_SHORT              (1 << CS35L34_M_LBST_SHORT_SHIFT)
+
+/* CS35L34_INT_4 */
+#define CS35L34_VMON_OVFL               (1 << CS35L34_M_VMON_OVFL_SHIFT)
+#define CS35L34_IMON_OVFL               (1 << CS35L34_M_IMON_OVFL_SHIFT)
+#define CS35L34_VPMON_OVFL              (1 << CS35L34_M_VPMON_OVFL_SHIFT)
+#define CS35L34_VBSTMON_OVFL            (1 << CS35L34_M_VBSTMON_OVFL_SHIFT)
+
+/* CS35L34_{RX,TX}_X */
+#define CS35L34_X_STATE_SHIFT           7
+#define CS35L34_X_STATE                 (1 << CS35L34_X_STATE_SHIFT)
+#define CS35L34_X_LOC_SHIFT             0
+#define CS35L34_X_LOC                   (0x1F << CS35L34_X_LOC_SHIFT)
+
+#define CS35L34_RATES (SNDRV_PCM_RATE_48000 | \
+                        SNDRV_PCM_RATE_44100 | \
+                        SNDRV_PCM_RATE_32000)
+#define CS35L34_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \
+                        SNDRV_PCM_FMTBIT_S24_LE | \
+                        SNDRV_PCM_FMTBIT_S32_LE)
+
+#endif
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
new file mode 100644
index 000000000000..55e4520cdcaf
--- /dev/null
+++ b/sound/soc/codecs/cs42l42.c
@@ -0,0 +1,1986 @@
+/*
+ * cs42l42.c -- CS42L42 ALSA SoC audio driver
+ *
+ * Copyright 2016 Cirrus Logic, Inc.
+ *
+ * Author: James Schulman <james.schulman@cirrus.com>
+ * Author: Brian Austin <brian.austin@cirrus.com>
+ * Author: Michael White <michael.white@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/version.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+#include <linux/gpio/consumer.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/of_device.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 <dt-bindings/sound/cs42l42.h>
+
+#include "cs42l42.h"
+
+static const struct reg_default cs42l42_reg_defaults[] = {
+        { CS42L42_FRZ_CTL,                      0x00 },
+        { CS42L42_SRC_CTL,                      0x10 },
+        { CS42L42_MCLK_STATUS,                  0x02 },
+        { CS42L42_MCLK_CTL,                     0x02 },
+        { CS42L42_SFTRAMP_RATE,                 0xA4 },
+        { CS42L42_I2C_DEBOUNCE,                 0x88 },
+        { CS42L42_I2C_STRETCH,                  0x03 },
+        { CS42L42_I2C_TIMEOUT,                  0xB7 },
+        { CS42L42_PWR_CTL1,                     0xFF },
+        { CS42L42_PWR_CTL2,                     0x84 },
+        { CS42L42_PWR_CTL3,                     0x20 },
+        { CS42L42_RSENSE_CTL1,                  0x40 },
+        { CS42L42_RSENSE_CTL2,                  0x00 },
+        { CS42L42_OSC_SWITCH,                   0x00 },
+        { CS42L42_OSC_SWITCH_STATUS,            0x05 },
+        { CS42L42_RSENSE_CTL3,                  0x1B },
+        { CS42L42_TSENSE_CTL,                   0x1B },
+        { CS42L42_TSRS_INT_DISABLE,             0x00 },
+        { CS42L42_TRSENSE_STATUS,               0x00 },
+        { CS42L42_HSDET_CTL1,                   0x77 },
+        { CS42L42_HSDET_CTL2,                   0x00 },
+        { CS42L42_HS_SWITCH_CTL,                0xF3 },
+        { CS42L42_HS_DET_STATUS,                0x00 },
+        { CS42L42_HS_CLAMP_DISABLE,             0x00 },
+        { CS42L42_MCLK_SRC_SEL,                 0x00 },
+        { CS42L42_SPDIF_CLK_CFG,                0x00 },
+        { CS42L42_FSYNC_PW_LOWER,               0x00 },
+        { CS42L42_FSYNC_PW_UPPER,               0x00 },
+        { CS42L42_FSYNC_P_LOWER,                0xF9 },
+        { CS42L42_FSYNC_P_UPPER,                0x00 },
+        { CS42L42_ASP_CLK_CFG,                  0x00 },
+        { CS42L42_ASP_FRM_CFG,                  0x10 },
+        { CS42L42_FS_RATE_EN,                   0x00 },
+        { CS42L42_IN_ASRC_CLK,                  0x00 },
+        { CS42L42_OUT_ASRC_CLK,                 0x00 },
+        { CS42L42_PLL_DIV_CFG1,                 0x00 },
+        { CS42L42_ADC_OVFL_STATUS,              0x00 },
+        { CS42L42_MIXER_STATUS,                 0x00 },
+        { CS42L42_SRC_STATUS,                   0x00 },
+        { CS42L42_ASP_RX_STATUS,                0x00 },
+        { CS42L42_ASP_TX_STATUS,                0x00 },
+        { CS42L42_CODEC_STATUS,                 0x00 },
+        { CS42L42_DET_INT_STATUS1,              0x00 },
+        { CS42L42_DET_INT_STATUS2,              0x00 },
+        { CS42L42_SRCPL_INT_STATUS,             0x00 },
+        { CS42L42_VPMON_STATUS,                 0x00 },
+        { CS42L42_PLL_LOCK_STATUS,              0x00 },
+        { CS42L42_TSRS_PLUG_STATUS,             0x00 },
+        { CS42L42_ADC_OVFL_INT_MASK,            0x01 },
+        { CS42L42_MIXER_INT_MASK,               0x0F },
+        { CS42L42_SRC_INT_MASK,                 0x0F },
+        { CS42L42_ASP_RX_INT_MASK,              0x1F },
+        { CS42L42_ASP_TX_INT_MASK,              0x0F },
+        { CS42L42_CODEC_INT_MASK,               0x03 },
+        { CS42L42_SRCPL_INT_MASK,               0xFF },
+        { CS42L42_VPMON_INT_MASK,               0x01 },
+        { CS42L42_PLL_LOCK_INT_MASK,            0x01 },
+        { CS42L42_TSRS_PLUG_INT_MASK,           0x0F },
+        { CS42L42_PLL_CTL1,                     0x00 },
+        { CS42L42_PLL_DIV_FRAC0,                0x00 },
+        { CS42L42_PLL_DIV_FRAC1,                0x00 },
+        { CS42L42_PLL_DIV_FRAC2,                0x00 },
+        { CS42L42_PLL_DIV_INT,                  0x40 },
+        { CS42L42_PLL_CTL3,                     0x10 },
+        { CS42L42_PLL_CAL_RATIO,                0x80 },
+        { CS42L42_PLL_CTL4,                     0x03 },
+        { CS42L42_LOAD_DET_RCSTAT,              0x00 },
+        { CS42L42_LOAD_DET_DONE,                0x00 },
+        { CS42L42_LOAD_DET_EN,                  0x00 },
+        { CS42L42_HSBIAS_SC_AUTOCTL,            0x03 },
+        { CS42L42_WAKE_CTL,                     0xC0 },
+        { CS42L42_ADC_DISABLE_MUTE,             0x00 },
+        { CS42L42_TIPSENSE_CTL,                 0x02 },
+        { CS42L42_MISC_DET_CTL,                 0x03 },
+        { CS42L42_MIC_DET_CTL1,                 0x1F },
+        { CS42L42_MIC_DET_CTL2,                 0x2F },
+        { CS42L42_DET_STATUS1,                  0x00 },
+        { CS42L42_DET_STATUS2,                  0x00 },
+        { CS42L42_DET_INT1_MASK,                0xE0 },
+        { CS42L42_DET_INT2_MASK,                0xFF },
+        { CS42L42_HS_BIAS_CTL,                  0xC2 },
+        { CS42L42_ADC_CTL,                      0x00 },
+        { CS42L42_ADC_VOLUME,                   0x00 },
+        { CS42L42_ADC_WNF_HPF_CTL,              0x71 },
+        { CS42L42_DAC_CTL1,                     0x00 },
+        { CS42L42_DAC_CTL2,                     0x02 },
+        { CS42L42_HP_CTL,                       0x0D },
+        { CS42L42_CLASSH_CTL,                   0x07 },
+        { CS42L42_MIXER_CHA_VOL,                0x3F },
+        { CS42L42_MIXER_ADC_VOL,                0x3F },
+        { CS42L42_MIXER_CHB_VOL,                0x3F },
+        { CS42L42_EQ_COEF_IN0,                  0x22 },
+        { CS42L42_EQ_COEF_IN1,                  0x00 },
+        { CS42L42_EQ_COEF_IN2,                  0x00 },
+        { CS42L42_EQ_COEF_IN3,                  0x00 },
+        { CS42L42_EQ_COEF_RW,                   0x00 },
+        { CS42L42_EQ_COEF_OUT0,                 0x00 },
+        { CS42L42_EQ_COEF_OUT1,                 0x00 },
+        { CS42L42_EQ_COEF_OUT2,                 0x00 },
+        { CS42L42_EQ_COEF_OUT3,                 0x00 },
+        { CS42L42_EQ_INIT_STAT,                 0x00 },
+        { CS42L42_EQ_START_FILT,                0x00 },
+        { CS42L42_EQ_MUTE_CTL,                  0x00 },
+        { CS42L42_SP_RX_CH_SEL,                 0x04 },
+        { CS42L42_SP_RX_ISOC_CTL,               0x04 },
+        { CS42L42_SP_RX_FS,                     0x8C },
+        { CS42l42_SPDIF_CH_SEL,                 0x0E },
+        { CS42L42_SP_TX_ISOC_CTL,               0x04 },
+        { CS42L42_SP_TX_FS,                     0xCC },
+        { CS42L42_SPDIF_SW_CTL1,                0x3F },
+        { CS42L42_SRC_SDIN_FS,                  0x40 },
+        { CS42L42_SRC_SDOUT_FS,                 0x40 },
+        { CS42L42_SPDIF_CTL1,                   0x01 },
+        { CS42L42_SPDIF_CTL2,                   0x00 },
+        { CS42L42_SPDIF_CTL3,                   0x00 },
+        { CS42L42_SPDIF_CTL4,                   0x42 },
+        { CS42L42_ASP_TX_SZ_EN,                 0x00 },
+        { CS42L42_ASP_TX_CH_EN,                 0x00 },
+        { CS42L42_ASP_TX_CH_AP_RES,             0x0F },
+        { CS42L42_ASP_TX_CH1_BIT_MSB,           0x00 },
+        { CS42L42_ASP_TX_CH1_BIT_LSB,           0x00 },
+        { CS42L42_ASP_TX_HIZ_DLY_CFG,           0x00 },
+        { CS42L42_ASP_TX_CH2_BIT_MSB,           0x00 },
+        { CS42L42_ASP_TX_CH2_BIT_LSB,           0x00 },
+        { CS42L42_ASP_RX_DAI0_EN,               0x00 },
+        { CS42L42_ASP_RX_DAI0_CH1_AP_RES,       0x03 },
+        { CS42L42_ASP_RX_DAI0_CH1_BIT_MSB,      0x00 },
+        { CS42L42_ASP_RX_DAI0_CH1_BIT_LSB,      0x00 },
+        { CS42L42_ASP_RX_DAI0_CH2_AP_RES,       0x03 },
+        { CS42L42_ASP_RX_DAI0_CH2_BIT_MSB,      0x00 },
+        { CS42L42_ASP_RX_DAI0_CH2_BIT_LSB,      0x00 },
+        { CS42L42_ASP_RX_DAI0_CH3_AP_RES,       0x03 },
+        { CS42L42_ASP_RX_DAI0_CH3_BIT_MSB,      0x00 },
+        { CS42L42_ASP_RX_DAI0_CH3_BIT_LSB,      0x00 },
+        { CS42L42_ASP_RX_DAI0_CH4_AP_RES,       0x03 },
+        { CS42L42_ASP_RX_DAI0_CH4_BIT_MSB,      0x00 },
+        { CS42L42_ASP_RX_DAI0_CH4_BIT_LSB,      0x00 },
+        { CS42L42_ASP_RX_DAI1_CH1_AP_RES,       0x03 },
+        { CS42L42_ASP_RX_DAI1_CH1_BIT_MSB,      0x00 },
+        { CS42L42_ASP_RX_DAI1_CH1_BIT_LSB,      0x00 },
+        { CS42L42_ASP_RX_DAI1_CH2_AP_RES,       0x03 },
+        { CS42L42_ASP_RX_DAI1_CH2_BIT_MSB,      0x00 },
+        { CS42L42_ASP_RX_DAI1_CH2_BIT_LSB,      0x00 },
+        { CS42L42_SUB_REVID,                    0x03 },
+};
+
+static bool cs42l42_readable_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case CS42L42_PAGE_REGISTER:
+        case CS42L42_DEVID_AB:
+        case CS42L42_DEVID_CD:
+        case CS42L42_DEVID_E:
+        case CS42L42_FABID:
+        case CS42L42_REVID:
+        case CS42L42_FRZ_CTL:
+        case CS42L42_SRC_CTL:
+        case CS42L42_MCLK_STATUS:
+        case CS42L42_MCLK_CTL:
+        case CS42L42_SFTRAMP_RATE:
+        case CS42L42_I2C_DEBOUNCE:
+        case CS42L42_I2C_STRETCH:
+        case CS42L42_I2C_TIMEOUT:
+        case CS42L42_PWR_CTL1:
+        case CS42L42_PWR_CTL2:
+        case CS42L42_PWR_CTL3:
+        case CS42L42_RSENSE_CTL1:
+        case CS42L42_RSENSE_CTL2:
+        case CS42L42_OSC_SWITCH:
+        case CS42L42_OSC_SWITCH_STATUS:
+        case CS42L42_RSENSE_CTL3:
+        case CS42L42_TSENSE_CTL:
+        case CS42L42_TSRS_INT_DISABLE:
+        case CS42L42_TRSENSE_STATUS:
+        case CS42L42_HSDET_CTL1:
+        case CS42L42_HSDET_CTL2:
+        case CS42L42_HS_SWITCH_CTL:
+        case CS42L42_HS_DET_STATUS:
+        case CS42L42_HS_CLAMP_DISABLE:
+        case CS42L42_MCLK_SRC_SEL:
+        case CS42L42_SPDIF_CLK_CFG:
+        case CS42L42_FSYNC_PW_LOWER:
+        case CS42L42_FSYNC_PW_UPPER:
+        case CS42L42_FSYNC_P_LOWER:
+        case CS42L42_FSYNC_P_UPPER:
+        case CS42L42_ASP_CLK_CFG:
+        case CS42L42_ASP_FRM_CFG:
+        case CS42L42_FS_RATE_EN:
+        case CS42L42_IN_ASRC_CLK:
+        case CS42L42_OUT_ASRC_CLK:
+        case CS42L42_PLL_DIV_CFG1:
+        case CS42L42_ADC_OVFL_STATUS:
+        case CS42L42_MIXER_STATUS:
+        case CS42L42_SRC_STATUS:
+        case CS42L42_ASP_RX_STATUS:
+        case CS42L42_ASP_TX_STATUS:
+        case CS42L42_CODEC_STATUS:
+        case CS42L42_DET_INT_STATUS1:
+        case CS42L42_DET_INT_STATUS2:
+        case CS42L42_SRCPL_INT_STATUS:
+        case CS42L42_VPMON_STATUS:
+        case CS42L42_PLL_LOCK_STATUS:
+        case CS42L42_TSRS_PLUG_STATUS:
+        case CS42L42_ADC_OVFL_INT_MASK:
+        case CS42L42_MIXER_INT_MASK:
+        case CS42L42_SRC_INT_MASK:
+        case CS42L42_ASP_RX_INT_MASK:
+        case CS42L42_ASP_TX_INT_MASK:
+        case CS42L42_CODEC_INT_MASK:
+        case CS42L42_SRCPL_INT_MASK:
+        case CS42L42_VPMON_INT_MASK:
+        case CS42L42_PLL_LOCK_INT_MASK:
+        case CS42L42_TSRS_PLUG_INT_MASK:
+        case CS42L42_PLL_CTL1:
+        case CS42L42_PLL_DIV_FRAC0:
+        case CS42L42_PLL_DIV_FRAC1:
+        case CS42L42_PLL_DIV_FRAC2:
+        case CS42L42_PLL_DIV_INT:
+        case CS42L42_PLL_CTL3:
+        case CS42L42_PLL_CAL_RATIO:
+        case CS42L42_PLL_CTL4:
+        case CS42L42_LOAD_DET_RCSTAT:
+        case CS42L42_LOAD_DET_DONE:
+        case CS42L42_LOAD_DET_EN:
+        case CS42L42_HSBIAS_SC_AUTOCTL:
+        case CS42L42_WAKE_CTL:
+        case CS42L42_ADC_DISABLE_MUTE:
+        case CS42L42_TIPSENSE_CTL:
+        case CS42L42_MISC_DET_CTL:
+        case CS42L42_MIC_DET_CTL1:
+        case CS42L42_MIC_DET_CTL2:
+        case CS42L42_DET_STATUS1:
+        case CS42L42_DET_STATUS2:
+        case CS42L42_DET_INT1_MASK:
+        case CS42L42_DET_INT2_MASK:
+        case CS42L42_HS_BIAS_CTL:
+        case CS42L42_ADC_CTL:
+        case CS42L42_ADC_VOLUME:
+        case CS42L42_ADC_WNF_HPF_CTL:
+        case CS42L42_DAC_CTL1:
+        case CS42L42_DAC_CTL2:
+        case CS42L42_HP_CTL:
+        case CS42L42_CLASSH_CTL:
+        case CS42L42_MIXER_CHA_VOL:
+        case CS42L42_MIXER_ADC_VOL:
+        case CS42L42_MIXER_CHB_VOL:
+        case CS42L42_EQ_COEF_IN0:
+        case CS42L42_EQ_COEF_IN1:
+        case CS42L42_EQ_COEF_IN2:
+        case CS42L42_EQ_COEF_IN3:
+        case CS42L42_EQ_COEF_RW:
+        case CS42L42_EQ_COEF_OUT0:
+        case CS42L42_EQ_COEF_OUT1:
+        case CS42L42_EQ_COEF_OUT2:
+        case CS42L42_EQ_COEF_OUT3:
+        case CS42L42_EQ_INIT_STAT:
+        case CS42L42_EQ_START_FILT:
+        case CS42L42_EQ_MUTE_CTL:
+        case CS42L42_SP_RX_CH_SEL:
+        case CS42L42_SP_RX_ISOC_CTL:
+        case CS42L42_SP_RX_FS:
+        case CS42l42_SPDIF_CH_SEL:
+        case CS42L42_SP_TX_ISOC_CTL:
+        case CS42L42_SP_TX_FS:
+        case CS42L42_SPDIF_SW_CTL1:
+        case CS42L42_SRC_SDIN_FS:
+        case CS42L42_SRC_SDOUT_FS:
+        case CS42L42_SPDIF_CTL1:
+        case CS42L42_SPDIF_CTL2:
+        case CS42L42_SPDIF_CTL3:
+        case CS42L42_SPDIF_CTL4:
+        case CS42L42_ASP_TX_SZ_EN:
+        case CS42L42_ASP_TX_CH_EN:
+        case CS42L42_ASP_TX_CH_AP_RES:
+        case CS42L42_ASP_TX_CH1_BIT_MSB:
+        case CS42L42_ASP_TX_CH1_BIT_LSB:
+        case CS42L42_ASP_TX_HIZ_DLY_CFG:
+        case CS42L42_ASP_TX_CH2_BIT_MSB:
+        case CS42L42_ASP_TX_CH2_BIT_LSB:
+        case CS42L42_ASP_RX_DAI0_EN:
+        case CS42L42_ASP_RX_DAI0_CH1_AP_RES:
+        case CS42L42_ASP_RX_DAI0_CH1_BIT_MSB:
+        case CS42L42_ASP_RX_DAI0_CH1_BIT_LSB:
+        case CS42L42_ASP_RX_DAI0_CH2_AP_RES:
+        case CS42L42_ASP_RX_DAI0_CH2_BIT_MSB:
+        case CS42L42_ASP_RX_DAI0_CH2_BIT_LSB:
+        case CS42L42_ASP_RX_DAI0_CH3_AP_RES:
+        case CS42L42_ASP_RX_DAI0_CH3_BIT_MSB:
+        case CS42L42_ASP_RX_DAI0_CH3_BIT_LSB:
+        case CS42L42_ASP_RX_DAI0_CH4_AP_RES:
+        case CS42L42_ASP_RX_DAI0_CH4_BIT_MSB:
+        case CS42L42_ASP_RX_DAI0_CH4_BIT_LSB:
+        case CS42L42_ASP_RX_DAI1_CH1_AP_RES:
+        case CS42L42_ASP_RX_DAI1_CH1_BIT_MSB:
+        case CS42L42_ASP_RX_DAI1_CH1_BIT_LSB:
+        case CS42L42_ASP_RX_DAI1_CH2_AP_RES:
+        case CS42L42_ASP_RX_DAI1_CH2_BIT_MSB:
+        case CS42L42_ASP_RX_DAI1_CH2_BIT_LSB:
+        case CS42L42_SUB_REVID:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static bool cs42l42_volatile_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case CS42L42_DEVID_AB:
+        case CS42L42_DEVID_CD:
+        case CS42L42_DEVID_E:
+        case CS42L42_MCLK_STATUS:
+        case CS42L42_TRSENSE_STATUS:
+        case CS42L42_HS_DET_STATUS:
+        case CS42L42_ADC_OVFL_STATUS:
+        case CS42L42_MIXER_STATUS:
+        case CS42L42_SRC_STATUS:
+        case CS42L42_ASP_RX_STATUS:
+        case CS42L42_ASP_TX_STATUS:
+        case CS42L42_CODEC_STATUS:
+        case CS42L42_DET_INT_STATUS1:
+        case CS42L42_DET_INT_STATUS2:
+        case CS42L42_SRCPL_INT_STATUS:
+        case CS42L42_VPMON_STATUS:
+        case CS42L42_PLL_LOCK_STATUS:
+        case CS42L42_TSRS_PLUG_STATUS:
+        case CS42L42_LOAD_DET_RCSTAT:
+        case CS42L42_LOAD_DET_DONE:
+        case CS42L42_DET_STATUS1:
+        case CS42L42_DET_STATUS2:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static const struct regmap_range_cfg cs42l42_page_range = {
+        .name = "Pages",
+        .range_min = 0,
+        .range_max = CS42L42_MAX_REGISTER,
+        .selector_reg = CS42L42_PAGE_REGISTER,
+        .selector_mask = 0xff,
+        .selector_shift = 0,
+        .window_start = 0,
+        .window_len = 256,
+};
+
+static const struct regmap_config cs42l42_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
+
+        .readable_reg = cs42l42_readable_register,
+        .volatile_reg = cs42l42_volatile_register,
+
+        .ranges = &cs42l42_page_range,
+        .num_ranges = 1,
+
+        .max_register = CS42L42_MAX_REGISTER,
+        .reg_defaults = cs42l42_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(cs42l42_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
+};
+
+static DECLARE_TLV_DB_SCALE(adc_tlv, -9600, 100, false);
+static DECLARE_TLV_DB_SCALE(mixer_tlv, -6200, 100, false);
+
+static const char * const cs42l42_hpf_freq_text[] = {
+        "1.86Hz", "120Hz", "235Hz", "466Hz"
+};
+
+static SOC_ENUM_SINGLE_DECL(cs42l42_hpf_freq_enum, CS42L42_ADC_WNF_HPF_CTL,
+                            CS42L42_ADC_HPF_CF_SHIFT,
+                            cs42l42_hpf_freq_text);
+
+static const char * const cs42l42_wnf3_freq_text[] = {
+        "160Hz", "180Hz", "200Hz", "220Hz",
+        "240Hz", "260Hz", "280Hz", "300Hz"
+};
+
+static SOC_ENUM_SINGLE_DECL(cs42l42_wnf3_freq_enum, CS42L42_ADC_WNF_HPF_CTL,
+                            CS42L42_ADC_WNF_CF_SHIFT,
+                            cs42l42_wnf3_freq_text);
+
+static const char * const cs42l42_wnf05_freq_text[] = {
+        "280Hz", "315Hz", "350Hz", "385Hz",
+        "420Hz", "455Hz", "490Hz", "525Hz"
+};
+
+static SOC_ENUM_SINGLE_DECL(cs42l42_wnf05_freq_enum, CS42L42_ADC_WNF_HPF_CTL,
+                            CS42L42_ADC_WNF_CF_SHIFT,
+                            cs42l42_wnf05_freq_text);
+
+static const struct snd_kcontrol_new cs42l42_snd_controls[] = {
+        /* ADC Volume and Filter Controls */
+        SOC_SINGLE("ADC Notch Switch", CS42L42_ADC_CTL,
+                                CS42L42_ADC_NOTCH_DIS_SHIFT, true, false),
+        SOC_SINGLE("ADC Weak Force Switch", CS42L42_ADC_CTL,
+                                CS42L42_ADC_FORCE_WEAK_VCM_SHIFT, true, false),
+        SOC_SINGLE("ADC Invert Switch", CS42L42_ADC_CTL,
+                                CS42L42_ADC_INV_SHIFT, true, false),
+        SOC_SINGLE("ADC Boost Switch", CS42L42_ADC_CTL,
+                                CS42L42_ADC_DIG_BOOST_SHIFT, true, false),
+        SOC_SINGLE_SX_TLV("ADC Volume", CS42L42_ADC_VOLUME,
+                                CS42L42_ADC_VOL_SHIFT, 0xA0, 0x6C, adc_tlv),
+        SOC_SINGLE("ADC WNF Switch", CS42L42_ADC_WNF_HPF_CTL,
+                                CS42L42_ADC_WNF_EN_SHIFT, true, false),
+        SOC_SINGLE("ADC HPF Switch", CS42L42_ADC_WNF_HPF_CTL,
+                                CS42L42_ADC_HPF_EN_SHIFT, true, false),
+        SOC_ENUM("HPF Corner Freq", cs42l42_hpf_freq_enum),
+        SOC_ENUM("WNF 3dB Freq", cs42l42_wnf3_freq_enum),
+        SOC_ENUM("WNF 05dB Freq", cs42l42_wnf05_freq_enum),
+
+        /* DAC Volume and Filter Controls */
+        SOC_SINGLE("DACA Invert Switch", CS42L42_DAC_CTL1,
+                                CS42L42_DACA_INV_SHIFT, true, false),
+        SOC_SINGLE("DACB Invert Switch", CS42L42_DAC_CTL1,
+                                CS42L42_DACB_INV_SHIFT, true, false),
+        SOC_SINGLE("DAC HPF Switch", CS42L42_DAC_CTL2,
+                                CS42L42_DAC_HPF_EN_SHIFT, true, false),
+        SOC_DOUBLE_R_TLV("Mixer Volume", CS42L42_MIXER_CHA_VOL,
+                         CS42L42_MIXER_CHB_VOL, CS42L42_MIXER_CH_VOL_SHIFT,
+                                0x3e, 1, mixer_tlv)
+};
+
+static int cs42l42_hpdrv_evt(struct snd_soc_dapm_widget *w,
+                                struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        if (event & SND_SOC_DAPM_POST_PMU) {
+                /* Enable the channels */
+                snd_soc_update_bits(codec, CS42L42_ASP_RX_DAI0_EN,
+                                CS42L42_ASP_RX0_CH_EN_MASK,
+                                (CS42L42_ASP_RX0_CH1_EN |
+                                CS42L42_ASP_RX0_CH2_EN) <<
+                                CS42L42_ASP_RX0_CH_EN_SHIFT);
+
+                /* Power up */
+                snd_soc_update_bits(codec, CS42L42_PWR_CTL1,
+                        CS42L42_ASP_DAI_PDN_MASK | CS42L42_MIXER_PDN_MASK |
+                                CS42L42_HP_PDN_MASK, 0);
+        } else if (event & SND_SOC_DAPM_PRE_PMD) {
+                /* Disable the channels */
+                snd_soc_update_bits(codec, CS42L42_ASP_RX_DAI0_EN,
+                                CS42L42_ASP_RX0_CH_EN_MASK, 0);
+
+                /* Power down */
+                snd_soc_update_bits(codec, CS42L42_PWR_CTL1,
+                        CS42L42_ASP_DAI_PDN_MASK | CS42L42_MIXER_PDN_MASK |
+                                CS42L42_HP_PDN_MASK,
+                        CS42L42_ASP_DAI_PDN_MASK | CS42L42_MIXER_PDN_MASK |
+                                CS42L42_HP_PDN_MASK);
+        } else {
+                dev_err(codec->dev, "Invalid event 0x%x\n", event);
+        }
+        return 0;
+}
+
+static const struct snd_soc_dapm_widget cs42l42_dapm_widgets[] = {
+        SND_SOC_DAPM_OUTPUT("HP"),
+        SND_SOC_DAPM_AIF_IN("SDIN", NULL, 0, CS42L42_ASP_CLK_CFG,
+                                        CS42L42_ASP_SCLK_EN_SHIFT, false),
+        SND_SOC_DAPM_OUT_DRV_E("HPDRV", SND_SOC_NOPM, 0,
+                                        0, NULL, 0, cs42l42_hpdrv_evt,
+                                        SND_SOC_DAPM_POST_PMU |
+                                        SND_SOC_DAPM_PRE_PMD)
+};
+
+static const struct snd_soc_dapm_route cs42l42_audio_map[] = {
+        {"SDIN", NULL, "Playback"},
+        {"HPDRV", NULL, "SDIN"},
+        {"HP", NULL, "HPDRV"}
+};
+
+static int cs42l42_set_bias_level(struct snd_soc_codec *codec,
+                                        enum snd_soc_bias_level level)
+{
+        struct cs42l42_private *cs42l42 = snd_soc_codec_get_drvdata(codec);
+        int ret;
+
+        switch (level) {
+        case SND_SOC_BIAS_ON:
+                break;
+        case SND_SOC_BIAS_PREPARE:
+                break;
+        case SND_SOC_BIAS_STANDBY:
+                if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {
+                        regcache_cache_only(cs42l42->regmap, false);
+                        regcache_sync(cs42l42->regmap);
+                        ret = regulator_bulk_enable(
+                                                ARRAY_SIZE(cs42l42->supplies),
+                                                cs42l42->supplies);
+                        if (ret != 0) {
+                                dev_err(codec->dev,
+                                        "Failed to enable regulators: %d\n",
+                                        ret);
+                                return ret;
+                        }
+                }
+                break;
+        case SND_SOC_BIAS_OFF:
+
+                regcache_cache_only(cs42l42->regmap, true);
+                regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies),
+                                                    cs42l42->supplies);
+                break;
+        }
+
+        return 0;
+}
+
+static int cs42l42_codec_probe(struct snd_soc_codec *codec)
+{
+        struct cs42l42_private *cs42l42 =
+                (struct cs42l42_private *)snd_soc_codec_get_drvdata(codec);
+
+        cs42l42->codec = codec;
+
+        return 0;
+}
+
+static const struct snd_soc_codec_driver soc_codec_dev_cs42l42 = {
+        .probe = cs42l42_codec_probe,
+        .set_bias_level = cs42l42_set_bias_level,
+        .ignore_pmdown_time = true,
+
+        .component_driver = {
+                .dapm_widgets = cs42l42_dapm_widgets,
+                .num_dapm_widgets = ARRAY_SIZE(cs42l42_dapm_widgets),
+                .dapm_routes = cs42l42_audio_map,
+                .num_dapm_routes = ARRAY_SIZE(cs42l42_audio_map),
+
+                .controls = cs42l42_snd_controls,
+                .num_controls = ARRAY_SIZE(cs42l42_snd_controls),
+        },
+};
+
+struct cs42l42_pll_params {
+        u32 sclk;
+        u8 mclk_div;
+        u8 mclk_src_sel;
+        u8 sclk_prediv;
+        u8 pll_div_int;
+        u32 pll_div_frac;
+        u8 pll_mode;
+        u8 pll_divout;
+        u32 mclk_int;
+        u8 pll_cal_ratio;
+};
+
+/*
+ * Common PLL Settings for given SCLK
+ * Table 4-5 from the Datasheet
+ */
+static const struct cs42l42_pll_params pll_ratio_table[] = {
+        { 1536000, 0, 1, 0x00, 0x7D, 0x000000, 0x03, 0x10, 12000000, 125 },
+        { 2822400, 0, 1, 0x00, 0x40, 0x000000, 0x03, 0x10, 11289600, 128 },
+        { 3000000, 0, 1, 0x00, 0x40, 0x000000, 0x03, 0x10, 12000000, 128 },
+        { 3072000, 0, 1, 0x00, 0x3E, 0x800000, 0x03, 0x10, 12000000, 125 },
+        { 4000000, 0, 1, 0x00, 0x30, 0x800000, 0x03, 0x10, 12000000, 96 },
+        { 4096000, 0, 1, 0x00, 0x2E, 0xE00000, 0x03, 0x10, 12000000, 94 },
+        { 5644800, 0, 1, 0x01, 0x40, 0x000000, 0x03, 0x10, 11289600, 128 },
+        { 6000000, 0, 1, 0x01, 0x40, 0x000000, 0x03, 0x10, 12000000, 128 },
+        { 6144000, 0, 1, 0x01, 0x3E, 0x800000, 0x03, 0x10, 12000000, 125 },
+        { 11289600, 0, 0, 0, 0, 0, 0, 0, 11289600, 0 },
+        { 12000000, 0, 0, 0, 0, 0, 0, 0, 12000000, 0 },
+        { 12288000, 0, 0, 0, 0, 0, 0, 0, 12288000, 0 },
+        { 22579200, 1, 0, 0, 0, 0, 0, 0, 22579200, 0 },
+        { 24000000, 1, 0, 0, 0, 0, 0, 0, 24000000, 0 },
+        { 24576000, 1, 0, 0, 0, 0, 0, 0, 24576000, 0 }
+};
+
+static int cs42l42_pll_config(struct snd_soc_codec *codec)
+{
+        struct cs42l42_private *cs42l42 = snd_soc_codec_get_drvdata(codec);
+        int i;
+        u32 fsync;
+
+        for (i = 0; i < ARRAY_SIZE(pll_ratio_table); i++) {
+                if (pll_ratio_table[i].sclk == cs42l42->sclk) {
+                        /* Configure the internal sample rate */
+                        snd_soc_update_bits(codec, CS42L42_MCLK_CTL,
+                                        CS42L42_INTERNAL_FS_MASK,
+                                        ((pll_ratio_table[i].mclk_int !=
+                                        12000000) &&
+                                        (pll_ratio_table[i].mclk_int !=
+                                        24000000)) <<
+                                        CS42L42_INTERNAL_FS_SHIFT);
+                        /* Set the MCLK src (PLL or SCLK) and the divide
+                         * ratio
+                         */
+                        snd_soc_update_bits(codec, CS42L42_MCLK_SRC_SEL,
+                                        CS42L42_MCLK_SRC_SEL_MASK |
+                                        CS42L42_MCLKDIV_MASK,
+                                        (pll_ratio_table[i].mclk_src_sel
+                                        << CS42L42_MCLK_SRC_SEL_SHIFT) |
+                                        (pll_ratio_table[i].mclk_div <<
+                                        CS42L42_MCLKDIV_SHIFT));
+                        /* Set up the LRCLK */
+                        fsync = cs42l42->sclk / cs42l42->srate;
+                        if (((fsync * cs42l42->srate) != cs42l42->sclk)
+                                || ((fsync % 2) != 0)) {
+                                dev_err(codec->dev,
+                                        "Unsupported sclk %d/sample rate %d\n",
+                                        cs42l42->sclk,
+                                        cs42l42->srate);
+                                return -EINVAL;
+                        }
+                        /* Set the LRCLK period */
+                        snd_soc_update_bits(codec,
+                                        CS42L42_FSYNC_P_LOWER,
+                                        CS42L42_FSYNC_PERIOD_MASK,
+                                        CS42L42_FRAC0_VAL(fsync - 1) <<
+                                        CS42L42_FSYNC_PERIOD_SHIFT);
+                        snd_soc_update_bits(codec,
+                                        CS42L42_FSYNC_P_UPPER,
+                                        CS42L42_FSYNC_PERIOD_MASK,
+                                        CS42L42_FRAC1_VAL(fsync - 1) <<
+                                        CS42L42_FSYNC_PERIOD_SHIFT);
+                        /* Set the LRCLK to 50% duty cycle */
+                        fsync = fsync / 2;
+                        snd_soc_update_bits(codec,
+                                        CS42L42_FSYNC_PW_LOWER,
+                                        CS42L42_FSYNC_PULSE_WIDTH_MASK,
+                                        CS42L42_FRAC0_VAL(fsync - 1) <<
+                                        CS42L42_FSYNC_PULSE_WIDTH_SHIFT);
+                        snd_soc_update_bits(codec,
+                                        CS42L42_FSYNC_PW_UPPER,
+                                        CS42L42_FSYNC_PULSE_WIDTH_MASK,
+                                        CS42L42_FRAC1_VAL(fsync - 1) <<
+                                        CS42L42_FSYNC_PULSE_WIDTH_SHIFT);
+                        snd_soc_update_bits(codec,
+                                        CS42L42_ASP_FRM_CFG,
+                                        CS42L42_ASP_5050_MASK,
+                                        CS42L42_ASP_5050_MASK);
+                        /* Set the frame delay to 1.0 SCLK clocks */
+                        snd_soc_update_bits(codec, CS42L42_ASP_FRM_CFG,
+                                        CS42L42_ASP_FSD_MASK,
+                                        CS42L42_ASP_FSD_1_0 <<
+                                        CS42L42_ASP_FSD_SHIFT);
+                        /* Set the sample rates (96k or lower) */
+                        snd_soc_update_bits(codec, CS42L42_FS_RATE_EN,
+                                        CS42L42_FS_EN_MASK,
+                                        (CS42L42_FS_EN_IASRC_96K |
+                                        CS42L42_FS_EN_OASRC_96K) <<
+                                        CS42L42_FS_EN_SHIFT);
+                        /* Set the input/output internal MCLK clock ~12 MHz */
+                        snd_soc_update_bits(codec, CS42L42_IN_ASRC_CLK,
+                                        CS42L42_CLK_IASRC_SEL_MASK,
+                                        CS42L42_CLK_IASRC_SEL_12 <<
+                                        CS42L42_CLK_IASRC_SEL_SHIFT);
+                        snd_soc_update_bits(codec,
+                                        CS42L42_OUT_ASRC_CLK,
+                                        CS42L42_CLK_OASRC_SEL_MASK,
+                                        CS42L42_CLK_OASRC_SEL_12 <<
+                                        CS42L42_CLK_OASRC_SEL_SHIFT);
+                        /* channel 1 on low LRCLK, 32 bit */
+                        snd_soc_update_bits(codec,
+                                        CS42L42_ASP_RX_DAI0_CH1_AP_RES,
+                                        CS42L42_ASP_RX_CH_AP_MASK |
+                                        CS42L42_ASP_RX_CH_RES_MASK,
+                                        (CS42L42_ASP_RX_CH_AP_LOW <<
+                                        CS42L42_ASP_RX_CH_AP_SHIFT) |
+                                        (CS42L42_ASP_RX_CH_RES_32 <<
+                                        CS42L42_ASP_RX_CH_RES_SHIFT));
+                        /* Channel 2 on high LRCLK, 32 bit */
+                        snd_soc_update_bits(codec,
+                                        CS42L42_ASP_RX_DAI0_CH2_AP_RES,
+                                        CS42L42_ASP_RX_CH_AP_MASK |
+                                        CS42L42_ASP_RX_CH_RES_MASK,
+                                        (CS42L42_ASP_RX_CH_AP_HI <<
+                                        CS42L42_ASP_RX_CH_AP_SHIFT) |
+                                        (CS42L42_ASP_RX_CH_RES_32 <<
+                                        CS42L42_ASP_RX_CH_RES_SHIFT));
+                        if (pll_ratio_table[i].mclk_src_sel == 0) {
+                                /* Pass the clock straight through */
+                                snd_soc_update_bits(codec,
+                                        CS42L42_PLL_CTL1,
+                                        CS42L42_PLL_START_MASK, 0);
+                        } else {
+                                /* Configure PLL per table 4-5 */
+                                snd_soc_update_bits(codec,
+                                        CS42L42_PLL_DIV_CFG1,
+                                        CS42L42_SCLK_PREDIV_MASK,
+                                        pll_ratio_table[i].sclk_prediv
+                                        << CS42L42_SCLK_PREDIV_SHIFT);
+                                snd_soc_update_bits(codec,
+                                        CS42L42_PLL_DIV_INT,
+                                        CS42L42_PLL_DIV_INT_MASK,
+                                        pll_ratio_table[i].pll_div_int
+                                        << CS42L42_PLL_DIV_INT_SHIFT);
+                                snd_soc_update_bits(codec,
+                                        CS42L42_PLL_DIV_FRAC0,
+                                        CS42L42_PLL_DIV_FRAC_MASK,
+                                        CS42L42_FRAC0_VAL(
+                                        pll_ratio_table[i].pll_div_frac)
+                                        << CS42L42_PLL_DIV_FRAC_SHIFT);
+                                snd_soc_update_bits(codec,
+                                        CS42L42_PLL_DIV_FRAC1,
+                                        CS42L42_PLL_DIV_FRAC_MASK,
+                                        CS42L42_FRAC1_VAL(
+                                        pll_ratio_table[i].pll_div_frac)
+                                        << CS42L42_PLL_DIV_FRAC_SHIFT);
+                                snd_soc_update_bits(codec,
+                                        CS42L42_PLL_DIV_FRAC2,
+                                        CS42L42_PLL_DIV_FRAC_MASK,
+                                        CS42L42_FRAC2_VAL(
+                                        pll_ratio_table[i].pll_div_frac)
+                                        << CS42L42_PLL_DIV_FRAC_SHIFT);
+                                snd_soc_update_bits(codec,
+                                        CS42L42_PLL_CTL4,
+                                        CS42L42_PLL_MODE_MASK,
+                                        pll_ratio_table[i].pll_mode
+                                        << CS42L42_PLL_MODE_SHIFT);
+                                snd_soc_update_bits(codec,
+                                        CS42L42_PLL_CTL3,
+                                        CS42L42_PLL_DIVOUT_MASK,
+                                        pll_ratio_table[i].pll_divout
+                                        << CS42L42_PLL_DIVOUT_SHIFT);
+                                snd_soc_update_bits(codec,
+                                        CS42L42_PLL_CAL_RATIO,
+                                        CS42L42_PLL_CAL_RATIO_MASK,
+                                        pll_ratio_table[i].pll_cal_ratio
+                                        << CS42L42_PLL_CAL_RATIO_SHIFT);
+                        }
+                        return 0;
+                }
+        }
+
+        return -EINVAL;
+}
+
+static int cs42l42_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        u32 asp_cfg_val = 0;
+
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBS_CFM:
+                asp_cfg_val |= CS42L42_ASP_MASTER_MODE <<
+                                CS42L42_ASP_MODE_SHIFT;
+                break;
+        case SND_SOC_DAIFMT_CBS_CFS:
+                asp_cfg_val |= CS42L42_ASP_SLAVE_MODE <<
+                                CS42L42_ASP_MODE_SHIFT;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* interface format */
+        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_I2S:
+        case SND_SOC_DAIFMT_LEFT_J:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* Bitclock/frame inversion */
+        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+        case SND_SOC_DAIFMT_NB_NF:
+                break;
+        case SND_SOC_DAIFMT_NB_IF:
+                asp_cfg_val |= CS42L42_ASP_POL_INV <<
+                                CS42L42_ASP_LCPOL_IN_SHIFT;
+                break;
+        case SND_SOC_DAIFMT_IB_NF:
+                asp_cfg_val |= CS42L42_ASP_POL_INV <<
+                                CS42L42_ASP_SCPOL_IN_DAC_SHIFT;
+                break;
+        case SND_SOC_DAIFMT_IB_IF:
+                asp_cfg_val |= CS42L42_ASP_POL_INV <<
+                                CS42L42_ASP_LCPOL_IN_SHIFT;
+                asp_cfg_val |= CS42L42_ASP_POL_INV <<
+                                CS42L42_ASP_SCPOL_IN_DAC_SHIFT;
+                break;
+        }
+
+        snd_soc_update_bits(codec, CS42L42_ASP_CLK_CFG,
+                                CS42L42_ASP_MODE_MASK |
+                                CS42L42_ASP_SCPOL_IN_DAC_MASK |
+                                CS42L42_ASP_LCPOL_IN_MASK, asp_cfg_val);
+
+        return 0;
+}
+
+static int cs42l42_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 cs42l42_private *cs42l42 = snd_soc_codec_get_drvdata(codec);
+        int retval;
+
+        cs42l42->srate = params_rate(params);
+        cs42l42->swidth = params_width(params);
+
+        retval = cs42l42_pll_config(codec);
+
+        return retval;
+}
+
+static int cs42l42_set_sysclk(struct snd_soc_dai *dai,
+                                int clk_id, unsigned int freq, int dir)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct cs42l42_private *cs42l42 = snd_soc_codec_get_drvdata(codec);
+
+        cs42l42->sclk = freq;
+
+        return 0;
+}
+
+static int cs42l42_digital_mute(struct snd_soc_dai *dai, int mute)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        unsigned int regval;
+        u8 fullScaleVol;
+
+        if (mute) {
+                /* Mark SCLK as not present to turn on the internal
+                 * oscillator.
+                 */
+                snd_soc_update_bits(codec, CS42L42_OSC_SWITCH,
+                                                CS42L42_SCLK_PRESENT_MASK, 0);
+
+                snd_soc_update_bits(codec, CS42L42_PLL_CTL1,
+                                CS42L42_PLL_START_MASK,
+                                0 << CS42L42_PLL_START_SHIFT);
+
+                /* Mute the headphone */
+                snd_soc_update_bits(codec, CS42L42_HP_CTL,
+                                CS42L42_HP_ANA_AMUTE_MASK |
+                                CS42L42_HP_ANA_BMUTE_MASK,
+                                CS42L42_HP_ANA_AMUTE_MASK |
+                                CS42L42_HP_ANA_BMUTE_MASK);
+        } else {
+                snd_soc_update_bits(codec, CS42L42_PLL_CTL1,
+                                CS42L42_PLL_START_MASK,
+                                1 << CS42L42_PLL_START_SHIFT);
+                /* Read the headphone load */
+                regval = snd_soc_read(codec, CS42L42_LOAD_DET_RCSTAT);
+                if (((regval & CS42L42_RLA_STAT_MASK) >>
+                        CS42L42_RLA_STAT_SHIFT) == CS42L42_RLA_STAT_15_OHM) {
+                        fullScaleVol = CS42L42_HP_FULL_SCALE_VOL_MASK;
+                } else {
+                        fullScaleVol = 0;
+                }
+
+                /* Un-mute the headphone, set the full scale volume flag */
+                snd_soc_update_bits(codec, CS42L42_HP_CTL,
+                                CS42L42_HP_ANA_AMUTE_MASK |
+                                CS42L42_HP_ANA_BMUTE_MASK |
+                                CS42L42_HP_FULL_SCALE_VOL_MASK, fullScaleVol);
+
+                /* Mark SCLK as present, turn off internal oscillator */
+                snd_soc_update_bits(codec, CS42L42_OSC_SWITCH,
+                                CS42L42_SCLK_PRESENT_MASK,
+                                CS42L42_SCLK_PRESENT_MASK);
+        }
+
+        return 0;
+}
+
+#define CS42L42_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 cs42l42_ops = {
+        .hw_params      = cs42l42_pcm_hw_params,
+        .set_fmt        = cs42l42_set_dai_fmt,
+        .set_sysclk     = cs42l42_set_sysclk,
+        .digital_mute = cs42l42_digital_mute
+};
+
+static struct snd_soc_dai_driver cs42l42_dai = {
+                .name = "cs42l42",
+                .playback = {
+                        .stream_name = "Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = SNDRV_PCM_RATE_8000_192000,
+                        .formats = CS42L42_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = SNDRV_PCM_RATE_8000_192000,
+                        .formats = CS42L42_FORMATS,
+                },
+                .ops = &cs42l42_ops,
+};
+
+static void cs42l42_process_hs_type_detect(struct cs42l42_private *cs42l42)
+{
+        unsigned int hs_det_status;
+        unsigned int int_status;
+
+        /* Mask the auto detect interrupt */
+        regmap_update_bits(cs42l42->regmap,
+                CS42L42_CODEC_INT_MASK,
+                CS42L42_PDN_DONE_MASK |
+                CS42L42_HSDET_AUTO_DONE_MASK,
+                (1 << CS42L42_PDN_DONE_SHIFT) |
+                (1 << CS42L42_HSDET_AUTO_DONE_SHIFT));
+
+        /* Set hs detect to automatic, disabled mode */
+        regmap_update_bits(cs42l42->regmap,
+                CS42L42_HSDET_CTL2,
+                CS42L42_HSDET_CTRL_MASK |
+                CS42L42_HSDET_SET_MASK |
+                CS42L42_HSBIAS_REF_MASK |
+                CS42L42_HSDET_AUTO_TIME_MASK,
+                (2 << CS42L42_HSDET_CTRL_SHIFT) |
+                (2 << CS42L42_HSDET_SET_SHIFT) |
+                (0 << CS42L42_HSBIAS_REF_SHIFT) |
+                (3 << CS42L42_HSDET_AUTO_TIME_SHIFT));
+
+        /* Read and save the hs detection result */
+        regmap_read(cs42l42->regmap, CS42L42_HS_DET_STATUS, &hs_det_status);
+
+        cs42l42->hs_type = (hs_det_status & CS42L42_HSDET_TYPE_MASK) >>
+                                CS42L42_HSDET_TYPE_SHIFT;
+
+        /* Set up button detection */
+        if ((cs42l42->hs_type == CS42L42_PLUG_CTIA) ||
+              (cs42l42->hs_type == CS42L42_PLUG_OMTP)) {
+                /* Set auto HS bias settings to default */
+                regmap_update_bits(cs42l42->regmap,
+                        CS42L42_HSBIAS_SC_AUTOCTL,
+                        CS42L42_HSBIAS_SENSE_EN_MASK |
+                        CS42L42_AUTO_HSBIAS_HIZ_MASK |
+                        CS42L42_TIP_SENSE_EN_MASK |
+                        CS42L42_HSBIAS_SENSE_TRIP_MASK,
+                        (0 << CS42L42_HSBIAS_SENSE_EN_SHIFT) |
+                        (0 << CS42L42_AUTO_HSBIAS_HIZ_SHIFT) |
+                        (0 << CS42L42_TIP_SENSE_EN_SHIFT) |
+                        (3 << CS42L42_HSBIAS_SENSE_TRIP_SHIFT));
+
+                /* Set up hs detect level sensitivity */
+                regmap_update_bits(cs42l42->regmap,
+                        CS42L42_MIC_DET_CTL1,
+                        CS42L42_LATCH_TO_VP_MASK |
+                        CS42L42_EVENT_STAT_SEL_MASK |
+                        CS42L42_HS_DET_LEVEL_MASK,
+                        (1 << CS42L42_LATCH_TO_VP_SHIFT) |
+                        (0 << CS42L42_EVENT_STAT_SEL_SHIFT) |
+                        (cs42l42->bias_thresholds[0] <<
+                        CS42L42_HS_DET_LEVEL_SHIFT));
+
+                /* Set auto HS bias settings to default */
+                regmap_update_bits(cs42l42->regmap,
+                        CS42L42_HSBIAS_SC_AUTOCTL,
+                        CS42L42_HSBIAS_SENSE_EN_MASK |
+                        CS42L42_AUTO_HSBIAS_HIZ_MASK |
+                        CS42L42_TIP_SENSE_EN_MASK |
+                        CS42L42_HSBIAS_SENSE_TRIP_MASK,
+                        (1 << CS42L42_HSBIAS_SENSE_EN_SHIFT) |
+                        (1 << CS42L42_AUTO_HSBIAS_HIZ_SHIFT) |
+                        (0 << CS42L42_TIP_SENSE_EN_SHIFT) |
+                        (3 << CS42L42_HSBIAS_SENSE_TRIP_SHIFT));
+
+                /* Turn on level detect circuitry */
+                regmap_update_bits(cs42l42->regmap,
+                        CS42L42_MISC_DET_CTL,
+                        CS42L42_DETECT_MODE_MASK |
+                        CS42L42_HSBIAS_CTL_MASK |
+                        CS42L42_PDN_MIC_LVL_DET_MASK,
+                        (0 << CS42L42_DETECT_MODE_SHIFT) |
+                        (3 << CS42L42_HSBIAS_CTL_SHIFT) |
+                        (0 << CS42L42_PDN_MIC_LVL_DET_SHIFT));
+
+                msleep(cs42l42->btn_det_init_dbnce);
+
+                /* Clear any button interrupts before unmasking them */
+                regmap_read(cs42l42->regmap, CS42L42_DET_INT_STATUS2,
+                            &int_status);
+
+                /* Unmask button detect interrupts */
+                regmap_update_bits(cs42l42->regmap,
+                        CS42L42_DET_INT2_MASK,
+                        CS42L42_M_DETECT_TF_MASK |
+                        CS42L42_M_DETECT_FT_MASK |
+                        CS42L42_M_HSBIAS_HIZ_MASK |
+                        CS42L42_M_SHORT_RLS_MASK |
+                        CS42L42_M_SHORT_DET_MASK,
+                        (0 << CS42L42_M_DETECT_TF_SHIFT) |
+                        (0 << CS42L42_M_DETECT_FT_SHIFT) |
+                        (0 << CS42L42_M_HSBIAS_HIZ_SHIFT) |
+                        (1 << CS42L42_M_SHORT_RLS_SHIFT) |
+                        (1 << CS42L42_M_SHORT_DET_SHIFT));
+        } else {
+                /* Make sure button detect and HS bias circuits are off */
+                regmap_update_bits(cs42l42->regmap,
+                        CS42L42_MISC_DET_CTL,
+                        CS42L42_DETECT_MODE_MASK |
+                        CS42L42_HSBIAS_CTL_MASK |
+                        CS42L42_PDN_MIC_LVL_DET_MASK,
+                        (0 << CS42L42_DETECT_MODE_SHIFT) |
+                        (1 << CS42L42_HSBIAS_CTL_SHIFT) |
+                        (1 << CS42L42_PDN_MIC_LVL_DET_SHIFT));
+        }
+
+        regmap_update_bits(cs42l42->regmap,
+                                CS42L42_DAC_CTL2,
+                                CS42L42_HPOUT_PULLDOWN_MASK |
+                                CS42L42_HPOUT_LOAD_MASK |
+                                CS42L42_HPOUT_CLAMP_MASK |
+                                CS42L42_DAC_HPF_EN_MASK |
+                                CS42L42_DAC_MON_EN_MASK,
+                                (0 << CS42L42_HPOUT_PULLDOWN_SHIFT) |
+                                (0 << CS42L42_HPOUT_LOAD_SHIFT) |
+                                (0 << CS42L42_HPOUT_CLAMP_SHIFT) |
+                                (1 << CS42L42_DAC_HPF_EN_SHIFT) |
+                                (0 << CS42L42_DAC_MON_EN_SHIFT));
+
+        /* Unmask tip sense interrupts */
+        regmap_update_bits(cs42l42->regmap,
+                CS42L42_TSRS_PLUG_INT_MASK,
+                CS42L42_RS_PLUG_MASK |
+                CS42L42_RS_UNPLUG_MASK |
+                CS42L42_TS_PLUG_MASK |
+                CS42L42_TS_UNPLUG_MASK,
+                (1 << CS42L42_RS_PLUG_SHIFT) |
+                (1 << CS42L42_RS_UNPLUG_SHIFT) |
+                (0 << CS42L42_TS_PLUG_SHIFT) |
+                (0 << CS42L42_TS_UNPLUG_SHIFT));
+}
+
+static void cs42l42_init_hs_type_detect(struct cs42l42_private *cs42l42)
+{
+        /* Mask tip sense interrupts */
+        regmap_update_bits(cs42l42->regmap,
+                                CS42L42_TSRS_PLUG_INT_MASK,
+                                CS42L42_RS_PLUG_MASK |
+                                CS42L42_RS_UNPLUG_MASK |
+                                CS42L42_TS_PLUG_MASK |
+                                CS42L42_TS_UNPLUG_MASK,
+                                (1 << CS42L42_RS_PLUG_SHIFT) |
+                                (1 << CS42L42_RS_UNPLUG_SHIFT) |
+                                (1 << CS42L42_TS_PLUG_SHIFT) |
+                                (1 << CS42L42_TS_UNPLUG_SHIFT));
+
+        /* Make sure button detect and HS bias circuits are off */
+        regmap_update_bits(cs42l42->regmap,
+                                CS42L42_MISC_DET_CTL,
+                                CS42L42_DETECT_MODE_MASK |
+                                CS42L42_HSBIAS_CTL_MASK |
+                                CS42L42_PDN_MIC_LVL_DET_MASK,
+                                (0 << CS42L42_DETECT_MODE_SHIFT) |
+                                (1 << CS42L42_HSBIAS_CTL_SHIFT) |
+                                (1 << CS42L42_PDN_MIC_LVL_DET_SHIFT));
+
+        /* Set auto HS bias settings to default */
+        regmap_update_bits(cs42l42->regmap,
+                                CS42L42_HSBIAS_SC_AUTOCTL,
+                                CS42L42_HSBIAS_SENSE_EN_MASK |
+                                CS42L42_AUTO_HSBIAS_HIZ_MASK |
+                                CS42L42_TIP_SENSE_EN_MASK |
+                                CS42L42_HSBIAS_SENSE_TRIP_MASK,
+                                (0 << CS42L42_HSBIAS_SENSE_EN_SHIFT) |
+                                (0 << CS42L42_AUTO_HSBIAS_HIZ_SHIFT) |
+                                (0 << CS42L42_TIP_SENSE_EN_SHIFT) |
+                                (3 << CS42L42_HSBIAS_SENSE_TRIP_SHIFT));
+
+        /* Set hs detect to manual, disabled mode */
+        regmap_update_bits(cs42l42->regmap,
+                                CS42L42_HSDET_CTL2,
+                                CS42L42_HSDET_CTRL_MASK |
+                                CS42L42_HSDET_SET_MASK |
+                                CS42L42_HSBIAS_REF_MASK |
+                                CS42L42_HSDET_AUTO_TIME_MASK,
+                                (0 << CS42L42_HSDET_CTRL_SHIFT) |
+                                (2 << CS42L42_HSDET_SET_SHIFT) |
+                                (0 << CS42L42_HSBIAS_REF_SHIFT) |
+                                (3 << CS42L42_HSDET_AUTO_TIME_SHIFT));
+
+        regmap_update_bits(cs42l42->regmap,
+                                CS42L42_DAC_CTL2,
+                                CS42L42_HPOUT_PULLDOWN_MASK |
+                                CS42L42_HPOUT_LOAD_MASK |
+                                CS42L42_HPOUT_CLAMP_MASK |
+                                CS42L42_DAC_HPF_EN_MASK |
+                                CS42L42_DAC_MON_EN_MASK,
+                                (8 << CS42L42_HPOUT_PULLDOWN_SHIFT) |
+                                (0 << CS42L42_HPOUT_LOAD_SHIFT) |
+                                (1 << CS42L42_HPOUT_CLAMP_SHIFT) |
+                                (1 << CS42L42_DAC_HPF_EN_SHIFT) |
+                                (1 << CS42L42_DAC_MON_EN_SHIFT));
+
+        /* Power up HS bias to 2.7V */
+        regmap_update_bits(cs42l42->regmap,
+                                CS42L42_MISC_DET_CTL,
+                                CS42L42_DETECT_MODE_MASK |
+                                CS42L42_HSBIAS_CTL_MASK |
+                                CS42L42_PDN_MIC_LVL_DET_MASK,
+                                (0 << CS42L42_DETECT_MODE_SHIFT) |
+                                (3 << CS42L42_HSBIAS_CTL_SHIFT) |
+                                (1 << CS42L42_PDN_MIC_LVL_DET_SHIFT));
+
+        /* Wait for HS bias to ramp up */
+        msleep(cs42l42->hs_bias_ramp_time);
+
+        /* Unmask auto detect interrupt */
+        regmap_update_bits(cs42l42->regmap,
+                                CS42L42_CODEC_INT_MASK,
+                                CS42L42_PDN_DONE_MASK |
+                                CS42L42_HSDET_AUTO_DONE_MASK,
+                                (1 << CS42L42_PDN_DONE_SHIFT) |
+                                (0 << CS42L42_HSDET_AUTO_DONE_SHIFT));
+
+        /* Set hs detect to automatic, enabled mode */
+        regmap_update_bits(cs42l42->regmap,
+                                CS42L42_HSDET_CTL2,
+                                CS42L42_HSDET_CTRL_MASK |
+                                CS42L42_HSDET_SET_MASK |
+                                CS42L42_HSBIAS_REF_MASK |
+                                CS42L42_HSDET_AUTO_TIME_MASK,
+                                (3 << CS42L42_HSDET_CTRL_SHIFT) |
+                                (2 << CS42L42_HSDET_SET_SHIFT) |
+                                (0 << CS42L42_HSBIAS_REF_SHIFT) |
+                                (3 << CS42L42_HSDET_AUTO_TIME_SHIFT));
+}
+
+static void cs42l42_cancel_hs_type_detect(struct cs42l42_private *cs42l42)
+{
+        /* Mask button detect interrupts */
+        regmap_update_bits(cs42l42->regmap,
+                CS42L42_DET_INT2_MASK,
+                CS42L42_M_DETECT_TF_MASK |
+                CS42L42_M_DETECT_FT_MASK |
+                CS42L42_M_HSBIAS_HIZ_MASK |
+                CS42L42_M_SHORT_RLS_MASK |
+                CS42L42_M_SHORT_DET_MASK,
+                (1 << CS42L42_M_DETECT_TF_SHIFT) |
+                (1 << CS42L42_M_DETECT_FT_SHIFT) |
+                (1 << CS42L42_M_HSBIAS_HIZ_SHIFT) |
+                (1 << CS42L42_M_SHORT_RLS_SHIFT) |
+                (1 << CS42L42_M_SHORT_DET_SHIFT));
+
+        /* Ground HS bias */
+        regmap_update_bits(cs42l42->regmap,
+                                CS42L42_MISC_DET_CTL,
+                                CS42L42_DETECT_MODE_MASK |
+                                CS42L42_HSBIAS_CTL_MASK |
+                                CS42L42_PDN_MIC_LVL_DET_MASK,
+                                (0 << CS42L42_DETECT_MODE_SHIFT) |
+                                (1 << CS42L42_HSBIAS_CTL_SHIFT) |
+                                (1 << CS42L42_PDN_MIC_LVL_DET_SHIFT));
+
+        /* Set auto HS bias settings to default */
+        regmap_update_bits(cs42l42->regmap,
+                                CS42L42_HSBIAS_SC_AUTOCTL,
+                                CS42L42_HSBIAS_SENSE_EN_MASK |
+                                CS42L42_AUTO_HSBIAS_HIZ_MASK |
+                                CS42L42_TIP_SENSE_EN_MASK |
+                                CS42L42_HSBIAS_SENSE_TRIP_MASK,
+                                (0 << CS42L42_HSBIAS_SENSE_EN_SHIFT) |
+                                (0 << CS42L42_AUTO_HSBIAS_HIZ_SHIFT) |
+                                (0 << CS42L42_TIP_SENSE_EN_SHIFT) |
+                                (3 << CS42L42_HSBIAS_SENSE_TRIP_SHIFT));
+
+        /* Set hs detect to manual, disabled mode */
+        regmap_update_bits(cs42l42->regmap,
+                                CS42L42_HSDET_CTL2,
+                                CS42L42_HSDET_CTRL_MASK |
+                                CS42L42_HSDET_SET_MASK |
+                                CS42L42_HSBIAS_REF_MASK |
+                                CS42L42_HSDET_AUTO_TIME_MASK,
+                                (0 << CS42L42_HSDET_CTRL_SHIFT) |
+                                (2 << CS42L42_HSDET_SET_SHIFT) |
+                                (0 << CS42L42_HSBIAS_REF_SHIFT) |
+                                (3 << CS42L42_HSDET_AUTO_TIME_SHIFT));
+}
+
+static void cs42l42_handle_button_press(struct cs42l42_private *cs42l42)
+{
+        int bias_level;
+        unsigned int detect_status;
+
+        /* Mask button detect interrupts */
+        regmap_update_bits(cs42l42->regmap,
+                CS42L42_DET_INT2_MASK,
+                CS42L42_M_DETECT_TF_MASK |
+                CS42L42_M_DETECT_FT_MASK |
+                CS42L42_M_HSBIAS_HIZ_MASK |
+                CS42L42_M_SHORT_RLS_MASK |
+                CS42L42_M_SHORT_DET_MASK,
+                (1 << CS42L42_M_DETECT_TF_SHIFT) |
+                (1 << CS42L42_M_DETECT_FT_SHIFT) |
+                (1 << CS42L42_M_HSBIAS_HIZ_SHIFT) |
+                (1 << CS42L42_M_SHORT_RLS_SHIFT) |
+                (1 << CS42L42_M_SHORT_DET_SHIFT));
+
+        usleep_range(cs42l42->btn_det_event_dbnce * 1000,
+                     cs42l42->btn_det_event_dbnce * 2000);
+
+        /* Test all 4 level detect biases */
+        bias_level = 1;
+        do {
+                /* Adjust button detect level sensitivity */
+                regmap_update_bits(cs42l42->regmap,
+                        CS42L42_MIC_DET_CTL1,
+                        CS42L42_LATCH_TO_VP_MASK |
+                        CS42L42_EVENT_STAT_SEL_MASK |
+                        CS42L42_HS_DET_LEVEL_MASK,
+                        (1 << CS42L42_LATCH_TO_VP_SHIFT) |
+                        (0 << CS42L42_EVENT_STAT_SEL_SHIFT) |
+                        (cs42l42->bias_thresholds[bias_level] <<
+                        CS42L42_HS_DET_LEVEL_SHIFT));
+
+                regmap_read(cs42l42->regmap, CS42L42_DET_STATUS2,
+                                &detect_status);
+        } while ((detect_status & CS42L42_HS_TRUE_MASK) &&
+                (++bias_level < CS42L42_NUM_BIASES));
+
+        switch (bias_level) {
+        case 1: /* Function C button press */
+                dev_dbg(cs42l42->codec->dev, "Function C button press\n");
+                break;
+        case 2: /* Function B button press */
+                dev_dbg(cs42l42->codec->dev, "Function B button press\n");
+                break;
+        case 3: /* Function D button press */
+                dev_dbg(cs42l42->codec->dev, "Function D button press\n");
+                break;
+        case 4: /* Function A button press */
+                dev_dbg(cs42l42->codec->dev, "Function A button press\n");
+                break;
+        }
+
+        /* Set button detect level sensitivity back to default */
+        regmap_update_bits(cs42l42->regmap,
+                CS42L42_MIC_DET_CTL1,
+                CS42L42_LATCH_TO_VP_MASK |
+                CS42L42_EVENT_STAT_SEL_MASK |
+                CS42L42_HS_DET_LEVEL_MASK,
+                (1 << CS42L42_LATCH_TO_VP_SHIFT) |
+                (0 << CS42L42_EVENT_STAT_SEL_SHIFT) |
+                (cs42l42->bias_thresholds[0] << CS42L42_HS_DET_LEVEL_SHIFT));
+
+        /* Clear any button interrupts before unmasking them */
+        regmap_read(cs42l42->regmap, CS42L42_DET_INT_STATUS2,
+                    &detect_status);
+
+        /* Unmask button detect interrupts */
+        regmap_update_bits(cs42l42->regmap,
+                CS42L42_DET_INT2_MASK,
+                CS42L42_M_DETECT_TF_MASK |
+                CS42L42_M_DETECT_FT_MASK |
+                CS42L42_M_HSBIAS_HIZ_MASK |
+                CS42L42_M_SHORT_RLS_MASK |
+                CS42L42_M_SHORT_DET_MASK,
+                (0 << CS42L42_M_DETECT_TF_SHIFT) |
+                (0 << CS42L42_M_DETECT_FT_SHIFT) |
+                (0 << CS42L42_M_HSBIAS_HIZ_SHIFT) |
+                (1 << CS42L42_M_SHORT_RLS_SHIFT) |
+                (1 << CS42L42_M_SHORT_DET_SHIFT));
+}
+
+struct cs42l42_irq_params {
+        u16 status_addr;
+        u16 mask_addr;
+        u8 mask;
+};
+
+static const struct cs42l42_irq_params irq_params_table[] = {
+        {CS42L42_ADC_OVFL_STATUS, CS42L42_ADC_OVFL_INT_MASK,
+                CS42L42_ADC_OVFL_VAL_MASK},
+        {CS42L42_MIXER_STATUS, CS42L42_MIXER_INT_MASK,
+                CS42L42_MIXER_VAL_MASK},
+        {CS42L42_SRC_STATUS, CS42L42_SRC_INT_MASK,
+                CS42L42_SRC_VAL_MASK},
+        {CS42L42_ASP_RX_STATUS, CS42L42_ASP_RX_INT_MASK,
+                CS42L42_ASP_RX_VAL_MASK},
+        {CS42L42_ASP_TX_STATUS, CS42L42_ASP_TX_INT_MASK,
+                CS42L42_ASP_TX_VAL_MASK},
+        {CS42L42_CODEC_STATUS, CS42L42_CODEC_INT_MASK,
+                CS42L42_CODEC_VAL_MASK},
+        {CS42L42_DET_INT_STATUS1, CS42L42_DET_INT1_MASK,
+                CS42L42_DET_INT_VAL1_MASK},
+        {CS42L42_DET_INT_STATUS2, CS42L42_DET_INT2_MASK,
+                CS42L42_DET_INT_VAL2_MASK},
+        {CS42L42_SRCPL_INT_STATUS, CS42L42_SRCPL_INT_MASK,
+                CS42L42_SRCPL_VAL_MASK},
+        {CS42L42_VPMON_STATUS, CS42L42_VPMON_INT_MASK,
+                CS42L42_VPMON_VAL_MASK},
+        {CS42L42_PLL_LOCK_STATUS, CS42L42_PLL_LOCK_INT_MASK,
+                CS42L42_PLL_LOCK_VAL_MASK},
+        {CS42L42_TSRS_PLUG_STATUS, CS42L42_TSRS_PLUG_INT_MASK,
+                CS42L42_TSRS_PLUG_VAL_MASK}
+};
+
+static irqreturn_t cs42l42_irq_thread(int irq, void *data)
+{
+        struct cs42l42_private *cs42l42 = (struct cs42l42_private *)data;
+        struct snd_soc_codec *codec = cs42l42->codec;
+        unsigned int stickies[12];
+        unsigned int masks[12];
+        unsigned int current_plug_status;
+        unsigned int current_button_status;
+        unsigned int i;
+
+        /* Read sticky registers to clear interurpt */
+        for (i = 0; i < ARRAY_SIZE(stickies); i++) {
+                regmap_read(cs42l42->regmap, irq_params_table[i].status_addr,
+                                &(stickies[i]));
+                regmap_read(cs42l42->regmap, irq_params_table[i].mask_addr,
+                                &(masks[i]));
+                stickies[i] = stickies[i] & (~masks[i]) &
+                                irq_params_table[i].mask;
+        }
+
+        /* Read tip sense status before handling type detect */
+        current_plug_status = (stickies[11] &
+                (CS42L42_TS_PLUG_MASK | CS42L42_TS_UNPLUG_MASK)) >>
+                CS42L42_TS_PLUG_SHIFT;
+
+        /* Read button sense status */
+        current_button_status = stickies[7] &
+                (CS42L42_M_DETECT_TF_MASK |
+                CS42L42_M_DETECT_FT_MASK |
+                CS42L42_M_HSBIAS_HIZ_MASK);
+
+        /* Check auto-detect status */
+        if ((~masks[5]) & irq_params_table[5].mask) {
+                if (stickies[5] & CS42L42_HSDET_AUTO_DONE_MASK) {
+                        cs42l42_process_hs_type_detect(cs42l42);
+                        dev_dbg(codec->dev,
+                                "Auto detect done (%d)\n",
+                                cs42l42->hs_type);
+                }
+        }
+
+        /* Check tip sense status */
+        if ((~masks[11]) & irq_params_table[11].mask) {
+                switch (current_plug_status) {
+                case CS42L42_TS_PLUG:
+                        if (cs42l42->plug_state != CS42L42_TS_PLUG) {
+                                cs42l42->plug_state = CS42L42_TS_PLUG;
+                                cs42l42_init_hs_type_detect(cs42l42);
+                        }
+                        break;
+
+                case CS42L42_TS_UNPLUG:
+                        if (cs42l42->plug_state != CS42L42_TS_UNPLUG) {
+                                cs42l42->plug_state = CS42L42_TS_UNPLUG;
+                                cs42l42_cancel_hs_type_detect(cs42l42);
+                                dev_dbg(codec->dev,
+                                        "Unplug event\n");
+                        }
+                        break;
+
+                default:
+                        if (cs42l42->plug_state != CS42L42_TS_TRANS)
+                                cs42l42->plug_state = CS42L42_TS_TRANS;
+                }
+        }
+
+        /* Check button detect status */
+        if ((~masks[7]) & irq_params_table[7].mask) {
+                if (!(current_button_status &
+                        CS42L42_M_HSBIAS_HIZ_MASK)) {
+
+                        if (current_button_status &
+                                CS42L42_M_DETECT_TF_MASK) {
+                                dev_dbg(codec->dev,
+                                        "Button released\n");
+                        } else if (current_button_status &
+                                CS42L42_M_DETECT_FT_MASK) {
+                                cs42l42_handle_button_press(cs42l42);
+                        }
+                }
+        }
+
+        return IRQ_HANDLED;
+}
+
+static void cs42l42_set_interrupt_masks(struct cs42l42_private *cs42l42)
+{
+        regmap_update_bits(cs42l42->regmap, CS42L42_ADC_OVFL_INT_MASK,
+                        CS42L42_ADC_OVFL_MASK,
+                        (1 << CS42L42_ADC_OVFL_SHIFT));
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_MIXER_INT_MASK,
+                        CS42L42_MIX_CHB_OVFL_MASK |
+                        CS42L42_MIX_CHA_OVFL_MASK |
+                        CS42L42_EQ_OVFL_MASK |
+                        CS42L42_EQ_BIQUAD_OVFL_MASK,
+                        (1 << CS42L42_MIX_CHB_OVFL_SHIFT) |
+                        (1 << CS42L42_MIX_CHA_OVFL_SHIFT) |
+                        (1 << CS42L42_EQ_OVFL_SHIFT) |
+                        (1 << CS42L42_EQ_BIQUAD_OVFL_SHIFT));
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_SRC_INT_MASK,
+                        CS42L42_SRC_ILK_MASK |
+                        CS42L42_SRC_OLK_MASK |
+                        CS42L42_SRC_IUNLK_MASK |
+                        CS42L42_SRC_OUNLK_MASK,
+                        (1 << CS42L42_SRC_ILK_SHIFT) |
+                        (1 << CS42L42_SRC_OLK_SHIFT) |
+                        (1 << CS42L42_SRC_IUNLK_SHIFT) |
+                        (1 << CS42L42_SRC_OUNLK_SHIFT));
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_ASP_RX_INT_MASK,
+                        CS42L42_ASPRX_NOLRCK_MASK |
+                        CS42L42_ASPRX_EARLY_MASK |
+                        CS42L42_ASPRX_LATE_MASK |
+                        CS42L42_ASPRX_ERROR_MASK |
+                        CS42L42_ASPRX_OVLD_MASK,
+                        (1 << CS42L42_ASPRX_NOLRCK_SHIFT) |
+                        (1 << CS42L42_ASPRX_EARLY_SHIFT) |
+                        (1 << CS42L42_ASPRX_LATE_SHIFT) |
+                        (1 << CS42L42_ASPRX_ERROR_SHIFT) |
+                        (1 << CS42L42_ASPRX_OVLD_SHIFT));
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_ASP_TX_INT_MASK,
+                        CS42L42_ASPTX_NOLRCK_MASK |
+                        CS42L42_ASPTX_EARLY_MASK |
+                        CS42L42_ASPTX_LATE_MASK |
+                        CS42L42_ASPTX_SMERROR_MASK,
+                        (1 << CS42L42_ASPTX_NOLRCK_SHIFT) |
+                        (1 << CS42L42_ASPTX_EARLY_SHIFT) |
+                        (1 << CS42L42_ASPTX_LATE_SHIFT) |
+                        (1 << CS42L42_ASPTX_SMERROR_SHIFT));
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_CODEC_INT_MASK,
+                        CS42L42_PDN_DONE_MASK |
+                        CS42L42_HSDET_AUTO_DONE_MASK,
+                        (1 << CS42L42_PDN_DONE_SHIFT) |
+                        (1 << CS42L42_HSDET_AUTO_DONE_SHIFT));
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_SRCPL_INT_MASK,
+                        CS42L42_SRCPL_ADC_LK_MASK |
+                        CS42L42_SRCPL_DAC_LK_MASK |
+                        CS42L42_SRCPL_ADC_UNLK_MASK |
+                        CS42L42_SRCPL_DAC_UNLK_MASK,
+                        (1 << CS42L42_SRCPL_ADC_LK_SHIFT) |
+                        (1 << CS42L42_SRCPL_DAC_LK_SHIFT) |
+                        (1 << CS42L42_SRCPL_ADC_UNLK_SHIFT) |
+                        (1 << CS42L42_SRCPL_DAC_UNLK_SHIFT));
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_DET_INT1_MASK,
+                        CS42L42_TIP_SENSE_UNPLUG_MASK |
+                        CS42L42_TIP_SENSE_PLUG_MASK |
+                        CS42L42_HSBIAS_SENSE_MASK,
+                        (1 << CS42L42_TIP_SENSE_UNPLUG_SHIFT) |
+                        (1 << CS42L42_TIP_SENSE_PLUG_SHIFT) |
+                        (1 << CS42L42_HSBIAS_SENSE_SHIFT));
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_DET_INT2_MASK,
+                        CS42L42_M_DETECT_TF_MASK |
+                        CS42L42_M_DETECT_FT_MASK |
+                        CS42L42_M_HSBIAS_HIZ_MASK |
+                        CS42L42_M_SHORT_RLS_MASK |
+                        CS42L42_M_SHORT_DET_MASK,
+                        (1 << CS42L42_M_DETECT_TF_SHIFT) |
+                        (1 << CS42L42_M_DETECT_FT_SHIFT) |
+                        (1 << CS42L42_M_HSBIAS_HIZ_SHIFT) |
+                        (1 << CS42L42_M_SHORT_RLS_SHIFT) |
+                        (1 << CS42L42_M_SHORT_DET_SHIFT));
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_VPMON_INT_MASK,
+                        CS42L42_VPMON_MASK,
+                        (1 << CS42L42_VPMON_SHIFT));
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_PLL_LOCK_INT_MASK,
+                        CS42L42_PLL_LOCK_MASK,
+                        (1 << CS42L42_PLL_LOCK_SHIFT));
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_TSRS_PLUG_INT_MASK,
+                        CS42L42_RS_PLUG_MASK |
+                        CS42L42_RS_UNPLUG_MASK |
+                        CS42L42_TS_PLUG_MASK |
+                        CS42L42_TS_UNPLUG_MASK,
+                        (1 << CS42L42_RS_PLUG_SHIFT) |
+                        (1 << CS42L42_RS_UNPLUG_SHIFT) |
+                        (0 << CS42L42_TS_PLUG_SHIFT) |
+                        (0 << CS42L42_TS_UNPLUG_SHIFT));
+}
+
+static void cs42l42_setup_hs_type_detect(struct cs42l42_private *cs42l42)
+{
+        unsigned int reg;
+
+        cs42l42->hs_type = CS42L42_PLUG_INVALID;
+
+        /* Latch analog controls to VP power domain */
+        regmap_update_bits(cs42l42->regmap, CS42L42_MIC_DET_CTL1,
+                        CS42L42_LATCH_TO_VP_MASK |
+                        CS42L42_EVENT_STAT_SEL_MASK |
+                        CS42L42_HS_DET_LEVEL_MASK,
+                        (1 << CS42L42_LATCH_TO_VP_SHIFT) |
+                        (0 << CS42L42_EVENT_STAT_SEL_SHIFT) |
+                        (cs42l42->bias_thresholds[0] <<
+                        CS42L42_HS_DET_LEVEL_SHIFT));
+
+        /* Remove ground noise-suppression clamps */
+        regmap_update_bits(cs42l42->regmap,
+                        CS42L42_HS_CLAMP_DISABLE,
+                        CS42L42_HS_CLAMP_DISABLE_MASK,
+                        (1 << CS42L42_HS_CLAMP_DISABLE_SHIFT));
+
+        /* Enable the tip sense circuit */
+        regmap_update_bits(cs42l42->regmap, CS42L42_TIPSENSE_CTL,
+                        CS42L42_TIP_SENSE_CTRL_MASK |
+                        CS42L42_TIP_SENSE_INV_MASK |
+                        CS42L42_TIP_SENSE_DEBOUNCE_MASK,
+                        (3 << CS42L42_TIP_SENSE_CTRL_SHIFT) |
+                        (0 << CS42L42_TIP_SENSE_INV_SHIFT) |
+                        (2 << CS42L42_TIP_SENSE_DEBOUNCE_SHIFT));
+
+        /* Save the initial status of the tip sense */
+        regmap_read(cs42l42->regmap,
+                          CS42L42_TSRS_PLUG_STATUS,
+                          &reg);
+        cs42l42->plug_state = (((char) reg) &
+                      (CS42L42_TS_PLUG_MASK | CS42L42_TS_UNPLUG_MASK)) >>
+                      CS42L42_TS_PLUG_SHIFT;
+}
+
+static const unsigned int threshold_defaults[] = {
+        CS42L42_HS_DET_LEVEL_15,
+        CS42L42_HS_DET_LEVEL_8,
+        CS42L42_HS_DET_LEVEL_4,
+        CS42L42_HS_DET_LEVEL_1
+};
+
+static int cs42l42_handle_device_data(struct i2c_client *i2c_client,
+                                        struct cs42l42_private *cs42l42)
+{
+        struct device_node *np = i2c_client->dev.of_node;
+        unsigned int val;
+        unsigned int thresholds[CS42L42_NUM_BIASES];
+        int ret;
+        int i;
+
+        ret = of_property_read_u32(np, "cirrus,ts-inv", &val);
+
+        if (!ret) {
+                switch (val) {
+                case CS42L42_TS_INV_EN:
+                case CS42L42_TS_INV_DIS:
+                        cs42l42->ts_inv = val;
+                        break;
+                default:
+                        dev_err(&i2c_client->dev,
+                                "Wrong cirrus,ts-inv DT value %d\n",
+                                val);
+                        cs42l42->ts_inv = CS42L42_TS_INV_DIS;
+                }
+        } else {
+                cs42l42->ts_inv = CS42L42_TS_INV_DIS;
+        }
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_TSENSE_CTL,
+                        CS42L42_TS_INV_MASK,
+                        (cs42l42->ts_inv << CS42L42_TS_INV_SHIFT));
+
+        ret = of_property_read_u32(np, "cirrus,ts-dbnc-rise", &val);
+
+        if (!ret) {
+                switch (val) {
+                case CS42L42_TS_DBNCE_0:
+                case CS42L42_TS_DBNCE_125:
+                case CS42L42_TS_DBNCE_250:
+                case CS42L42_TS_DBNCE_500:
+                case CS42L42_TS_DBNCE_750:
+                case CS42L42_TS_DBNCE_1000:
+                case CS42L42_TS_DBNCE_1250:
+                case CS42L42_TS_DBNCE_1500:
+                        cs42l42->ts_dbnc_rise = val;
+                        break;
+                default:
+                        dev_err(&i2c_client->dev,
+                                "Wrong cirrus,ts-dbnc-rise DT value %d\n",
+                                val);
+                        cs42l42->ts_dbnc_rise = CS42L42_TS_DBNCE_1000;
+                }
+        } else {
+                cs42l42->ts_dbnc_rise = CS42L42_TS_DBNCE_1000;
+        }
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_TSENSE_CTL,
+                        CS42L42_TS_RISE_DBNCE_TIME_MASK,
+                        (cs42l42->ts_dbnc_rise <<
+                        CS42L42_TS_RISE_DBNCE_TIME_SHIFT));
+
+        ret = of_property_read_u32(np, "cirrus,ts-dbnc-fall", &val);
+
+        if (!ret) {
+                switch (val) {
+                case CS42L42_TS_DBNCE_0:
+                case CS42L42_TS_DBNCE_125:
+                case CS42L42_TS_DBNCE_250:
+                case CS42L42_TS_DBNCE_500:
+                case CS42L42_TS_DBNCE_750:
+                case CS42L42_TS_DBNCE_1000:
+                case CS42L42_TS_DBNCE_1250:
+                case CS42L42_TS_DBNCE_1500:
+                        cs42l42->ts_dbnc_fall = val;
+                        break;
+                default:
+                        dev_err(&i2c_client->dev,
+                                "Wrong cirrus,ts-dbnc-fall DT value %d\n",
+                                val);
+                        cs42l42->ts_dbnc_fall = CS42L42_TS_DBNCE_0;
+                }
+        } else {
+                cs42l42->ts_dbnc_fall = CS42L42_TS_DBNCE_0;
+        }
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_TSENSE_CTL,
+                        CS42L42_TS_FALL_DBNCE_TIME_MASK,
+                        (cs42l42->ts_dbnc_fall <<
+                        CS42L42_TS_FALL_DBNCE_TIME_SHIFT));
+
+        ret = of_property_read_u32(np, "cirrus,btn-det-init-dbnce", &val);
+
+        if (!ret) {
+                if ((val >= CS42L42_BTN_DET_INIT_DBNCE_MIN) &&
+                        (val <= CS42L42_BTN_DET_INIT_DBNCE_MAX))
+                        cs42l42->btn_det_init_dbnce = val;
+                else {
+                        dev_err(&i2c_client->dev,
+                                "Wrong cirrus,btn-det-init-dbnce DT value %d\n",
+                                val);
+                        cs42l42->btn_det_init_dbnce =
+                                CS42L42_BTN_DET_INIT_DBNCE_DEFAULT;
+                }
+        } else {
+                cs42l42->btn_det_init_dbnce =
+                        CS42L42_BTN_DET_INIT_DBNCE_DEFAULT;
+        }
+
+        ret = of_property_read_u32(np, "cirrus,btn-det-event-dbnce", &val);
+
+        if (!ret) {
+                if ((val >= CS42L42_BTN_DET_EVENT_DBNCE_MIN) &&
+                        (val <= CS42L42_BTN_DET_EVENT_DBNCE_MAX))
+                        cs42l42->btn_det_event_dbnce = val;
+                else {
+                        dev_err(&i2c_client->dev,
+                        "Wrong cirrus,btn-det-event-dbnce DT value %d\n", val);
+                        cs42l42->btn_det_event_dbnce =
+                                CS42L42_BTN_DET_EVENT_DBNCE_DEFAULT;
+                }
+        } else {
+                cs42l42->btn_det_event_dbnce =
+                        CS42L42_BTN_DET_EVENT_DBNCE_DEFAULT;
+        }
+
+        ret = of_property_read_u32_array(np, "cirrus,bias-lvls",
+                                   (u32 *)thresholds, CS42L42_NUM_BIASES);
+
+        if (!ret) {
+                for (i = 0; i < CS42L42_NUM_BIASES; i++) {
+                        if ((thresholds[i] >= CS42L42_HS_DET_LEVEL_MIN) &&
+                                (thresholds[i] <= CS42L42_HS_DET_LEVEL_MAX))
+                                cs42l42->bias_thresholds[i] = thresholds[i];
+                        else {
+                                dev_err(&i2c_client->dev,
+                                "Wrong cirrus,bias-lvls[%d] DT value %d\n", i,
+                                        thresholds[i]);
+                                cs42l42->bias_thresholds[i] =
+                                        threshold_defaults[i];
+                        }
+                }
+        } else {
+                for (i = 0; i < CS42L42_NUM_BIASES; i++)
+                        cs42l42->bias_thresholds[i] = threshold_defaults[i];
+        }
+
+        ret = of_property_read_u32(np, "cirrus,hs-bias-ramp-rate", &val);
+
+        if (!ret) {
+                switch (val) {
+                case CS42L42_HSBIAS_RAMP_FAST_RISE_SLOW_FALL:
+                        cs42l42->hs_bias_ramp_rate = val;
+                        cs42l42->hs_bias_ramp_time = CS42L42_HSBIAS_RAMP_TIME0;
+                        break;
+                case CS42L42_HSBIAS_RAMP_FAST:
+                        cs42l42->hs_bias_ramp_rate = val;
+                        cs42l42->hs_bias_ramp_time = CS42L42_HSBIAS_RAMP_TIME1;
+                        break;
+                case CS42L42_HSBIAS_RAMP_SLOW:
+                        cs42l42->hs_bias_ramp_rate = val;
+                        cs42l42->hs_bias_ramp_time = CS42L42_HSBIAS_RAMP_TIME2;
+                        break;
+                case CS42L42_HSBIAS_RAMP_SLOWEST:
+                        cs42l42->hs_bias_ramp_rate = val;
+                        cs42l42->hs_bias_ramp_time = CS42L42_HSBIAS_RAMP_TIME3;
+                        break;
+                default:
+                        dev_err(&i2c_client->dev,
+                                "Wrong cirrus,hs-bias-ramp-rate DT value %d\n",
+                                val);
+                        cs42l42->hs_bias_ramp_rate = CS42L42_HSBIAS_RAMP_SLOW;
+                        cs42l42->hs_bias_ramp_time = CS42L42_HSBIAS_RAMP_TIME2;
+                }
+        } else {
+                cs42l42->hs_bias_ramp_rate = CS42L42_HSBIAS_RAMP_SLOW;
+                cs42l42->hs_bias_ramp_time = CS42L42_HSBIAS_RAMP_TIME2;
+        }
+
+        regmap_update_bits(cs42l42->regmap, CS42L42_HS_BIAS_CTL,
+                        CS42L42_HSBIAS_RAMP_MASK,
+                        (cs42l42->hs_bias_ramp_rate <<
+                        CS42L42_HSBIAS_RAMP_SHIFT));
+
+        return 0;
+}
+
+static int cs42l42_i2c_probe(struct i2c_client *i2c_client,
+                                       const struct i2c_device_id *id)
+{
+        struct cs42l42_private *cs42l42;
+        int ret, i;
+        unsigned int devid = 0;
+        unsigned int reg;
+
+        cs42l42 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs42l42_private),
+                               GFP_KERNEL);
+        if (!cs42l42)
+                return -ENOMEM;
+
+        i2c_set_clientdata(i2c_client, cs42l42);
+
+        cs42l42->regmap = devm_regmap_init_i2c(i2c_client, &cs42l42_regmap);
+        if (IS_ERR(cs42l42->regmap)) {
+                ret = PTR_ERR(cs42l42->regmap);
+                dev_err(&i2c_client->dev, "regmap_init() failed: %d\n", ret);
+                return ret;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(cs42l42->supplies); i++)
+                cs42l42->supplies[i].supply = cs42l42_supply_names[i];
+
+        ret = devm_regulator_bulk_get(&i2c_client->dev,
+                                      ARRAY_SIZE(cs42l42->supplies),
+                                      cs42l42->supplies);
+        if (ret != 0) {
+                dev_err(&i2c_client->dev,
+                        "Failed to request supplies: %d\n", ret);
+                return ret;
+        }
+
+        ret = regulator_bulk_enable(ARRAY_SIZE(cs42l42->supplies),
+                                    cs42l42->supplies);
+        if (ret != 0) {
+                dev_err(&i2c_client->dev,
+                        "Failed to enable supplies: %d\n", ret);
+                return ret;
+        }
+
+        /* Reset the Device */
+        cs42l42->reset_gpio = devm_gpiod_get_optional(&i2c_client->dev,
+                "reset", GPIOD_OUT_LOW);
+        if (IS_ERR(cs42l42->reset_gpio))
+                return PTR_ERR(cs42l42->reset_gpio);
+
+        if (cs42l42->reset_gpio) {
+                dev_dbg(&i2c_client->dev, "Found reset GPIO\n");
+                gpiod_set_value_cansleep(cs42l42->reset_gpio, 1);
+        }
+        mdelay(3);
+
+        /* Request IRQ */
+        ret = devm_request_threaded_irq(&i2c_client->dev,
+                        i2c_client->irq,
+                        NULL, cs42l42_irq_thread,
+                        IRQF_ONESHOT | IRQF_TRIGGER_LOW,
+                        "cs42l42", cs42l42);
+
+        if (ret != 0)
+                dev_err(&i2c_client->dev,
+                        "Failed to request IRQ: %d\n", ret);
+
+        /* initialize codec */
+        ret = regmap_read(cs42l42->regmap, CS42L42_DEVID_AB, &reg);
+        devid = (reg & 0xFF) << 12;
+
+        ret = regmap_read(cs42l42->regmap, CS42L42_DEVID_CD, &reg);
+        devid |= (reg & 0xFF) << 4;
+
+        ret = regmap_read(cs42l42->regmap, CS42L42_DEVID_E, &reg);
+        devid |= (reg & 0xF0) >> 4;
+
+        if (devid != CS42L42_CHIP_ID) {
+                ret = -ENODEV;
+                dev_err(&i2c_client->dev,
+                        "CS42L42 Device ID (%X). Expected %X\n",
+                        devid, CS42L42_CHIP_ID);
+                return ret;
+        }
+
+        ret = regmap_read(cs42l42->regmap, CS42L42_REVID, &reg);
+        if (ret < 0) {
+                dev_err(&i2c_client->dev, "Get Revision ID failed\n");
+                return ret;
+        }
+
+        dev_info(&i2c_client->dev,
+                 "Cirrus Logic CS42L42, Revision: %02X\n", reg & 0xFF);
+
+        /* Power up the codec */
+        regmap_update_bits(cs42l42->regmap, CS42L42_PWR_CTL1,
+                        CS42L42_ASP_DAO_PDN_MASK |
+                        CS42L42_ASP_DAI_PDN_MASK |
+                        CS42L42_MIXER_PDN_MASK |
+                        CS42L42_EQ_PDN_MASK |
+                        CS42L42_HP_PDN_MASK |
+                        CS42L42_ADC_PDN_MASK |
+                        CS42L42_PDN_ALL_MASK,
+                        (1 << CS42L42_ASP_DAO_PDN_SHIFT) |
+                        (1 << CS42L42_ASP_DAI_PDN_SHIFT) |
+                        (1 << CS42L42_MIXER_PDN_SHIFT) |
+                        (1 << CS42L42_EQ_PDN_SHIFT) |
+                        (1 << CS42L42_HP_PDN_SHIFT) |
+                        (1 << CS42L42_ADC_PDN_SHIFT) |
+                        (0 << CS42L42_PDN_ALL_SHIFT));
+
+        if (i2c_client->dev.of_node) {
+                ret = cs42l42_handle_device_data(i2c_client, cs42l42);
+                if (ret != 0)
+                        return ret;
+        }
+
+        /* Setup headset detection */
+        cs42l42_setup_hs_type_detect(cs42l42);
+
+        /* Mask/Unmask Interrupts */
+        cs42l42_set_interrupt_masks(cs42l42);
+
+        /* Register codec for machine driver */
+        ret =  snd_soc_register_codec(&i2c_client->dev,
+                        &soc_codec_dev_cs42l42, &cs42l42_dai, 1);
+        if (ret < 0)
+                goto err_disable;
+        return 0;
+
+err_disable:
+        regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies),
+                                cs42l42->supplies);
+        return ret;
+}
+
+static int cs42l42_i2c_remove(struct i2c_client *i2c_client)
+{
+        struct cs42l42_private *cs42l42 = i2c_get_clientdata(i2c_client);
+
+        snd_soc_unregister_codec(&i2c_client->dev);
+
+        /* Hold down reset */
+        if (cs42l42->reset_gpio)
+                gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int cs42l42_runtime_suspend(struct device *dev)
+{
+        struct cs42l42_private *cs42l42 = dev_get_drvdata(dev);
+
+        regcache_cache_only(cs42l42->regmap, true);
+        regcache_mark_dirty(cs42l42->regmap);
+
+        /* Hold down reset */
+        if (cs42l42->reset_gpio)
+                gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);
+
+        /* remove power */
+        regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies),
+                                cs42l42->supplies);
+
+        return 0;
+}
+
+static int cs42l42_runtime_resume(struct device *dev)
+{
+        struct cs42l42_private *cs42l42 = dev_get_drvdata(dev);
+        int ret;
+
+        /* Enable power */
+        ret = regulator_bulk_enable(ARRAY_SIZE(cs42l42->supplies),
+                                        cs42l42->supplies);
+        if (ret != 0) {
+                dev_err(dev, "Failed to enable supplies: %d\n",
+                        ret);
+                return ret;
+        }
+
+        if (cs42l42->reset_gpio)
+                gpiod_set_value_cansleep(cs42l42->reset_gpio, 1);
+
+        regcache_cache_only(cs42l42->regmap, false);
+        regcache_sync(cs42l42->regmap);
+
+        return 0;
+}
+#endif
+
+static const struct dev_pm_ops cs42l42_runtime_pm = {
+        SET_RUNTIME_PM_OPS(cs42l42_runtime_suspend, cs42l42_runtime_resume,
+                           NULL)
+};
+
+static const struct of_device_id cs42l42_of_match[] = {
+        { .compatible = "cirrus,cs42l42", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, cs42l42_of_match);
+
+
+static const struct i2c_device_id cs42l42_id[] = {
+        {"cs42l42", 0},
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, cs42l42_id);
+
+static struct i2c_driver cs42l42_i2c_driver = {
+        .driver = {
+                .name = "cs42l42",
+                .pm = &cs42l42_runtime_pm,
+                .of_match_table = cs42l42_of_match,
+                },
+        .id_table = cs42l42_id,
+        .probe = cs42l42_i2c_probe,
+        .remove = cs42l42_i2c_remove,
+};
+
+module_i2c_driver(cs42l42_i2c_driver);
+
+MODULE_DESCRIPTION("ASoC CS42L42 driver");
+MODULE_AUTHOR("James Schulman, Cirrus Logic Inc, <james.schulman@cirrus.com>");
+MODULE_AUTHOR("Brian Austin, Cirrus Logic Inc, <brian.austin@cirrus.com>");
+MODULE_AUTHOR("Michael White, Cirrus Logic Inc, <michael.white@cirrus.com>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h
new file mode 100644
index 000000000000..d87a0a5322d5
--- /dev/null
+++ b/sound/soc/codecs/cs42l42.h
@@ -0,0 +1,776 @@
+/*
+ * cs42l42.h -- CS42L42 ALSA SoC audio driver header
+ *
+ * Copyright 2016 Cirrus Logic, Inc.
+ *
+ * Author: James Schulman <james.schulman@cirrus.com>
+ * Author: Brian Austin <brian.austin@cirrus.com>
+ * Author: Michael White <michael.white@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 __CS42L42_H__
+#define __CS42L42_H__
+
+#define CS42L42_PAGE_REGISTER   0x00    /* Page Select Register */
+#define CS42L42_WIN_START       0x00
+#define CS42L42_WIN_LEN         0x100
+#define CS42L42_RANGE_MIN       0x00
+#define CS42L42_RANGE_MAX       0x7F
+
+#define CS42L42_PAGE_10         0x1000
+#define CS42L42_PAGE_11         0x1100
+#define CS42L42_PAGE_12         0x1200
+#define CS42L42_PAGE_13         0x1300
+#define CS42L42_PAGE_15         0x1500
+#define CS42L42_PAGE_19         0x1900
+#define CS42L42_PAGE_1B         0x1B00
+#define CS42L42_PAGE_1C         0x1C00
+#define CS42L42_PAGE_1D         0x1D00
+#define CS42L42_PAGE_1F         0x1F00
+#define CS42L42_PAGE_20         0x2000
+#define CS42L42_PAGE_21         0x2100
+#define CS42L42_PAGE_23         0x2300
+#define CS42L42_PAGE_24         0x2400
+#define CS42L42_PAGE_25         0x2500
+#define CS42L42_PAGE_26         0x2600
+#define CS42L42_PAGE_28         0x2800
+#define CS42L42_PAGE_29         0x2900
+#define CS42L42_PAGE_2A         0x2A00
+#define CS42L42_PAGE_30         0x3000
+
+#define CS42L42_CHIP_ID         0x42A42
+
+/* Page 0x10 Global Registers */
+#define CS42L42_DEVID_AB                (CS42L42_PAGE_10 + 0x01)
+#define CS42L42_DEVID_CD                (CS42L42_PAGE_10 + 0x02)
+#define CS42L42_DEVID_E                 (CS42L42_PAGE_10 + 0x03)
+#define CS42L42_FABID                   (CS42L42_PAGE_10 + 0x04)
+#define CS42L42_REVID                   (CS42L42_PAGE_10 + 0x05)
+#define CS42L42_FRZ_CTL                 (CS42L42_PAGE_10 + 0x06)
+
+#define CS42L42_SRC_CTL                 (CS42L42_PAGE_10 + 0x07)
+#define CS42L42_SRC_BYPASS_DAC_SHIFT    1
+#define CS42L42_SRC_BYPASS_DAC_MASK     (1 << CS42L42_SRC_BYPASS_DAC_SHIFT)
+
+#define CS42L42_MCLK_STATUS             (CS42L42_PAGE_10 + 0x08)
+
+#define CS42L42_MCLK_CTL                (CS42L42_PAGE_10 + 0x09)
+#define CS42L42_INTERNAL_FS_SHIFT       1
+#define CS42L42_INTERNAL_FS_MASK        (1 << CS42L42_INTERNAL_FS_SHIFT)
+
+#define CS42L42_SFTRAMP_RATE            (CS42L42_PAGE_10 + 0x0A)
+#define CS42L42_I2C_DEBOUNCE            (CS42L42_PAGE_10 + 0x0E)
+#define CS42L42_I2C_STRETCH             (CS42L42_PAGE_10 + 0x0F)
+#define CS42L42_I2C_TIMEOUT             (CS42L42_PAGE_10 + 0x10)
+
+/* Page 0x11 Power and Headset Detect Registers */
+#define CS42L42_PWR_CTL1                (CS42L42_PAGE_11 + 0x01)
+#define CS42L42_ASP_DAO_PDN_SHIFT       7
+#define CS42L42_ASP_DAO_PDN_MASK        (1 << CS42L42_ASP_DAO_PDN_SHIFT)
+#define CS42L42_ASP_DAI_PDN_SHIFT       6
+#define CS42L42_ASP_DAI_PDN_MASK        (1 << CS42L42_ASP_DAI_PDN_SHIFT)
+#define CS42L42_MIXER_PDN_SHIFT         5
+#define CS42L42_MIXER_PDN_MASK          (1 << CS42L42_MIXER_PDN_SHIFT)
+#define CS42L42_EQ_PDN_SHIFT            4
+#define CS42L42_EQ_PDN_MASK             (1 << CS42L42_EQ_PDN_SHIFT)
+#define CS42L42_HP_PDN_SHIFT            3
+#define CS42L42_HP_PDN_MASK             (1 << CS42L42_HP_PDN_SHIFT)
+#define CS42L42_ADC_PDN_SHIFT           2
+#define CS42L42_ADC_PDN_MASK            (1 << CS42L42_HP_PDN_SHIFT)
+#define CS42L42_PDN_ALL_SHIFT           0
+#define CS42L42_PDN_ALL_MASK            (1 << CS42L42_PDN_ALL_SHIFT)
+
+#define CS42L42_PWR_CTL2                (CS42L42_PAGE_11 + 0x02)
+#define CS42L42_ADC_SRC_PDNB_SHIFT      0
+#define CS42L42_ADC_SRC_PDNB_MASK       (1 << CS42L42_ADC_SRC_PDNB_SHIFT)
+#define CS42L42_DAC_SRC_PDNB_SHIFT      1
+#define CS42L42_DAC_SRC_PDNB_MASK       (1 << CS42L42_DAC_SRC_PDNB_SHIFT)
+#define CS42L42_ASP_DAI1_PDN_SHIFT      2
+#define CS42L42_ASP_DAI1_PDN_MASK       (1 << CS42L42_ASP_DAI1_PDN_SHIFT)
+#define CS42L42_SRC_PDN_OVERRIDE_SHIFT  3
+#define CS42L42_SRC_PDN_OVERRIDE_MASK   (1 << CS42L42_SRC_PDN_OVERRIDE_SHIFT)
+#define CS42L42_DISCHARGE_FILT_SHIFT    4
+#define CS42L42_DISCHARGE_FILT_MASK     (1 << CS42L42_DISCHARGE_FILT_SHIFT)
+
+#define CS42L42_PWR_CTL3                        (CS42L42_PAGE_11 + 0x03)
+#define CS42L42_RING_SENSE_PDNB_SHIFT           1
+#define CS42L42_RING_SENSE_PDNB_MASK            (1 << \
+                                        CS42L42_RING_SENSE_PDNB_SHIFT)
+#define CS42L42_VPMON_PDNB_SHIFT                2
+#define CS42L42_VPMON_PDNB_MASK                 (1 << \
+                                        CS42L42_VPMON_PDNB_SHIFT)
+#define CS42L42_SW_CLK_STP_STAT_SEL_SHIFT       5
+#define CS42L42_SW_CLK_STP_STAT_SEL_MASK        (3 << \
+                                        CS42L42_SW_CLK_STP_STAT_SEL_SHIFT)
+
+#define CS42L42_RSENSE_CTL1                     (CS42L42_PAGE_11 + 0x04)
+#define CS42L42_RS_TRIM_R_SHIFT                 0
+#define CS42L42_RS_TRIM_R_MASK                  (1 << \
+                                        CS42L42_RS_TRIM_R_SHIFT)
+#define CS42L42_RS_TRIM_T_SHIFT                 1
+#define CS42L42_RS_TRIM_T_MASK                  (1 << \
+                                        CS42L42_RS_TRIM_T_SHIFT)
+#define CS42L42_HPREF_RS_SHIFT                  2
+#define CS42L42_HPREF_RS_MASK                   (1 << \
+                                        CS42L42_HPREF_RS_SHIFT)
+#define CS42L42_HSBIAS_FILT_REF_RS_SHIFT        3
+#define CS42L42_HSBIAS_FILT_REF_RS_MASK         (1 << \
+                                        CS42L42_HSBIAS_FILT_REF_RS_SHIFT)
+#define CS42L42_RING_SENSE_PU_HIZ_SHIFT         6
+#define CS42L42_RING_SENSE_PU_HIZ_MASK          (1 << \
+                                        CS42L42_RING_SENSE_PU_HIZ_SHIFT)
+
+#define CS42L42_RSENSE_CTL2             (CS42L42_PAGE_11 + 0x05)
+#define CS42L42_TS_RS_GATE_SHIFT        7
+#define CS42L42_TS_RS_GATE_MAS          (1 << CS42L42_TS_RS_GATE_SHIFT)
+
+#define CS42L42_OSC_SWITCH              (CS42L42_PAGE_11 + 0x07)
+#define CS42L42_SCLK_PRESENT_SHIFT      0
+#define CS42L42_SCLK_PRESENT_MASK       (1 << CS42L42_SCLK_PRESENT_SHIFT)
+
+#define CS42L42_OSC_SWITCH_STATUS       (CS42L42_PAGE_11 + 0x09)
+#define CS42L42_OSC_SW_SEL_STAT_SHIFT   0
+#define CS42L42_OSC_SW_SEL_STAT_MASK    (3 << CS42L42_OSC_SW_SEL_STAT_SHIFT)
+#define CS42L42_OSC_PDNB_STAT_SHIFT     2
+#define CS42L42_OSC_PDNB_STAT_MASK      (1 << CS42L42_OSC_SW_SEL_STAT_SHIFT)
+
+#define CS42L42_RSENSE_CTL3                     (CS42L42_PAGE_11 + 0x12)
+#define CS42L42_RS_RISE_DBNCE_TIME_SHIFT        0
+#define CS42L42_RS_RISE_DBNCE_TIME_MASK         (7 << \
+                                        CS42L42_RS_RISE_DBNCE_TIME_SHIFT)
+#define CS42L42_RS_FALL_DBNCE_TIME_SHIFT        3
+#define CS42L42_RS_FALL_DBNCE_TIME_MASK         (7 << \
+                                        CS42L42_RS_FALL_DBNCE_TIME_SHIFT)
+#define CS42L42_RS_PU_EN_SHIFT                  6
+#define CS42L42_RS_PU_EN_MASK                   (1 << \
+                                        CS42L42_RS_PU_EN_SHIFT)
+#define CS42L42_RS_INV_SHIFT                    7
+#define CS42L42_RS_INV_MASK                     (1 << \
+                                        CS42L42_RS_INV_SHIFT)
+
+#define CS42L42_TSENSE_CTL                      (CS42L42_PAGE_11 + 0x13)
+#define CS42L42_TS_RISE_DBNCE_TIME_SHIFT        0
+#define CS42L42_TS_RISE_DBNCE_TIME_MASK         (7 << \
+                                        CS42L42_TS_RISE_DBNCE_TIME_SHIFT)
+#define CS42L42_TS_FALL_DBNCE_TIME_SHIFT        3
+#define CS42L42_TS_FALL_DBNCE_TIME_MASK         (7 << \
+                                        CS42L42_TS_FALL_DBNCE_TIME_SHIFT)
+#define CS42L42_TS_INV_SHIFT                    7
+#define CS42L42_TS_INV_MASK                     (1 << \
+                                        CS42L42_TS_INV_SHIFT)
+
+#define CS42L42_TSRS_INT_DISABLE        (CS42L42_PAGE_11 + 0x14)
+#define CS42L42_D_RS_PLUG_DBNC_SHIFT    0
+#define CS42L42_D_RS_PLUG_DBNC_MASK     (1 << CS42L42_D_RS_PLUG_DBNC_SHIFT)
+#define CS42L42_D_RS_UNPLUG_DBNC_SHIFT  1
+#define CS42L42_D_RS_UNPLUG_DBNC_MASK   (1 << CS42L42_D_RS_UNPLUG_DBNC_SHIFT)
+#define CS42L42_D_TS_PLUG_DBNC_SHIFT    2
+#define CS42L42_D_TS_PLUG_DBNC_MASK     (1 << CS42L42_D_TS_PLUG_DBNC_SHIFT)
+#define CS42L42_D_TS_UNPLUG_DBNC_SHIFT  3
+#define CS42L42_D_TS_UNPLUG_DBNC_MASK   (1 << CS42L42_D_TS_UNPLUG_DBNC_SHIFT)
+
+#define CS42L42_TRSENSE_STATUS          (CS42L42_PAGE_11 + 0x15)
+#define CS42L42_RS_PLUG_DBNC_SHIFT      0
+#define CS42L42_RS_PLUG_DBNC_MASK       (1 << CS42L42_RS_PLUG_DBNC_SHIFT)
+#define CS42L42_RS_UNPLUG_DBNC_SHIFT    1
+#define CS42L42_RS_UNPLUG_DBNC_MASK     (1 << CS42L42_RS_UNPLUG_DBNC_SHIFT)
+#define CS42L42_TS_PLUG_DBNC_SHIFT      2
+#define CS42L42_TS_PLUG_DBNC_MASK       (1 << CS42L42_TS_PLUG_DBNC_SHIFT)
+#define CS42L42_TS_UNPLUG_DBNC_SHIFT    3
+#define CS42L42_TS_UNPLUG_DBNC_MASK     (1 << CS42L42_TS_UNPLUG_DBNC_SHIFT)
+
+#define CS42L42_HSDET_CTL1              (CS42L42_PAGE_11 + 0x1F)
+#define CS42L42_HSDET_COMP1_LVL_SHIFT   0
+#define CS42L42_HSDET_COMP1_LVL_MASK    (15 << CS42L42_HSDET_COMP1_LVL_SHIFT)
+#define CS42L42_HSDET_COMP2_LVL_SHIFT   4
+#define CS42L42_HSDET_COMP2_LVL_MASK    (15 << CS42L42_HSDET_COMP2_LVL_SHIFT)
+
+#define CS42L42_HSDET_CTL2              (CS42L42_PAGE_11 + 0x20)
+#define CS42L42_HSDET_AUTO_TIME_SHIFT   0
+#define CS42L42_HSDET_AUTO_TIME_MASK    (3 << CS42L42_HSDET_AUTO_TIME_SHIFT)
+#define CS42L42_HSBIAS_REF_SHIFT        3
+#define CS42L42_HSBIAS_REF_MASK         (1 << CS42L42_HSBIAS_REF_SHIFT)
+#define CS42L42_HSDET_SET_SHIFT         4
+#define CS42L42_HSDET_SET_MASK          (3 << CS42L42_HSDET_SET_SHIFT)
+#define CS42L42_HSDET_CTRL_SHIFT        6
+#define CS42L42_HSDET_CTRL_MASK         (3 << CS42L42_HSDET_CTRL_SHIFT)
+
+#define CS42L42_HS_SWITCH_CTL           (CS42L42_PAGE_11 + 0x21)
+#define CS42L42_SW_GNDHS_HS4_SHIFT      0
+#define CS42L42_SW_GNDHS_HS4_MASK       (1 << CS42L42_SW_GNDHS_HS4_SHIFT)
+#define CS42L42_SW_GNDHS_HS3_SHIFT      1
+#define CS42L42_SW_GNDHS_HS3_MASK       (1 << CS42L42_SW_GNDHS_HS3_SHIFT)
+#define CS42L42_SW_HSB_HS4_SHIFT        2
+#define CS42L42_SW_HSB_HS4_MASK         (1 << CS42L42_SW_HSB_HS4_SHIFT)
+#define CS42L42_SW_HSB_HS3_SHIFT        3
+#define CS42L42_SW_HSB_HS3_MASK         (1 << CS42L42_SW_HSB_HS3_SHIFT)
+#define CS42L42_SW_HSB_FILT_HS4_SHIFT   4
+#define CS42L42_SW_HSB_FILT_HS4_MASK    (1 << CS42L42_SW_HSB_FILT_HS4_SHIFT)
+#define CS42L42_SW_HSB_FILT_HS3_SHIFT   5
+#define CS42L42_SW_HSB_FILT_HS3_MASK    (1 << CS42L42_SW_HSB_FILT_HS3_SHIFT)
+#define CS42L42_SW_REF_HS4_SHIFT        6
+#define CS42L42_SW_REF_HS4_MASK         (1 << CS42L42_SW_REF_HS4_SHIFT)
+#define CS42L42_SW_REF_HS3_SHIFT        7
+#define CS42L42_SW_REF_HS3_MASK         (1 << CS42L42_SW_REF_HS3_SHIFT)
+
+#define CS42L42_HS_DET_STATUS           (CS42L42_PAGE_11 + 0x24)
+#define CS42L42_HSDET_TYPE_SHIFT        0
+#define CS42L42_HSDET_TYPE_MASK         (3 << CS42L42_HSDET_TYPE_SHIFT)
+#define CS42L42_HSDET_COMP1_OUT_SHIFT   6
+#define CS42L42_HSDET_COMP1_OUT_MASK    (1 << CS42L42_HSDET_COMP1_OUT_SHIFT)
+#define CS42L42_HSDET_COMP2_OUT_SHIFT   7
+#define CS42L42_HSDET_COMP2_OUT_MASK    (1 << CS42L42_HSDET_COMP2_OUT_SHIFT)
+#define CS42L42_PLUG_CTIA               0
+#define CS42L42_PLUG_OMTP               1
+#define CS42L42_PLUG_HEADPHONE          2
+#define CS42L42_PLUG_INVALID            3
+
+#define CS42L42_HS_CLAMP_DISABLE        (CS42L42_PAGE_11 + 0x29)
+#define CS42L42_HS_CLAMP_DISABLE_SHIFT  0
+#define CS42L42_HS_CLAMP_DISABLE_MASK   (1 << CS42L42_HS_CLAMP_DISABLE_SHIFT)
+
+/* Page 0x12 Clocking Registers */
+#define CS42L42_MCLK_SRC_SEL            (CS42L42_PAGE_12 + 0x01)
+#define CS42L42_MCLKDIV_SHIFT           1
+#define CS42L42_MCLKDIV_MASK            (1 << CS42L42_MCLKDIV_SHIFT)
+#define CS42L42_MCLK_SRC_SEL_SHIFT      0
+#define CS42L42_MCLK_SRC_SEL_MASK       (1 << CS42L42_MCLK_SRC_SEL_SHIFT)
+
+#define CS42L42_SPDIF_CLK_CFG           (CS42L42_PAGE_12 + 0x02)
+#define CS42L42_FSYNC_PW_LOWER          (CS42L42_PAGE_12 + 0x03)
+
+#define CS42L42_FSYNC_PW_UPPER                  (CS42L42_PAGE_12 + 0x04)
+#define CS42L42_FSYNC_PULSE_WIDTH_SHIFT         0
+#define CS42L42_FSYNC_PULSE_WIDTH_MASK          (0xff << \
+                                        CS42L42_FSYNC_PULSE_WIDTH_SHIFT)
+
+#define CS42L42_FSYNC_P_LOWER           (CS42L42_PAGE_12 + 0x05)
+
+#define CS42L42_FSYNC_P_UPPER           (CS42L42_PAGE_12 + 0x06)
+#define CS42L42_FSYNC_PERIOD_SHIFT      0
+#define CS42L42_FSYNC_PERIOD_MASK       (0xff << CS42L42_FSYNC_PERIOD_SHIFT)
+
+#define CS42L42_ASP_CLK_CFG             (CS42L42_PAGE_12 + 0x07)
+#define CS42L42_ASP_SCLK_EN_SHIFT       5
+#define CS42L42_ASP_SCLK_EN_MASK        (1 << CS42L42_ASP_SCLK_EN_SHIFT)
+#define CS42L42_ASP_MASTER_MODE         0x01
+#define CS42L42_ASP_SLAVE_MODE          0x00
+#define CS42L42_ASP_MODE_SHIFT          4
+#define CS42L42_ASP_MODE_MASK           (1 << CS42L42_ASP_MODE_SHIFT)
+#define CS42L42_ASP_SCPOL_IN_DAC_SHIFT  2
+#define CS42L42_ASP_SCPOL_IN_DAC_MASK   (1 << CS42L42_ASP_SCPOL_IN_DAC_SHIFT)
+#define CS42L42_ASP_LCPOL_IN_SHIFT      0
+#define CS42L42_ASP_LCPOL_IN_MASK       (1 << CS42L42_ASP_LCPOL_IN_SHIFT)
+#define CS42L42_ASP_POL_INV             1
+
+#define CS42L42_ASP_FRM_CFG             (CS42L42_PAGE_12 + 0x08)
+#define CS42L42_ASP_STP_SHIFT           4
+#define CS42L42_ASP_STP_MASK            (1 << CS42L42_ASP_STP_SHIFT)
+#define CS42L42_ASP_5050_SHIFT          3
+#define CS42L42_ASP_5050_MASK           (1 << CS42L42_ASP_5050_SHIFT)
+#define CS42L42_ASP_FSD_SHIFT           0
+#define CS42L42_ASP_FSD_MASK            (7 << CS42L42_ASP_FSD_SHIFT)
+#define CS42L42_ASP_FSD_0_5             1
+#define CS42L42_ASP_FSD_1_0             2
+#define CS42L42_ASP_FSD_1_5             3
+#define CS42L42_ASP_FSD_2_0             4
+
+#define CS42L42_FS_RATE_EN              (CS42L42_PAGE_12 + 0x09)
+#define CS42L42_FS_EN_SHIFT             0
+#define CS42L42_FS_EN_MASK              (0xf << CS42L42_FS_EN_SHIFT)
+#define CS42L42_FS_EN_IASRC_96K         0x1
+#define CS42L42_FS_EN_OASRC_96K         0x2
+
+#define CS42L42_IN_ASRC_CLK             (CS42L42_PAGE_12 + 0x0A)
+#define CS42L42_CLK_IASRC_SEL_SHIFT     0
+#define CS42L42_CLK_IASRC_SEL_MASK      (1 << CS42L42_CLK_IASRC_SEL_SHIFT)
+#define CS42L42_CLK_IASRC_SEL_12        1
+
+#define CS42L42_OUT_ASRC_CLK            (CS42L42_PAGE_12 + 0x0B)
+#define CS42L42_CLK_OASRC_SEL_SHIFT     0
+#define CS42L42_CLK_OASRC_SEL_MASK      (1 << CS42L42_CLK_OASRC_SEL_SHIFT)
+#define CS42L42_CLK_OASRC_SEL_12        1
+
+#define CS42L42_PLL_DIV_CFG1            (CS42L42_PAGE_12 + 0x0C)
+#define CS42L42_SCLK_PREDIV_SHIFT       0
+#define CS42L42_SCLK_PREDIV_MASK        (3 << CS42L42_SCLK_PREDIV_SHIFT)
+
+/* Page 0x13 Interrupt Registers */
+/* Interrupts */
+#define CS42L42_ADC_OVFL_STATUS         (CS42L42_PAGE_13 + 0x01)
+#define CS42L42_MIXER_STATUS            (CS42L42_PAGE_13 + 0x02)
+#define CS42L42_SRC_STATUS              (CS42L42_PAGE_13 + 0x03)
+#define CS42L42_ASP_RX_STATUS           (CS42L42_PAGE_13 + 0x04)
+#define CS42L42_ASP_TX_STATUS           (CS42L42_PAGE_13 + 0x05)
+#define CS42L42_CODEC_STATUS            (CS42L42_PAGE_13 + 0x08)
+#define CS42L42_DET_INT_STATUS1         (CS42L42_PAGE_13 + 0x09)
+#define CS42L42_DET_INT_STATUS2         (CS42L42_PAGE_13 + 0x0A)
+#define CS42L42_SRCPL_INT_STATUS        (CS42L42_PAGE_13 + 0x0B)
+#define CS42L42_VPMON_STATUS            (CS42L42_PAGE_13 + 0x0D)
+#define CS42L42_PLL_LOCK_STATUS         (CS42L42_PAGE_13 + 0x0E)
+#define CS42L42_TSRS_PLUG_STATUS        (CS42L42_PAGE_13 + 0x0F)
+/* Masks */
+#define CS42L42_ADC_OVFL_INT_MASK       (CS42L42_PAGE_13 + 0x16)
+#define CS42L42_ADC_OVFL_SHIFT          0
+#define CS42L42_ADC_OVFL_MASK           (1 << CS42L42_ADC_OVFL_SHIFT)
+#define CS42L42_ADC_OVFL_VAL_MASK       CS42L42_ADC_OVFL_MASK
+
+#define CS42L42_MIXER_INT_MASK          (CS42L42_PAGE_13 + 0x17)
+#define CS42L42_MIX_CHB_OVFL_SHIFT      0
+#define CS42L42_MIX_CHB_OVFL_MASK       (1 << CS42L42_MIX_CHB_OVFL_SHIFT)
+#define CS42L42_MIX_CHA_OVFL_SHIFT      1
+#define CS42L42_MIX_CHA_OVFL_MASK       (1 << CS42L42_MIX_CHA_OVFL_SHIFT)
+#define CS42L42_EQ_OVFL_SHIFT           2
+#define CS42L42_EQ_OVFL_MASK            (1 << CS42L42_EQ_OVFL_SHIFT)
+#define CS42L42_EQ_BIQUAD_OVFL_SHIFT    3
+#define CS42L42_EQ_BIQUAD_OVFL_MASK     (1 << CS42L42_EQ_BIQUAD_OVFL_SHIFT)
+#define CS42L42_MIXER_VAL_MASK          (CS42L42_MIX_CHB_OVFL_MASK | \
+                                        CS42L42_MIX_CHA_OVFL_MASK | \
+                                        CS42L42_EQ_OVFL_MASK | \
+                                        CS42L42_EQ_BIQUAD_OVFL_MASK)
+
+#define CS42L42_SRC_INT_MASK            (CS42L42_PAGE_13 + 0x18)
+#define CS42L42_SRC_ILK_SHIFT           0
+#define CS42L42_SRC_ILK_MASK            (1 << CS42L42_SRC_ILK_SHIFT)
+#define CS42L42_SRC_OLK_SHIFT           1
+#define CS42L42_SRC_OLK_MASK            (1 << CS42L42_SRC_OLK_SHIFT)
+#define CS42L42_SRC_IUNLK_SHIFT         2
+#define CS42L42_SRC_IUNLK_MASK          (1 << CS42L42_SRC_IUNLK_SHIFT)
+#define CS42L42_SRC_OUNLK_SHIFT         3
+#define CS42L42_SRC_OUNLK_MASK          (1 << CS42L42_SRC_OUNLK_SHIFT)
+#define CS42L42_SRC_VAL_MASK            (CS42L42_SRC_ILK_MASK | \
+                                        CS42L42_SRC_OLK_MASK | \
+                                        CS42L42_SRC_IUNLK_MASK | \
+                                        CS42L42_SRC_OUNLK_MASK)
+
+#define CS42L42_ASP_RX_INT_MASK         (CS42L42_PAGE_13 + 0x19)
+#define CS42L42_ASPRX_NOLRCK_SHIFT      0
+#define CS42L42_ASPRX_NOLRCK_MASK       (1 << CS42L42_ASPRX_NOLRCK_SHIFT)
+#define CS42L42_ASPRX_EARLY_SHIFT       1
+#define CS42L42_ASPRX_EARLY_MASK        (1 << CS42L42_ASPRX_EARLY_SHIFT)
+#define CS42L42_ASPRX_LATE_SHIFT        2
+#define CS42L42_ASPRX_LATE_MASK         (1 << CS42L42_ASPRX_LATE_SHIFT)
+#define CS42L42_ASPRX_ERROR_SHIFT       3
+#define CS42L42_ASPRX_ERROR_MASK        (1 << CS42L42_ASPRX_ERROR_SHIFT)
+#define CS42L42_ASPRX_OVLD_SHIFT        4
+#define CS42L42_ASPRX_OVLD_MASK         (1 << CS42L42_ASPRX_OVLD_SHIFT)
+#define CS42L42_ASP_RX_VAL_MASK         (CS42L42_ASPRX_NOLRCK_MASK | \
+                                        CS42L42_ASPRX_EARLY_MASK | \
+                                        CS42L42_ASPRX_LATE_MASK | \
+                                        CS42L42_ASPRX_ERROR_MASK | \
+                                        CS42L42_ASPRX_OVLD_MASK)
+
+#define CS42L42_ASP_TX_INT_MASK         (CS42L42_PAGE_13 + 0x1A)
+#define CS42L42_ASPTX_NOLRCK_SHIFT      0
+#define CS42L42_ASPTX_NOLRCK_MASK       (1 << CS42L42_ASPTX_NOLRCK_SHIFT)
+#define CS42L42_ASPTX_EARLY_SHIFT       1
+#define CS42L42_ASPTX_EARLY_MASK        (1 << CS42L42_ASPTX_EARLY_SHIFT)
+#define CS42L42_ASPTX_LATE_SHIFT        2
+#define CS42L42_ASPTX_LATE_MASK         (1 << CS42L42_ASPTX_LATE_SHIFT)
+#define CS42L42_ASPTX_SMERROR_SHIFT     3
+#define CS42L42_ASPTX_SMERROR_MASK      (1 << CS42L42_ASPTX_SMERROR_SHIFT)
+#define CS42L42_ASP_TX_VAL_MASK         (CS42L42_ASPTX_NOLRCK_MASK | \
+                                        CS42L42_ASPTX_EARLY_MASK | \
+                                        CS42L42_ASPTX_LATE_MASK | \
+                                        CS42L42_ASPTX_SMERROR_MASK)
+
+#define CS42L42_CODEC_INT_MASK          (CS42L42_PAGE_13 + 0x1B)
+#define CS42L42_PDN_DONE_SHIFT          0
+#define CS42L42_PDN_DONE_MASK           (1 << CS42L42_PDN_DONE_SHIFT)
+#define CS42L42_HSDET_AUTO_DONE_SHIFT   1
+#define CS42L42_HSDET_AUTO_DONE_MASK    (1 << CS42L42_HSDET_AUTO_DONE_SHIFT)
+#define CS42L42_CODEC_VAL_MASK          (CS42L42_PDN_DONE_MASK | \
+                                        CS42L42_HSDET_AUTO_DONE_MASK)
+
+#define CS42L42_SRCPL_INT_MASK          (CS42L42_PAGE_13 + 0x1C)
+#define CS42L42_SRCPL_ADC_LK_SHIFT      0
+#define CS42L42_SRCPL_ADC_LK_MASK       (1 << CS42L42_SRCPL_ADC_LK_SHIFT)
+#define CS42L42_SRCPL_DAC_LK_SHIFT      2
+#define CS42L42_SRCPL_DAC_LK_MASK       (1 << CS42L42_SRCPL_DAC_LK_SHIFT)
+#define CS42L42_SRCPL_ADC_UNLK_SHIFT    5
+#define CS42L42_SRCPL_ADC_UNLK_MASK     (1 << CS42L42_SRCPL_ADC_UNLK_SHIFT)
+#define CS42L42_SRCPL_DAC_UNLK_SHIFT    6
+#define CS42L42_SRCPL_DAC_UNLK_MASK     (1 << CS42L42_SRCPL_DAC_UNLK_SHIFT)
+#define CS42L42_SRCPL_VAL_MASK          (CS42L42_SRCPL_ADC_LK_MASK | \
+                                        CS42L42_SRCPL_DAC_LK_MASK | \
+                                        CS42L42_SRCPL_ADC_UNLK_MASK | \
+                                        CS42L42_SRCPL_DAC_UNLK_MASK)
+
+#define CS42L42_VPMON_INT_MASK          (CS42L42_PAGE_13 + 0x1E)
+#define CS42L42_VPMON_SHIFT             0
+#define CS42L42_VPMON_MASK              (1 << CS42L42_VPMON_SHIFT)
+#define CS42L42_VPMON_VAL_MASK          CS42L42_VPMON_MASK
+
+#define CS42L42_PLL_LOCK_INT_MASK       (CS42L42_PAGE_13 + 0x1F)
+#define CS42L42_PLL_LOCK_SHIFT          0
+#define CS42L42_PLL_LOCK_MASK           (1 << CS42L42_PLL_LOCK_SHIFT)
+#define CS42L42_PLL_LOCK_VAL_MASK       CS42L42_PLL_LOCK_MASK
+
+#define CS42L42_TSRS_PLUG_INT_MASK      (CS42L42_PAGE_13 + 0x20)
+#define CS42L42_RS_PLUG_SHIFT           0
+#define CS42L42_RS_PLUG_MASK            (1 << CS42L42_RS_PLUG_SHIFT)
+#define CS42L42_RS_UNPLUG_SHIFT         1
+#define CS42L42_RS_UNPLUG_MASK          (1 << CS42L42_RS_UNPLUG_SHIFT)
+#define CS42L42_TS_PLUG_SHIFT           2
+#define CS42L42_TS_PLUG_MASK            (1 << CS42L42_TS_PLUG_SHIFT)
+#define CS42L42_TS_UNPLUG_SHIFT         3
+#define CS42L42_TS_UNPLUG_MASK          (1 << CS42L42_TS_UNPLUG_SHIFT)
+#define CS42L42_TSRS_PLUG_VAL_MASK      (CS42L42_RS_PLUG_MASK | \
+                                        CS42L42_RS_UNPLUG_MASK | \
+                                        CS42L42_TS_PLUG_MASK | \
+                                        CS42L42_TS_UNPLUG_MASK)
+#define CS42L42_TS_PLUG                 3
+#define CS42L42_TS_UNPLUG               0
+#define CS42L42_TS_TRANS                1
+
+/* Page 0x15 Fractional-N PLL Registers */
+#define CS42L42_PLL_CTL1                (CS42L42_PAGE_15 + 0x01)
+#define CS42L42_PLL_START_SHIFT         0
+#define CS42L42_PLL_START_MASK          (1 << CS42L42_PLL_START_SHIFT)
+
+#define CS42L42_PLL_DIV_FRAC0           (CS42L42_PAGE_15 + 0x02)
+#define CS42L42_PLL_DIV_FRAC_SHIFT      0
+#define CS42L42_PLL_DIV_FRAC_MASK       (0xff << CS42L42_PLL_DIV_FRAC_SHIFT)
+
+#define CS42L42_PLL_DIV_FRAC1           (CS42L42_PAGE_15 + 0x03)
+#define CS42L42_PLL_DIV_FRAC2           (CS42L42_PAGE_15 + 0x04)
+
+#define CS42L42_PLL_DIV_INT             (CS42L42_PAGE_15 + 0x05)
+#define CS42L42_PLL_DIV_INT_SHIFT       0
+#define CS42L42_PLL_DIV_INT_MASK        (0xff << CS42L42_PLL_DIV_INT_SHIFT)
+
+#define CS42L42_PLL_CTL3                (CS42L42_PAGE_15 + 0x08)
+#define CS42L42_PLL_DIVOUT_SHIFT        0
+#define CS42L42_PLL_DIVOUT_MASK         (0xff << CS42L42_PLL_DIVOUT_SHIFT)
+
+#define CS42L42_PLL_CAL_RATIO           (CS42L42_PAGE_15 + 0x0A)
+#define CS42L42_PLL_CAL_RATIO_SHIFT     0
+#define CS42L42_PLL_CAL_RATIO_MASK      (0xff << CS42L42_PLL_CAL_RATIO_SHIFT)
+
+#define CS42L42_PLL_CTL4                (CS42L42_PAGE_15 + 0x1B)
+#define CS42L42_PLL_MODE_SHIFT          0
+#define CS42L42_PLL_MODE_MASK           (3 << CS42L42_PLL_MODE_SHIFT)
+
+/* Page 0x19 HP Load Detect Registers */
+#define CS42L42_LOAD_DET_RCSTAT         (CS42L42_PAGE_19 + 0x25)
+#define CS42L42_RLA_STAT_SHIFT          0
+#define CS42L42_RLA_STAT_MASK           (3 << CS42L42_RLA_STAT_SHIFT)
+#define CS42L42_RLA_STAT_15_OHM         0
+
+#define CS42L42_LOAD_DET_DONE           (CS42L42_PAGE_19 + 0x26)
+#define CS42L42_HPLOAD_DET_DONE_SHIFT   0
+#define CS42L42_HPLOAD_DET_DONE_MASK    (1 << CS42L42_HPLOAD_DET_DONE_SHIFT)
+
+#define CS42L42_LOAD_DET_EN             (CS42L42_PAGE_19 + 0x27)
+#define CS42L42_HP_LD_EN_SHIFT          0
+#define CS42L42_HP_LD_EN_MASK           (1 << CS42L42_HP_LD_EN_SHIFT)
+
+/* Page 0x1B Headset Interface Registers */
+#define CS42L42_HSBIAS_SC_AUTOCTL               (CS42L42_PAGE_1B + 0x70)
+#define CS42L42_HSBIAS_SENSE_TRIP_SHIFT         0
+#define CS42L42_HSBIAS_SENSE_TRIP_MASK          (7 << \
+                                        CS42L42_HSBIAS_SENSE_TRIP_SHIFT)
+#define CS42L42_TIP_SENSE_EN_SHIFT              5
+#define CS42L42_TIP_SENSE_EN_MASK               (1 << \
+                                        CS42L42_TIP_SENSE_EN_SHIFT)
+#define CS42L42_AUTO_HSBIAS_HIZ_SHIFT           6
+#define CS42L42_AUTO_HSBIAS_HIZ_MASK            (1 << \
+                                        CS42L42_AUTO_HSBIAS_HIZ_SHIFT)
+#define CS42L42_HSBIAS_SENSE_EN_SHIFT           7
+#define CS42L42_HSBIAS_SENSE_EN_MASK            (1 << \
+                                        CS42L42_HSBIAS_SENSE_EN_SHIFT)
+
+#define CS42L42_WAKE_CTL                (CS42L42_PAGE_1B + 0x71)
+#define CS42L42_WAKEB_CLEAR_SHIFT       0
+#define CS42L42_WAKEB_CLEAR_MASK        (1 << CS42L42_WAKEB_CLEAR_SHIFT)
+#define CS42L42_WAKEB_MODE_SHIFT        5
+#define CS42L42_WAKEB_MODE_MASK         (1 << CS42L42_WAKEB_MODE_SHIFT)
+#define CS42L42_M_HP_WAKE_SHIFT         6
+#define CS42L42_M_HP_WAKE_MASK          (1 << CS42L42_M_HP_WAKE_SHIFT)
+#define CS42L42_M_MIC_WAKE_SHIFT        7
+#define CS42L42_M_MIC_WAKE_MASK         (1 << CS42L42_M_MIC_WAKE_SHIFT)
+
+#define CS42L42_ADC_DISABLE_MUTE                (CS42L42_PAGE_1B + 0x72)
+#define CS42L42_ADC_DISABLE_S0_MUTE_SHIFT       7
+#define CS42L42_ADC_DISABLE_S0_MUTE_MASK        (1 << \
+                                        CS42L42_ADC_DISABLE_S0_MUTE_SHIFT)
+
+#define CS42L42_TIPSENSE_CTL                    (CS42L42_PAGE_1B + 0x73)
+#define CS42L42_TIP_SENSE_DEBOUNCE_SHIFT        0
+#define CS42L42_TIP_SENSE_DEBOUNCE_MASK         (3 << \
+                                        CS42L42_TIP_SENSE_DEBOUNCE_SHIFT)
+#define CS42L42_TIP_SENSE_INV_SHIFT             5
+#define CS42L42_TIP_SENSE_INV_MASK              (1 << \
+                                        CS42L42_TIP_SENSE_INV_SHIFT)
+#define CS42L42_TIP_SENSE_CTRL_SHIFT            6
+#define CS42L42_TIP_SENSE_CTRL_MASK             (3 << \
+                                        CS42L42_TIP_SENSE_CTRL_SHIFT)
+
+#define CS42L42_MISC_DET_CTL            (CS42L42_PAGE_1B + 0x74)
+#define CS42L42_PDN_MIC_LVL_DET_SHIFT   0
+#define CS42L42_PDN_MIC_LVL_DET_MASK    (1 << CS42L42_PDN_MIC_LVL_DET_SHIFT)
+#define CS42L42_HSBIAS_CTL_SHIFT        1
+#define CS42L42_HSBIAS_CTL_MASK         (3 << CS42L42_HSBIAS_CTL_SHIFT)
+#define CS42L42_DETECT_MODE_SHIFT       3
+#define CS42L42_DETECT_MODE_MASK        (3 << CS42L42_DETECT_MODE_SHIFT)
+
+#define CS42L42_MIC_DET_CTL1            (CS42L42_PAGE_1B + 0x75)
+#define CS42L42_HS_DET_LEVEL_SHIFT      0
+#define CS42L42_HS_DET_LEVEL_MASK       (0x3F << CS42L42_HS_DET_LEVEL_SHIFT)
+#define CS42L42_EVENT_STAT_SEL_SHIFT    6
+#define CS42L42_EVENT_STAT_SEL_MASK     (1 << CS42L42_EVENT_STAT_SEL_SHIFT)
+#define CS42L42_LATCH_TO_VP_SHIFT       7
+#define CS42L42_LATCH_TO_VP_MASK        (1 << CS42L42_LATCH_TO_VP_SHIFT)
+
+#define CS42L42_MIC_DET_CTL2            (CS42L42_PAGE_1B + 0x76)
+#define CS42L42_DEBOUNCE_TIME_SHIFT     5
+#define CS42L42_DEBOUNCE_TIME_MASK      (0x07 << CS42L42_DEBOUNCE_TIME_SHIFT)
+
+#define CS42L42_DET_STATUS1             (CS42L42_PAGE_1B + 0x77)
+#define CS42L42_HSBIAS_HIZ_MODE_SHIFT   6
+#define CS42L42_HSBIAS_HIZ_MODE_MASK    (1 << CS42L42_HSBIAS_HIZ_MODE_SHIFT)
+#define CS42L42_TIP_SENSE_SHIFT         7
+#define CS42L42_TIP_SENSE_MASK          (1 << CS42L42_TIP_SENSE_SHIFT)
+
+#define CS42L42_DET_STATUS2             (CS42L42_PAGE_1B + 0x78)
+#define CS42L42_SHORT_TRUE_SHIFT        0
+#define CS42L42_SHORT_TRUE_MASK         (1 << CS42L42_SHORT_TRUE_SHIFT)
+#define CS42L42_HS_TRUE_SHIFT   1
+#define CS42L42_HS_TRUE_MASK            (1 << CS42L42_HS_TRUE_SHIFT)
+
+#define CS42L42_DET_INT1_MASK           (CS42L42_PAGE_1B + 0x79)
+#define CS42L42_TIP_SENSE_UNPLUG_SHIFT  5
+#define CS42L42_TIP_SENSE_UNPLUG_MASK   (1 << CS42L42_TIP_SENSE_UNPLUG_SHIFT)
+#define CS42L42_TIP_SENSE_PLUG_SHIFT    6
+#define CS42L42_TIP_SENSE_PLUG_MASK     (1 << CS42L42_TIP_SENSE_PLUG_SHIFT)
+#define CS42L42_HSBIAS_SENSE_SHIFT      7
+#define CS42L42_HSBIAS_SENSE_MASK       (1 << CS42L42_HSBIAS_SENSE_SHIFT)
+#define CS42L42_DET_INT_VAL1_MASK       (CS42L42_TIP_SENSE_UNPLUG_MASK | \
+                                        CS42L42_TIP_SENSE_PLUG_MASK | \
+                                        CS42L42_HSBIAS_SENSE_MASK)
+
+#define CS42L42_DET_INT2_MASK           (CS42L42_PAGE_1B + 0x7A)
+#define CS42L42_M_SHORT_DET_SHIFT       0
+#define CS42L42_M_SHORT_DET_MASK        (1 << \
+                                        CS42L42_M_SHORT_DET_SHIFT)
+#define CS42L42_M_SHORT_RLS_SHIFT       1
+#define CS42L42_M_SHORT_RLS_MASK        (1 << \
+                                        CS42L42_M_SHORT_RLS_SHIFT)
+#define CS42L42_M_HSBIAS_HIZ_SHIFT      2
+#define CS42L42_M_HSBIAS_HIZ_MASK       (1 << \
+                                        CS42L42_M_HSBIAS_HIZ_SHIFT)
+#define CS42L42_M_DETECT_FT_SHIFT       6
+#define CS42L42_M_DETECT_FT_MASK        (1 << \
+                                        CS42L42_M_DETECT_FT_SHIFT)
+#define CS42L42_M_DETECT_TF_SHIFT       7
+#define CS42L42_M_DETECT_TF_MASK        (1 << \
+                                        CS42L42_M_DETECT_TF_SHIFT)
+#define CS42L42_DET_INT_VAL2_MASK       (CS42L42_M_SHORT_DET_MASK | \
+                                        CS42L42_M_SHORT_RLS_MASK | \
+                                        CS42L42_M_HSBIAS_HIZ_MASK | \
+                                        CS42L42_M_DETECT_FT_MASK | \
+                                        CS42L42_M_DETECT_TF_MASK)
+
+/* Page 0x1C Headset Bias Registers */
+#define CS42L42_HS_BIAS_CTL             (CS42L42_PAGE_1C + 0x03)
+#define CS42L42_HSBIAS_RAMP_SHIFT       0
+#define CS42L42_HSBIAS_RAMP_MASK        (3 << CS42L42_HSBIAS_RAMP_SHIFT)
+#define CS42L42_HSBIAS_PD_SHIFT         4
+#define CS42L42_HSBIAS_PD_MASK          (1 << CS42L42_HSBIAS_PD_SHIFT)
+#define CS42L42_HSBIAS_CAPLESS_SHIFT    7
+#define CS42L42_HSBIAS_CAPLESS_MASK     (1 << CS42L42_HSBIAS_CAPLESS_SHIFT)
+
+/* Page 0x1D ADC Registers */
+#define CS42L42_ADC_CTL                 (CS42L42_PAGE_1D + 0x01)
+#define CS42L42_ADC_NOTCH_DIS_SHIFT             5
+#define CS42L42_ADC_FORCE_WEAK_VCM_SHIFT        4
+#define CS42L42_ADC_INV_SHIFT                   2
+#define CS42L42_ADC_DIG_BOOST_SHIFT             0
+
+#define CS42L42_ADC_VOLUME              (CS42L42_PAGE_1D + 0x03)
+#define CS42L42_ADC_VOL_SHIFT           0
+
+#define CS42L42_ADC_WNF_HPF_CTL         (CS42L42_PAGE_1D + 0x04)
+#define CS42L42_ADC_WNF_CF_SHIFT        4
+#define CS42L42_ADC_WNF_EN_SHIFT        3
+#define CS42L42_ADC_HPF_CF_SHIFT        1
+#define CS42L42_ADC_HPF_EN_SHIFT        0
+
+/* Page 0x1F DAC Registers */
+#define CS42L42_DAC_CTL1                (CS42L42_PAGE_1F + 0x01)
+#define CS42L42_DACB_INV_SHIFT          1
+#define CS42L42_DACA_INV_SHIFT          0
+
+#define CS42L42_DAC_CTL2                (CS42L42_PAGE_1F + 0x06)
+#define CS42L42_HPOUT_PULLDOWN_SHIFT    4
+#define CS42L42_HPOUT_PULLDOWN_MASK     (15 << CS42L42_HPOUT_PULLDOWN_SHIFT)
+#define CS42L42_HPOUT_LOAD_SHIFT        3
+#define CS42L42_HPOUT_LOAD_MASK         (1 << CS42L42_HPOUT_LOAD_SHIFT)
+#define CS42L42_HPOUT_CLAMP_SHIFT       2
+#define CS42L42_HPOUT_CLAMP_MASK        (1 << CS42L42_HPOUT_CLAMP_SHIFT)
+#define CS42L42_DAC_HPF_EN_SHIFT        1
+#define CS42L42_DAC_HPF_EN_MASK         (1 << CS42L42_DAC_HPF_EN_SHIFT)
+#define CS42L42_DAC_MON_EN_SHIFT        0
+#define CS42L42_DAC_MON_EN_MASK         (1 << CS42L42_DAC_MON_EN_SHIFT)
+
+/* Page 0x20 HP CTL Registers */
+#define CS42L42_HP_CTL                  (CS42L42_PAGE_20 + 0x01)
+#define CS42L42_HP_ANA_BMUTE_SHIFT      3
+#define CS42L42_HP_ANA_BMUTE_MASK       (1 << CS42L42_HP_ANA_BMUTE_SHIFT)
+#define CS42L42_HP_ANA_AMUTE_SHIFT      2
+#define CS42L42_HP_ANA_AMUTE_MASK       (1 << CS42L42_HP_ANA_AMUTE_SHIFT)
+#define CS42L42_HP_FULL_SCALE_VOL_SHIFT 1
+#define CS42L42_HP_FULL_SCALE_VOL_MASK  (1 << CS42L42_HP_FULL_SCALE_VOL_SHIFT)
+
+/* Page 0x21 Class H Registers */
+#define CS42L42_CLASSH_CTL              (CS42L42_PAGE_21 + 0x01)
+
+/* Page 0x23 Mixer Volume Registers */
+#define CS42L42_MIXER_CHA_VOL           (CS42L42_PAGE_23 + 0x01)
+#define CS42L42_MIXER_ADC_VOL           (CS42L42_PAGE_23 + 0x02)
+
+#define CS42L42_MIXER_CHB_VOL           (CS42L42_PAGE_23 + 0x03)
+#define CS42L42_MIXER_CH_VOL_SHIFT      0
+#define CS42L42_MIXER_CH_VOL_MASK       (0x3f << CS42L42_MIXER_CH_VOL_SHIFT)
+
+/* Page 0x24 EQ Registers */
+#define CS42L42_EQ_COEF_IN0             (CS42L42_PAGE_24 + 0x01)
+#define CS42L42_EQ_COEF_IN1             (CS42L42_PAGE_24 + 0x02)
+#define CS42L42_EQ_COEF_IN2             (CS42L42_PAGE_24 + 0x03)
+#define CS42L42_EQ_COEF_IN3             (CS42L42_PAGE_24 + 0x04)
+#define CS42L42_EQ_COEF_RW              (CS42L42_PAGE_24 + 0x06)
+#define CS42L42_EQ_COEF_OUT0            (CS42L42_PAGE_24 + 0x07)
+#define CS42L42_EQ_COEF_OUT1            (CS42L42_PAGE_24 + 0x08)
+#define CS42L42_EQ_COEF_OUT2            (CS42L42_PAGE_24 + 0x09)
+#define CS42L42_EQ_COEF_OUT3            (CS42L42_PAGE_24 + 0x0A)
+#define CS42L42_EQ_INIT_STAT            (CS42L42_PAGE_24 + 0x0B)
+#define CS42L42_EQ_START_FILT           (CS42L42_PAGE_24 + 0x0C)
+#define CS42L42_EQ_MUTE_CTL             (CS42L42_PAGE_24 + 0x0E)
+
+/* Page 0x25 Audio Port Registers */
+#define CS42L42_SP_RX_CH_SEL            (CS42L42_PAGE_25 + 0x01)
+
+#define CS42L42_SP_RX_ISOC_CTL          (CS42L42_PAGE_25 + 0x02)
+#define CS42L42_SP_RX_RSYNC_SHIFT       6
+#define CS42L42_SP_RX_RSYNC_MASK        (1 << CS42L42_SP_RX_RSYNC_SHIFT)
+#define CS42L42_SP_RX_NSB_POS_SHIFT     3
+#define CS42L42_SP_RX_NSB_POS_MASK      (7 << CS42L42_SP_RX_NSB_POS_SHIFT)
+#define CS42L42_SP_RX_NFS_NSBB_SHIFT    2
+#define CS42L42_SP_RX_NFS_NSBB_MASK     (1 << CS42L42_SP_RX_NFS_NSBB_SHIFT)
+#define CS42L42_SP_RX_ISOC_MODE_SHIFT   0
+#define CS42L42_SP_RX_ISOC_MODE_MASK    (3 << CS42L42_SP_RX_ISOC_MODE_SHIFT)
+
+#define CS42L42_SP_RX_FS                (CS42L42_PAGE_25 + 0x03)
+#define CS42l42_SPDIF_CH_SEL            (CS42L42_PAGE_25 + 0x04)
+#define CS42L42_SP_TX_ISOC_CTL          (CS42L42_PAGE_25 + 0x05)
+#define CS42L42_SP_TX_FS                (CS42L42_PAGE_25 + 0x06)
+#define CS42L42_SPDIF_SW_CTL1           (CS42L42_PAGE_25 + 0x07)
+
+/* Page 0x26 SRC Registers */
+#define CS42L42_SRC_SDIN_FS             (CS42L42_PAGE_26 + 0x01)
+#define CS42L42_SRC_SDIN_FS_SHIFT       0
+#define CS42L42_SRC_SDIN_FS_MASK        (0x1f << CS42L42_SRC_SDIN_FS_SHIFT)
+
+#define CS42L42_SRC_SDOUT_FS            (CS42L42_PAGE_26 + 0x09)
+
+/* Page 0x28 S/PDIF Registers */
+#define CS42L42_SPDIF_CTL1              (CS42L42_PAGE_28 + 0x01)
+#define CS42L42_SPDIF_CTL2              (CS42L42_PAGE_28 + 0x02)
+#define CS42L42_SPDIF_CTL3              (CS42L42_PAGE_28 + 0x03)
+#define CS42L42_SPDIF_CTL4              (CS42L42_PAGE_28 + 0x04)
+
+/* Page 0x29 Serial Port TX Registers */
+#define CS42L42_ASP_TX_SZ_EN            (CS42L42_PAGE_29 + 0x01)
+#define CS42L42_ASP_TX_CH_EN            (CS42L42_PAGE_29 + 0x02)
+#define CS42L42_ASP_TX_CH_AP_RES        (CS42L42_PAGE_29 + 0x03)
+#define CS42L42_ASP_TX_CH1_BIT_MSB      (CS42L42_PAGE_29 + 0x04)
+#define CS42L42_ASP_TX_CH1_BIT_LSB      (CS42L42_PAGE_29 + 0x05)
+#define CS42L42_ASP_TX_HIZ_DLY_CFG      (CS42L42_PAGE_29 + 0x06)
+#define CS42L42_ASP_TX_CH2_BIT_MSB      (CS42L42_PAGE_29 + 0x0A)
+#define CS42L42_ASP_TX_CH2_BIT_LSB      (CS42L42_PAGE_29 + 0x0B)
+
+/* Page 0x2A Serial Port RX Registers */
+#define CS42L42_ASP_RX_DAI0_EN          (CS42L42_PAGE_2A + 0x01)
+#define CS42L42_ASP_RX0_CH_EN_SHIFT     2
+#define CS42L42_ASP_RX0_CH_EN_MASK      (0xf << CS42L42_ASP_RX0_CH_EN_SHIFT)
+#define CS42L42_ASP_RX0_CH1_EN          1
+#define CS42L42_ASP_RX0_CH2_EN          2
+#define CS42L42_ASP_RX0_CH3_EN          4
+#define CS42L42_ASP_RX0_CH4_EN          8
+
+#define CS42L42_ASP_RX_DAI0_CH1_AP_RES  (CS42L42_PAGE_2A + 0x02)
+#define CS42L42_ASP_RX_DAI0_CH1_BIT_MSB (CS42L42_PAGE_2A + 0x03)
+#define CS42L42_ASP_RX_DAI0_CH1_BIT_LSB (CS42L42_PAGE_2A + 0x04)
+#define CS42L42_ASP_RX_DAI0_CH2_AP_RES  (CS42L42_PAGE_2A + 0x05)
+#define CS42L42_ASP_RX_DAI0_CH2_BIT_MSB (CS42L42_PAGE_2A + 0x06)
+#define CS42L42_ASP_RX_DAI0_CH2_BIT_LSB (CS42L42_PAGE_2A + 0x07)
+#define CS42L42_ASP_RX_DAI0_CH3_AP_RES  (CS42L42_PAGE_2A + 0x08)
+#define CS42L42_ASP_RX_DAI0_CH3_BIT_MSB (CS42L42_PAGE_2A + 0x09)
+#define CS42L42_ASP_RX_DAI0_CH3_BIT_LSB (CS42L42_PAGE_2A + 0x0A)
+#define CS42L42_ASP_RX_DAI0_CH4_AP_RES  (CS42L42_PAGE_2A + 0x0B)
+#define CS42L42_ASP_RX_DAI0_CH4_BIT_MSB (CS42L42_PAGE_2A + 0x0C)
+#define CS42L42_ASP_RX_DAI0_CH4_BIT_LSB (CS42L42_PAGE_2A + 0x0D)
+#define CS42L42_ASP_RX_DAI1_CH1_AP_RES  (CS42L42_PAGE_2A + 0x0E)
+#define CS42L42_ASP_RX_DAI1_CH1_BIT_MSB (CS42L42_PAGE_2A + 0x0F)
+#define CS42L42_ASP_RX_DAI1_CH1_BIT_LSB (CS42L42_PAGE_2A + 0x10)
+#define CS42L42_ASP_RX_DAI1_CH2_AP_RES  (CS42L42_PAGE_2A + 0x11)
+#define CS42L42_ASP_RX_DAI1_CH2_BIT_MSB (CS42L42_PAGE_2A + 0x12)
+#define CS42L42_ASP_RX_DAI1_CH2_BIT_LSB (CS42L42_PAGE_2A + 0x13)
+
+#define CS42L42_ASP_RX_CH_AP_SHIFT      6
+#define CS42L42_ASP_RX_CH_AP_MASK       (1 << CS42L42_ASP_RX_CH_AP_SHIFT)
+#define CS42L42_ASP_RX_CH_AP_LOW        0
+#define CS42L42_ASP_RX_CH_AP_HI         1
+#define CS42L42_ASP_RX_CH_RES_SHIFT     0
+#define CS42L42_ASP_RX_CH_RES_MASK      (3 << CS42L42_ASP_RX_CH_RES_SHIFT)
+#define CS42L42_ASP_RX_CH_RES_32        3
+#define CS42L42_ASP_RX_CH_RES_16        1
+#define CS42L42_ASP_RX_CH_BIT_ST_SHIFT  0
+#define CS42L42_ASP_RX_CH_BIT_ST_MASK   (0xff << CS42L42_ASP_RX_CH_BIT_ST_SHIFT)
+
+/* Page 0x30 ID Registers */
+#define CS42L42_SUB_REVID               (CS42L42_PAGE_30 + 0x14)
+#define CS42L42_MAX_REGISTER            (CS42L42_PAGE_30 + 0x14)
+
+/* Defines for fracturing values spread across multiple registers */
+#define CS42L42_FRAC0_VAL(val)  ((val) & 0x0000ff)
+#define CS42L42_FRAC1_VAL(val)  (((val) & 0x00ff00) >> 8)
+#define CS42L42_FRAC2_VAL(val)  (((val) & 0xff0000) >> 16)
+
+#define CS42L42_NUM_SUPPLIES    5
+
+static const char *const cs42l42_supply_names[CS42L42_NUM_SUPPLIES] = {
+        "VA",
+        "VP",
+        "VCP",
+        "VD_FILT",
+        "VL",
+};
+
+struct  cs42l42_private {
+        struct regmap *regmap;
+        struct snd_soc_codec *codec;
+        struct regulator_bulk_data supplies[CS42L42_NUM_SUPPLIES];
+        struct gpio_desc *reset_gpio;
+        struct completion pdn_done;
+        u32 sclk;
+        u32 srate;
+        u32 swidth;
+        u8 plug_state;
+        u8 hs_type;
+        u8 ts_inv;
+        u8 ts_dbnc_rise;
+        u8 ts_dbnc_fall;
+        u8 btn_det_init_dbnce;
+        u8 btn_det_event_dbnce;
+        u8 bias_thresholds[CS42L42_NUM_BIASES];
+        u8 hs_bias_ramp_rate;
+        u8 hs_bias_ramp_time;
+};
+
+#endif /* __CS42L42_H__ */
diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c
index 54c1768bc818..cb6ca85f1536 100644
--- a/sound/soc/codecs/cs42l56.c
+++ b/sound/soc/codecs/cs42l56.c
@@ -64,8 +64,6 @@ struct  cs42l56_private {
 };
 
 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 */
@@ -1262,8 +1260,6 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client,
                 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) {
@@ -1279,23 +1275,25 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client,
         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);
+                                   CS42L56_AIN1A_REF_MASK,
+                                   CS42L56_AIN1A_REF_MASK);
 
         if (cs42l56->pdata.ain1b_ref_cfg)
                 regmap_update_bits(cs42l56->regmap, CS42L56_AIN_REFCFG_ADC_MUX,
-                                   CS42L56_AIN1B_REF_MASK, 1);
+                                   CS42L56_AIN1B_REF_MASK,
+                                   CS42L56_AIN1B_REF_MASK);
 
         if (cs42l56->pdata.ain2a_ref_cfg)
                 regmap_update_bits(cs42l56->regmap, CS42L56_AIN_REFCFG_ADC_MUX,
-                                   CS42L56_AIN2A_REF_MASK, 1);
+                                   CS42L56_AIN2A_REF_MASK,
+                                   CS42L56_AIN2A_REF_MASK);
 
         if (cs42l56->pdata.ain2b_ref_cfg)
                 regmap_update_bits(cs42l56->regmap, CS42L56_AIN_REFCFG_ADC_MUX,
-                                   CS42L56_AIN2B_REF_MASK, 1);
+                                   CS42L56_AIN2B_REF_MASK,
+                                   CS42L56_AIN2B_REF_MASK);
 
         if (cs42l56->pdata.micbias_lvl)
                 regmap_update_bits(cs42l56->regmap, CS42L56_GAIN_BIAS_CTL,
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 71ba5605495f..3df2c473ab88 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1337,8 +1337,6 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
                 gpio_set_value_cansleep(cs42l73->pdata.reset_gpio, 1);
         }
 
-        regcache_cache_bypass(cs42l73->regmap, true);
-
         /* initialize codec */
         ret = regmap_read(cs42l73->regmap, CS42L73_DEVID_AB, &reg);
         devid = (reg & 0xFF) << 12;
@@ -1366,8 +1364,6 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
         dev_info(&i2c_client->dev,
                  "Cirrus Logic CS42L73, Revision: %02X\n", reg & 0xFF);
 
-        regcache_cache_bypass(cs42l73->regmap, false);
-
         ret =  snd_soc_register_codec(&i2c_client->dev,
                         &soc_codec_dev_cs42l73, cs42l73_dai,
                         ARRAY_SIZE(cs42l73_dai));
diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
index b4d87379d2bc..c1785bd4ff19 100644
--- a/sound/soc/codecs/cs42xx8.c
+++ b/sound/soc/codecs/cs42xx8.c
@@ -321,7 +321,6 @@ static struct snd_soc_dai_driver cs42xx8_dai = {
 };
 
 static const struct reg_default cs42xx8_reg[] = {
-        { 0x01, 0x01 },   /* Chip I.D. and Revision Register */
         { 0x02, 0x00 },   /* Power Control */
         { 0x03, 0xF0 },   /* Functional Mode */
         { 0x04, 0x46 },   /* Interface Formats */
@@ -498,13 +497,6 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap)
         /* Make sure hardware reset done */
         msleep(5);
 
-        /*
-         * We haven't marked the chip revision as volatile due to
-         * sharing a register with the right input volume; explicitly
-         * bypass the cache to read it.
-         */
-        regcache_cache_bypass(cs42xx8->regmap, true);
-
         /* Validate the chip ID */
         ret = regmap_read(cs42xx8->regmap, CS42XX8_CHIPID, &val);
         if (ret < 0) {
@@ -523,8 +515,6 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap)
         dev_info(dev, "found device, revision %X\n",
                         val & CS42XX8_CHIPID_REV_ID_MASK);
 
-        regcache_cache_bypass(cs42xx8->regmap, false);
-
         cs42xx8_dai.name = cs42xx8->drvdata->name;
 
         /* Each adc supports stereo input */
diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c
index 5b22564f037c..73559ae864b6 100644
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@ -335,9 +335,11 @@ static const struct snd_kcontrol_new cs47l24_aec_loopback_mux =
 
 static const struct snd_soc_dapm_widget cs47l24_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1,
-                    ARIZONA_SYSCLK_ENA_SHIFT, 0, NULL, 0),
+                    ARIZONA_SYSCLK_ENA_SHIFT, 0, arizona_clk_ev,
+                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("ASYNCCLK", ARIZONA_ASYNC_CLOCK_1,
-                    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, NULL, 0),
+                    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, arizona_clk_ev,
+                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,
                     ARIZONA_OPCLK_ENA_SHIFT, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", ARIZONA_OUTPUT_ASYNC_CLOCK,
@@ -1064,7 +1066,7 @@ static struct snd_soc_dai_driver cs47l24_dai[] = {
 static int cs47l24_open(struct snd_compr_stream *stream)
 {
         struct snd_soc_pcm_runtime *rtd = stream->private_data;
-        struct cs47l24_priv *priv = snd_soc_codec_get_drvdata(rtd->codec);
+        struct cs47l24_priv *priv = snd_soc_platform_get_drvdata(rtd->platform);
         struct arizona *arizona = priv->core.arizona;
         int n_adsp;
 
@@ -1113,8 +1115,8 @@ static irqreturn_t cs47l24_adsp2_irq(int irq, void *data)
 static int cs47l24_codec_probe(struct snd_soc_codec *codec)
 {
         struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
+        struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
         struct cs47l24_priv *priv = snd_soc_codec_get_drvdata(codec);
-        struct arizona *arizona = priv->core.arizona;
         int ret;
 
         priv->core.arizona->dapm = dapm;
@@ -1124,14 +1126,6 @@ static int cs47l24_codec_probe(struct snd_soc_codec *codec)
         arizona_init_mono(codec);
         arizona_init_notifiers(codec);
 
-        ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,
-                                  "ADSP2 Compressed IRQ", cs47l24_adsp2_irq,
-                                  priv);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to request DSP IRQ: %d\n", ret);
-                return ret;
-        }
-
         ret = wm_adsp2_codec_probe(&priv->core.adsp[1], codec);
         if (ret)
                 goto err_adsp2_codec_probe;
@@ -1145,7 +1139,7 @@ static int cs47l24_codec_probe(struct snd_soc_codec *codec)
         if (ret)
                 goto err_adsp2_codec_probe;
 
-        snd_soc_dapm_disable_pin(dapm, "HAPTICS");
+        snd_soc_component_disable_pin(component, "HAPTICS");
 
         return 0;
 
@@ -1159,17 +1153,12 @@ err_adsp2_codec_probe:
 static int cs47l24_codec_remove(struct snd_soc_codec *codec)
 {
         struct cs47l24_priv *priv = snd_soc_codec_get_drvdata(codec);
-        struct arizona *arizona = priv->core.arizona;
 
         wm_adsp2_codec_remove(&priv->core.adsp[1], codec);
         wm_adsp2_codec_remove(&priv->core.adsp[2], codec);
 
         priv->core.arizona->dapm = NULL;
 
-        arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);
-
-        arizona_free_spk(codec);
-
         return 0;
 }
 
@@ -1285,25 +1274,47 @@ static int cs47l24_probe(struct platform_device *pdev)
         pm_runtime_enable(&pdev->dev);
         pm_runtime_idle(&pdev->dev);
 
+        ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,
+                                  "ADSP2 Compressed IRQ", cs47l24_adsp2_irq,
+                                  cs47l24);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "Failed to request DSP IRQ: %d\n", ret);
+                return ret;
+        }
+
+        ret = arizona_init_spk_irqs(arizona);
+        if (ret < 0)
+                goto err_dsp_irq;
+
         ret = snd_soc_register_platform(&pdev->dev, &cs47l24_compr_platform);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Failed to register platform: %d\n", ret);
-                return ret;
+                goto err_spk_irqs;
         }
 
         ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_cs47l24,
                                       cs47l24_dai, ARRAY_SIZE(cs47l24_dai));
         if (ret < 0) {
                 dev_err(&pdev->dev, "Failed to register codec: %d\n", ret);
-                snd_soc_unregister_platform(&pdev->dev);
+                goto err_platform;
         }
 
         return ret;
+
+err_platform:
+        snd_soc_unregister_platform(&pdev->dev);
+err_spk_irqs:
+        arizona_free_spk_irqs(arizona);
+err_dsp_irq:
+        arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, cs47l24);
+
+        return ret;
 }
 
 static int cs47l24_remove(struct platform_device *pdev)
 {
         struct cs47l24_priv *cs47l24 = platform_get_drvdata(pdev);
+        struct arizona *arizona = cs47l24->core.arizona;
 
         snd_soc_unregister_platform(&pdev->dev);
         snd_soc_unregister_codec(&pdev->dev);
@@ -1312,6 +1323,10 @@ static int cs47l24_remove(struct platform_device *pdev)
         wm_adsp2_remove(&cs47l24->core.adsp[1]);
         wm_adsp2_remove(&cs47l24->core.adsp[2]);
 
+        arizona_free_spk_irqs(arizona);
+
+        arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, cs47l24);
+
         return 0;
 }
 
diff --git a/sound/soc/codecs/da7219-aad.c b/sound/soc/codecs/da7219-aad.c
index 2b8914dd5990..6274d79c1353 100644
--- a/sound/soc/codecs/da7219-aad.c
+++ b/sound/soc/codecs/da7219-aad.c
@@ -204,10 +204,19 @@ static void da7219_aad_hptest_work(struct work_struct *work)
         snd_soc_update_bits(codec, DA7219_MIXOUT_R_CTRL,
                             DA7219_MIXOUT_R_AMP_EN_MASK,
                             DA7219_MIXOUT_R_AMP_EN_MASK);
-        snd_soc_write(codec, DA7219_HP_L_CTRL,
-                      DA7219_HP_L_AMP_OE_MASK | DA7219_HP_L_AMP_EN_MASK);
-        snd_soc_write(codec, DA7219_HP_R_CTRL,
-                      DA7219_HP_R_AMP_OE_MASK | DA7219_HP_R_AMP_EN_MASK);
+        snd_soc_update_bits(codec, DA7219_HP_L_CTRL,
+                            DA7219_HP_L_AMP_OE_MASK | DA7219_HP_L_AMP_EN_MASK,
+                            DA7219_HP_L_AMP_OE_MASK | DA7219_HP_L_AMP_EN_MASK);
+        snd_soc_update_bits(codec, DA7219_HP_R_CTRL,
+                            DA7219_HP_R_AMP_OE_MASK | DA7219_HP_R_AMP_EN_MASK,
+                            DA7219_HP_R_AMP_OE_MASK | DA7219_HP_R_AMP_EN_MASK);
+        msleep(DA7219_SETTLING_DELAY);
+        snd_soc_update_bits(codec, DA7219_HP_L_CTRL,
+                            DA7219_HP_L_AMP_MUTE_EN_MASK |
+                            DA7219_HP_L_AMP_MIN_GAIN_EN_MASK, 0);
+        snd_soc_update_bits(codec, DA7219_HP_R_CTRL,
+                            DA7219_HP_R_AMP_MUTE_EN_MASK |
+                            DA7219_HP_R_AMP_MIN_GAIN_EN_MASK, 0);
 
         /*
          * If we're running from the internal oscillator then give audio paths
@@ -244,6 +253,7 @@ static void da7219_aad_hptest_work(struct work_struct *work)
         regcache_mark_dirty(da7219->regmap);
         regcache_sync_region(da7219->regmap, DA7219_HP_L_CTRL,
                              DA7219_HP_R_CTRL);
+        msleep(DA7219_SETTLING_DELAY);
         regcache_sync_region(da7219->regmap, DA7219_MIXOUT_L_CTRL,
                              DA7219_MIXOUT_R_CTRL);
         regcache_sync_region(da7219->regmap, DA7219_DROUTING_ST_OUTFILT_1L,
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index cf37936bfe3a..99601627f83c 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -823,6 +823,85 @@ static int da7219_dai_event(struct snd_soc_dapm_widget *w,
         }
 }
 
+static int da7219_settling_event(struct snd_soc_dapm_widget *w,
+                                 struct snd_kcontrol *kcontrol, int event)
+{
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+        case SND_SOC_DAPM_POST_PMD:
+                msleep(DA7219_SETTLING_DELAY);
+                break;
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+static int da7219_mixout_event(struct snd_soc_dapm_widget *w,
+                               struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        u8 hp_ctrl, min_gain_mask;
+
+        switch (w->reg) {
+        case DA7219_MIXOUT_L_CTRL:
+                hp_ctrl = DA7219_HP_L_CTRL;
+                min_gain_mask = DA7219_HP_L_AMP_MIN_GAIN_EN_MASK;
+                break;
+        case DA7219_MIXOUT_R_CTRL:
+                hp_ctrl = DA7219_HP_R_CTRL;
+                min_gain_mask = DA7219_HP_R_AMP_MIN_GAIN_EN_MASK;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMD:
+                /* Enable minimum gain on HP to avoid pops */
+                snd_soc_update_bits(codec, hp_ctrl, min_gain_mask,
+                                    min_gain_mask);
+
+                msleep(DA7219_MIN_GAIN_DELAY);
+
+                break;
+        case SND_SOC_DAPM_POST_PMU:
+                /* Remove minimum gain on HP */
+                snd_soc_update_bits(codec, hp_ctrl, min_gain_mask, 0);
+
+                break;
+        }
+
+        return 0;
+}
+
+static int da7219_gain_ramp_event(struct snd_soc_dapm_widget *w,
+                                  struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct da7219_priv *da7219 = snd_soc_codec_get_drvdata(codec);
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+        case SND_SOC_DAPM_PRE_PMD:
+                /* Ensure nominal gain ramping for DAPM sequence */
+                da7219->gain_ramp_ctrl =
+                        snd_soc_read(codec, DA7219_GAIN_RAMP_CTRL);
+                snd_soc_write(codec, DA7219_GAIN_RAMP_CTRL,
+                              DA7219_GAIN_RAMP_RATE_NOMINAL);
+                break;
+        case SND_SOC_DAPM_POST_PMU:
+        case SND_SOC_DAPM_POST_PMD:
+                /* Restore previous gain ramp settings */
+                snd_soc_write(codec, DA7219_GAIN_RAMP_CTRL,
+                              da7219->gain_ramp_ctrl);
+                break;
+        }
+
+        return 0;
+}
+
 
 /*
  * DAPM Widgets
@@ -907,30 +986,46 @@ static const struct snd_soc_dapm_widget da7219_dapm_widgets[] = {
                            ARRAY_SIZE(da7219_st_out_filtr_mix_controls)),
 
         /* DACs */
-        SND_SOC_DAPM_DAC("DACL", NULL, DA7219_DAC_L_CTRL, DA7219_DAC_L_EN_SHIFT,
-                         DA7219_NO_INVERT),
-        SND_SOC_DAPM_DAC("DACR", NULL, DA7219_DAC_R_CTRL, DA7219_DAC_R_EN_SHIFT,
-                         DA7219_NO_INVERT),
+        SND_SOC_DAPM_DAC_E("DACL", NULL, DA7219_DAC_L_CTRL,
+                           DA7219_DAC_L_EN_SHIFT, DA7219_NO_INVERT,
+                           da7219_settling_event,
+                           SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_DAC_E("DACR", NULL, DA7219_DAC_R_CTRL,
+                           DA7219_DAC_R_EN_SHIFT, DA7219_NO_INVERT,
+                           da7219_settling_event,
+                           SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
 
         /* Output PGAs */
-        SND_SOC_DAPM_PGA("Mixout Left PGA", DA7219_MIXOUT_L_CTRL,
-                         DA7219_MIXOUT_L_AMP_EN_SHIFT, DA7219_NO_INVERT,
-                         NULL, 0),
-        SND_SOC_DAPM_PGA("Mixout Right PGA", DA7219_MIXOUT_R_CTRL,
-                         DA7219_MIXOUT_R_AMP_EN_SHIFT, DA7219_NO_INVERT,
-                         NULL, 0),
-        SND_SOC_DAPM_PGA("Headphone Left PGA", DA7219_HP_L_CTRL,
-                         DA7219_HP_L_AMP_EN_SHIFT, DA7219_NO_INVERT, NULL, 0),
-        SND_SOC_DAPM_PGA("Headphone Right PGA", DA7219_HP_R_CTRL,
-                         DA7219_HP_R_AMP_EN_SHIFT, DA7219_NO_INVERT, NULL, 0),
+        SND_SOC_DAPM_PGA_E("Mixout Left PGA", DA7219_MIXOUT_L_CTRL,
+                           DA7219_MIXOUT_L_AMP_EN_SHIFT, DA7219_NO_INVERT,
+                           NULL, 0, da7219_mixout_event,
+                           SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
+        SND_SOC_DAPM_PGA_E("Mixout Right PGA", DA7219_MIXOUT_R_CTRL,
+                           DA7219_MIXOUT_R_AMP_EN_SHIFT, DA7219_NO_INVERT,
+                           NULL, 0, da7219_mixout_event,
+                           SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
+        SND_SOC_DAPM_SUPPLY_S("Headphone Left PGA", 1, DA7219_HP_L_CTRL,
+                              DA7219_HP_L_AMP_EN_SHIFT, DA7219_NO_INVERT,
+                              da7219_settling_event,
+                              SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_SUPPLY_S("Headphone Right PGA", 1, DA7219_HP_R_CTRL,
+                              DA7219_HP_R_AMP_EN_SHIFT, DA7219_NO_INVERT,
+                              da7219_settling_event,
+                              SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
 
         /* Output Supplies */
-        SND_SOC_DAPM_SUPPLY("Charge Pump", DA7219_CP_CTRL, DA7219_CP_EN_SHIFT,
-                            DA7219_NO_INVERT, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("Charge Pump", 0, DA7219_CP_CTRL,
+                              DA7219_CP_EN_SHIFT, DA7219_NO_INVERT,
+                              da7219_settling_event,
+                              SND_SOC_DAPM_POST_PMU),
 
         /* Outputs */
         SND_SOC_DAPM_OUTPUT("HPL"),
         SND_SOC_DAPM_OUTPUT("HPR"),
+
+        /* Pre/Post Power */
+        SND_SOC_DAPM_PRE("Pre Power Gain Ramp", da7219_gain_ramp_event),
+        SND_SOC_DAPM_POST("Post Power Gain Ramp", da7219_gain_ramp_event),
 };
 
 
@@ -1003,8 +1098,8 @@ static const struct snd_soc_dapm_route da7219_audio_map[] = {
         {"Mixout Left PGA", NULL, "DACL"},
         {"Mixout Right PGA", NULL, "DACR"},
 
-        {"Headphone Left PGA", NULL, "Mixout Left PGA"},
-        {"Headphone Right PGA", NULL, "Mixout Right PGA"},
+        {"HPL", NULL, "Mixout Left PGA"},
+        {"HPR", NULL, "Mixout Right PGA"},
 
         {"HPL", NULL, "Headphone Left PGA"},
         {"HPR", NULL, "Headphone Right PGA"},
@@ -1712,6 +1807,14 @@ static int da7219_probe(struct snd_soc_codec *codec)
                             DA7219_HP_R_AMP_RAMP_EN_MASK,
                             DA7219_HP_R_AMP_RAMP_EN_MASK);
 
+        /* Default minimum gain on HP to avoid pops during DAPM sequencing */
+        snd_soc_update_bits(codec, DA7219_HP_L_CTRL,
+                            DA7219_HP_L_AMP_MIN_GAIN_EN_MASK,
+                            DA7219_HP_L_AMP_MIN_GAIN_EN_MASK);
+        snd_soc_update_bits(codec, DA7219_HP_R_CTRL,
+                            DA7219_HP_R_AMP_MIN_GAIN_EN_MASK,
+                            DA7219_HP_R_AMP_MIN_GAIN_EN_MASK);
+
         /* Default infinite tone gen, start/stop by Kcontrol */
         snd_soc_write(codec, DA7219_TONE_GEN_CYCLES, DA7219_BEEP_CYCLES_MASK);
 
diff --git a/sound/soc/codecs/da7219.h b/sound/soc/codecs/da7219.h
index 66d3bad86739..6baba7455fa1 100644
--- a/sound/soc/codecs/da7219.h
+++ b/sound/soc/codecs/da7219.h
@@ -777,6 +777,10 @@
 #define DA7219_SYS_STAT_CHECK_RETRIES   6
 #define DA7219_SYS_STAT_CHECK_DELAY     50
 
+/* Power up/down Delays */
+#define DA7219_SETTLING_DELAY   40
+#define DA7219_MIN_GAIN_DELAY   30
+
 enum da7219_clk_src {
         DA7219_CLKSRC_MCLK = 0,
         DA7219_CLKSRC_MCLK_SQR,
@@ -814,6 +818,7 @@ struct da7219_priv {
 
         bool master;
         bool alc_en;
+        u8 gain_ramp_ctrl;
 };
 
 #endif /* __DA7219_H */
diff --git a/sound/soc/codecs/es8328.h b/sound/soc/codecs/es8328.h
index 1a736e72a929..8930322d712b 100644
--- a/sound/soc/codecs/es8328.h
+++ b/sound/soc/codecs/es8328.h
@@ -278,43 +278,6 @@ int es8328_probe(struct device *dev, struct regmap *regmap);
 
 #define ES8328_REG_MAX          0x35
 
-#define ES8328_PLL1             0
-#define ES8328_PLL2             1
-
-/* clock inputs */
-#define ES8328_MCLK             0
-#define ES8328_PCMCLK           1
-
-/* clock divider id's */
-#define ES8328_PCMDIV           0
-#define ES8328_BCLKDIV          1
-#define ES8328_VXCLKDIV         2
-
-/* PCM clock dividers */
-#define ES8328_PCM_DIV_1        (0 << 6)
-#define ES8328_PCM_DIV_3        (2 << 6)
-#define ES8328_PCM_DIV_5_5      (3 << 6)
-#define ES8328_PCM_DIV_2        (4 << 6)
-#define ES8328_PCM_DIV_4        (5 << 6)
-#define ES8328_PCM_DIV_6        (6 << 6)
-#define ES8328_PCM_DIV_8        (7 << 6)
-
-/* BCLK clock dividers */
-#define ES8328_BCLK_DIV_1       (0 << 7)
-#define ES8328_BCLK_DIV_2       (1 << 7)
-#define ES8328_BCLK_DIV_4       (2 << 7)
-#define ES8328_BCLK_DIV_8       (3 << 7)
-
-/* VXCLK clock dividers */
-#define ES8328_VXCLK_DIV_1      (0 << 6)
-#define ES8328_VXCLK_DIV_2      (1 << 6)
-#define ES8328_VXCLK_DIV_4      (2 << 6)
-#define ES8328_VXCLK_DIV_8      (3 << 6)
-#define ES8328_VXCLK_DIV_16     (4 << 6)
-
-#define ES8328_DAI_HIFI         0
-#define ES8328_DAI_VOICE        1
-
 #define ES8328_1536FS           1536
 #define ES8328_1024FS           1024
 #define ES8328_768FS            768
diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c
new file mode 100644
index 000000000000..d8e8590746af
--- /dev/null
+++ b/sound/soc/codecs/msm8916-wcd-analog.c
@@ -0,0 +1,890 @@
+#include <linux/module.h>
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/regulator/consumer.h>
+#include <linux/types.h>
+#include <linux/clk.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <sound/soc.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/tlv.h>
+
+#define CDC_D_REVISION1                 (0xf000)
+#define CDC_D_PERPH_SUBTYPE             (0xf005)
+#define CDC_D_CDC_RST_CTL               (0xf046)
+#define RST_CTL_DIG_SW_RST_N_MASK       BIT(7)
+#define RST_CTL_DIG_SW_RST_N_RESET      0
+#define RST_CTL_DIG_SW_RST_N_REMOVE_RESET BIT(7)
+
+#define CDC_D_CDC_TOP_CLK_CTL           (0xf048)
+#define TOP_CLK_CTL_A_MCLK_MCLK2_EN_MASK (BIT(2) | BIT(3))
+#define TOP_CLK_CTL_A_MCLK_EN_ENABLE     BIT(2)
+#define TOP_CLK_CTL_A_MCLK2_EN_ENABLE   BIT(3)
+
+#define CDC_D_CDC_ANA_CLK_CTL           (0xf049)
+#define ANA_CLK_CTL_EAR_HPHR_CLK_EN_MASK BIT(0)
+#define ANA_CLK_CTL_EAR_HPHR_CLK_EN     BIT(0)
+#define ANA_CLK_CTL_EAR_HPHL_CLK_EN     BIT(1)
+#define ANA_CLK_CTL_SPKR_CLK_EN_MASK    BIT(4)
+#define ANA_CLK_CTL_SPKR_CLK_EN BIT(4)
+#define ANA_CLK_CTL_TXA_CLK25_EN        BIT(5)
+
+#define CDC_D_CDC_DIG_CLK_CTL           (0xf04A)
+#define DIG_CLK_CTL_RXD1_CLK_EN         BIT(0)
+#define DIG_CLK_CTL_RXD2_CLK_EN         BIT(1)
+#define DIG_CLK_CTL_RXD3_CLK_EN         BIT(3)
+#define DIG_CLK_CTL_TXD_CLK_EN          BIT(4)
+#define DIG_CLK_CTL_NCP_CLK_EN_MASK     BIT(6)
+#define DIG_CLK_CTL_NCP_CLK_EN          BIT(6)
+#define DIG_CLK_CTL_RXD_PDM_CLK_EN_MASK BIT(7)
+#define DIG_CLK_CTL_RXD_PDM_CLK_EN      BIT(7)
+
+#define CDC_D_CDC_CONN_TX1_CTL          (0xf050)
+#define CONN_TX1_SERIAL_TX1_MUX         GENMASK(1, 0)
+#define CONN_TX1_SERIAL_TX1_ADC_1       0x0
+#define CONN_TX1_SERIAL_TX1_RX_PDM_LB   0x1
+#define CONN_TX1_SERIAL_TX1_ZERO        0x2
+
+#define CDC_D_CDC_CONN_TX2_CTL          (0xf051)
+#define CONN_TX2_SERIAL_TX2_MUX         GENMASK(1, 0)
+#define CONN_TX2_SERIAL_TX2_ADC_2       0x0
+#define CONN_TX2_SERIAL_TX2_RX_PDM_LB   0x1
+#define CONN_TX2_SERIAL_TX2_ZERO        0x2
+#define CDC_D_CDC_CONN_HPHR_DAC_CTL     (0xf052)
+#define CDC_D_CDC_CONN_RX1_CTL          (0xf053)
+#define CDC_D_CDC_CONN_RX2_CTL          (0xf054)
+#define CDC_D_CDC_CONN_RX3_CTL          (0xf055)
+#define CDC_D_CDC_CONN_RX_LB_CTL        (0xf056)
+#define CDC_D_SEC_ACCESS                (0xf0D0)
+#define CDC_D_PERPH_RESET_CTL3          (0xf0DA)
+#define CDC_D_PERPH_RESET_CTL4          (0xf0DB)
+#define CDC_A_REVISION1                 (0xf100)
+#define CDC_A_REVISION2                 (0xf101)
+#define CDC_A_REVISION3                 (0xf102)
+#define CDC_A_REVISION4                 (0xf103)
+#define CDC_A_PERPH_TYPE                (0xf104)
+#define CDC_A_PERPH_SUBTYPE             (0xf105)
+#define CDC_A_INT_RT_STS                (0xf110)
+#define CDC_A_INT_SET_TYPE              (0xf111)
+#define CDC_A_INT_POLARITY_HIGH         (0xf112)
+#define CDC_A_INT_POLARITY_LOW          (0xf113)
+#define CDC_A_INT_LATCHED_CLR           (0xf114)
+#define CDC_A_INT_EN_SET                (0xf115)
+#define CDC_A_INT_EN_CLR                (0xf116)
+#define CDC_A_INT_LATCHED_STS           (0xf118)
+#define CDC_A_INT_PENDING_STS           (0xf119)
+#define CDC_A_INT_MID_SEL               (0xf11A)
+#define CDC_A_INT_PRIORITY              (0xf11B)
+#define CDC_A_MICB_1_EN                 (0xf140)
+#define MICB_1_EN_MICB_ENABLE           BIT(7)
+#define MICB_1_EN_BYP_CAP_MASK          BIT(6)
+#define MICB_1_EN_NO_EXT_BYP_CAP        BIT(6)
+#define MICB_1_EN_EXT_BYP_CAP           0
+#define MICB_1_EN_PULL_DOWN_EN_MASK     BIT(5)
+#define MICB_1_EN_PULL_DOWN_EN_ENABLE   BIT(5)
+#define MICB_1_EN_OPA_STG2_TAIL_CURR_MASK GENMASK(3, 1)
+#define MICB_1_EN_OPA_STG2_TAIL_CURR_1_60UA     (0x4)
+#define MICB_1_EN_PULL_UP_EN_MASK       BIT(4)
+#define MICB_1_EN_TX3_GND_SEL_MASK      BIT(0)
+#define MICB_1_EN_TX3_GND_SEL_TX_GND    0
+
+#define CDC_A_MICB_1_VAL                (0xf141)
+#define MICB_1_VAL_MICB_OUT_VAL_MASK    GENMASK(7, 3)
+#define MICB_1_VAL_MICB_OUT_VAL_V2P70V  ((0x16)  << 3)
+#define CDC_A_MICB_1_CTL                (0xf142)
+
+#define MICB_1_CTL_CFILT_REF_SEL_MASK           BIT(1)
+#define MICB_1_CTL_CFILT_REF_SEL_HPF_REF        BIT(1)
+#define MICB_1_CTL_EXT_PRECHARG_EN_MASK         BIT(5)
+#define MICB_1_CTL_EXT_PRECHARG_EN_ENABLE       BIT(5)
+#define MICB_1_CTL_INT_PRECHARG_BYP_MASK        BIT(6)
+#define MICB_1_CTL_INT_PRECHARG_BYP_EXT_PRECHRG_SEL     BIT(6)
+
+#define CDC_A_MICB_1_INT_RBIAS                  (0xf143)
+#define MICB_1_INT_TX1_INT_RBIAS_EN_MASK        BIT(7)
+#define MICB_1_INT_TX1_INT_RBIAS_EN_ENABLE      BIT(7)
+#define MICB_1_INT_TX1_INT_RBIAS_EN_DISABLE     0
+
+#define MICB_1_INT_TX1_INT_PULLUP_EN_MASK       BIT(6)
+#define MICB_1_INT_TX1_INT_PULLUP_EN_TX1N_TO_MICBIAS BIT(6)
+#define MICB_1_INT_TX1_INT_PULLUP_EN_TX1N_TO_GND        0
+
+#define MICB_1_INT_TX2_INT_RBIAS_EN_MASK        BIT(4)
+#define MICB_1_INT_TX2_INT_RBIAS_EN_ENABLE      BIT(4)
+#define MICB_1_INT_TX2_INT_RBIAS_EN_DISABLE     0
+#define MICB_1_INT_TX2_INT_PULLUP_EN_MASK       BIT(3)
+#define MICB_1_INT_TX2_INT_PULLUP_EN_TX1N_TO_MICBIAS BIT(3)
+#define MICB_1_INT_TX2_INT_PULLUP_EN_TX1N_TO_GND        0
+
+#define MICB_1_INT_TX3_INT_RBIAS_EN_MASK        BIT(1)
+#define MICB_1_INT_TX3_INT_RBIAS_EN_ENABLE      BIT(1)
+#define MICB_1_INT_TX3_INT_RBIAS_EN_DISABLE     0
+#define MICB_1_INT_TX3_INT_PULLUP_EN_MASK       BIT(0)
+#define MICB_1_INT_TX3_INT_PULLUP_EN_TX1N_TO_MICBIAS BIT(0)
+#define MICB_1_INT_TX3_INT_PULLUP_EN_TX1N_TO_GND        0
+
+#define CDC_A_MICB_2_EN                 (0xf144)
+#define CDC_A_TX_1_2_ATEST_CTL_2        (0xf145)
+#define CDC_A_MASTER_BIAS_CTL           (0xf146)
+#define CDC_A_TX_1_EN                   (0xf160)
+#define CDC_A_TX_2_EN                   (0xf161)
+#define CDC_A_TX_1_2_TEST_CTL_1         (0xf162)
+#define CDC_A_TX_1_2_TEST_CTL_2         (0xf163)
+#define CDC_A_TX_1_2_ATEST_CTL          (0xf164)
+#define CDC_A_TX_1_2_OPAMP_BIAS         (0xf165)
+#define CDC_A_TX_3_EN                   (0xf167)
+#define CDC_A_NCP_EN                    (0xf180)
+#define CDC_A_NCP_CLK                   (0xf181)
+#define CDC_A_NCP_FBCTRL                (0xf183)
+#define CDC_A_NCP_FBCTRL_FB_CLK_INV_MASK        BIT(5)
+#define CDC_A_NCP_FBCTRL_FB_CLK_INV             BIT(5)
+#define CDC_A_NCP_BIAS                  (0xf184)
+#define CDC_A_NCP_VCTRL                 (0xf185)
+#define CDC_A_NCP_TEST                  (0xf186)
+#define CDC_A_NCP_CLIM_ADDR             (0xf187)
+#define CDC_A_RX_CLOCK_DIVIDER          (0xf190)
+#define CDC_A_RX_COM_OCP_CTL            (0xf191)
+#define CDC_A_RX_COM_OCP_COUNT          (0xf192)
+#define CDC_A_RX_COM_BIAS_DAC           (0xf193)
+#define RX_COM_BIAS_DAC_RX_BIAS_EN_MASK         BIT(7)
+#define RX_COM_BIAS_DAC_RX_BIAS_EN_ENABLE       BIT(7)
+#define RX_COM_BIAS_DAC_DAC_REF_EN_MASK         BIT(0)
+#define RX_COM_BIAS_DAC_DAC_REF_EN_ENABLE       BIT(0)
+
+#define CDC_A_RX_HPH_BIAS_PA            (0xf194)
+#define CDC_A_RX_HPH_BIAS_LDO_OCP       (0xf195)
+#define CDC_A_RX_HPH_BIAS_CNP           (0xf196)
+#define CDC_A_RX_HPH_CNP_EN             (0xf197)
+#define CDC_A_RX_HPH_L_PA_DAC_CTL       (0xf19B)
+#define RX_HPA_L_PA_DAC_CTL_DATA_RESET_MASK     BIT(1)
+#define RX_HPA_L_PA_DAC_CTL_DATA_RESET_RESET    BIT(1)
+#define CDC_A_RX_HPH_R_PA_DAC_CTL       (0xf19D)
+#define RX_HPH_R_PA_DAC_CTL_DATA_RESET  BIT(1)
+#define RX_HPH_R_PA_DAC_CTL_DATA_RESET_MASK BIT(1)
+
+#define CDC_A_RX_EAR_CTL                        (0xf19E)
+#define RX_EAR_CTL_SPK_VBAT_LDO_EN_MASK         BIT(0)
+#define RX_EAR_CTL_SPK_VBAT_LDO_EN_ENABLE       BIT(0)
+
+#define CDC_A_SPKR_DAC_CTL              (0xf1B0)
+#define SPKR_DAC_CTL_DAC_RESET_MASK     BIT(4)
+#define SPKR_DAC_CTL_DAC_RESET_NORMAL   0
+
+#define CDC_A_SPKR_DRV_CTL              (0xf1B2)
+#define SPKR_DRV_CTL_DEF_MASK           0xEF
+#define SPKR_DRV_CLASSD_PA_EN_MASK      BIT(7)
+#define SPKR_DRV_CLASSD_PA_EN_ENABLE    BIT(7)
+#define SPKR_DRV_CAL_EN                 BIT(6)
+#define SPKR_DRV_SETTLE_EN              BIT(5)
+#define SPKR_DRV_FW_EN                  BIT(3)
+#define SPKR_DRV_BOOST_SET              BIT(2)
+#define SPKR_DRV_CMFB_SET               BIT(1)
+#define SPKR_DRV_GAIN_SET               BIT(0)
+#define SPKR_DRV_CTL_DEF_VAL (SPKR_DRV_CLASSD_PA_EN_ENABLE | \
+                SPKR_DRV_CAL_EN | SPKR_DRV_SETTLE_EN | \
+                SPKR_DRV_FW_EN | SPKR_DRV_BOOST_SET | \
+                SPKR_DRV_CMFB_SET | SPKR_DRV_GAIN_SET)
+#define CDC_A_SPKR_OCP_CTL              (0xf1B4)
+#define CDC_A_SPKR_PWRSTG_CTL           (0xf1B5)
+#define SPKR_PWRSTG_CTL_DAC_EN_MASK     BIT(0)
+#define SPKR_PWRSTG_CTL_DAC_EN          BIT(0)
+#define SPKR_PWRSTG_CTL_MASK            0xE0
+#define SPKR_PWRSTG_CTL_BBM_MASK        BIT(7)
+#define SPKR_PWRSTG_CTL_BBM_EN          BIT(7)
+#define SPKR_PWRSTG_CTL_HBRDGE_EN_MASK  BIT(6)
+#define SPKR_PWRSTG_CTL_HBRDGE_EN       BIT(6)
+#define SPKR_PWRSTG_CTL_CLAMP_EN_MASK   BIT(5)
+#define SPKR_PWRSTG_CTL_CLAMP_EN        BIT(5)
+
+#define CDC_A_SPKR_DRV_DBG              (0xf1B7)
+#define CDC_A_CURRENT_LIMIT             (0xf1C0)
+#define CDC_A_BOOST_EN_CTL              (0xf1C3)
+#define CDC_A_SLOPE_COMP_IP_ZERO        (0xf1C4)
+#define CDC_A_SEC_ACCESS                (0xf1D0)
+#define CDC_A_PERPH_RESET_CTL3          (0xf1DA)
+#define CDC_A_PERPH_RESET_CTL4          (0xf1DB)
+
+#define MSM8916_WCD_ANALOG_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
+                        SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000)
+#define MSM8916_WCD_ANALOG_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\
+                                    SNDRV_PCM_FMTBIT_S24_LE)
+
+static const char * const supply_names[] = {
+        "vdd-cdc-io",
+        "vdd-cdc-tx-rx-cx",
+};
+
+struct pm8916_wcd_analog_priv {
+        u16 pmic_rev;
+        u16 codec_version;
+        struct clk *mclk;
+        struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)];
+        bool micbias1_cap_mode;
+        bool micbias2_cap_mode;
+};
+
+static const char *const adc2_mux_text[] = { "ZERO", "INP2", "INP3" };
+static const char *const rdac2_mux_text[] = { "ZERO", "RX2", "RX1" };
+static const char *const hph_text[] = { "ZERO", "Switch", };
+
+static const struct soc_enum hph_enum = SOC_ENUM_SINGLE_VIRT(
+                                        ARRAY_SIZE(hph_text), hph_text);
+
+static const struct snd_kcontrol_new hphl_mux = SOC_DAPM_ENUM("HPHL", hph_enum);
+static const struct snd_kcontrol_new hphr_mux = SOC_DAPM_ENUM("HPHR", hph_enum);
+
+/* ADC2 MUX */
+static const struct soc_enum adc2_enum = SOC_ENUM_SINGLE_VIRT(
+                        ARRAY_SIZE(adc2_mux_text), adc2_mux_text);
+
+/* RDAC2 MUX */
+static const struct soc_enum rdac2_mux_enum = SOC_ENUM_SINGLE(
+                        CDC_D_CDC_CONN_HPHR_DAC_CTL, 0, 3, rdac2_mux_text);
+
+static const struct snd_kcontrol_new spkr_switch[] = {
+        SOC_DAPM_SINGLE("Switch", CDC_A_SPKR_DAC_CTL, 7, 1, 0)
+};
+
+static const struct snd_kcontrol_new rdac2_mux = SOC_DAPM_ENUM(
+                                        "RDAC2 MUX Mux", rdac2_mux_enum);
+static const struct snd_kcontrol_new tx_adc2_mux = SOC_DAPM_ENUM(
+                                        "ADC2 MUX Mux", adc2_enum);
+
+/* Analog Gain control 0 dB to +24 dB in 6 dB steps */
+static const DECLARE_TLV_DB_SCALE(analog_gain, 0, 600, 0);
+
+static const struct snd_kcontrol_new pm8916_wcd_analog_snd_controls[] = {
+        SOC_SINGLE_TLV("ADC1 Volume", CDC_A_TX_1_EN, 3, 8, 0, analog_gain),
+        SOC_SINGLE_TLV("ADC2 Volume", CDC_A_TX_2_EN, 3, 8, 0, analog_gain),
+        SOC_SINGLE_TLV("ADC3 Volume", CDC_A_TX_3_EN, 3, 8, 0, analog_gain),
+};
+
+static void pm8916_wcd_analog_micbias_enable(struct snd_soc_codec *codec)
+{
+        snd_soc_update_bits(codec, CDC_A_MICB_1_CTL,
+                            MICB_1_CTL_EXT_PRECHARG_EN_MASK |
+                            MICB_1_CTL_INT_PRECHARG_BYP_MASK,
+                            MICB_1_CTL_INT_PRECHARG_BYP_EXT_PRECHRG_SEL
+                            | MICB_1_CTL_EXT_PRECHARG_EN_ENABLE);
+
+        snd_soc_write(codec, CDC_A_MICB_1_VAL, MICB_1_VAL_MICB_OUT_VAL_V2P70V);
+        /*
+         * Special headset needs MICBIAS as 2.7V so wait for
+         * 50 msec for the MICBIAS to reach 2.7 volts.
+         */
+        msleep(50);
+        snd_soc_update_bits(codec, CDC_A_MICB_1_CTL,
+                            MICB_1_CTL_EXT_PRECHARG_EN_MASK |
+                            MICB_1_CTL_INT_PRECHARG_BYP_MASK, 0);
+
+}
+
+static int pm8916_wcd_analog_enable_micbias_ext(struct snd_soc_codec
+                                                 *codec, int event,
+                                                 int reg, u32 cap_mode)
+{
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                pm8916_wcd_analog_micbias_enable(codec);
+                snd_soc_update_bits(codec, CDC_A_MICB_1_EN,
+                                    MICB_1_EN_BYP_CAP_MASK, cap_mode);
+                break;
+        }
+
+        return 0;
+}
+
+static int pm8916_wcd_analog_enable_micbias_int(struct snd_soc_codec
+                                                 *codec, int event,
+                                                 int reg, u32 cap_mode)
+{
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                snd_soc_update_bits(codec, CDC_A_MICB_1_INT_RBIAS,
+                                    MICB_1_INT_TX2_INT_RBIAS_EN_MASK,
+                                    MICB_1_INT_TX2_INT_RBIAS_EN_ENABLE);
+                snd_soc_update_bits(codec, reg, MICB_1_EN_PULL_DOWN_EN_MASK, 0);
+                snd_soc_update_bits(codec, CDC_A_MICB_1_EN,
+                                    MICB_1_EN_OPA_STG2_TAIL_CURR_MASK,
+                                    MICB_1_EN_OPA_STG2_TAIL_CURR_1_60UA);
+
+                break;
+        case SND_SOC_DAPM_POST_PMU:
+                pm8916_wcd_analog_micbias_enable(codec);
+                snd_soc_update_bits(codec, CDC_A_MICB_1_EN,
+                                    MICB_1_EN_BYP_CAP_MASK, cap_mode);
+                break;
+        }
+
+        return 0;
+}
+
+static int pm8916_wcd_analog_enable_micbias_ext1(struct
+                                                  snd_soc_dapm_widget
+                                                  *w, struct snd_kcontrol
+                                                  *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct pm8916_wcd_analog_priv *wcd = snd_soc_codec_get_drvdata(codec);
+
+        return pm8916_wcd_analog_enable_micbias_ext(codec, event, w->reg,
+                                                     wcd->micbias1_cap_mode);
+}
+
+static int pm8916_wcd_analog_enable_micbias_ext2(struct
+                                                  snd_soc_dapm_widget
+                                                  *w, struct snd_kcontrol
+                                                  *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct pm8916_wcd_analog_priv *wcd = snd_soc_codec_get_drvdata(codec);
+
+        return pm8916_wcd_analog_enable_micbias_ext(codec, event, w->reg,
+                                                     wcd->micbias2_cap_mode);
+
+}
+
+static int pm8916_wcd_analog_enable_micbias_int1(struct
+                                                  snd_soc_dapm_widget
+                                                  *w, struct snd_kcontrol
+                                                  *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct pm8916_wcd_analog_priv *wcd = snd_soc_codec_get_drvdata(codec);
+
+        return pm8916_wcd_analog_enable_micbias_int(codec, event, w->reg,
+                                                     wcd->micbias1_cap_mode);
+}
+
+static int pm8916_wcd_analog_enable_micbias_int2(struct
+                                                  snd_soc_dapm_widget
+                                                  *w, struct snd_kcontrol
+                                                  *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct pm8916_wcd_analog_priv *wcd = snd_soc_codec_get_drvdata(codec);
+
+        return pm8916_wcd_analog_enable_micbias_int(codec, event, w->reg,
+                                                     wcd->micbias2_cap_mode);
+}
+
+static int pm8916_wcd_analog_enable_adc(struct snd_soc_dapm_widget *w,
+                                         struct snd_kcontrol *kcontrol,
+                                         int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        u16 adc_reg = CDC_A_TX_1_2_TEST_CTL_2;
+        u8 init_bit_shift;
+
+        if (w->reg == CDC_A_TX_1_EN)
+                init_bit_shift = 5;
+        else
+                init_bit_shift = 4;
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                if (w->reg == CDC_A_TX_2_EN)
+                        snd_soc_update_bits(codec, CDC_A_MICB_1_CTL,
+                                            MICB_1_CTL_CFILT_REF_SEL_MASK,
+                                            MICB_1_CTL_CFILT_REF_SEL_HPF_REF);
+                /*
+                 * Add delay of 10 ms to give sufficient time for the voltage
+                 * to shoot up and settle so that the txfe init does not
+                 * happen when the input voltage is changing too much.
+                 */
+                usleep_range(10000, 10010);
+                snd_soc_update_bits(codec, adc_reg, 1 << init_bit_shift,
+                                    1 << init_bit_shift);
+                switch (w->reg) {
+                case CDC_A_TX_1_EN:
+                        snd_soc_update_bits(codec, CDC_D_CDC_CONN_TX1_CTL,
+                                            CONN_TX1_SERIAL_TX1_MUX,
+                                            CONN_TX1_SERIAL_TX1_ADC_1);
+                        break;
+                case CDC_A_TX_2_EN:
+                case CDC_A_TX_3_EN:
+                        snd_soc_update_bits(codec, CDC_D_CDC_CONN_TX2_CTL,
+                                            CONN_TX2_SERIAL_TX2_MUX,
+                                            CONN_TX2_SERIAL_TX2_ADC_2);
+                        break;
+                }
+                break;
+        case SND_SOC_DAPM_POST_PMU:
+                /*
+                 * Add delay of 12 ms before deasserting the init
+                 * to reduce the tx pop
+                 */
+                usleep_range(12000, 12010);
+                snd_soc_update_bits(codec, adc_reg, 1 << init_bit_shift, 0x00);
+                break;
+        case SND_SOC_DAPM_POST_PMD:
+                switch (w->reg) {
+                case CDC_A_TX_1_EN:
+                        snd_soc_update_bits(codec, CDC_D_CDC_CONN_TX1_CTL,
+                                            CONN_TX1_SERIAL_TX1_MUX,
+                                            CONN_TX1_SERIAL_TX1_ZERO);
+                        break;
+                case CDC_A_TX_2_EN:
+                        snd_soc_update_bits(codec, CDC_A_MICB_1_CTL,
+                                            MICB_1_CTL_CFILT_REF_SEL_MASK, 0);
+                case CDC_A_TX_3_EN:
+                        snd_soc_update_bits(codec, CDC_D_CDC_CONN_TX2_CTL,
+                                            CONN_TX2_SERIAL_TX2_MUX,
+                                            CONN_TX2_SERIAL_TX2_ZERO);
+                        break;
+                }
+
+
+                break;
+        }
+        return 0;
+}
+
+static int pm8916_wcd_analog_enable_spk_pa(struct snd_soc_dapm_widget *w,
+                                            struct snd_kcontrol *kcontrol,
+                                            int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                snd_soc_update_bits(codec, CDC_A_SPKR_PWRSTG_CTL,
+                                    SPKR_PWRSTG_CTL_DAC_EN_MASK |
+                                    SPKR_PWRSTG_CTL_BBM_MASK |
+                                    SPKR_PWRSTG_CTL_HBRDGE_EN_MASK |
+                                    SPKR_PWRSTG_CTL_CLAMP_EN_MASK,
+                                    SPKR_PWRSTG_CTL_DAC_EN|
+                                    SPKR_PWRSTG_CTL_BBM_EN |
+                                    SPKR_PWRSTG_CTL_HBRDGE_EN |
+                                    SPKR_PWRSTG_CTL_CLAMP_EN);
+
+                snd_soc_update_bits(codec, CDC_A_RX_EAR_CTL,
+                                    RX_EAR_CTL_SPK_VBAT_LDO_EN_MASK,
+                                    RX_EAR_CTL_SPK_VBAT_LDO_EN_ENABLE);
+                break;
+        case SND_SOC_DAPM_POST_PMU:
+                snd_soc_update_bits(codec, CDC_A_SPKR_DRV_CTL,
+                                    SPKR_DRV_CTL_DEF_MASK,
+                                    SPKR_DRV_CTL_DEF_VAL);
+                snd_soc_update_bits(codec, w->reg,
+                                    SPKR_DRV_CLASSD_PA_EN_MASK,
+                                    SPKR_DRV_CLASSD_PA_EN_ENABLE);
+                break;
+        case SND_SOC_DAPM_POST_PMD:
+                snd_soc_update_bits(codec, CDC_A_SPKR_PWRSTG_CTL,
+                                    SPKR_PWRSTG_CTL_DAC_EN_MASK|
+                                    SPKR_PWRSTG_CTL_BBM_MASK |
+                                    SPKR_PWRSTG_CTL_HBRDGE_EN_MASK |
+                                    SPKR_PWRSTG_CTL_CLAMP_EN_MASK, 0);
+
+                snd_soc_update_bits(codec, CDC_A_SPKR_DAC_CTL,
+                                    SPKR_DAC_CTL_DAC_RESET_MASK,
+                                    SPKR_DAC_CTL_DAC_RESET_NORMAL);
+                snd_soc_update_bits(codec, CDC_A_RX_EAR_CTL,
+                                    RX_EAR_CTL_SPK_VBAT_LDO_EN_MASK, 0);
+                break;
+        }
+        return 0;
+}
+
+static const struct reg_default wcd_reg_defaults_2_0[] = {
+        {CDC_A_RX_COM_OCP_CTL, 0xD1},
+        {CDC_A_RX_COM_OCP_COUNT, 0xFF},
+        {CDC_D_SEC_ACCESS, 0xA5},
+        {CDC_D_PERPH_RESET_CTL3, 0x0F},
+        {CDC_A_TX_1_2_OPAMP_BIAS, 0x4F},
+        {CDC_A_NCP_FBCTRL, 0x28},
+        {CDC_A_SPKR_DRV_CTL, 0x69},
+        {CDC_A_SPKR_DRV_DBG, 0x01},
+        {CDC_A_BOOST_EN_CTL, 0x5F},
+        {CDC_A_SLOPE_COMP_IP_ZERO, 0x88},
+        {CDC_A_SEC_ACCESS, 0xA5},
+        {CDC_A_PERPH_RESET_CTL3, 0x0F},
+        {CDC_A_CURRENT_LIMIT, 0x82},
+        {CDC_A_SPKR_DAC_CTL, 0x03},
+        {CDC_A_SPKR_OCP_CTL, 0xE1},
+        {CDC_A_MASTER_BIAS_CTL, 0x30},
+};
+
+static int pm8916_wcd_analog_probe(struct snd_soc_codec *codec)
+{
+        struct pm8916_wcd_analog_priv *priv = dev_get_drvdata(codec->dev);
+        int err, reg;
+
+        err = regulator_bulk_enable(ARRAY_SIZE(priv->supplies), priv->supplies);
+        if (err != 0) {
+                dev_err(codec->dev, "failed to enable regulators (%d)\n", err);
+                return err;
+        }
+
+        snd_soc_codec_set_drvdata(codec, priv);
+        priv->pmic_rev = snd_soc_read(codec, CDC_D_REVISION1);
+        priv->codec_version = snd_soc_read(codec, CDC_D_PERPH_SUBTYPE);
+
+        dev_info(codec->dev, "PMIC REV: %d\t CODEC Version: %d\n",
+                 priv->pmic_rev, priv->codec_version);
+
+        snd_soc_write(codec, CDC_D_PERPH_RESET_CTL4, 0x01);
+        snd_soc_write(codec, CDC_A_PERPH_RESET_CTL4, 0x01);
+
+        for (reg = 0; reg < ARRAY_SIZE(wcd_reg_defaults_2_0); reg++)
+                snd_soc_write(codec, wcd_reg_defaults_2_0[reg].reg,
+                              wcd_reg_defaults_2_0[reg].def);
+
+        return 0;
+}
+
+static int pm8916_wcd_analog_remove(struct snd_soc_codec *codec)
+{
+        struct pm8916_wcd_analog_priv *priv = dev_get_drvdata(codec->dev);
+
+        return regulator_bulk_disable(ARRAY_SIZE(priv->supplies),
+                                      priv->supplies);
+}
+
+static const struct snd_soc_dapm_route pm8916_wcd_analog_audio_map[] = {
+
+        {"PDM_RX1", NULL, "PDM Playback"},
+        {"PDM_RX2", NULL, "PDM Playback"},
+        {"PDM_RX3", NULL, "PDM Playback"},
+        {"PDM Capture", NULL, "PDM_TX"},
+
+        /* ADC Connections */
+        {"PDM_TX", NULL, "ADC2"},
+        {"PDM_TX", NULL, "ADC3"},
+        {"ADC2", NULL, "ADC2 MUX"},
+        {"ADC3", NULL, "ADC2 MUX"},
+        {"ADC2 MUX", "INP2", "ADC2_INP2"},
+        {"ADC2 MUX", "INP3", "ADC2_INP3"},
+
+        {"PDM_TX", NULL, "ADC1"},
+        {"ADC1", NULL, "AMIC1"},
+        {"ADC2_INP2", NULL, "AMIC2"},
+        {"ADC2_INP3", NULL, "AMIC3"},
+
+        /* RDAC Connections */
+        {"HPHR DAC", NULL, "RDAC2 MUX"},
+        {"RDAC2 MUX", "RX1", "PDM_RX1"},
+        {"RDAC2 MUX", "RX2", "PDM_RX2"},
+        {"HPHL DAC", NULL, "PDM_RX1"},
+        {"PDM_RX1", NULL, "RXD1_CLK"},
+        {"PDM_RX2", NULL, "RXD2_CLK"},
+        {"PDM_RX3", NULL, "RXD3_CLK"},
+
+        {"PDM_RX1", NULL, "RXD_PDM_CLK"},
+        {"PDM_RX2", NULL, "RXD_PDM_CLK"},
+        {"PDM_RX3", NULL, "RXD_PDM_CLK"},
+
+        {"ADC1", NULL, "TXD_CLK"},
+        {"ADC2", NULL, "TXD_CLK"},
+        {"ADC3", NULL, "TXD_CLK"},
+
+        {"ADC1", NULL, "TXA_CLK25"},
+        {"ADC2", NULL, "TXA_CLK25"},
+        {"ADC3", NULL, "TXA_CLK25"},
+
+        {"PDM_RX1", NULL, "A_MCLK2"},
+        {"PDM_RX2", NULL, "A_MCLK2"},
+        {"PDM_RX3", NULL, "A_MCLK2"},
+
+        {"PDM_TX", NULL, "A_MCLK2"},
+        {"A_MCLK2", NULL, "A_MCLK"},
+
+        /* Headset (RX MIX1 and RX MIX2) */
+        {"HEADPHONE", NULL, "HPHL PA"},
+        {"HEADPHONE", NULL, "HPHR PA"},
+
+        {"HPHL PA", NULL, "EAR_HPHL_CLK"},
+        {"HPHR PA", NULL, "EAR_HPHR_CLK"},
+
+        {"CP", NULL, "NCP_CLK"},
+
+        {"HPHL PA", NULL, "HPHL"},
+        {"HPHR PA", NULL, "HPHR"},
+        {"HPHL PA", NULL, "CP"},
+        {"HPHL PA", NULL, "RX_BIAS"},
+        {"HPHR PA", NULL, "CP"},
+        {"HPHR PA", NULL, "RX_BIAS"},
+        {"HPHL", "Switch", "HPHL DAC"},
+        {"HPHR", "Switch", "HPHR DAC"},
+
+        {"RX_BIAS", NULL, "DAC_REF"},
+
+        {"SPK_OUT", NULL, "SPK PA"},
+        {"SPK PA", NULL, "RX_BIAS"},
+        {"SPK PA", NULL, "SPKR_CLK"},
+        {"SPK PA", NULL, "SPK DAC"},
+        {"SPK DAC", "Switch", "PDM_RX3"},
+
+        {"MIC BIAS Internal1", NULL, "INT_LDO_H"},
+        {"MIC BIAS Internal2", NULL, "INT_LDO_H"},
+        {"MIC BIAS External1", NULL, "INT_LDO_H"},
+        {"MIC BIAS External2", NULL, "INT_LDO_H"},
+        {"MIC BIAS Internal1", NULL, "vdd-micbias"},
+        {"MIC BIAS Internal2", NULL, "vdd-micbias"},
+        {"MIC BIAS External1", NULL, "vdd-micbias"},
+        {"MIC BIAS External2", NULL, "vdd-micbias"},
+};
+
+static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
+
+        SND_SOC_DAPM_AIF_IN("PDM_RX1", NULL, 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("PDM_RX2", NULL, 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("PDM_RX3", NULL, 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("PDM_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
+
+        SND_SOC_DAPM_INPUT("AMIC1"),
+        SND_SOC_DAPM_INPUT("AMIC3"),
+        SND_SOC_DAPM_INPUT("AMIC2"),
+        SND_SOC_DAPM_OUTPUT("HEADPHONE"),
+
+        /* RX stuff */
+        SND_SOC_DAPM_SUPPLY("INT_LDO_H", SND_SOC_NOPM, 1, 0, NULL, 0),
+
+        SND_SOC_DAPM_PGA("HPHL PA", CDC_A_RX_HPH_CNP_EN, 5, 0, NULL, 0),
+        SND_SOC_DAPM_MUX("HPHL", SND_SOC_NOPM, 0, 0, &hphl_mux),
+        SND_SOC_DAPM_MIXER("HPHL DAC", CDC_A_RX_HPH_L_PA_DAC_CTL, 3, 0, NULL,
+                           0),
+        SND_SOC_DAPM_PGA("HPHR PA", CDC_A_RX_HPH_CNP_EN, 4, 0, NULL, 0),
+        SND_SOC_DAPM_MUX("HPHR", SND_SOC_NOPM, 0, 0, &hphr_mux),
+        SND_SOC_DAPM_MIXER("HPHR DAC", CDC_A_RX_HPH_R_PA_DAC_CTL, 3, 0, NULL,
+                           0),
+        SND_SOC_DAPM_MIXER("SPK DAC", SND_SOC_NOPM, 0, 0,
+                           spkr_switch, ARRAY_SIZE(spkr_switch)),
+
+        /* Speaker */
+        SND_SOC_DAPM_OUTPUT("SPK_OUT"),
+        SND_SOC_DAPM_PGA_E("SPK PA", CDC_A_SPKR_DRV_CTL,
+                           6, 0, NULL, 0,
+                           pm8916_wcd_analog_enable_spk_pa,
+                           SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+                           SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_REGULATOR_SUPPLY("vdd-micbias", 0, 0),
+        SND_SOC_DAPM_SUPPLY("CP", CDC_A_NCP_EN, 0, 0, NULL, 0),
+
+        SND_SOC_DAPM_SUPPLY("DAC_REF", CDC_A_RX_COM_BIAS_DAC, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("RX_BIAS", CDC_A_RX_COM_BIAS_DAC, 7, 0, NULL, 0),
+
+        /* TX */
+        SND_SOC_DAPM_SUPPLY("MIC BIAS Internal1", CDC_A_MICB_1_EN, 7, 0,
+                            pm8916_wcd_analog_enable_micbias_int1,
+                            SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+                            SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_SUPPLY("MIC BIAS Internal2", CDC_A_MICB_2_EN, 7, 0,
+                            pm8916_wcd_analog_enable_micbias_int2,
+                            SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+                            SND_SOC_DAPM_POST_PMD),
+
+        SND_SOC_DAPM_SUPPLY("MIC BIAS External1", CDC_A_MICB_1_EN, 7, 0,
+                            pm8916_wcd_analog_enable_micbias_ext1,
+                            SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_SUPPLY("MIC BIAS External2", CDC_A_MICB_2_EN, 7, 0,
+                            pm8916_wcd_analog_enable_micbias_ext2,
+                            SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+
+        SND_SOC_DAPM_ADC_E("ADC1", NULL, CDC_A_TX_1_EN, 7, 0,
+                           pm8916_wcd_analog_enable_adc,
+                           SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+                           SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_ADC_E("ADC2_INP2", NULL, CDC_A_TX_2_EN, 7, 0,
+                           pm8916_wcd_analog_enable_adc,
+                           SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+                           SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_ADC_E("ADC2_INP3", NULL, CDC_A_TX_3_EN, 7, 0,
+                           pm8916_wcd_analog_enable_adc,
+                           SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+                           SND_SOC_DAPM_POST_PMD),
+
+        SND_SOC_DAPM_MIXER("ADC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("ADC3", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        SND_SOC_DAPM_MUX("ADC2 MUX", SND_SOC_NOPM, 0, 0, &tx_adc2_mux),
+        SND_SOC_DAPM_MUX("RDAC2 MUX", SND_SOC_NOPM, 0, 0, &rdac2_mux),
+
+        /* Analog path clocks */
+        SND_SOC_DAPM_SUPPLY("EAR_HPHR_CLK", CDC_D_CDC_ANA_CLK_CTL, 0, 0, NULL,
+                            0),
+        SND_SOC_DAPM_SUPPLY("EAR_HPHL_CLK", CDC_D_CDC_ANA_CLK_CTL, 1, 0, NULL,
+                            0),
+        SND_SOC_DAPM_SUPPLY("SPKR_CLK", CDC_D_CDC_ANA_CLK_CTL, 4, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("TXA_CLK25", CDC_D_CDC_ANA_CLK_CTL, 5, 0, NULL, 0),
+
+        /* Digital path clocks */
+
+        SND_SOC_DAPM_SUPPLY("RXD1_CLK", CDC_D_CDC_DIG_CLK_CTL, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("RXD2_CLK", CDC_D_CDC_DIG_CLK_CTL, 1, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("RXD3_CLK", CDC_D_CDC_DIG_CLK_CTL, 2, 0, NULL, 0),
+
+        SND_SOC_DAPM_SUPPLY("TXD_CLK", CDC_D_CDC_DIG_CLK_CTL, 4, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("NCP_CLK", CDC_D_CDC_DIG_CLK_CTL, 6, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("RXD_PDM_CLK", CDC_D_CDC_DIG_CLK_CTL, 7, 0, NULL,
+                            0),
+
+        /* System Clock source */
+        SND_SOC_DAPM_SUPPLY("A_MCLK", CDC_D_CDC_TOP_CLK_CTL, 2, 0, NULL, 0),
+        /* TX ADC and RX DAC Clock source. */
+        SND_SOC_DAPM_SUPPLY("A_MCLK2", CDC_D_CDC_TOP_CLK_CTL, 3, 0, NULL, 0),
+};
+
+static struct regmap *pm8916_get_regmap(struct device *dev)
+{
+        return dev_get_regmap(dev->parent, NULL);
+}
+
+static int pm8916_wcd_analog_startup(struct snd_pcm_substream *substream,
+                                      struct snd_soc_dai *dai)
+{
+        snd_soc_update_bits(dai->codec, CDC_D_CDC_RST_CTL,
+                            RST_CTL_DIG_SW_RST_N_MASK,
+                            RST_CTL_DIG_SW_RST_N_REMOVE_RESET);
+
+        return 0;
+}
+
+static void pm8916_wcd_analog_shutdown(struct snd_pcm_substream *substream,
+                                         struct snd_soc_dai *dai)
+{
+        snd_soc_update_bits(dai->codec, CDC_D_CDC_RST_CTL,
+                            RST_CTL_DIG_SW_RST_N_MASK, 0);
+}
+
+static struct snd_soc_dai_ops pm8916_wcd_analog_dai_ops = {
+        .startup = pm8916_wcd_analog_startup,
+        .shutdown = pm8916_wcd_analog_shutdown,
+};
+
+static struct snd_soc_dai_driver pm8916_wcd_analog_dai[] = {
+        [0] = {
+               .name = "pm8916_wcd_analog_pdm_rx",
+               .id = 0,
+               .playback = {
+                            .stream_name = "PDM Playback",
+                            .rates = MSM8916_WCD_ANALOG_RATES,
+                            .formats = MSM8916_WCD_ANALOG_FORMATS,
+                            .channels_min = 1,
+                            .channels_max = 3,
+                            },
+               .ops = &pm8916_wcd_analog_dai_ops,
+               },
+        [1] = {
+               .name = "pm8916_wcd_analog_pdm_tx",
+               .id = 1,
+               .capture = {
+                           .stream_name = "PDM Capture",
+                           .rates = MSM8916_WCD_ANALOG_RATES,
+                           .formats = MSM8916_WCD_ANALOG_FORMATS,
+                           .channels_min = 1,
+                           .channels_max = 4,
+                           },
+               .ops = &pm8916_wcd_analog_dai_ops,
+               },
+};
+
+static struct snd_soc_codec_driver pm8916_wcd_analog = {
+        .probe = pm8916_wcd_analog_probe,
+        .remove = pm8916_wcd_analog_remove,
+        .get_regmap = pm8916_get_regmap,
+        .component_driver = {
+                .controls = pm8916_wcd_analog_snd_controls,
+                .num_controls = ARRAY_SIZE(pm8916_wcd_analog_snd_controls),
+                .dapm_widgets = pm8916_wcd_analog_dapm_widgets,
+                .num_dapm_widgets = ARRAY_SIZE(pm8916_wcd_analog_dapm_widgets),
+                .dapm_routes = pm8916_wcd_analog_audio_map,
+                .num_dapm_routes = ARRAY_SIZE(pm8916_wcd_analog_audio_map),
+        },
+};
+
+static int pm8916_wcd_analog_parse_dt(struct device *dev,
+                                       struct pm8916_wcd_analog_priv *priv)
+{
+
+        if (of_property_read_bool(dev->of_node, "qcom,micbias1-ext-cap"))
+                priv->micbias1_cap_mode = MICB_1_EN_EXT_BYP_CAP;
+        else
+                priv->micbias1_cap_mode = MICB_1_EN_NO_EXT_BYP_CAP;
+
+        if (of_property_read_bool(dev->of_node, "qcom,micbias2-ext-cap"))
+                priv->micbias2_cap_mode = MICB_1_EN_EXT_BYP_CAP;
+        else
+                priv->micbias2_cap_mode = MICB_1_EN_NO_EXT_BYP_CAP;
+
+        return 0;
+}
+
+static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)
+{
+        struct pm8916_wcd_analog_priv *priv;
+        struct device *dev = &pdev->dev;
+        int ret, i;
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        ret = pm8916_wcd_analog_parse_dt(dev, priv);
+        if (ret < 0)
+                return ret;
+
+        priv->mclk = devm_clk_get(dev, "mclk");
+        if (IS_ERR(priv->mclk)) {
+                dev_err(dev, "failed to get mclk\n");
+                return PTR_ERR(priv->mclk);
+        }
+
+        for (i = 0; i < ARRAY_SIZE(supply_names); i++)
+                priv->supplies[i].supply = supply_names[i];
+
+        ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(priv->supplies),
+                                    priv->supplies);
+        if (ret) {
+                dev_err(dev, "Failed to get regulator supplies %d\n", ret);
+                return ret;
+        }
+
+        ret = clk_prepare_enable(priv->mclk);
+        if (ret < 0) {
+                dev_err(dev, "failed to enable mclk %d\n", ret);
+                return ret;
+        }
+
+        dev_set_drvdata(dev, priv);
+
+        return snd_soc_register_codec(dev, &pm8916_wcd_analog,
+                                      pm8916_wcd_analog_dai,
+                                      ARRAY_SIZE(pm8916_wcd_analog_dai));
+}
+
+static int pm8916_wcd_analog_spmi_remove(struct platform_device *pdev)
+{
+        struct pm8916_wcd_analog_priv *priv = dev_get_drvdata(&pdev->dev);
+
+        snd_soc_unregister_codec(&pdev->dev);
+        clk_disable_unprepare(priv->mclk);
+
+        return 0;
+}
+
+static const struct of_device_id pm8916_wcd_analog_spmi_match_table[] = {
+        { .compatible = "qcom,pm8916-wcd-analog-codec", },
+        { }
+};
+
+static struct platform_driver pm8916_wcd_analog_spmi_driver = {
+        .driver = {
+                   .name = "qcom,pm8916-wcd-spmi-codec",
+                   .of_match_table = pm8916_wcd_analog_spmi_match_table,
+        },
+        .probe = pm8916_wcd_analog_spmi_probe,
+        .remove = pm8916_wcd_analog_spmi_remove,
+};
+
+module_platform_driver(pm8916_wcd_analog_spmi_driver);
+
+MODULE_AUTHOR("Srinivas Kandagatla <srinivas.kandagatla@linaro.org>");
+MODULE_DESCRIPTION("PMIC PM8916 WCD Analog Codec driver");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c
new file mode 100644
index 000000000000..f690442af8c9
--- /dev/null
+++ b/sound/soc/codecs/msm8916-wcd-digital.c
@@ -0,0 +1,923 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/types.h>
+#include <linux/clk.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
+#include <sound/soc.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/tlv.h>
+
+#define LPASS_CDC_CLK_RX_RESET_CTL              (0x000)
+#define LPASS_CDC_CLK_TX_RESET_B1_CTL           (0x004)
+#define CLK_RX_RESET_B1_CTL_TX1_RESET_MASK      BIT(0)
+#define CLK_RX_RESET_B1_CTL_TX2_RESET_MASK      BIT(1)
+#define LPASS_CDC_CLK_DMIC_B1_CTL               (0x008)
+#define DMIC_B1_CTL_DMIC0_CLK_SEL_MASK          GENMASK(3, 1)
+#define DMIC_B1_CTL_DMIC0_CLK_SEL_DIV2          (0x0 << 1)
+#define DMIC_B1_CTL_DMIC0_CLK_SEL_DIV3          (0x1 << 1)
+#define DMIC_B1_CTL_DMIC0_CLK_SEL_DIV4          (0x2 << 1)
+#define DMIC_B1_CTL_DMIC0_CLK_SEL_DIV6          (0x3 << 1)
+#define DMIC_B1_CTL_DMIC0_CLK_SEL_DIV16         (0x4 << 1)
+#define DMIC_B1_CTL_DMIC0_CLK_EN_MASK           BIT(0)
+#define DMIC_B1_CTL_DMIC0_CLK_EN_ENABLE         BIT(0)
+
+#define LPASS_CDC_CLK_RX_I2S_CTL                (0x00C)
+#define RX_I2S_CTL_RX_I2S_MODE_MASK             BIT(5)
+#define RX_I2S_CTL_RX_I2S_MODE_16               BIT(5)
+#define RX_I2S_CTL_RX_I2S_MODE_32               0
+#define RX_I2S_CTL_RX_I2S_FS_RATE_MASK          GENMASK(2, 0)
+#define RX_I2S_CTL_RX_I2S_FS_RATE_F_8_KHZ       0x0
+#define RX_I2S_CTL_RX_I2S_FS_RATE_F_16_KHZ      0x1
+#define RX_I2S_CTL_RX_I2S_FS_RATE_F_32_KHZ      0x2
+#define RX_I2S_CTL_RX_I2S_FS_RATE_F_48_KHZ      0x3
+#define RX_I2S_CTL_RX_I2S_FS_RATE_F_96_KHZ      0x4
+#define RX_I2S_CTL_RX_I2S_FS_RATE_F_192_KHZ     0x5
+#define LPASS_CDC_CLK_TX_I2S_CTL                (0x010)
+#define TX_I2S_CTL_TX_I2S_MODE_MASK             BIT(5)
+#define TX_I2S_CTL_TX_I2S_MODE_16               BIT(5)
+#define TX_I2S_CTL_TX_I2S_MODE_32               0
+#define TX_I2S_CTL_TX_I2S_FS_RATE_MASK          GENMASK(2, 0)
+#define TX_I2S_CTL_TX_I2S_FS_RATE_F_8_KHZ       0x0
+#define TX_I2S_CTL_TX_I2S_FS_RATE_F_16_KHZ      0x1
+#define TX_I2S_CTL_TX_I2S_FS_RATE_F_32_KHZ      0x2
+#define TX_I2S_CTL_TX_I2S_FS_RATE_F_48_KHZ      0x3
+#define TX_I2S_CTL_TX_I2S_FS_RATE_F_96_KHZ      0x4
+#define TX_I2S_CTL_TX_I2S_FS_RATE_F_192_KHZ     0x5
+
+#define LPASS_CDC_CLK_OTHR_RESET_B1_CTL         (0x014)
+#define LPASS_CDC_CLK_TX_CLK_EN_B1_CTL          (0x018)
+#define LPASS_CDC_CLK_OTHR_CTL                  (0x01C)
+#define LPASS_CDC_CLK_RX_B1_CTL                 (0x020)
+#define LPASS_CDC_CLK_MCLK_CTL                  (0x024)
+#define MCLK_CTL_MCLK_EN_MASK                   BIT(0)
+#define MCLK_CTL_MCLK_EN_ENABLE                 BIT(0)
+#define MCLK_CTL_MCLK_EN_DISABLE                0
+#define LPASS_CDC_CLK_PDM_CTL                   (0x028)
+#define LPASS_CDC_CLK_PDM_CTL_PDM_EN_MASK       BIT(0)
+#define LPASS_CDC_CLK_PDM_CTL_PDM_EN            BIT(0)
+#define LPASS_CDC_CLK_PDM_CTL_PDM_CLK_SEL_MASK  BIT(1)
+#define LPASS_CDC_CLK_PDM_CTL_PDM_CLK_SEL_FB    BIT(1)
+#define LPASS_CDC_CLK_PDM_CTL_PDM_CLK_PDM_CLK   0
+
+#define LPASS_CDC_CLK_SD_CTL                    (0x02C)
+#define LPASS_CDC_RX1_B1_CTL                    (0x040)
+#define LPASS_CDC_RX2_B1_CTL                    (0x060)
+#define LPASS_CDC_RX3_B1_CTL                    (0x080)
+#define LPASS_CDC_RX1_B2_CTL                    (0x044)
+#define LPASS_CDC_RX2_B2_CTL                    (0x064)
+#define LPASS_CDC_RX3_B2_CTL                    (0x084)
+#define LPASS_CDC_RX1_B3_CTL                    (0x048)
+#define LPASS_CDC_RX2_B3_CTL                    (0x068)
+#define LPASS_CDC_RX3_B3_CTL                    (0x088)
+#define LPASS_CDC_RX1_B4_CTL                    (0x04C)
+#define LPASS_CDC_RX2_B4_CTL                    (0x06C)
+#define LPASS_CDC_RX3_B4_CTL                    (0x08C)
+#define LPASS_CDC_RX1_B5_CTL                    (0x050)
+#define LPASS_CDC_RX2_B5_CTL                    (0x070)
+#define LPASS_CDC_RX3_B5_CTL                    (0x090)
+#define LPASS_CDC_RX1_B6_CTL                    (0x054)
+#define RXn_B6_CTL_MUTE_MASK                    BIT(0)
+#define RXn_B6_CTL_MUTE_ENABLE                  BIT(0)
+#define RXn_B6_CTL_MUTE_DISABLE                 0
+#define LPASS_CDC_RX2_B6_CTL                    (0x074)
+#define LPASS_CDC_RX3_B6_CTL                    (0x094)
+#define LPASS_CDC_RX1_VOL_CTL_B1_CTL            (0x058)
+#define LPASS_CDC_RX2_VOL_CTL_B1_CTL            (0x078)
+#define LPASS_CDC_RX3_VOL_CTL_B1_CTL            (0x098)
+#define LPASS_CDC_RX1_VOL_CTL_B2_CTL            (0x05C)
+#define LPASS_CDC_RX2_VOL_CTL_B2_CTL            (0x07C)
+#define LPASS_CDC_RX3_VOL_CTL_B2_CTL            (0x09C)
+#define LPASS_CDC_TOP_GAIN_UPDATE               (0x0A0)
+#define LPASS_CDC_TOP_CTL                       (0x0A4)
+#define TOP_CTL_DIG_MCLK_FREQ_MASK              BIT(0)
+#define TOP_CTL_DIG_MCLK_FREQ_F_12_288MHZ       0
+#define TOP_CTL_DIG_MCLK_FREQ_F_9_6MHZ          BIT(0)
+
+#define LPASS_CDC_DEBUG_DESER1_CTL              (0x0E0)
+#define LPASS_CDC_DEBUG_DESER2_CTL              (0x0E4)
+#define LPASS_CDC_DEBUG_B1_CTL_CFG              (0x0E8)
+#define LPASS_CDC_DEBUG_B2_CTL_CFG              (0x0EC)
+#define LPASS_CDC_DEBUG_B3_CTL_CFG              (0x0F0)
+#define LPASS_CDC_IIR1_GAIN_B1_CTL              (0x100)
+#define LPASS_CDC_IIR2_GAIN_B1_CTL              (0x140)
+#define LPASS_CDC_IIR1_GAIN_B2_CTL              (0x104)
+#define LPASS_CDC_IIR2_GAIN_B2_CTL              (0x144)
+#define LPASS_CDC_IIR1_GAIN_B3_CTL              (0x108)
+#define LPASS_CDC_IIR2_GAIN_B3_CTL              (0x148)
+#define LPASS_CDC_IIR1_GAIN_B4_CTL              (0x10C)
+#define LPASS_CDC_IIR2_GAIN_B4_CTL              (0x14C)
+#define LPASS_CDC_IIR1_GAIN_B5_CTL              (0x110)
+#define LPASS_CDC_IIR2_GAIN_B5_CTL              (0x150)
+#define LPASS_CDC_IIR1_GAIN_B6_CTL              (0x114)
+#define LPASS_CDC_IIR2_GAIN_B6_CTL              (0x154)
+#define LPASS_CDC_IIR1_GAIN_B7_CTL              (0x118)
+#define LPASS_CDC_IIR2_GAIN_B7_CTL              (0x158)
+#define LPASS_CDC_IIR1_GAIN_B8_CTL              (0x11C)
+#define LPASS_CDC_IIR2_GAIN_B8_CTL              (0x15C)
+#define LPASS_CDC_IIR1_CTL                      (0x120)
+#define LPASS_CDC_IIR2_CTL                      (0x160)
+#define LPASS_CDC_IIR1_GAIN_TIMER_CTL           (0x124)
+#define LPASS_CDC_IIR2_GAIN_TIMER_CTL           (0x164)
+#define LPASS_CDC_IIR1_COEF_B1_CTL              (0x128)
+#define LPASS_CDC_IIR2_COEF_B1_CTL              (0x168)
+#define LPASS_CDC_IIR1_COEF_B2_CTL              (0x12C)
+#define LPASS_CDC_IIR2_COEF_B2_CTL              (0x16C)
+#define LPASS_CDC_CONN_RX1_B1_CTL               (0x180)
+#define LPASS_CDC_CONN_RX1_B2_CTL               (0x184)
+#define LPASS_CDC_CONN_RX1_B3_CTL               (0x188)
+#define LPASS_CDC_CONN_RX2_B1_CTL               (0x18C)
+#define LPASS_CDC_CONN_RX2_B2_CTL               (0x190)
+#define LPASS_CDC_CONN_RX2_B3_CTL               (0x194)
+#define LPASS_CDC_CONN_RX3_B1_CTL               (0x198)
+#define LPASS_CDC_CONN_RX3_B2_CTL               (0x19C)
+#define LPASS_CDC_CONN_TX_B1_CTL                (0x1A0)
+#define LPASS_CDC_CONN_EQ1_B1_CTL               (0x1A8)
+#define LPASS_CDC_CONN_EQ1_B2_CTL               (0x1AC)
+#define LPASS_CDC_CONN_EQ1_B3_CTL               (0x1B0)
+#define LPASS_CDC_CONN_EQ1_B4_CTL               (0x1B4)
+#define LPASS_CDC_CONN_EQ2_B1_CTL               (0x1B8)
+#define LPASS_CDC_CONN_EQ2_B2_CTL               (0x1BC)
+#define LPASS_CDC_CONN_EQ2_B3_CTL               (0x1C0)
+#define LPASS_CDC_CONN_EQ2_B4_CTL               (0x1C4)
+#define LPASS_CDC_CONN_TX_I2S_SD1_CTL           (0x1C8)
+#define LPASS_CDC_TX1_VOL_CTL_TIMER             (0x280)
+#define LPASS_CDC_TX2_VOL_CTL_TIMER             (0x2A0)
+#define LPASS_CDC_TX1_VOL_CTL_GAIN              (0x284)
+#define LPASS_CDC_TX2_VOL_CTL_GAIN              (0x2A4)
+#define LPASS_CDC_TX1_VOL_CTL_CFG               (0x288)
+#define TX_VOL_CTL_CFG_MUTE_EN_MASK             BIT(0)
+#define TX_VOL_CTL_CFG_MUTE_EN_ENABLE           BIT(0)
+
+#define LPASS_CDC_TX2_VOL_CTL_CFG               (0x2A8)
+#define LPASS_CDC_TX1_MUX_CTL                   (0x28C)
+#define TX_MUX_CTL_CUT_OFF_FREQ_MASK            GENMASK(5, 4)
+#define TX_MUX_CTL_CUT_OFF_FREQ_SHIFT           4
+#define TX_MUX_CTL_CF_NEG_3DB_4HZ               (0x0 << 4)
+#define TX_MUX_CTL_CF_NEG_3DB_75HZ              (0x1 << 4)
+#define TX_MUX_CTL_CF_NEG_3DB_150HZ             (0x2 << 4)
+#define TX_MUX_CTL_HPF_BP_SEL_MASK              BIT(3)
+#define TX_MUX_CTL_HPF_BP_SEL_BYPASS            BIT(3)
+#define TX_MUX_CTL_HPF_BP_SEL_NO_BYPASS         0
+
+#define LPASS_CDC_TX2_MUX_CTL                   (0x2AC)
+#define LPASS_CDC_TX1_CLK_FS_CTL                (0x290)
+#define LPASS_CDC_TX2_CLK_FS_CTL                (0x2B0)
+#define LPASS_CDC_TX1_DMIC_CTL                  (0x294)
+#define LPASS_CDC_TX2_DMIC_CTL                  (0x2B4)
+#define TXN_DMIC_CTL_CLK_SEL_MASK               GENMASK(2, 0)
+#define TXN_DMIC_CTL_CLK_SEL_DIV2               0x0
+#define TXN_DMIC_CTL_CLK_SEL_DIV3               0x1
+#define TXN_DMIC_CTL_CLK_SEL_DIV4               0x2
+#define TXN_DMIC_CTL_CLK_SEL_DIV6               0x3
+#define TXN_DMIC_CTL_CLK_SEL_DIV16              0x4
+
+#define MSM8916_WCD_DIGITAL_RATES (SNDRV_PCM_RATE_8000 | \
+                                   SNDRV_PCM_RATE_16000 | \
+                                   SNDRV_PCM_RATE_32000 | \
+                                   SNDRV_PCM_RATE_48000)
+#define MSM8916_WCD_DIGITAL_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\
+                                     SNDRV_PCM_FMTBIT_S24_LE)
+
+struct msm8916_wcd_digital_priv {
+        struct clk *ahbclk, *mclk;
+};
+
+static const unsigned long rx_gain_reg[] = {
+        LPASS_CDC_RX1_VOL_CTL_B2_CTL,
+        LPASS_CDC_RX2_VOL_CTL_B2_CTL,
+        LPASS_CDC_RX3_VOL_CTL_B2_CTL,
+};
+
+static const unsigned long tx_gain_reg[] = {
+        LPASS_CDC_TX1_VOL_CTL_GAIN,
+        LPASS_CDC_TX2_VOL_CTL_GAIN,
+};
+
+static const char *const rx_mix1_text[] = {
+        "ZERO", "IIR1", "IIR2", "RX1", "RX2", "RX3"
+};
+
+static const char *const dec_mux_text[] = {
+        "ZERO", "ADC1", "ADC2", "ADC3", "DMIC1", "DMIC2"
+};
+static const char *const rx_mix2_text[] = { "ZERO", "IIR1", "IIR2" };
+static const char *const adc2_mux_text[] = { "ZERO", "INP2", "INP3" };
+
+/* RX1 MIX1 */
+static const struct soc_enum rx_mix1_inp_enum[] = {
+        SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX1_B1_CTL, 0, 6, rx_mix1_text),
+        SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX1_B1_CTL, 3, 6, rx_mix1_text),
+        SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX1_B2_CTL, 0, 6, rx_mix1_text),
+};
+
+/* RX1 MIX2 */
+static const struct soc_enum rx_mix2_inp1_chain_enum = SOC_ENUM_SINGLE(
+                                LPASS_CDC_CONN_RX1_B3_CTL, 0, 3, rx_mix2_text);
+
+/* RX2 MIX1 */
+static const struct soc_enum rx2_mix1_inp_enum[] = {
+        SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 0, 6, rx_mix1_text),
+        SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 3, 6, rx_mix1_text),
+        SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 0, 6, rx_mix1_text),
+};
+
+/* RX2 MIX2 */
+static const struct soc_enum rx2_mix2_inp1_chain_enum = SOC_ENUM_SINGLE(
+                                LPASS_CDC_CONN_RX2_B3_CTL, 0, 3, rx_mix2_text);
+
+/* RX3 MIX1 */
+static const struct soc_enum rx3_mix1_inp_enum[] = {
+        SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 0, 6, rx_mix1_text),
+        SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 3, 6, rx_mix1_text),
+        SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 0, 6, rx_mix1_text),
+};
+
+/* DEC */
+static const struct soc_enum dec1_mux_enum = SOC_ENUM_SINGLE(
+                                LPASS_CDC_CONN_TX_B1_CTL, 0, 6, dec_mux_text);
+static const struct soc_enum dec2_mux_enum = SOC_ENUM_SINGLE(
+                                LPASS_CDC_CONN_TX_B1_CTL, 3, 6, dec_mux_text);
+
+/* RDAC2 MUX */
+static const struct snd_kcontrol_new dec1_mux = SOC_DAPM_ENUM(
+                                "DEC1 MUX Mux", dec1_mux_enum);
+static const struct snd_kcontrol_new dec2_mux = SOC_DAPM_ENUM(
+                                "DEC2 MUX Mux", dec2_mux_enum);
+static const struct snd_kcontrol_new rx_mix1_inp1_mux = SOC_DAPM_ENUM(
+                                "RX1 MIX1 INP1 Mux", rx_mix1_inp_enum[0]);
+static const struct snd_kcontrol_new rx_mix1_inp2_mux = SOC_DAPM_ENUM(
+                                "RX1 MIX1 INP2 Mux", rx_mix1_inp_enum[1]);
+static const struct snd_kcontrol_new rx_mix1_inp3_mux = SOC_DAPM_ENUM(
+                                "RX1 MIX1 INP3 Mux", rx_mix1_inp_enum[2]);
+static const struct snd_kcontrol_new rx2_mix1_inp1_mux = SOC_DAPM_ENUM(
+                                "RX2 MIX1 INP1 Mux", rx2_mix1_inp_enum[0]);
+static const struct snd_kcontrol_new rx2_mix1_inp2_mux = SOC_DAPM_ENUM(
+                                "RX2 MIX1 INP2 Mux", rx2_mix1_inp_enum[1]);
+static const struct snd_kcontrol_new rx2_mix1_inp3_mux = SOC_DAPM_ENUM(
+                                "RX2 MIX1 INP3 Mux", rx2_mix1_inp_enum[2]);
+static const struct snd_kcontrol_new rx3_mix1_inp1_mux = SOC_DAPM_ENUM(
+                                "RX3 MIX1 INP1 Mux", rx3_mix1_inp_enum[0]);
+static const struct snd_kcontrol_new rx3_mix1_inp2_mux = SOC_DAPM_ENUM(
+                                "RX3 MIX1 INP2 Mux", rx3_mix1_inp_enum[1]);
+static const struct snd_kcontrol_new rx3_mix1_inp3_mux = SOC_DAPM_ENUM(
+                                "RX3 MIX1 INP3 Mux", rx3_mix1_inp_enum[2]);
+
+/* Digital Gain control -38.4 dB to +38.4 dB in 0.3 dB steps */
+static const DECLARE_TLV_DB_SCALE(digital_gain, -3840, 30, 0);
+
+/* Cutoff Freq for High Pass Filter at -3dB */
+static const char * const hpf_cutoff_text[] = {
+        "4Hz", "75Hz", "150Hz",
+};
+
+static SOC_ENUM_SINGLE_DECL(tx1_hpf_cutoff_enum, LPASS_CDC_TX1_MUX_CTL, 4,
+                            hpf_cutoff_text);
+static SOC_ENUM_SINGLE_DECL(tx2_hpf_cutoff_enum, LPASS_CDC_TX2_MUX_CTL, 4,
+                            hpf_cutoff_text);
+
+/* cut off for dc blocker inside rx chain */
+static const char * const dc_blocker_cutoff_text[] = {
+        "4Hz", "75Hz", "150Hz",
+};
+
+static SOC_ENUM_SINGLE_DECL(rx1_dcb_cutoff_enum, LPASS_CDC_RX1_B4_CTL, 0,
+                            dc_blocker_cutoff_text);
+static SOC_ENUM_SINGLE_DECL(rx2_dcb_cutoff_enum, LPASS_CDC_RX2_B4_CTL, 0,
+                            dc_blocker_cutoff_text);
+static SOC_ENUM_SINGLE_DECL(rx3_dcb_cutoff_enum, LPASS_CDC_RX3_B4_CTL, 0,
+                            dc_blocker_cutoff_text);
+
+static const struct snd_kcontrol_new msm8916_wcd_digital_snd_controls[] = {
+        SOC_SINGLE_S8_TLV("RX1 Digital Volume", LPASS_CDC_RX1_VOL_CTL_B2_CTL,
+                          -128, 127, digital_gain),
+        SOC_SINGLE_S8_TLV("RX2 Digital Volume", LPASS_CDC_RX2_VOL_CTL_B2_CTL,
+                          -128, 127, digital_gain),
+        SOC_SINGLE_S8_TLV("RX3 Digital Volume", LPASS_CDC_RX3_VOL_CTL_B2_CTL,
+                          -128, 127, digital_gain),
+        SOC_SINGLE_S8_TLV("TX1 Digital Volume", LPASS_CDC_TX1_VOL_CTL_GAIN,
+                          -128, 127, digital_gain),
+        SOC_SINGLE_S8_TLV("TX2 Digital Volume", LPASS_CDC_TX2_VOL_CTL_GAIN,
+                          -128, 127, digital_gain),
+        SOC_ENUM("TX1 HPF Cutoff", tx1_hpf_cutoff_enum),
+        SOC_ENUM("TX2 HPF Cutoff", tx2_hpf_cutoff_enum),
+        SOC_SINGLE("TX1 HPF Switch", LPASS_CDC_TX1_MUX_CTL, 3, 1, 0),
+        SOC_SINGLE("TX2 HPF Switch", LPASS_CDC_TX2_MUX_CTL, 3, 1, 0),
+        SOC_ENUM("RX1 DCB Cutoff", rx1_dcb_cutoff_enum),
+        SOC_ENUM("RX2 DCB Cutoff", rx2_dcb_cutoff_enum),
+        SOC_ENUM("RX3 DCB Cutoff", rx3_dcb_cutoff_enum),
+        SOC_SINGLE("RX1 DCB Switch", LPASS_CDC_RX1_B5_CTL, 2, 1, 0),
+        SOC_SINGLE("RX2 DCB Switch", LPASS_CDC_RX2_B5_CTL, 2, 1, 0),
+        SOC_SINGLE("RX3 DCB Switch", LPASS_CDC_RX3_B5_CTL, 2, 1, 0),
+        SOC_SINGLE("RX1 Mute Switch", LPASS_CDC_RX1_B6_CTL, 0, 1, 0),
+        SOC_SINGLE("RX2 Mute Switch", LPASS_CDC_RX2_B6_CTL, 0, 1, 0),
+        SOC_SINGLE("RX3 Mute Switch", LPASS_CDC_RX3_B6_CTL, 0, 1, 0),
+};
+
+static int msm8916_wcd_digital_enable_interpolator(
+                                                struct snd_soc_dapm_widget *w,
+                                                struct snd_kcontrol *kcontrol,
+                                                int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                /* apply the digital gain after the interpolator is enabled */
+                usleep_range(10000, 10100);
+                snd_soc_write(codec, rx_gain_reg[w->shift],
+                              snd_soc_read(codec, rx_gain_reg[w->shift]));
+                break;
+        }
+        return 0;
+}
+
+static int msm8916_wcd_digital_enable_dec(struct snd_soc_dapm_widget *w,
+                                          struct snd_kcontrol *kcontrol,
+                                          int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        unsigned int decimator = w->shift + 1;
+        u16 dec_reset_reg, tx_vol_ctl_reg, tx_mux_ctl_reg;
+        u8 dec_hpf_cut_of_freq;
+
+        dec_reset_reg = LPASS_CDC_CLK_TX_RESET_B1_CTL;
+        tx_vol_ctl_reg = LPASS_CDC_TX1_VOL_CTL_CFG + 32 * (decimator - 1);
+        tx_mux_ctl_reg = LPASS_CDC_TX1_MUX_CTL + 32 * (decimator - 1);
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                /* Enable TX digital mute */
+                snd_soc_update_bits(codec, tx_vol_ctl_reg,
+                                    TX_VOL_CTL_CFG_MUTE_EN_MASK,
+                                    TX_VOL_CTL_CFG_MUTE_EN_ENABLE);
+                dec_hpf_cut_of_freq = snd_soc_read(codec, tx_mux_ctl_reg) &
+                                        TX_MUX_CTL_CUT_OFF_FREQ_MASK;
+                dec_hpf_cut_of_freq >>= TX_MUX_CTL_CUT_OFF_FREQ_SHIFT;
+                if (dec_hpf_cut_of_freq != TX_MUX_CTL_CF_NEG_3DB_150HZ) {
+                        /* set cut of freq to CF_MIN_3DB_150HZ (0x1) */
+                        snd_soc_update_bits(codec, tx_mux_ctl_reg,
+                                            TX_MUX_CTL_CUT_OFF_FREQ_MASK,
+                                            TX_MUX_CTL_CF_NEG_3DB_150HZ);
+                }
+                break;
+        case SND_SOC_DAPM_POST_PMU:
+                /* enable HPF */
+                snd_soc_update_bits(codec, tx_mux_ctl_reg,
+                                    TX_MUX_CTL_HPF_BP_SEL_MASK,
+                                    TX_MUX_CTL_HPF_BP_SEL_NO_BYPASS);
+                /* apply the digital gain after the decimator is enabled */
+                snd_soc_write(codec, tx_gain_reg[w->shift],
+                              snd_soc_read(codec, tx_gain_reg[w->shift]));
+                snd_soc_update_bits(codec, tx_vol_ctl_reg,
+                                    TX_VOL_CTL_CFG_MUTE_EN_MASK, 0);
+                break;
+        case SND_SOC_DAPM_PRE_PMD:
+                snd_soc_update_bits(codec, tx_vol_ctl_reg,
+                                    TX_VOL_CTL_CFG_MUTE_EN_MASK,
+                                    TX_VOL_CTL_CFG_MUTE_EN_ENABLE);
+                snd_soc_update_bits(codec, tx_mux_ctl_reg,
+                                    TX_MUX_CTL_HPF_BP_SEL_MASK,
+                                    TX_MUX_CTL_HPF_BP_SEL_BYPASS);
+                break;
+        case SND_SOC_DAPM_POST_PMD:
+                snd_soc_update_bits(codec, dec_reset_reg, 1 << w->shift,
+                                    1 << w->shift);
+                snd_soc_update_bits(codec, dec_reset_reg, 1 << w->shift, 0x0);
+                snd_soc_update_bits(codec, tx_mux_ctl_reg,
+                                    TX_MUX_CTL_HPF_BP_SEL_MASK,
+                                    TX_MUX_CTL_HPF_BP_SEL_BYPASS);
+                snd_soc_update_bits(codec, tx_vol_ctl_reg,
+                                    TX_VOL_CTL_CFG_MUTE_EN_MASK, 0);
+                break;
+        }
+
+        return 0;
+}
+
+static int msm8916_wcd_digital_enable_dmic(struct snd_soc_dapm_widget *w,
+                                           struct snd_kcontrol *kcontrol,
+                                           int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        unsigned int dmic;
+        int ret;
+        /* get dmic number out of widget name */
+        char *dmic_num = strpbrk(w->name, "12");
+
+        if (dmic_num == NULL) {
+                dev_err(codec->dev, "Invalid DMIC\n");
+                return -EINVAL;
+        }
+        ret = kstrtouint(dmic_num, 10, &dmic);
+        if (ret < 0 || dmic > 2) {
+                dev_err(codec->dev, "Invalid DMIC line on the codec\n");
+                return -EINVAL;
+        }
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                snd_soc_update_bits(codec, LPASS_CDC_CLK_DMIC_B1_CTL,
+                                    DMIC_B1_CTL_DMIC0_CLK_SEL_MASK,
+                                    DMIC_B1_CTL_DMIC0_CLK_SEL_DIV3);
+                switch (dmic) {
+                case 1:
+                        snd_soc_update_bits(codec, LPASS_CDC_TX1_DMIC_CTL,
+                                            TXN_DMIC_CTL_CLK_SEL_MASK,
+                                            TXN_DMIC_CTL_CLK_SEL_DIV3);
+                        break;
+                case 2:
+                        snd_soc_update_bits(codec, LPASS_CDC_TX2_DMIC_CTL,
+                                            TXN_DMIC_CTL_CLK_SEL_MASK,
+                                            TXN_DMIC_CTL_CLK_SEL_DIV3);
+                        break;
+                }
+                break;
+        }
+
+        return 0;
+}
+
+static const struct snd_soc_dapm_widget msm8916_wcd_digital_dapm_widgets[] = {
+        /*RX stuff */
+        SND_SOC_DAPM_AIF_IN("I2S RX1", NULL, 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("I2S RX2", NULL, 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("I2S RX3", NULL, 0, SND_SOC_NOPM, 0, 0),
+
+        SND_SOC_DAPM_OUTPUT("PDM_RX1"),
+        SND_SOC_DAPM_OUTPUT("PDM_RX2"),
+        SND_SOC_DAPM_OUTPUT("PDM_RX3"),
+
+        SND_SOC_DAPM_INPUT("LPASS_PDM_TX"),
+
+        SND_SOC_DAPM_MIXER("RX1 MIX1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("RX2 MIX1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("RX3 MIX1", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        /* Interpolator */
+        SND_SOC_DAPM_MIXER_E("RX1 INT", LPASS_CDC_CLK_RX_B1_CTL, 0, 0, NULL,
+                             0, msm8916_wcd_digital_enable_interpolator,
+                             SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_MIXER_E("RX2 INT", LPASS_CDC_CLK_RX_B1_CTL, 1, 0, NULL,
+                             0, msm8916_wcd_digital_enable_interpolator,
+                             SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_MIXER_E("RX3 INT", LPASS_CDC_CLK_RX_B1_CTL, 2, 0, NULL,
+                             0, msm8916_wcd_digital_enable_interpolator,
+                             SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_MUX("RX1 MIX1 INP1", SND_SOC_NOPM, 0, 0,
+                         &rx_mix1_inp1_mux),
+        SND_SOC_DAPM_MUX("RX1 MIX1 INP2", SND_SOC_NOPM, 0, 0,
+                         &rx_mix1_inp2_mux),
+        SND_SOC_DAPM_MUX("RX1 MIX1 INP3", SND_SOC_NOPM, 0, 0,
+                         &rx_mix1_inp3_mux),
+        SND_SOC_DAPM_MUX("RX2 MIX1 INP1", SND_SOC_NOPM, 0, 0,
+                         &rx2_mix1_inp1_mux),
+        SND_SOC_DAPM_MUX("RX2 MIX1 INP2", SND_SOC_NOPM, 0, 0,
+                         &rx2_mix1_inp2_mux),
+        SND_SOC_DAPM_MUX("RX2 MIX1 INP3", SND_SOC_NOPM, 0, 0,
+                         &rx2_mix1_inp3_mux),
+        SND_SOC_DAPM_MUX("RX3 MIX1 INP1", SND_SOC_NOPM, 0, 0,
+                         &rx3_mix1_inp1_mux),
+        SND_SOC_DAPM_MUX("RX3 MIX1 INP2", SND_SOC_NOPM, 0, 0,
+                         &rx3_mix1_inp2_mux),
+        SND_SOC_DAPM_MUX("RX3 MIX1 INP3", SND_SOC_NOPM, 0, 0,
+                         &rx3_mix1_inp3_mux),
+
+        /* TX */
+        SND_SOC_DAPM_MIXER("ADC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("ADC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("ADC3", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        SND_SOC_DAPM_MUX_E("DEC1 MUX", LPASS_CDC_CLK_TX_CLK_EN_B1_CTL, 0, 0,
+                           &dec1_mux, msm8916_wcd_digital_enable_dec,
+                           SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+                           SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_MUX_E("DEC2 MUX", LPASS_CDC_CLK_TX_CLK_EN_B1_CTL, 1, 0,
+                           &dec2_mux, msm8916_wcd_digital_enable_dec,
+                           SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+                           SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_AIF_OUT("I2S TX1", NULL, 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("I2S TX2", NULL, 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("I2S TX3", NULL, 0, SND_SOC_NOPM, 0, 0),
+
+        /* Digital Mic Inputs */
+        SND_SOC_DAPM_ADC_E("DMIC1", NULL, SND_SOC_NOPM, 0, 0,
+                           msm8916_wcd_digital_enable_dmic,
+                           SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_ADC_E("DMIC2", NULL, SND_SOC_NOPM, 0, 0,
+                           msm8916_wcd_digital_enable_dmic,
+                           SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_SUPPLY("DMIC_CLK", LPASS_CDC_CLK_DMIC_B1_CTL, 0, 0,
+                            NULL, 0),
+        SND_SOC_DAPM_SUPPLY("RX_I2S_CLK", LPASS_CDC_CLK_RX_I2S_CTL,
+                            4, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("TX_I2S_CLK", LPASS_CDC_CLK_TX_I2S_CTL, 4, 0,
+                            NULL, 0),
+
+        SND_SOC_DAPM_SUPPLY("MCLK", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("PDM_CLK", LPASS_CDC_CLK_PDM_CTL, 0, 0, NULL, 0),
+        /* Connectivity Clock */
+        SND_SOC_DAPM_SUPPLY_S("CDC_CONN", -2, LPASS_CDC_CLK_OTHR_CTL, 2, 0,
+                              NULL, 0),
+
+};
+
+static int msm8916_wcd_digital_get_clks(struct platform_device *pdev,
+                                        struct msm8916_wcd_digital_priv *priv)
+{
+        struct device *dev = &pdev->dev;
+
+        priv->ahbclk = devm_clk_get(dev, "ahbix-clk");
+        if (IS_ERR(priv->ahbclk)) {
+                dev_err(dev, "failed to get ahbix clk\n");
+                return PTR_ERR(priv->ahbclk);
+        }
+
+        priv->mclk = devm_clk_get(dev, "mclk");
+        if (IS_ERR(priv->mclk)) {
+                dev_err(dev, "failed to get mclk\n");
+                return PTR_ERR(priv->mclk);
+        }
+
+        return 0;
+}
+
+static int msm8916_wcd_digital_codec_probe(struct snd_soc_codec *codec)
+{
+        struct msm8916_wcd_digital_priv *priv = dev_get_drvdata(codec->dev);
+
+        snd_soc_codec_set_drvdata(codec, priv);
+
+        return 0;
+}
+
+static int msm8916_wcd_digital_hw_params(struct snd_pcm_substream *substream,
+                                         struct snd_pcm_hw_params *params,
+                                         struct snd_soc_dai *dai)
+{
+        u8 tx_fs_rate;
+        u8 rx_fs_rate;
+
+        switch (params_rate(params)) {
+        case 8000:
+                tx_fs_rate = TX_I2S_CTL_TX_I2S_FS_RATE_F_8_KHZ;
+                rx_fs_rate = RX_I2S_CTL_RX_I2S_FS_RATE_F_8_KHZ;
+                break;
+        case 16000:
+                tx_fs_rate = TX_I2S_CTL_TX_I2S_FS_RATE_F_16_KHZ;
+                rx_fs_rate = RX_I2S_CTL_RX_I2S_FS_RATE_F_16_KHZ;
+                break;
+        case 32000:
+                tx_fs_rate = TX_I2S_CTL_TX_I2S_FS_RATE_F_32_KHZ;
+                rx_fs_rate = RX_I2S_CTL_RX_I2S_FS_RATE_F_32_KHZ;
+                break;
+        case 48000:
+                tx_fs_rate = TX_I2S_CTL_TX_I2S_FS_RATE_F_48_KHZ;
+                rx_fs_rate = RX_I2S_CTL_RX_I2S_FS_RATE_F_48_KHZ;
+                break;
+        default:
+                dev_err(dai->codec->dev, "Invalid sampling rate %d\n",
+                        params_rate(params));
+                return -EINVAL;
+        }
+
+        switch (substream->stream) {
+        case SNDRV_PCM_STREAM_CAPTURE:
+                snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_TX_I2S_CTL,
+                                    TX_I2S_CTL_TX_I2S_FS_RATE_MASK, tx_fs_rate);
+                break;
+        case SNDRV_PCM_STREAM_PLAYBACK:
+                snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_RX_I2S_CTL,
+                                    RX_I2S_CTL_RX_I2S_FS_RATE_MASK, rx_fs_rate);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (params_format(params)) {
+        case SNDRV_PCM_FORMAT_S16_LE:
+                snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_TX_I2S_CTL,
+                                    TX_I2S_CTL_TX_I2S_MODE_MASK,
+                                    TX_I2S_CTL_TX_I2S_MODE_16);
+                snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_RX_I2S_CTL,
+                                    RX_I2S_CTL_RX_I2S_MODE_MASK,
+                                    RX_I2S_CTL_RX_I2S_MODE_16);
+                break;
+        case SNDRV_PCM_FORMAT_S24_LE:
+                snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_TX_I2S_CTL,
+                                    TX_I2S_CTL_TX_I2S_MODE_MASK,
+                                    TX_I2S_CTL_TX_I2S_MODE_32);
+                snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_RX_I2S_CTL,
+                                    RX_I2S_CTL_RX_I2S_MODE_MASK,
+                                    RX_I2S_CTL_RX_I2S_MODE_32);
+                break;
+        default:
+                dev_err(dai->dev, "%s: wrong format selected\n", __func__);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static const struct snd_soc_dapm_route msm8916_wcd_digital_audio_map[] = {
+
+        {"I2S RX1",  NULL, "AIF1 Playback"},
+        {"I2S RX2",  NULL, "AIF1 Playback"},
+        {"I2S RX3",  NULL, "AIF1 Playback"},
+
+        {"AIF1 Capture", NULL, "I2S TX1"},
+        {"AIF1 Capture", NULL, "I2S TX2"},
+        {"AIF1 Capture", NULL, "I2S TX3"},
+
+        /* Decimator Inputs */
+        {"DEC1 MUX", "DMIC1", "DMIC1"},
+        {"DEC1 MUX", "DMIC2", "DMIC2"},
+        {"DEC1 MUX", "ADC1", "ADC1"},
+        {"DEC1 MUX", "ADC2", "ADC2"},
+        {"DEC1 MUX", "ADC3", "ADC3"},
+        {"DEC1 MUX", NULL, "CDC_CONN"},
+
+        {"DEC2 MUX", "DMIC1", "DMIC1"},
+        {"DEC2 MUX", "DMIC2", "DMIC2"},
+        {"DEC2 MUX", "ADC1", "ADC1"},
+        {"DEC2 MUX", "ADC2", "ADC2"},
+        {"DEC2 MUX", "ADC3", "ADC3"},
+        {"DEC2 MUX", NULL, "CDC_CONN"},
+
+        {"DMIC1", NULL, "DMIC_CLK"},
+        {"DMIC2", NULL, "DMIC_CLK"},
+
+        {"I2S TX1", NULL, "DEC1 MUX"},
+        {"I2S TX2", NULL, "DEC2 MUX"},
+
+        {"I2S TX1", NULL, "TX_I2S_CLK"},
+        {"I2S TX2", NULL, "TX_I2S_CLK"},
+
+        {"TX_I2S_CLK", NULL, "MCLK"},
+        {"TX_I2S_CLK", NULL, "PDM_CLK"},
+
+        {"ADC1", NULL, "LPASS_PDM_TX"},
+        {"ADC2", NULL, "LPASS_PDM_TX"},
+        {"ADC3", NULL, "LPASS_PDM_TX"},
+
+        {"I2S RX1", NULL, "RX_I2S_CLK"},
+        {"I2S RX2", NULL, "RX_I2S_CLK"},
+        {"I2S RX3", NULL, "RX_I2S_CLK"},
+
+        {"RX_I2S_CLK", NULL, "PDM_CLK"},
+        {"RX_I2S_CLK", NULL, "MCLK"},
+        {"RX_I2S_CLK", NULL, "CDC_CONN"},
+
+        /* RX1 PATH.. */
+        {"PDM_RX1", NULL, "RX1 INT"},
+        {"RX1 INT", NULL, "RX1 MIX1"},
+
+        {"RX1 MIX1", NULL, "RX1 MIX1 INP1"},
+        {"RX1 MIX1", NULL, "RX1 MIX1 INP2"},
+        {"RX1 MIX1", NULL, "RX1 MIX1 INP3"},
+
+        {"RX1 MIX1 INP1", "RX1", "I2S RX1"},
+        {"RX1 MIX1 INP1", "RX2", "I2S RX2"},
+        {"RX1 MIX1 INP1", "RX3", "I2S RX3"},
+
+        {"RX1 MIX1 INP2", "RX1", "I2S RX1"},
+        {"RX1 MIX1 INP2", "RX2", "I2S RX2"},
+        {"RX1 MIX1 INP2", "RX3", "I2S RX3"},
+
+        {"RX1 MIX1 INP3", "RX1", "I2S RX1"},
+        {"RX1 MIX1 INP3", "RX2", "I2S RX2"},
+        {"RX1 MIX1 INP3", "RX3", "I2S RX3"},
+
+        /* RX2 PATH */
+        {"PDM_RX2", NULL, "RX2 INT"},
+        {"RX2 INT", NULL, "RX2 MIX1"},
+
+        {"RX2 MIX1", NULL, "RX2 MIX1 INP1"},
+        {"RX2 MIX1", NULL, "RX2 MIX1 INP2"},
+        {"RX2 MIX1", NULL, "RX2 MIX1 INP3"},
+
+        {"RX2 MIX1 INP1", "RX1", "I2S RX1"},
+        {"RX2 MIX1 INP1", "RX2", "I2S RX2"},
+        {"RX2 MIX1 INP1", "RX3", "I2S RX3"},
+
+        {"RX2 MIX1 INP2", "RX1", "I2S RX1"},
+        {"RX2 MIX1 INP2", "RX2", "I2S RX2"},
+        {"RX2 MIX1 INP2", "RX3", "I2S RX3"},
+
+        {"RX2 MIX1 INP3", "RX1", "I2S RX1"},
+        {"RX2 MIX1 INP3", "RX2", "I2S RX2"},
+        {"RX2 MIX1 INP3", "RX3", "I2S RX3"},
+
+        /* RX3 PATH */
+        {"PDM_RX3", NULL, "RX3 INT"},
+        {"RX3 INT", NULL, "RX3 MIX1"},
+
+        {"RX3 MIX1", NULL, "RX3 MIX1 INP1"},
+        {"RX3 MIX1", NULL, "RX3 MIX1 INP2"},
+        {"RX3 MIX1", NULL, "RX3 MIX1 INP3"},
+
+        {"RX3 MIX1 INP1", "RX1", "I2S RX1"},
+        {"RX3 MIX1 INP1", "RX2", "I2S RX2"},
+        {"RX3 MIX1 INP1", "RX3", "I2S RX3"},
+
+        {"RX3 MIX1 INP2", "RX1", "I2S RX1"},
+        {"RX3 MIX1 INP2", "RX2", "I2S RX2"},
+        {"RX3 MIX1 INP2", "RX3", "I2S RX3"},
+
+        {"RX3 MIX1 INP3", "RX1", "I2S RX1"},
+        {"RX3 MIX1 INP3", "RX2", "I2S RX2"},
+        {"RX3 MIX1 INP3", "RX3", "I2S RX3"},
+
+};
+
+static int msm8916_wcd_digital_startup(struct snd_pcm_substream *substream,
+                                       struct snd_soc_dai *dai)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct msm8916_wcd_digital_priv *msm8916_wcd;
+        unsigned long mclk_rate;
+
+        msm8916_wcd = snd_soc_codec_get_drvdata(codec);
+        snd_soc_update_bits(codec, LPASS_CDC_CLK_MCLK_CTL,
+                            MCLK_CTL_MCLK_EN_MASK,
+                            MCLK_CTL_MCLK_EN_ENABLE);
+        snd_soc_update_bits(codec, LPASS_CDC_CLK_PDM_CTL,
+                            LPASS_CDC_CLK_PDM_CTL_PDM_CLK_SEL_MASK,
+                            LPASS_CDC_CLK_PDM_CTL_PDM_CLK_SEL_FB);
+
+        mclk_rate = clk_get_rate(msm8916_wcd->mclk);
+        switch (mclk_rate) {
+        case 12288000:
+                snd_soc_update_bits(codec, LPASS_CDC_TOP_CTL,
+                                    TOP_CTL_DIG_MCLK_FREQ_MASK,
+                                    TOP_CTL_DIG_MCLK_FREQ_F_12_288MHZ);
+                break;
+        case 9600000:
+                snd_soc_update_bits(codec, LPASS_CDC_TOP_CTL,
+                                    TOP_CTL_DIG_MCLK_FREQ_MASK,
+                                    TOP_CTL_DIG_MCLK_FREQ_F_9_6MHZ);
+                break;
+        default:
+                dev_err(codec->dev, "Invalid mclk rate %ld\n", mclk_rate);
+                break;
+        }
+        return 0;
+}
+
+static void msm8916_wcd_digital_shutdown(struct snd_pcm_substream *substream,
+                                         struct snd_soc_dai *dai)
+{
+        snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_PDM_CTL,
+                            LPASS_CDC_CLK_PDM_CTL_PDM_CLK_SEL_MASK, 0);
+}
+
+static struct snd_soc_dai_ops msm8916_wcd_digital_dai_ops = {
+        .startup = msm8916_wcd_digital_startup,
+        .shutdown = msm8916_wcd_digital_shutdown,
+        .hw_params = msm8916_wcd_digital_hw_params,
+};
+
+static struct snd_soc_dai_driver msm8916_wcd_digital_dai[] = {
+        [0] = {
+               .name = "msm8916_wcd_digital_i2s_rx1",
+               .id = 0,
+               .playback = {
+                            .stream_name = "AIF1 Playback",
+                            .rates = MSM8916_WCD_DIGITAL_RATES,
+                            .formats = MSM8916_WCD_DIGITAL_FORMATS,
+                            .channels_min = 1,
+                            .channels_max = 3,
+                            },
+               .ops = &msm8916_wcd_digital_dai_ops,
+               },
+        [1] = {
+               .name = "msm8916_wcd_digital_i2s_tx1",
+               .id = 1,
+               .capture = {
+                           .stream_name = "AIF1 Capture",
+                           .rates = MSM8916_WCD_DIGITAL_RATES,
+                           .formats = MSM8916_WCD_DIGITAL_FORMATS,
+                           .channels_min = 1,
+                           .channels_max = 4,
+                           },
+               .ops = &msm8916_wcd_digital_dai_ops,
+               },
+};
+
+static struct snd_soc_codec_driver msm8916_wcd_digital = {
+        .probe = msm8916_wcd_digital_codec_probe,
+        .component_driver = {
+                .controls = msm8916_wcd_digital_snd_controls,
+                .num_controls = ARRAY_SIZE(msm8916_wcd_digital_snd_controls),
+                .dapm_widgets = msm8916_wcd_digital_dapm_widgets,
+                .num_dapm_widgets =
+                                 ARRAY_SIZE(msm8916_wcd_digital_dapm_widgets),
+                .dapm_routes = msm8916_wcd_digital_audio_map,
+                .num_dapm_routes = ARRAY_SIZE(msm8916_wcd_digital_audio_map),
+        },
+};
+
+static const struct regmap_config msm8916_codec_regmap_config = {
+        .reg_bits = 32,
+        .reg_stride = 4,
+        .val_bits = 32,
+        .max_register = LPASS_CDC_TX2_DMIC_CTL,
+        .cache_type = REGCACHE_FLAT,
+};
+
+static int msm8916_wcd_digital_probe(struct platform_device *pdev)
+{
+        struct msm8916_wcd_digital_priv *priv;
+        struct device *dev = &pdev->dev;
+        void __iomem *base;
+        struct resource *mem_res;
+        struct regmap *digital_map;
+        int ret;
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        base = devm_ioremap_resource(&pdev->dev, mem_res);
+        if (IS_ERR(base))
+                return PTR_ERR(base);
+
+        digital_map =
+            devm_regmap_init_mmio(&pdev->dev, base,
+                                  &msm8916_codec_regmap_config);
+        if (IS_ERR(digital_map))
+                return PTR_ERR(digital_map);
+
+        ret = msm8916_wcd_digital_get_clks(pdev, priv);
+        if (ret < 0)
+                return ret;
+
+        ret = clk_prepare_enable(priv->ahbclk);
+        if (ret < 0) {
+                dev_err(dev, "failed to enable ahbclk %d\n", ret);
+                return ret;
+        }
+
+        ret = clk_prepare_enable(priv->mclk);
+        if (ret < 0) {
+                dev_err(dev, "failed to enable mclk %d\n", ret);
+                return ret;
+        }
+
+        dev_set_drvdata(dev, priv);
+
+        return snd_soc_register_codec(dev, &msm8916_wcd_digital,
+                                      msm8916_wcd_digital_dai,
+                                      ARRAY_SIZE(msm8916_wcd_digital_dai));
+}
+
+static int msm8916_wcd_digital_remove(struct platform_device *pdev)
+{
+        struct msm8916_wcd_digital_priv *priv = dev_get_drvdata(&pdev->dev);
+
+        snd_soc_unregister_codec(&pdev->dev);
+        clk_disable_unprepare(priv->mclk);
+        clk_disable_unprepare(priv->ahbclk);
+
+        return 0;
+}
+
+static const struct of_device_id msm8916_wcd_digital_match_table[] = {
+        { .compatible = "qcom,msm8916-wcd-digital-codec" },
+        { }
+};
+
+MODULE_DEVICE_TABLE(of, msm8916_wcd_digital_match_table);
+
+static struct platform_driver msm8916_wcd_digital_driver = {
+        .driver = {
+                   .name = "msm8916-wcd-digital-codec",
+                   .of_match_table = msm8916_wcd_digital_match_table,
+        },
+        .probe = msm8916_wcd_digital_probe,
+        .remove = msm8916_wcd_digital_remove,
+};
+
+module_platform_driver(msm8916_wcd_digital_driver);
+
+MODULE_AUTHOR("Srinivas Kandagatla <srinivas.kandagatla@linaro.org>");
+MODULE_DESCRIPTION("MSM8916 WCD Digital Codec driver");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c
index e643be91d762..efe3a44658d5 100644
--- a/sound/soc/codecs/nau8825.c
+++ b/sound/soc/codecs/nau8825.c
@@ -43,6 +43,8 @@
 #define GAIN_AUGMENT 22500
 #define SIDETONE_BASE 207000
 
+/* the maximum frequency of CLK_ADC and CLK_DAC */
+#define CLK_DA_AD_MAX 6144000
 
 static int nau8825_configure_sysclk(struct nau8825 *nau8825,
                 int clk_id, unsigned int freq);
@@ -95,6 +97,27 @@ static const struct nau8825_fll_attr fll_pre_scalar[] = {
         { 8, 0x3 },
 };
 
+/* over sampling rate */
+struct nau8825_osr_attr {
+        unsigned int osr;
+        unsigned int clk_src;
+};
+
+static const struct nau8825_osr_attr osr_dac_sel[] = {
+        { 64, 2 },      /* OSR 64, SRC 1/4 */
+        { 256, 0 },     /* OSR 256, SRC 1 */
+        { 128, 1 },     /* OSR 128, SRC 1/2 */
+        { 0, 0 },
+        { 32, 3 },      /* OSR 32, SRC 1/8 */
+};
+
+static const struct nau8825_osr_attr osr_adc_sel[] = {
+        { 32, 3 },      /* OSR 32, SRC 1/8 */
+        { 64, 2 },      /* OSR 64, SRC 1/4 */
+        { 128, 1 },     /* OSR 128, SRC 1/2 */
+        { 256, 0 },     /* OSR 256, SRC 1 */
+};
+
 static const struct reg_default nau8825_reg_defaults[] = {
         { NAU8825_REG_ENA_CTRL, 0x00ff },
         { NAU8825_REG_IIC_ADDR_SET, 0x0 },
@@ -1179,15 +1202,64 @@ static const struct snd_soc_dapm_route nau8825_dapm_routes[] = {
         {"HPOR", NULL, "Class G"},
 };
 
+static int nau8825_clock_check(struct nau8825 *nau8825,
+        int stream, int rate, int osr)
+{
+        int osrate;
+
+        if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                if (osr >= ARRAY_SIZE(osr_dac_sel))
+                        return -EINVAL;
+                osrate = osr_dac_sel[osr].osr;
+        } else {
+                if (osr >= ARRAY_SIZE(osr_adc_sel))
+                        return -EINVAL;
+                osrate = osr_adc_sel[osr].osr;
+        }
+
+        if (!osrate || rate * osr > CLK_DA_AD_MAX) {
+                dev_err(nau8825->dev, "exceed the maximum frequency of CLK_ADC or CLK_DAC\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 static int nau8825_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 nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec);
-        unsigned int val_len = 0;
+        unsigned int val_len = 0, osr;
+
+        nau8825_sema_acquire(nau8825, 3 * HZ);
 
-        nau8825_sema_acquire(nau8825, 2 * HZ);
+        /* CLK_DAC or CLK_ADC = OSR * FS
+         * DAC or ADC clock frequency is defined as Over Sampling Rate (OSR)
+         * multiplied by the audio sample rate (Fs). Note that the OSR and Fs
+         * values must be selected such that the maximum frequency is less
+         * than 6.144 MHz.
+         */
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                regmap_read(nau8825->regmap, NAU8825_REG_DAC_CTRL1, &osr);
+                osr &= NAU8825_DAC_OVERSAMPLE_MASK;
+                if (nau8825_clock_check(nau8825, substream->stream,
+                        params_rate(params), osr))
+                        return -EINVAL;
+                regmap_update_bits(nau8825->regmap, NAU8825_REG_CLK_DIVIDER,
+                        NAU8825_CLK_DAC_SRC_MASK,
+                        osr_dac_sel[osr].clk_src << NAU8825_CLK_DAC_SRC_SFT);
+        } else {
+                regmap_read(nau8825->regmap, NAU8825_REG_ADC_RATE, &osr);
+                osr &= NAU8825_ADC_SYNC_DOWN_MASK;
+                if (nau8825_clock_check(nau8825, substream->stream,
+                        params_rate(params), osr))
+                        return -EINVAL;
+                regmap_update_bits(nau8825->regmap, NAU8825_REG_CLK_DIVIDER,
+                        NAU8825_CLK_ADC_SRC_MASK,
+                        osr_adc_sel[osr].clk_src << NAU8825_CLK_ADC_SRC_SFT);
+        }
 
         switch (params_width(params)) {
         case 16:
@@ -1221,7 +1293,7 @@ static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
         struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec);
         unsigned int ctrl1_val = 0, ctrl2_val = 0;
 
-        nau8825_sema_acquire(nau8825, 2 * HZ);
+        nau8825_sema_acquire(nau8825, 3 * HZ);
 
         switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
         case SND_SOC_DAIFMT_CBM_CFM:
@@ -1774,9 +1846,10 @@ static void nau8825_init_regs(struct nau8825 *nau8825)
          * (audible hiss). Set it to something better.
          */
         regmap_update_bits(regmap, NAU8825_REG_ADC_RATE,
-                NAU8825_ADC_SYNC_DOWN_MASK, NAU8825_ADC_SYNC_DOWN_128);
+                NAU8825_ADC_SYNC_DOWN_MASK | NAU8825_ADC_SINC4_EN,
+                NAU8825_ADC_SYNC_DOWN_64);
         regmap_update_bits(regmap, NAU8825_REG_DAC_CTRL1,
-                NAU8825_DAC_OVERSAMPLE_MASK, NAU8825_DAC_OVERSAMPLE_128);
+                NAU8825_DAC_OVERSAMPLE_MASK, NAU8825_DAC_OVERSAMPLE_64);
         /* Disable DACR/L power */
         regmap_update_bits(regmap, NAU8825_REG_CHARGE_PUMP,
                 NAU8825_POWER_DOWN_DACR | NAU8825_POWER_DOWN_DACL,
@@ -1811,6 +1884,9 @@ static void nau8825_init_regs(struct nau8825 *nau8825)
                 NAU8825_DACL_CH_SEL_MASK, NAU8825_DACL_CH_SEL_L);
         regmap_update_bits(nau8825->regmap, NAU8825_REG_DACR_CTRL,
                 NAU8825_DACL_CH_SEL_MASK, NAU8825_DACL_CH_SEL_R);
+        /* Disable short Frame Sync detection logic */
+        regmap_update_bits(regmap, NAU8825_REG_LEFT_TIME_SLOT,
+                NAU8825_DIS_FS_SHORT_DET, NAU8825_DIS_FS_SHORT_DET);
 }
 
 static const struct regmap_config nau8825_regmap_config = {
@@ -1919,8 +1995,10 @@ static void nau8825_fll_apply(struct nau8825 *nau8825,
         regmap_update_bits(nau8825->regmap, NAU8825_REG_CLK_DIVIDER,
                 NAU8825_CLK_SRC_MASK | NAU8825_CLK_MCLK_SRC_MASK,
                 NAU8825_CLK_SRC_MCLK | fll_param->mclk_src);
+        /* Make DSP operate at high speed for better performance. */
         regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL1,
-                        NAU8825_FLL_RATIO_MASK, fll_param->ratio);
+                NAU8825_FLL_RATIO_MASK | NAU8825_ICTRL_LATCH_MASK,
+                fll_param->ratio | (0x6 << NAU8825_ICTRL_LATCH_SFT));
         /* FLL 16-bit fractional input */
         regmap_write(nau8825->regmap, NAU8825_REG_FLL2, fll_param->fll_frac);
         /* FLL 10-bit integer input */
@@ -1936,19 +2014,22 @@ static void nau8825_fll_apply(struct nau8825 *nau8825,
         regmap_update_bits(nau8825->regmap,
                 NAU8825_REG_FLL6, NAU8825_DCO_EN, 0);
         if (fll_param->fll_frac) {
+                /* set FLL loop filter enable and cutoff frequency at 500Khz */
                 regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL5,
                         NAU8825_FLL_PDB_DAC_EN | NAU8825_FLL_LOOP_FTR_EN |
                         NAU8825_FLL_FTR_SW_MASK,
                         NAU8825_FLL_PDB_DAC_EN | NAU8825_FLL_LOOP_FTR_EN |
                         NAU8825_FLL_FTR_SW_FILTER);
                 regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL6,
-                        NAU8825_SDM_EN, NAU8825_SDM_EN);
+                        NAU8825_SDM_EN | NAU8825_CUTOFF500,
+                        NAU8825_SDM_EN | NAU8825_CUTOFF500);
         } else {
+                /* disable FLL loop filter and cutoff frequency */
                 regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL5,
                         NAU8825_FLL_PDB_DAC_EN | NAU8825_FLL_LOOP_FTR_EN |
                         NAU8825_FLL_FTR_SW_MASK, NAU8825_FLL_FTR_SW_ACCU);
-                regmap_update_bits(nau8825->regmap,
-                        NAU8825_REG_FLL6, NAU8825_SDM_EN, 0);
+                regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL6,
+                        NAU8825_SDM_EN | NAU8825_CUTOFF500, 0);
         }
 }
 
@@ -2014,6 +2095,9 @@ static void nau8825_configure_mclk_as_sysclk(struct regmap *regmap)
                 NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_MCLK);
         regmap_update_bits(regmap, NAU8825_REG_FLL6,
                 NAU8825_DCO_EN, 0);
+        /* Make DSP operate as default setting for power saving. */
+        regmap_update_bits(regmap, NAU8825_REG_FLL1,
+                NAU8825_ICTRL_LATCH_MASK, 0);
 }
 
 static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
@@ -2038,7 +2122,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
                  * fered by cross talk process, the driver make the playback
                  * preparation halted until cross talk process finish.
                  */
-                nau8825_sema_acquire(nau8825, 2 * HZ);
+                nau8825_sema_acquire(nau8825, 3 * HZ);
                 nau8825_configure_mclk_as_sysclk(regmap);
                 /* MCLK not changed by clock tree */
                 regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER,
@@ -2057,10 +2141,13 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
                                 NAU8825_DCO_EN, NAU8825_DCO_EN);
                         regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER,
                                 NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_VCO);
-                        /* Decrease the VCO frequency for power saving */
+                        /* Decrease the VCO frequency and make DSP operate
+                         * as default setting for power saving.
+                         */
                         regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER,
                                 NAU8825_CLK_MCLK_SRC_MASK, 0xf);
                         regmap_update_bits(regmap, NAU8825_REG_FLL1,
+                                NAU8825_ICTRL_LATCH_MASK |
                                 NAU8825_FLL_RATIO_MASK, 0x10);
                         regmap_update_bits(regmap, NAU8825_REG_FLL6,
                                 NAU8825_SDM_EN, NAU8825_SDM_EN);
@@ -2083,9 +2170,14 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
                  * fered by cross talk process, the driver make the playback
                  * preparation halted until cross talk process finish.
                  */
-                nau8825_sema_acquire(nau8825, 2 * HZ);
+                nau8825_sema_acquire(nau8825, 3 * HZ);
+                /* Higher FLL reference input frequency can only set lower
+                 * gain error, such as 0000 for input reference from MCLK
+                 * 12.288Mhz.
+                 */
                 regmap_update_bits(regmap, NAU8825_REG_FLL3,
-                        NAU8825_FLL_CLK_SRC_MASK, NAU8825_FLL_CLK_SRC_MCLK);
+                        NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK,
+                        NAU8825_FLL_CLK_SRC_MCLK | 0);
                 /* Release the semaphone. */
                 nau8825_sema_release(nau8825);
 
@@ -2100,9 +2192,17 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
                  * fered by cross talk process, the driver make the playback
                  * preparation halted until cross talk process finish.
                  */
-                nau8825_sema_acquire(nau8825, 2 * HZ);
+                nau8825_sema_acquire(nau8825, 3 * HZ);
+                /* If FLL reference input is from low frequency source,
+                 * higher error gain can apply such as 0xf which has
+                 * the most sensitive gain error correction threshold,
+                 * Therefore, FLL has the most accurate DCO to
+                 * target frequency.
+                 */
                 regmap_update_bits(regmap, NAU8825_REG_FLL3,
-                        NAU8825_FLL_CLK_SRC_MASK, NAU8825_FLL_CLK_SRC_BLK);
+                        NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK,
+                        NAU8825_FLL_CLK_SRC_BLK |
+                        (0xf << NAU8825_GAIN_ERR_SFT));
                 /* Release the semaphone. */
                 nau8825_sema_release(nau8825);
 
@@ -2118,9 +2218,17 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
                  * fered by cross talk process, the driver make the playback
                  * preparation halted until cross talk process finish.
                  */
-                nau8825_sema_acquire(nau8825, 2 * HZ);
+                nau8825_sema_acquire(nau8825, 3 * HZ);
+                /* If FLL reference input is from low frequency source,
+                 * higher error gain can apply such as 0xf which has
+                 * the most sensitive gain error correction threshold,
+                 * Therefore, FLL has the most accurate DCO to
+                 * target frequency.
+                 */
                 regmap_update_bits(regmap, NAU8825_REG_FLL3,
-                        NAU8825_FLL_CLK_SRC_MASK, NAU8825_FLL_CLK_SRC_FS);
+                        NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK,
+                        NAU8825_FLL_CLK_SRC_FS |
+                        (0xf << NAU8825_GAIN_ERR_SFT));
                 /* Release the semaphone. */
                 nau8825_sema_release(nau8825);
 
diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h
index 1c63e2abafa9..5d1704e73241 100644
--- a/sound/soc/codecs/nau8825.h
+++ b/sound/soc/codecs/nau8825.h
@@ -115,12 +115,20 @@
 #define NAU8825_CLK_SRC_MASK                    (1 << NAU8825_CLK_SRC_SFT)
 #define NAU8825_CLK_SRC_VCO                     (1 << NAU8825_CLK_SRC_SFT)
 #define NAU8825_CLK_SRC_MCLK                    (0 << NAU8825_CLK_SRC_SFT)
+#define NAU8825_CLK_ADC_SRC_SFT         6
+#define NAU8825_CLK_ADC_SRC_MASK                (0x3 << NAU8825_CLK_ADC_SRC_SFT)
+#define NAU8825_CLK_DAC_SRC_SFT         4
+#define NAU8825_CLK_DAC_SRC_MASK                (0x3 << NAU8825_CLK_DAC_SRC_SFT)
 #define NAU8825_CLK_MCLK_SRC_MASK               (0xf << 0)
 
 /* FLL1 (0x04) */
+#define NAU8825_ICTRL_LATCH_SFT 10
+#define NAU8825_ICTRL_LATCH_MASK        (0x7 << NAU8825_ICTRL_LATCH_SFT)
 #define NAU8825_FLL_RATIO_MASK                  (0x7f << 0)
 
 /* FLL3 (0x06) */
+#define NAU8825_GAIN_ERR_SFT                    12
+#define NAU8825_GAIN_ERR_MASK                   (0xf << NAU8825_GAIN_ERR_SFT)
 #define NAU8825_FLL_INTEGER_MASK                (0x3ff << 0)
 #define NAU8825_FLL_CLK_SRC_SFT         10
 #define NAU8825_FLL_CLK_SRC_MASK                (0x3 << NAU8825_FLL_CLK_SRC_SFT)
@@ -144,6 +152,7 @@
 /* FLL6 (0x9) */
 #define NAU8825_DCO_EN                          (0x1 << 15)
 #define NAU8825_SDM_EN                          (0x1 << 14)
+#define NAU8825_CUTOFF500                       (0x1 << 13)
 
 /* HSD_CTRL (0xc) */
 #define NAU8825_HSD_AUTO_MODE   (1 << 6)
@@ -246,6 +255,11 @@
 #define NAU8825_I2S_MS_SLAVE    (0 << NAU8825_I2S_MS_SFT)
 #define NAU8825_I2S_BLK_DIV_MASK        0x7
 
+/* LEFT_TIME_SLOT (0x1e) */
+#define NAU8825_FS_ERR_CMP_SEL_SFT      14
+#define NAU8825_FS_ERR_CMP_SEL_MASK     (0x3 << NAU8825_FS_ERR_CMP_SEL_SFT)
+#define NAU8825_DIS_FS_SHORT_DET        (1 << 13)
+
 /* BIQ_CTRL (0x20) */
 #define NAU8825_BIQ_WRT_SFT   4
 #define NAU8825_BIQ_WRT_EN     (1 << NAU8825_BIQ_WRT_SFT)
@@ -255,6 +269,8 @@
 #define NAU8825_BIQ_PATH_DAC   (1 << NAU8825_BIQ_PATH_SFT)
 
 /* ADC_RATE (0x2b) */
+#define NAU8825_ADC_SINC4_SFT           4
+#define NAU8825_ADC_SINC4_EN            (1 << NAU8825_ADC_SINC4_SFT)
 #define NAU8825_ADC_SYNC_DOWN_SFT       0
 #define NAU8825_ADC_SYNC_DOWN_MASK      0x3
 #define NAU8825_ADC_SYNC_DOWN_32        0
diff --git a/sound/soc/codecs/rl6231.c b/sound/soc/codecs/rl6231.c
index 1dc68ab08a17..7b447d0b173a 100644
--- a/sound/soc/codecs/rl6231.c
+++ b/sound/soc/codecs/rl6231.c
@@ -102,6 +102,7 @@ struct pll_calc_map {
 };
 
 static const struct pll_calc_map pll_preset_table[] = {
+        {19200000,  4096000,  23, 14, 1, false},
         {19200000,  24576000,  3, 30, 3, false},
 };
 
diff --git a/sound/soc/codecs/rl6347a.c b/sound/soc/codecs/rl6347a.c
index a4b910efbd45..8f571cf8edd4 100644
--- a/sound/soc/codecs/rl6347a.c
+++ b/sound/soc/codecs/rl6347a.c
@@ -51,7 +51,7 @@ int rl6347a_hw_write(void *context, unsigned int reg, unsigned int value)
         if (ret == 4)
                 return 0;
         else
-                pr_err("ret=%d\n", ret);
+                dev_err(&client->dev, "I2C error %d\n", ret);
         if (ret < 0)
                 return ret;
         else
diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c
index 2db8179047ae..7150a407ffd9 100644
--- a/sound/soc/codecs/rt298.c
+++ b/sound/soc/codecs/rt298.c
@@ -326,11 +326,31 @@ static void rt298_jack_detect_work(struct work_struct *work)
 int rt298_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
 {
         struct rt298_priv *rt298 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm;
+        bool hp = false;
+        bool mic = false;
+        int status = 0;
+
+        /* If jack in NULL, disable HS jack */
+        if (!jack) {
+                regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x2, 0x0);
+                dapm = snd_soc_codec_get_dapm(codec);
+                snd_soc_dapm_disable_pin(dapm, "LDO1");
+                snd_soc_dapm_sync(dapm);
+                return 0;
+        }
 
         rt298->jack = jack;
+        regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x2, 0x2);
 
-        /* Send an initial empty report */
-        snd_soc_jack_report(rt298->jack, 0,
+        rt298_jack_detect(rt298, &hp, &mic);
+        if (hp == true)
+                status |= SND_JACK_HEADPHONE;
+
+        if (mic == true)
+                status |= SND_JACK_MICROPHONE;
+
+        snd_soc_jack_report(rt298->jack, status,
                 SND_JACK_MICROPHONE | SND_JACK_HEADPHONE);
 
         return 0;
diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c
index 09103aab0cb2..0901e25d6db6 100644
--- a/sound/soc/codecs/rt5514-spi.c
+++ b/sound/soc/codecs/rt5514-spi.c
@@ -20,7 +20,6 @@
 #include <linux/slab.h>
 #include <linux/gpio.h>
 #include <linux/sched.h>
-#include <linux/kthread.h>
 #include <linux/uaccess.h>
 #include <linux/miscdevice.h>
 #include <linux/regulator/consumer.h>
diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c
index f24b7cfd3a89..b281a46d769d 100644
--- a/sound/soc/codecs/rt5514.c
+++ b/sound/soc/codecs/rt5514.c
@@ -452,6 +452,9 @@ static int rt5514_set_dmic_clk(struct snd_soc_dapm_widget *w,
                         RT5514_CLK_DMIC_OUT_SEL_MASK,
                         idx << RT5514_CLK_DMIC_OUT_SEL_SFT);
 
+        if (rt5514->pdata.dmic_init_delay)
+                msleep(rt5514->pdata.dmic_init_delay);
+
         return idx;
 }
 
@@ -1073,9 +1076,18 @@ static const struct of_device_id rt5514_of_match[] = {
 MODULE_DEVICE_TABLE(of, rt5514_of_match);
 #endif
 
+static int rt5514_parse_dt(struct rt5514_priv *rt5514, struct device *dev)
+{
+        device_property_read_u32(dev, "realtek,dmic-init-delay-ms",
+                &rt5514->pdata.dmic_init_delay);
+
+        return 0;
+}
+
 static int rt5514_i2c_probe(struct i2c_client *i2c,
                     const struct i2c_device_id *id)
 {
+        struct rt5514_platform_data *pdata = dev_get_platdata(&i2c->dev);
         struct rt5514_priv *rt5514;
         int ret;
         unsigned int val;
@@ -1087,6 +1099,11 @@ static int rt5514_i2c_probe(struct i2c_client *i2c,
 
         i2c_set_clientdata(i2c, rt5514);
 
+        if (pdata)
+                rt5514->pdata = *pdata;
+        else if (i2c->dev.of_node)
+                rt5514_parse_dt(rt5514, &i2c->dev);
+
         rt5514->i2c_regmap = devm_regmap_init_i2c(i2c, &rt5514_i2c_regmap);
         if (IS_ERR(rt5514->i2c_regmap)) {
                 ret = PTR_ERR(rt5514->i2c_regmap);
diff --git a/sound/soc/codecs/rt5514.h b/sound/soc/codecs/rt5514.h
index 229de0e2c88c..5d343fb6d125 100644
--- a/sound/soc/codecs/rt5514.h
+++ b/sound/soc/codecs/rt5514.h
@@ -13,6 +13,7 @@
 #define __RT5514_H__
 
 #include <linux/clk.h>
+#include <sound/rt5514.h>
 
 #define RT5514_DEVICE_ID                        0x10ec5514
 
@@ -243,6 +244,7 @@ enum {
 };
 
 struct rt5514_priv {
+        struct rt5514_platform_data pdata;
         struct snd_soc_codec *codec;
         struct regmap *i2c_regmap, *regmap;
         struct clk *mclk;
diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c
index d1f273b24991..7d6e0823f98f 100644
--- a/sound/soc/codecs/rt5616.c
+++ b/sound/soc/codecs/rt5616.c
@@ -960,8 +960,7 @@ static int rt5616_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 rt5616_priv *rt5616 = snd_soc_codec_get_drvdata(codec);
         unsigned int val_len = 0, val_clk, mask_clk;
         int pre_div, bclk_ms, frame_size;
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 3cc1135fc2cd..e29a6defefa0 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -423,6 +423,8 @@ static const struct snd_kcontrol_new rt5640_snd_controls[] = {
         SOC_DOUBLE_TLV("ADC Capture Volume", RT5640_ADC_DIG_VOL,
                         RT5640_L_VOL_SFT, RT5640_R_VOL_SFT,
                         127, 0, adc_vol_tlv),
+        SOC_DOUBLE("Mono ADC Capture Switch", RT5640_DUMMY1,
+                RT5640_M_MONO_ADC_L_SFT, RT5640_M_MONO_ADC_R_SFT, 1, 1),
         SOC_DOUBLE_TLV("Mono ADC Capture Volume", RT5640_ADC_DATA,
                         RT5640_L_VOL_SFT, RT5640_R_VOL_SFT,
                         127, 0, adc_vol_tlv),
@@ -2407,6 +2409,9 @@ static int rt5640_i2c_probe(struct i2c_client *i2c,
         if (ret != 0)
                 dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret);
 
+        regmap_update_bits(rt5640->regmap, RT5640_DUMMY1,
+                                RT5640_MCLK_DET, RT5640_MCLK_DET);
+
         if (rt5640->pdata.in1_diff)
                 regmap_update_bits(rt5640->regmap, RT5640_IN1_IN2,
                                         RT5640_IN_DF1, RT5640_IN_DF1);
diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h
index 90c88711c72a..b8a811732a52 100644
--- a/sound/soc/codecs/rt5640.h
+++ b/sound/soc/codecs/rt5640.h
@@ -1970,6 +1970,12 @@
 #define RT5640_ZCD_HP_DIS                       (0x0 << 15)
 #define RT5640_ZCD_HP_EN                        (0x1 << 15)
 
+/* General Control 1 (0xfa) */
+#define RT5640_M_MONO_ADC_L                     (0x1 << 13)
+#define RT5640_M_MONO_ADC_L_SFT                 13
+#define RT5640_M_MONO_ADC_R                     (0x1 << 12)
+#define RT5640_M_MONO_ADC_R_SFT                 12
+#define RT5640_MCLK_DET                         (0x1 << 11)
 
 /* Codec Private Register definition */
 /* 3D Speaker Control (0x63) */
diff --git a/sound/soc/codecs/rt5660.c b/sound/soc/codecs/rt5660.c
index 9f0933ced804..76cf76a2e9b6 100644
--- a/sound/soc/codecs/rt5660.c
+++ b/sound/soc/codecs/rt5660.c
@@ -1311,6 +1311,10 @@ static int rt5660_i2c_probe(struct i2c_client *i2c,
         if (ret != 0)
                 dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret);
 
+        regmap_update_bits(rt5660->regmap, RT5660_GEN_CTRL1,
+                RT5660_AUTO_DIS_AMP | RT5660_MCLK_DET | RT5660_POW_CLKDET,
+                RT5660_AUTO_DIS_AMP | RT5660_MCLK_DET | RT5660_POW_CLKDET);
+
         if (rt5660->pdata.dmic1_data_pin) {
                 regmap_update_bits(rt5660->regmap, RT5660_GPIO_CTRL1,
                         RT5660_GP1_PIN_MASK, RT5660_GP1_PIN_DMIC1_SCL);
diff --git a/sound/soc/codecs/rt5660.h b/sound/soc/codecs/rt5660.h
index 6cdb9269ec9e..bba18fb66b6f 100644
--- a/sound/soc/codecs/rt5660.h
+++ b/sound/soc/codecs/rt5660.h
@@ -810,6 +810,9 @@
 /* General Control 1 (0xfa) */
 #define RT5660_PWR_VREF_HP                      (0x1 << 11)
 #define RT5660_PWR_VREF_HP_SFT                  11
+#define RT5660_AUTO_DIS_AMP                     (0x1 << 6)
+#define RT5660_MCLK_DET                         (0x1 << 5)
+#define RT5660_POW_CLKDET                       (0x1 << 1)
 #define RT5660_DIG_GATE_CTRL                    (0x1)
 #define RT5660_DIG_GATE_CTRL_SFT                0
 
diff --git a/sound/soc/codecs/rt5663.c b/sound/soc/codecs/rt5663.c
index 00ff2788879e..a32508d7dcfd 100644
--- a/sound/soc/codecs/rt5663.c
+++ b/sound/soc/codecs/rt5663.c
@@ -1,5 +1,5 @@
 /*
- * rt5663.c  --  RT5668/RT5663 ALSA SoC audio codec driver
+ * rt5663.c  --  RT5663 ALSA SoC audio codec driver
  *
  * Copyright 2016 Realtek Semiconductor Corp.
  * Author: Jack Yu <jack.yu@realtek.com>
@@ -30,12 +30,12 @@
 #include "rt5663.h"
 #include "rl6231.h"
 
-#define RT5668_DEVICE_ID 0x6451
-#define RT5663_DEVICE_ID 0x6406
+#define RT5663_DEVICE_ID_2 0x6451
+#define RT5663_DEVICE_ID_1 0x6406
 
 enum {
-        CODEC_TYPE_RT5668,
-        CODEC_TYPE_RT5663,
+        CODEC_VER_1,
+        CODEC_VER_0,
 };
 
 struct rt5663_priv {
@@ -45,7 +45,7 @@ struct rt5663_priv {
         struct snd_soc_jack *hs_jack;
         struct timer_list btn_check_timer;
 
-        int codec_type;
+        int codec_ver;
         int sysclk;
         int sysclk_src;
         int lrck;
@@ -57,7 +57,7 @@ struct rt5663_priv {
         int jack_type;
 };
 
-static const struct reg_default rt5668_reg[] = {
+static const struct reg_default rt5663_v2_reg[] = {
         { 0x0000, 0x0000 },
         { 0x0001, 0xc8c8 },
         { 0x0002, 0x8080 },
@@ -730,7 +730,7 @@ static bool rt5663_volatile_register(struct device *dev, unsigned int reg)
         case RT5663_ADC_EQ_1:
         case RT5663_INT_ST_1:
         case RT5663_INT_ST_2:
-        case RT5663_GPIO_STA:
+        case RT5663_GPIO_STA1:
         case RT5663_SIN_GEN_1:
         case RT5663_IL_CMD_1:
         case RT5663_IL_CMD_5:
@@ -846,7 +846,7 @@ static bool rt5663_readable_register(struct device *dev, unsigned int reg)
         case RT5663_INT_ST_2:
         case RT5663_GPIO_1:
         case RT5663_GPIO_2:
-        case RT5663_GPIO_STA:
+        case RT5663_GPIO_STA1:
         case RT5663_SIN_GEN_1:
         case RT5663_SIN_GEN_2:
         case RT5663_SIN_GEN_3:
@@ -1036,23 +1036,23 @@ static bool rt5663_readable_register(struct device *dev, unsigned int reg)
         }
 }
 
-static bool rt5668_volatile_register(struct device *dev, unsigned int reg)
+static bool rt5663_v2_volatile_register(struct device *dev, unsigned int reg)
 {
         switch (reg) {
         case RT5663_RESET:
-        case RT5668_CBJ_TYPE_2:
-        case RT5668_PDM_OUT_CTL:
-        case RT5668_PDM_I2C_DATA_CTL1:
-        case RT5668_PDM_I2C_DATA_CTL4:
-        case RT5668_ALC_BK_GAIN:
+        case RT5663_CBJ_TYPE_2:
+        case RT5663_PDM_OUT_CTL:
+        case RT5663_PDM_I2C_DATA_CTL1:
+        case RT5663_PDM_I2C_DATA_CTL4:
+        case RT5663_ALC_BK_GAIN:
         case RT5663_PLL_2:
         case RT5663_MICBIAS_1:
         case RT5663_ADC_EQ_1:
         case RT5663_INT_ST_1:
-        case RT5668_GPIO_STA:
+        case RT5663_GPIO_STA2:
         case RT5663_IL_CMD_1:
         case RT5663_IL_CMD_5:
-        case RT5668_A_JD_CTRL:
+        case RT5663_A_JD_CTRL:
         case RT5663_JD_CTRL2:
         case RT5663_VENDOR_ID:
         case RT5663_VENDOR_ID_1:
@@ -1061,15 +1061,15 @@ static bool rt5668_volatile_register(struct device *dev, unsigned int reg)
         case RT5663_STO_DRE_5:
         case RT5663_STO_DRE_6:
         case RT5663_STO_DRE_7:
-        case RT5668_MONO_DYNA_6:
-        case RT5668_STO1_SIL_DET:
-        case RT5668_MONOL_SIL_DET:
-        case RT5668_MONOR_SIL_DET:
-        case RT5668_STO2_DAC_SIL:
-        case RT5668_MONO_AMP_CAL_ST1:
-        case RT5668_MONO_AMP_CAL_ST2:
-        case RT5668_MONO_AMP_CAL_ST3:
-        case RT5668_MONO_AMP_CAL_ST4:
+        case RT5663_MONO_DYNA_6:
+        case RT5663_STO1_SIL_DET:
+        case RT5663_MONOL_SIL_DET:
+        case RT5663_MONOR_SIL_DET:
+        case RT5663_STO2_DAC_SIL:
+        case RT5663_MONO_AMP_CAL_ST1:
+        case RT5663_MONO_AMP_CAL_ST2:
+        case RT5663_MONO_AMP_CAL_ST3:
+        case RT5663_MONO_AMP_CAL_ST4:
         case RT5663_HP_IMP_SEN_2:
         case RT5663_HP_IMP_SEN_3:
         case RT5663_HP_IMP_SEN_4:
@@ -1083,218 +1083,218 @@ static bool rt5668_volatile_register(struct device *dev, unsigned int reg)
         case RT5663_HP_CALIB_ST7:
         case RT5663_HP_CALIB_ST8:
         case RT5663_HP_CALIB_ST9:
-        case RT5668_HP_CALIB_ST10:
-        case RT5668_HP_CALIB_ST11:
+        case RT5663_HP_CALIB_ST10:
+        case RT5663_HP_CALIB_ST11:
                 return true;
         default:
                 return false;
         }
 }
 
-static bool rt5668_readable_register(struct device *dev, unsigned int reg)
+static bool rt5663_v2_readable_register(struct device *dev, unsigned int reg)
 {
         switch (reg) {
-        case RT5668_LOUT_CTRL:
-        case RT5668_HP_AMP_2:
-        case RT5668_MONO_OUT:
-        case RT5668_MONO_GAIN:
-        case RT5668_AEC_BST:
-        case RT5668_IN1_IN2:
-        case RT5668_IN3_IN4:
-        case RT5668_INL1_INR1:
-        case RT5668_CBJ_TYPE_2:
-        case RT5668_CBJ_TYPE_3:
-        case RT5668_CBJ_TYPE_4:
-        case RT5668_CBJ_TYPE_5:
-        case RT5668_CBJ_TYPE_8:
-        case RT5668_DAC3_DIG_VOL:
-        case RT5668_DAC3_CTRL:
-        case RT5668_MONO_ADC_DIG_VOL:
-        case RT5668_STO2_ADC_DIG_VOL:
-        case RT5668_MONO_ADC_BST_GAIN:
-        case RT5668_STO2_ADC_BST_GAIN:
-        case RT5668_SIDETONE_CTRL:
-        case RT5668_MONO1_ADC_MIXER:
-        case RT5668_STO2_ADC_MIXER:
-        case RT5668_MONO_DAC_MIXER:
-        case RT5668_DAC2_SRC_CTRL:
-        case RT5668_IF_3_4_DATA_CTL:
-        case RT5668_IF_5_DATA_CTL:
-        case RT5668_PDM_OUT_CTL:
-        case RT5668_PDM_I2C_DATA_CTL1:
-        case RT5668_PDM_I2C_DATA_CTL2:
-        case RT5668_PDM_I2C_DATA_CTL3:
-        case RT5668_PDM_I2C_DATA_CTL4:
-        case RT5668_RECMIX1_NEW:
-        case RT5668_RECMIX1L_0:
-        case RT5668_RECMIX1L:
-        case RT5668_RECMIX1R_0:
-        case RT5668_RECMIX1R:
-        case RT5668_RECMIX2_NEW:
-        case RT5668_RECMIX2_L_2:
-        case RT5668_RECMIX2_R:
-        case RT5668_RECMIX2_R_2:
-        case RT5668_CALIB_REC_LR:
-        case RT5668_ALC_BK_GAIN:
-        case RT5668_MONOMIX_GAIN:
-        case RT5668_MONOMIX_IN_GAIN:
-        case RT5668_OUT_MIXL_GAIN:
-        case RT5668_OUT_LMIX_IN_GAIN:
-        case RT5668_OUT_RMIX_IN_GAIN:
-        case RT5668_OUT_RMIX_IN_GAIN1:
-        case RT5668_LOUT_MIXER_CTRL:
-        case RT5668_PWR_VOL:
-        case RT5668_ADCDAC_RST:
-        case RT5668_I2S34_SDP:
-        case RT5668_I2S5_SDP:
-        case RT5668_TDM_5:
-        case RT5668_TDM_6:
-        case RT5668_TDM_7:
-        case RT5668_TDM_8:
-        case RT5668_ASRC_3:
-        case RT5668_ASRC_6:
-        case RT5668_ASRC_7:
-        case RT5668_PLL_TRK_13:
-        case RT5668_I2S_M_CLK_CTL:
-        case RT5668_FDIV_I2S34_M_CLK:
-        case RT5668_FDIV_I2S34_M_CLK2:
-        case RT5668_FDIV_I2S5_M_CLK:
-        case RT5668_FDIV_I2S5_M_CLK2:
-        case RT5668_IRQ_4:
-        case RT5668_GPIO_3:
-        case RT5668_GPIO_4:
-        case RT5668_GPIO_STA:
-        case RT5668_HP_AMP_DET1:
-        case RT5668_HP_AMP_DET2:
-        case RT5668_HP_AMP_DET3:
-        case RT5668_MID_BD_HP_AMP:
-        case RT5668_LOW_BD_HP_AMP:
-        case RT5668_SOF_VOL_ZC2:
-        case RT5668_ADC_STO2_ADJ1:
-        case RT5668_ADC_STO2_ADJ2:
-        case RT5668_A_JD_CTRL:
-        case RT5668_JD1_TRES_CTRL:
-        case RT5668_JD2_TRES_CTRL:
-        case RT5668_JD_CTRL2:
-        case RT5668_DUM_REG_2:
-        case RT5668_DUM_REG_3:
+        case RT5663_LOUT_CTRL:
+        case RT5663_HP_AMP_2:
+        case RT5663_MONO_OUT:
+        case RT5663_MONO_GAIN:
+        case RT5663_AEC_BST:
+        case RT5663_IN1_IN2:
+        case RT5663_IN3_IN4:
+        case RT5663_INL1_INR1:
+        case RT5663_CBJ_TYPE_2:
+        case RT5663_CBJ_TYPE_3:
+        case RT5663_CBJ_TYPE_4:
+        case RT5663_CBJ_TYPE_5:
+        case RT5663_CBJ_TYPE_8:
+        case RT5663_DAC3_DIG_VOL:
+        case RT5663_DAC3_CTRL:
+        case RT5663_MONO_ADC_DIG_VOL:
+        case RT5663_STO2_ADC_DIG_VOL:
+        case RT5663_MONO_ADC_BST_GAIN:
+        case RT5663_STO2_ADC_BST_GAIN:
+        case RT5663_SIDETONE_CTRL:
+        case RT5663_MONO1_ADC_MIXER:
+        case RT5663_STO2_ADC_MIXER:
+        case RT5663_MONO_DAC_MIXER:
+        case RT5663_DAC2_SRC_CTRL:
+        case RT5663_IF_3_4_DATA_CTL:
+        case RT5663_IF_5_DATA_CTL:
+        case RT5663_PDM_OUT_CTL:
+        case RT5663_PDM_I2C_DATA_CTL1:
+        case RT5663_PDM_I2C_DATA_CTL2:
+        case RT5663_PDM_I2C_DATA_CTL3:
+        case RT5663_PDM_I2C_DATA_CTL4:
+        case RT5663_RECMIX1_NEW:
+        case RT5663_RECMIX1L_0:
+        case RT5663_RECMIX1L:
+        case RT5663_RECMIX1R_0:
+        case RT5663_RECMIX1R:
+        case RT5663_RECMIX2_NEW:
+        case RT5663_RECMIX2_L_2:
+        case RT5663_RECMIX2_R:
+        case RT5663_RECMIX2_R_2:
+        case RT5663_CALIB_REC_LR:
+        case RT5663_ALC_BK_GAIN:
+        case RT5663_MONOMIX_GAIN:
+        case RT5663_MONOMIX_IN_GAIN:
+        case RT5663_OUT_MIXL_GAIN:
+        case RT5663_OUT_LMIX_IN_GAIN:
+        case RT5663_OUT_RMIX_IN_GAIN:
+        case RT5663_OUT_RMIX_IN_GAIN1:
+        case RT5663_LOUT_MIXER_CTRL:
+        case RT5663_PWR_VOL:
+        case RT5663_ADCDAC_RST:
+        case RT5663_I2S34_SDP:
+        case RT5663_I2S5_SDP:
+        case RT5663_TDM_6:
+        case RT5663_TDM_7:
+        case RT5663_TDM_8:
+        case RT5663_TDM_9:
+        case RT5663_ASRC_3:
+        case RT5663_ASRC_6:
+        case RT5663_ASRC_7:
+        case RT5663_PLL_TRK_13:
+        case RT5663_I2S_M_CLK_CTL:
+        case RT5663_FDIV_I2S34_M_CLK:
+        case RT5663_FDIV_I2S34_M_CLK2:
+        case RT5663_FDIV_I2S5_M_CLK:
+        case RT5663_FDIV_I2S5_M_CLK2:
+        case RT5663_V2_IRQ_4:
+        case RT5663_GPIO_3:
+        case RT5663_GPIO_4:
+        case RT5663_GPIO_STA2:
+        case RT5663_HP_AMP_DET1:
+        case RT5663_HP_AMP_DET2:
+        case RT5663_HP_AMP_DET3:
+        case RT5663_MID_BD_HP_AMP:
+        case RT5663_LOW_BD_HP_AMP:
+        case RT5663_SOF_VOL_ZC2:
+        case RT5663_ADC_STO2_ADJ1:
+        case RT5663_ADC_STO2_ADJ2:
+        case RT5663_A_JD_CTRL:
+        case RT5663_JD1_TRES_CTRL:
+        case RT5663_JD2_TRES_CTRL:
+        case RT5663_V2_JD_CTRL2:
+        case RT5663_DUM_REG_2:
+        case RT5663_DUM_REG_3:
         case RT5663_VENDOR_ID:
         case RT5663_VENDOR_ID_1:
         case RT5663_VENDOR_ID_2:
-        case RT5668_DACADC_DIG_VOL2:
-        case RT5668_DIG_IN_PIN2:
-        case RT5668_PAD_DRV_CTL1:
-        case RT5668_SOF_RAM_DEPOP:
-        case RT5668_VOL_TEST:
-        case RT5668_TEST_MODE_3:
-        case RT5668_TEST_MODE_4:
+        case RT5663_DACADC_DIG_VOL2:
+        case RT5663_DIG_IN_PIN2:
+        case RT5663_PAD_DRV_CTL1:
+        case RT5663_SOF_RAM_DEPOP:
+        case RT5663_VOL_TEST:
+        case RT5663_TEST_MODE_4:
+        case RT5663_TEST_MODE_5:
         case RT5663_STO_DRE_9:
-        case RT5668_MONO_DYNA_1:
-        case RT5668_MONO_DYNA_2:
-        case RT5668_MONO_DYNA_3:
-        case RT5668_MONO_DYNA_4:
-        case RT5668_MONO_DYNA_5:
-        case RT5668_MONO_DYNA_6:
-        case RT5668_STO1_SIL_DET:
-        case RT5668_MONOL_SIL_DET:
-        case RT5668_MONOR_SIL_DET:
-        case RT5668_STO2_DAC_SIL:
-        case RT5668_PWR_SAV_CTL1:
-        case RT5668_PWR_SAV_CTL2:
-        case RT5668_PWR_SAV_CTL3:
-        case RT5668_PWR_SAV_CTL4:
-        case RT5668_PWR_SAV_CTL5:
-        case RT5668_PWR_SAV_CTL6:
-        case RT5668_MONO_AMP_CAL1:
-        case RT5668_MONO_AMP_CAL2:
-        case RT5668_MONO_AMP_CAL3:
-        case RT5668_MONO_AMP_CAL4:
-        case RT5668_MONO_AMP_CAL5:
-        case RT5668_MONO_AMP_CAL6:
-        case RT5668_MONO_AMP_CAL7:
-        case RT5668_MONO_AMP_CAL_ST1:
-        case RT5668_MONO_AMP_CAL_ST2:
-        case RT5668_MONO_AMP_CAL_ST3:
-        case RT5668_MONO_AMP_CAL_ST4:
-        case RT5668_MONO_AMP_CAL_ST5:
-        case RT5668_HP_IMP_SEN_13:
-        case RT5668_HP_IMP_SEN_14:
-        case RT5668_HP_IMP_SEN_6:
-        case RT5668_HP_IMP_SEN_7:
-        case RT5668_HP_IMP_SEN_8:
-        case RT5668_HP_IMP_SEN_9:
-        case RT5668_HP_IMP_SEN_10:
-        case RT5668_HP_LOGIC_3:
-        case RT5668_HP_CALIB_ST10:
-        case RT5668_HP_CALIB_ST11:
-        case RT5668_PRO_REG_TBL_4:
-        case RT5668_PRO_REG_TBL_5:
-        case RT5668_PRO_REG_TBL_6:
-        case RT5668_PRO_REG_TBL_7:
-        case RT5668_PRO_REG_TBL_8:
-        case RT5668_PRO_REG_TBL_9:
-        case RT5668_SAR_ADC_INL_1:
-        case RT5668_SAR_ADC_INL_2:
-        case RT5668_SAR_ADC_INL_3:
-        case RT5668_SAR_ADC_INL_4:
-        case RT5668_SAR_ADC_INL_5:
-        case RT5668_SAR_ADC_INL_6:
-        case RT5668_SAR_ADC_INL_7:
-        case RT5668_SAR_ADC_INL_8:
-        case RT5668_SAR_ADC_INL_9:
-        case RT5668_SAR_ADC_INL_10:
-        case RT5668_SAR_ADC_INL_11:
-        case RT5668_SAR_ADC_INL_12:
-        case RT5668_DRC_CTRL_1:
-        case RT5668_DRC1_CTRL_2:
-        case RT5668_DRC1_CTRL_3:
-        case RT5668_DRC1_CTRL_4:
-        case RT5668_DRC1_CTRL_5:
-        case RT5668_DRC1_CTRL_6:
-        case RT5668_DRC1_HD_CTRL_1:
-        case RT5668_DRC1_HD_CTRL_2:
-        case RT5668_DRC1_PRI_REG_1:
-        case RT5668_DRC1_PRI_REG_2:
-        case RT5668_DRC1_PRI_REG_3:
-        case RT5668_DRC1_PRI_REG_4:
-        case RT5668_DRC1_PRI_REG_5:
-        case RT5668_DRC1_PRI_REG_6:
-        case RT5668_DRC1_PRI_REG_7:
-        case RT5668_DRC1_PRI_REG_8:
-        case RT5668_ALC_PGA_CTL_1:
-        case RT5668_ALC_PGA_CTL_2:
-        case RT5668_ALC_PGA_CTL_3:
-        case RT5668_ALC_PGA_CTL_4:
-        case RT5668_ALC_PGA_CTL_5:
-        case RT5668_ALC_PGA_CTL_6:
-        case RT5668_ALC_PGA_CTL_7:
-        case RT5668_ALC_PGA_CTL_8:
-        case RT5668_ALC_PGA_REG_1:
-        case RT5668_ALC_PGA_REG_2:
-        case RT5668_ALC_PGA_REG_3:
-        case RT5668_ADC_EQ_RECOV_1:
-        case RT5668_ADC_EQ_RECOV_2:
-        case RT5668_ADC_EQ_RECOV_3:
-        case RT5668_ADC_EQ_RECOV_4:
-        case RT5668_ADC_EQ_RECOV_5:
-        case RT5668_ADC_EQ_RECOV_6:
-        case RT5668_ADC_EQ_RECOV_7:
-        case RT5668_ADC_EQ_RECOV_8:
-        case RT5668_ADC_EQ_RECOV_9:
-        case RT5668_ADC_EQ_RECOV_10:
-        case RT5668_ADC_EQ_RECOV_11:
-        case RT5668_ADC_EQ_RECOV_12:
-        case RT5668_ADC_EQ_RECOV_13:
-        case RT5668_VID_HIDDEN:
-        case RT5668_VID_CUSTOMER:
-        case RT5668_SCAN_MODE:
-        case RT5668_I2C_BYPA:
+        case RT5663_MONO_DYNA_1:
+        case RT5663_MONO_DYNA_2:
+        case RT5663_MONO_DYNA_3:
+        case RT5663_MONO_DYNA_4:
+        case RT5663_MONO_DYNA_5:
+        case RT5663_MONO_DYNA_6:
+        case RT5663_STO1_SIL_DET:
+        case RT5663_MONOL_SIL_DET:
+        case RT5663_MONOR_SIL_DET:
+        case RT5663_STO2_DAC_SIL:
+        case RT5663_PWR_SAV_CTL1:
+        case RT5663_PWR_SAV_CTL2:
+        case RT5663_PWR_SAV_CTL3:
+        case RT5663_PWR_SAV_CTL4:
+        case RT5663_PWR_SAV_CTL5:
+        case RT5663_PWR_SAV_CTL6:
+        case RT5663_MONO_AMP_CAL1:
+        case RT5663_MONO_AMP_CAL2:
+        case RT5663_MONO_AMP_CAL3:
+        case RT5663_MONO_AMP_CAL4:
+        case RT5663_MONO_AMP_CAL5:
+        case RT5663_MONO_AMP_CAL6:
+        case RT5663_MONO_AMP_CAL7:
+        case RT5663_MONO_AMP_CAL_ST1:
+        case RT5663_MONO_AMP_CAL_ST2:
+        case RT5663_MONO_AMP_CAL_ST3:
+        case RT5663_MONO_AMP_CAL_ST4:
+        case RT5663_MONO_AMP_CAL_ST5:
+        case RT5663_V2_HP_IMP_SEN_13:
+        case RT5663_V2_HP_IMP_SEN_14:
+        case RT5663_V2_HP_IMP_SEN_6:
+        case RT5663_V2_HP_IMP_SEN_7:
+        case RT5663_V2_HP_IMP_SEN_8:
+        case RT5663_V2_HP_IMP_SEN_9:
+        case RT5663_V2_HP_IMP_SEN_10:
+        case RT5663_HP_LOGIC_3:
+        case RT5663_HP_CALIB_ST10:
+        case RT5663_HP_CALIB_ST11:
+        case RT5663_PRO_REG_TBL_4:
+        case RT5663_PRO_REG_TBL_5:
+        case RT5663_PRO_REG_TBL_6:
+        case RT5663_PRO_REG_TBL_7:
+        case RT5663_PRO_REG_TBL_8:
+        case RT5663_PRO_REG_TBL_9:
+        case RT5663_SAR_ADC_INL_1:
+        case RT5663_SAR_ADC_INL_2:
+        case RT5663_SAR_ADC_INL_3:
+        case RT5663_SAR_ADC_INL_4:
+        case RT5663_SAR_ADC_INL_5:
+        case RT5663_SAR_ADC_INL_6:
+        case RT5663_SAR_ADC_INL_7:
+        case RT5663_SAR_ADC_INL_8:
+        case RT5663_SAR_ADC_INL_9:
+        case RT5663_SAR_ADC_INL_10:
+        case RT5663_SAR_ADC_INL_11:
+        case RT5663_SAR_ADC_INL_12:
+        case RT5663_DRC_CTRL_1:
+        case RT5663_DRC1_CTRL_2:
+        case RT5663_DRC1_CTRL_3:
+        case RT5663_DRC1_CTRL_4:
+        case RT5663_DRC1_CTRL_5:
+        case RT5663_DRC1_CTRL_6:
+        case RT5663_DRC1_HD_CTRL_1:
+        case RT5663_DRC1_HD_CTRL_2:
+        case RT5663_DRC1_PRI_REG_1:
+        case RT5663_DRC1_PRI_REG_2:
+        case RT5663_DRC1_PRI_REG_3:
+        case RT5663_DRC1_PRI_REG_4:
+        case RT5663_DRC1_PRI_REG_5:
+        case RT5663_DRC1_PRI_REG_6:
+        case RT5663_DRC1_PRI_REG_7:
+        case RT5663_DRC1_PRI_REG_8:
+        case RT5663_ALC_PGA_CTL_1:
+        case RT5663_ALC_PGA_CTL_2:
+        case RT5663_ALC_PGA_CTL_3:
+        case RT5663_ALC_PGA_CTL_4:
+        case RT5663_ALC_PGA_CTL_5:
+        case RT5663_ALC_PGA_CTL_6:
+        case RT5663_ALC_PGA_CTL_7:
+        case RT5663_ALC_PGA_CTL_8:
+        case RT5663_ALC_PGA_REG_1:
+        case RT5663_ALC_PGA_REG_2:
+        case RT5663_ALC_PGA_REG_3:
+        case RT5663_ADC_EQ_RECOV_1:
+        case RT5663_ADC_EQ_RECOV_2:
+        case RT5663_ADC_EQ_RECOV_3:
+        case RT5663_ADC_EQ_RECOV_4:
+        case RT5663_ADC_EQ_RECOV_5:
+        case RT5663_ADC_EQ_RECOV_6:
+        case RT5663_ADC_EQ_RECOV_7:
+        case RT5663_ADC_EQ_RECOV_8:
+        case RT5663_ADC_EQ_RECOV_9:
+        case RT5663_ADC_EQ_RECOV_10:
+        case RT5663_ADC_EQ_RECOV_11:
+        case RT5663_ADC_EQ_RECOV_12:
+        case RT5663_ADC_EQ_RECOV_13:
+        case RT5663_VID_HIDDEN:
+        case RT5663_VID_CUSTOMER:
+        case RT5663_SCAN_MODE:
+        case RT5663_I2C_BYPA:
                 return true;
         case RT5663_TDM_1:
         case RT5663_DEPOP_3:
         case RT5663_ASRC_11_2:
         case RT5663_INT_ST_2:
-        case RT5663_GPIO_STA:
+        case RT5663_GPIO_STA1:
         case RT5663_SIN_GEN_1:
         case RT5663_SIN_GEN_2:
         case RT5663_SIN_GEN_3:
@@ -1344,7 +1344,7 @@ static bool rt5668_readable_register(struct device *dev, unsigned int reg)
 }
 
 static const DECLARE_TLV_DB_SCALE(rt5663_hp_vol_tlv, -2400, 150, 0);
-static const DECLARE_TLV_DB_SCALE(rt5668_hp_vol_tlv, -2250, 150, 0);
+static const DECLARE_TLV_DB_SCALE(rt5663_v2_hp_vol_tlv, -2250, 150, 0);
 static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -6525, 75, 0);
 static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -1725, 75, 0);
 
@@ -1374,57 +1374,57 @@ static void rt5663_enable_push_button_irq(struct snd_soc_codec *codec,
 
         if (enable) {
                 snd_soc_update_bits(codec, RT5663_IL_CMD_6,
-                        RT5668_EN_4BTN_INL_MASK, RT5668_EN_4BTN_INL_EN);
+                        RT5663_EN_4BTN_INL_MASK, RT5663_EN_4BTN_INL_EN);
                 /* reset in-line command */
                 snd_soc_update_bits(codec, RT5663_IL_CMD_6,
-                        RT5668_RESET_4BTN_INL_MASK,
-                        RT5668_RESET_4BTN_INL_RESET);
+                        RT5663_RESET_4BTN_INL_MASK,
+                        RT5663_RESET_4BTN_INL_RESET);
                 snd_soc_update_bits(codec, RT5663_IL_CMD_6,
-                        RT5668_RESET_4BTN_INL_MASK,
-                        RT5668_RESET_4BTN_INL_NOR);
-                switch (rt5663->codec_type) {
-                case CODEC_TYPE_RT5668:
+                        RT5663_RESET_4BTN_INL_MASK,
+                        RT5663_RESET_4BTN_INL_NOR);
+                switch (rt5663->codec_ver) {
+                case CODEC_VER_1:
                         snd_soc_update_bits(codec, RT5663_IRQ_3,
-                                RT5668_EN_IRQ_INLINE_MASK,
-                                RT5668_EN_IRQ_INLINE_NOR);
+                                RT5663_V2_EN_IRQ_INLINE_MASK,
+                                RT5663_V2_EN_IRQ_INLINE_NOR);
                         break;
-                case CODEC_TYPE_RT5663:
+                case CODEC_VER_0:
                         snd_soc_update_bits(codec, RT5663_IRQ_2,
                                 RT5663_EN_IRQ_INLINE_MASK,
                                 RT5663_EN_IRQ_INLINE_NOR);
                         break;
                 default:
-                        dev_err(codec->dev, "Unknown CODEC_TYPE\n");
+                        dev_err(codec->dev, "Unknown CODEC Version\n");
                 }
         } else {
-                switch (rt5663->codec_type) {
-                case CODEC_TYPE_RT5668:
+                switch (rt5663->codec_ver) {
+                case CODEC_VER_1:
                         snd_soc_update_bits(codec, RT5663_IRQ_3,
-                                RT5668_EN_IRQ_INLINE_MASK,
-                                RT5668_EN_IRQ_INLINE_BYP);
+                                RT5663_V2_EN_IRQ_INLINE_MASK,
+                                RT5663_V2_EN_IRQ_INLINE_BYP);
                         break;
-                case CODEC_TYPE_RT5663:
+                case CODEC_VER_0:
                         snd_soc_update_bits(codec, RT5663_IRQ_2,
                                 RT5663_EN_IRQ_INLINE_MASK,
                                 RT5663_EN_IRQ_INLINE_BYP);
                         break;
                 default:
-                        dev_err(codec->dev, "Unknown CODEC_TYPE\n");
+                        dev_err(codec->dev, "Unknown CODEC Version\n");
                 }
                 snd_soc_update_bits(codec, RT5663_IL_CMD_6,
-                        RT5668_EN_4BTN_INL_MASK, RT5668_EN_4BTN_INL_DIS);
+                        RT5663_EN_4BTN_INL_MASK, RT5663_EN_4BTN_INL_DIS);
                 /* reset in-line command */
                 snd_soc_update_bits(codec, RT5663_IL_CMD_6,
-                        RT5668_RESET_4BTN_INL_MASK,
-                        RT5668_RESET_4BTN_INL_RESET);
+                        RT5663_RESET_4BTN_INL_MASK,
+                        RT5663_RESET_4BTN_INL_RESET);
                 snd_soc_update_bits(codec, RT5663_IL_CMD_6,
-                        RT5668_RESET_4BTN_INL_MASK,
-                        RT5668_RESET_4BTN_INL_NOR);
+                        RT5663_RESET_4BTN_INL_MASK,
+                        RT5663_RESET_4BTN_INL_NOR);
         }
 }
 
 /**
- * rt5668_jack_detect - Detect headset.
+ * rt5663_v2_jack_detect - Detect headset.
  * @codec: SoC audio codec device.
  * @jack_insert: Jack insert or not.
  *
@@ -1433,16 +1433,16 @@ static void rt5663_enable_push_button_irq(struct snd_soc_codec *codec,
  * Returns detect status.
  */
 
-static int rt5668_jack_detect(struct snd_soc_codec *codec, int jack_insert)
+static int rt5663_v2_jack_detect(struct snd_soc_codec *codec, int jack_insert)
 {
         struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
-        struct rt5663_priv *rt5668 = snd_soc_codec_get_drvdata(codec);
+        struct rt5663_priv *rt5663 = snd_soc_codec_get_drvdata(codec);
         int val, i = 0, sleep_time[5] = {300, 150, 100, 50, 30};
 
         dev_dbg(codec->dev, "%s jack_insert:%d\n", __func__, jack_insert);
         if (jack_insert) {
-                snd_soc_write(codec, RT5668_CBJ_TYPE_2, 0x8040);
-                snd_soc_write(codec, RT5668_CBJ_TYPE_3, 0x1484);
+                snd_soc_write(codec, RT5663_CBJ_TYPE_2, 0x8040);
+                snd_soc_write(codec, RT5663_CBJ_TYPE_3, 0x1484);
 
                 snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");
                 snd_soc_dapm_force_enable_pin(dapm, "MICBIAS2");
@@ -1450,12 +1450,12 @@ static int rt5668_jack_detect(struct snd_soc_codec *codec, int jack_insert)
                 snd_soc_dapm_force_enable_pin(dapm, "CBJ Power");
                 snd_soc_dapm_sync(dapm);
                 snd_soc_update_bits(codec, RT5663_RC_CLK,
-                        RT5668_DIG_1M_CLK_MASK, RT5668_DIG_1M_CLK_EN);
+                        RT5663_DIG_1M_CLK_MASK, RT5663_DIG_1M_CLK_EN);
                 snd_soc_update_bits(codec, RT5663_RECMIX, 0x8, 0x8);
 
                 while (i < 5) {
                         msleep(sleep_time[i]);
-                        val = snd_soc_read(codec, RT5668_CBJ_TYPE_2) & 0x0003;
+                        val = snd_soc_read(codec, RT5663_CBJ_TYPE_2) & 0x0003;
                         if (val == 0x1 || val == 0x2 || val == 0x3)
                                 break;
                         dev_dbg(codec->dev, "%s: MX-0011 val=%x sleep %d\n",
@@ -1466,7 +1466,7 @@ static int rt5668_jack_detect(struct snd_soc_codec *codec, int jack_insert)
                 switch (val) {
                 case 1:
                 case 2:
-                        rt5668->jack_type = SND_JACK_HEADSET;
+                        rt5663->jack_type = SND_JACK_HEADSET;
                         rt5663_enable_push_button_irq(codec, true);
                         break;
                 default:
@@ -1475,13 +1475,13 @@ static int rt5668_jack_detect(struct snd_soc_codec *codec, int jack_insert)
                         snd_soc_dapm_disable_pin(dapm, "Mic Det Power");
                         snd_soc_dapm_disable_pin(dapm, "CBJ Power");
                         snd_soc_dapm_sync(dapm);
-                        rt5668->jack_type = SND_JACK_HEADPHONE;
+                        rt5663->jack_type = SND_JACK_HEADPHONE;
                         break;
                 }
         } else {
                 snd_soc_update_bits(codec, RT5663_RECMIX, 0x8, 0x0);
 
-                if (rt5668->jack_type == SND_JACK_HEADSET) {
+                if (rt5663->jack_type == SND_JACK_HEADSET) {
                         rt5663_enable_push_button_irq(codec, false);
                         snd_soc_dapm_disable_pin(dapm, "MICBIAS1");
                         snd_soc_dapm_disable_pin(dapm, "MICBIAS2");
@@ -1489,11 +1489,11 @@ static int rt5668_jack_detect(struct snd_soc_codec *codec, int jack_insert)
                         snd_soc_dapm_disable_pin(dapm, "CBJ Power");
                         snd_soc_dapm_sync(dapm);
                 }
-                rt5668->jack_type = 0;
+                rt5663->jack_type = 0;
         }
 
-        dev_dbg(codec->dev, "jack_type = %d\n", rt5668->jack_type);
-        return rt5668->jack_type;
+        dev_dbg(codec->dev, "jack_type = %d\n", rt5663->jack_type);
+        return rt5663->jack_type;
 }
 
 /**
@@ -1514,11 +1514,11 @@ static int rt5663_jack_detect(struct snd_soc_codec *codec, int jack_insert)
 
         if (jack_insert) {
                 snd_soc_update_bits(codec, RT5663_DIG_MISC,
-                        RT5668_DIG_GATE_CTRL_MASK, RT5668_DIG_GATE_CTRL_EN);
+                        RT5663_DIG_GATE_CTRL_MASK, RT5663_DIG_GATE_CTRL_EN);
                 snd_soc_update_bits(codec, RT5663_HP_CHARGE_PUMP_1,
-                        RT5663_SI_HP_MASK | RT5668_OSW_HP_L_MASK |
-                        RT5668_OSW_HP_R_MASK, RT5663_SI_HP_EN |
-                        RT5668_OSW_HP_L_DIS | RT5668_OSW_HP_R_DIS);
+                        RT5663_SI_HP_MASK | RT5663_OSW_HP_L_MASK |
+                        RT5663_OSW_HP_R_MASK, RT5663_SI_HP_EN |
+                        RT5663_OSW_HP_L_DIS | RT5663_OSW_HP_R_DIS);
                 snd_soc_update_bits(codec, RT5663_DUMMY_1,
                         RT5663_EMB_CLK_MASK | RT5663_HPA_CPL_BIAS_MASK |
                         RT5663_HPA_CPR_BIAS_MASK, RT5663_EMB_CLK_EN |
@@ -1530,17 +1530,17 @@ static int rt5663_jack_detect(struct snd_soc_codec *codec, int jack_insert)
                         RT5663_PWR_MIC_DET_MASK, RT5663_PWR_MIC_DET_ON);
                 /* BST1 power on for JD */
                 snd_soc_update_bits(codec, RT5663_PWR_ANLG_2,
-                        RT5668_PWR_BST1_MASK, RT5668_PWR_BST1_ON);
+                        RT5663_PWR_BST1_MASK, RT5663_PWR_BST1_ON);
                 snd_soc_update_bits(codec, RT5663_EM_JACK_TYPE_1,
                         RT5663_CBJ_DET_MASK | RT5663_EXT_JD_MASK |
                         RT5663_POL_EXT_JD_MASK, RT5663_CBJ_DET_EN |
                         RT5663_EXT_JD_EN | RT5663_POL_EXT_JD_EN);
                 snd_soc_update_bits(codec, RT5663_PWR_ANLG_1,
-                        RT5668_PWR_MB_MASK | RT5668_LDO1_DVO_MASK |
-                        RT5668_AMP_HP_MASK, RT5668_PWR_MB |
-                        RT5668_LDO1_DVO_0_9V | RT5668_AMP_HP_3X);
+                        RT5663_PWR_MB_MASK | RT5663_LDO1_DVO_MASK |
+                        RT5663_AMP_HP_MASK, RT5663_PWR_MB |
+                        RT5663_LDO1_DVO_0_9V | RT5663_AMP_HP_3X);
                 snd_soc_update_bits(codec, RT5663_AUTO_1MRC_CLK,
-                        RT5668_IRQ_POW_SAV_MASK, RT5668_IRQ_POW_SAV_EN);
+                        RT5663_IRQ_POW_SAV_MASK, RT5663_IRQ_POW_SAV_EN);
                 snd_soc_update_bits(codec, RT5663_IRQ_1,
                         RT5663_EN_IRQ_JD1_MASK, RT5663_EN_IRQ_JD1_EN);
                 while (i < 5) {
@@ -1619,13 +1619,13 @@ static bool rt5663_check_jd_status(struct snd_soc_codec *codec)
         dev_dbg(codec->dev, "%s val=%x\n", __func__, val);
 
         /* JD1 */
-        switch (rt5663->codec_type) {
-        case CODEC_TYPE_RT5668:
+        switch (rt5663->codec_ver) {
+        case CODEC_VER_1:
                 return !(val & 0x2000);
-        case CODEC_TYPE_RT5663:
+        case CODEC_VER_0:
                 return !(val & 0x1000);
         default:
-                dev_err(codec->dev, "Unknown CODEC_TYPE\n");
+                dev_err(codec->dev, "Unknown CODEC Version\n");
         }
 
         return false;
@@ -1645,15 +1645,16 @@ static void rt5663_jack_detect_work(struct work_struct *work)
                 /* jack in */
                 if (rt5663->jack_type == 0) {
                         /* jack was out, report jack type */
-                        switch (rt5663->codec_type) {
-                        case CODEC_TYPE_RT5668:
-                                report = rt5668_jack_detect(rt5663->codec, 1);
+                        switch (rt5663->codec_ver) {
+                        case CODEC_VER_1:
+                                report = rt5663_v2_jack_detect(
+                                                rt5663->codec, 1);
                                 break;
-                        case CODEC_TYPE_RT5663:
+                        case CODEC_VER_0:
                                 report = rt5663_jack_detect(rt5663->codec, 1);
                                 break;
                         default:
-                                dev_err(codec->dev, "Unknown CODEC_TYPE\n");
+                                dev_err(codec->dev, "Unknown CODEC Version\n");
                         }
                 } else {
                         /* jack is already in, report button event */
@@ -1702,15 +1703,15 @@ static void rt5663_jack_detect_work(struct work_struct *work)
                 }
         } else {
                 /* jack out */
-                switch (rt5663->codec_type) {
-                case CODEC_TYPE_RT5668:
-                        report = rt5668_jack_detect(rt5663->codec, 0);
+                switch (rt5663->codec_ver) {
+                case CODEC_VER_1:
+                        report = rt5663_v2_jack_detect(rt5663->codec, 0);
                         break;
-                case CODEC_TYPE_RT5663:
+                case CODEC_VER_0:
                         report = rt5663_jack_detect(rt5663->codec, 0);
                         break;
                 default:
-                        dev_err(codec->dev, "Unknown CODEC_TYPE\n");
+                        dev_err(codec->dev, "Unknown CODEC Version\n");
                 }
         }
         dev_dbg(codec->dev, "%s jack report: 0x%04x\n", __func__, report);
@@ -1722,24 +1723,24 @@ static void rt5663_jack_detect_work(struct work_struct *work)
 static const struct snd_kcontrol_new rt5663_snd_controls[] = {
         /* DAC Digital Volume */
         SOC_DOUBLE_TLV("DAC Playback Volume", RT5663_STO1_DAC_DIG_VOL,
-                RT5668_DAC_L1_VOL_SHIFT + 1, RT5668_DAC_R1_VOL_SHIFT + 1,
+                RT5663_DAC_L1_VOL_SHIFT + 1, RT5663_DAC_R1_VOL_SHIFT + 1,
                 87, 0, dac_vol_tlv),
         /* ADC Digital Volume Control */
         SOC_DOUBLE("ADC Capture Switch", RT5663_STO1_ADC_DIG_VOL,
-                RT5668_ADC_L_MUTE_SHIFT, RT5668_ADC_R_MUTE_SHIFT, 1, 1),
+                RT5663_ADC_L_MUTE_SHIFT, RT5663_ADC_R_MUTE_SHIFT, 1, 1),
         SOC_DOUBLE_TLV("ADC Capture Volume", RT5663_STO1_ADC_DIG_VOL,
-                RT5668_ADC_L_VOL_SHIFT + 1, RT5668_ADC_R_VOL_SHIFT + 1,
+                RT5663_ADC_L_VOL_SHIFT + 1, RT5663_ADC_R_VOL_SHIFT + 1,
                 63, 0, adc_vol_tlv),
 };
 
-static const struct snd_kcontrol_new rt5668_specific_controls[] = {
+static const struct snd_kcontrol_new rt5663_v2_specific_controls[] = {
         /* Headphone Output Volume */
         SOC_DOUBLE_R_TLV("Headphone Playback Volume", RT5663_HP_LCH_DRE,
-                RT5663_HP_RCH_DRE, RT5668_GAIN_HP_SHIFT, 15, 1,
-                rt5668_hp_vol_tlv),
+                RT5663_HP_RCH_DRE, RT5663_GAIN_HP_SHIFT, 15, 1,
+                rt5663_v2_hp_vol_tlv),
         /* Mic Boost Volume */
-        SOC_SINGLE_TLV("IN1 Capture Volume", RT5668_AEC_BST,
-                RT5668_GAIN_CBJ_SHIFT, 8, 0, in_bst_tlv),
+        SOC_SINGLE_TLV("IN1 Capture Volume", RT5663_AEC_BST,
+                RT5663_GAIN_CBJ_SHIFT, 8, 0, in_bst_tlv),
 };
 
 static const struct snd_kcontrol_new rt5663_specific_controls[] = {
@@ -1775,15 +1776,15 @@ static int rt5663_is_using_asrc(struct snd_soc_dapm_widget *w,
         struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
         struct rt5663_priv *rt5663 = snd_soc_codec_get_drvdata(codec);
 
-        if (rt5663->codec_type == CODEC_TYPE_RT5668) {
+        if (rt5663->codec_ver == CODEC_VER_1) {
                 switch (w->shift) {
-                case RT5668_ADC_STO1_ASRC_SHIFT:
-                        reg = RT5668_ASRC_3;
-                        shift = RT5668_AD_STO1_TRACK_SHIFT;
+                case RT5663_ADC_STO1_ASRC_SHIFT:
+                        reg = RT5663_ASRC_3;
+                        shift = RT5663_V2_AD_STO1_TRACK_SHIFT;
                         break;
-                case RT5668_DAC_STO1_ASRC_SHIFT:
+                case RT5663_DAC_STO1_ASRC_SHIFT:
                         reg = RT5663_ASRC_2;
-                        shift = RT5668_DA_STO1_TRACK_SHIFT;
+                        shift = RT5663_DA_STO1_TRACK_SHIFT;
                         break;
                 default:
                         return 0;
@@ -1820,17 +1821,17 @@ static int rt5663_i2s_use_asrc(struct snd_soc_dapm_widget *source,
 
         da_asrc_en = (snd_soc_read(codec, RT5663_ASRC_2) &
                 RT5663_DA_STO1_TRACK_MASK) ? 1 : 0;
-        switch (rt5663->codec_type) {
-        case CODEC_TYPE_RT5668:
-                ad_asrc_en = (snd_soc_read(codec, RT5668_ASRC_3) &
-                        RT5668_AD_STO1_TRACK_MASK) ? 1 : 0;
+        switch (rt5663->codec_ver) {
+        case CODEC_VER_1:
+                ad_asrc_en = (snd_soc_read(codec, RT5663_ASRC_3) &
+                        RT5663_V2_AD_STO1_TRACK_MASK) ? 1 : 0;
                 break;
-        case CODEC_TYPE_RT5663:
+        case CODEC_VER_0:
                 ad_asrc_en = (snd_soc_read(codec, RT5663_ASRC_2) &
                         RT5663_AD_STO1_TRACK_MASK) ? 1 : 0;
                 break;
         default:
-                dev_err(codec->dev, "Unknown CODEC_TYPE\n");
+                dev_err(codec->dev, "Unknown CODEC Version\n");
                 return 1;
         }
 
@@ -1849,7 +1850,7 @@ static int rt5663_i2s_use_asrc(struct snd_soc_dapm_widget *source,
  * @filter_mask: mask of filters.
  * @clk_src: clock source
  *
- * The ASRC function is for asynchronous MCLK and LRCK. Also, since RT5668 can
+ * The ASRC function is for asynchronous MCLK and LRCK. Also, since RT5663 can
  * only support standard 32fs or 64fs i2s format, ASRC should be enabled to
  * support special i2s clock format such as Intel's 100fs(100 * sampling rate).
  * ASRC function will track i2s clock and generate a corresponding system clock
@@ -1860,7 +1861,7 @@ static int rt5663_i2s_use_asrc(struct snd_soc_dapm_widget *source,
 int rt5663_sel_asrc_clk_src(struct snd_soc_codec *codec,
                 unsigned int filter_mask, unsigned int clk_src)
 {
-        struct rt5663_priv *rt5668 = snd_soc_codec_get_drvdata(codec);
+        struct rt5663_priv *rt5663 = snd_soc_codec_get_drvdata(codec);
         unsigned int asrc2_mask = 0;
         unsigned int asrc2_value = 0;
         unsigned int asrc3_mask = 0;
@@ -1876,22 +1877,22 @@ int rt5663_sel_asrc_clk_src(struct snd_soc_codec *codec,
         }
 
         if (filter_mask & RT5663_DA_STEREO_FILTER) {
-                asrc2_mask |= RT5668_DA_STO1_TRACK_MASK;
-                asrc2_value |= clk_src << RT5668_DA_STO1_TRACK_SHIFT;
+                asrc2_mask |= RT5663_DA_STO1_TRACK_MASK;
+                asrc2_value |= clk_src << RT5663_DA_STO1_TRACK_SHIFT;
         }
 
         if (filter_mask & RT5663_AD_STEREO_FILTER) {
-                switch (rt5668->codec_type) {
-                case CODEC_TYPE_RT5668:
-                        asrc3_mask |= RT5668_AD_STO1_TRACK_MASK;
-                        asrc3_value |= clk_src << RT5668_AD_STO1_TRACK_SHIFT;
+                switch (rt5663->codec_ver) {
+                case CODEC_VER_1:
+                        asrc3_mask |= RT5663_V2_AD_STO1_TRACK_MASK;
+                        asrc3_value |= clk_src << RT5663_V2_AD_STO1_TRACK_SHIFT;
                         break;
-                case CODEC_TYPE_RT5663:
+                case CODEC_VER_0:
                         asrc2_mask |= RT5663_AD_STO1_TRACK_MASK;
                         asrc2_value |= clk_src << RT5663_AD_STO1_TRACK_SHIFT;
                         break;
                 default:
-                        dev_err(codec->dev, "Unknown CODEC_TYPE\n");
+                        dev_err(codec->dev, "Unknown CODEC Version\n");
                 }
         }
 
@@ -1900,7 +1901,7 @@ int rt5663_sel_asrc_clk_src(struct snd_soc_codec *codec,
                         asrc2_value);
 
         if (asrc3_mask)
-                snd_soc_update_bits(codec, RT5668_ASRC_3, asrc3_mask,
+                snd_soc_update_bits(codec, RT5663_ASRC_3, asrc3_mask,
                         asrc3_value);
 
         return 0;
@@ -1908,82 +1909,82 @@ int rt5663_sel_asrc_clk_src(struct snd_soc_codec *codec,
 EXPORT_SYMBOL_GPL(rt5663_sel_asrc_clk_src);
 
 /* Analog Mixer */
-static const struct snd_kcontrol_new rt5668_recmix1l[] = {
-        SOC_DAPM_SINGLE("BST2 Switch", RT5668_RECMIX1L,
-                RT5668_RECMIX1L_BST2_SHIFT, 1, 1),
-        SOC_DAPM_SINGLE("BST1 CBJ Switch", RT5668_RECMIX1L,
-                RT5668_RECMIX1L_BST1_CBJ_SHIFT, 1, 1),
+static const struct snd_kcontrol_new rt5663_recmix1l[] = {
+        SOC_DAPM_SINGLE("BST2 Switch", RT5663_RECMIX1L,
+                RT5663_RECMIX1L_BST2_SHIFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 CBJ Switch", RT5663_RECMIX1L,
+                RT5663_RECMIX1L_BST1_CBJ_SHIFT, 1, 1),
 };
 
-static const struct snd_kcontrol_new rt5668_recmix1r[] = {
-        SOC_DAPM_SINGLE("BST2 Switch", RT5668_RECMIX1R,
-                RT5668_RECMIX1R_BST2_SHIFT, 1, 1),
+static const struct snd_kcontrol_new rt5663_recmix1r[] = {
+        SOC_DAPM_SINGLE("BST2 Switch", RT5663_RECMIX1R,
+                RT5663_RECMIX1R_BST2_SHIFT, 1, 1),
 };
 
 /* Digital Mixer */
 static const struct snd_kcontrol_new rt5663_sto1_adc_l_mix[] = {
         SOC_DAPM_SINGLE("ADC1 Switch", RT5663_STO1_ADC_MIXER,
-                        RT5668_M_STO1_ADC_L1_SHIFT, 1, 1),
+                        RT5663_M_STO1_ADC_L1_SHIFT, 1, 1),
         SOC_DAPM_SINGLE("ADC2 Switch", RT5663_STO1_ADC_MIXER,
-                        RT5668_M_STO1_ADC_L2_SHIFT, 1, 1),
+                        RT5663_M_STO1_ADC_L2_SHIFT, 1, 1),
 };
 
-static const struct snd_kcontrol_new rt5668_sto1_adc_r_mix[] = {
+static const struct snd_kcontrol_new rt5663_sto1_adc_r_mix[] = {
         SOC_DAPM_SINGLE("ADC1 Switch", RT5663_STO1_ADC_MIXER,
-                        RT5668_M_STO1_ADC_R1_SHIFT, 1, 1),
+                        RT5663_M_STO1_ADC_R1_SHIFT, 1, 1),
         SOC_DAPM_SINGLE("ADC2 Switch", RT5663_STO1_ADC_MIXER,
-                        RT5668_M_STO1_ADC_R2_SHIFT, 1, 1),
+                        RT5663_M_STO1_ADC_R2_SHIFT, 1, 1),
 };
 
 static const struct snd_kcontrol_new rt5663_adda_l_mix[] = {
         SOC_DAPM_SINGLE("ADC L Switch", RT5663_AD_DA_MIXER,
-                        RT5668_M_ADCMIX_L_SHIFT, 1, 1),
+                        RT5663_M_ADCMIX_L_SHIFT, 1, 1),
         SOC_DAPM_SINGLE("DAC L Switch", RT5663_AD_DA_MIXER,
-                        RT5668_M_DAC1_L_SHIFT, 1, 1),
+                        RT5663_M_DAC1_L_SHIFT, 1, 1),
 };
 
 static const struct snd_kcontrol_new rt5663_adda_r_mix[] = {
         SOC_DAPM_SINGLE("ADC R Switch", RT5663_AD_DA_MIXER,
-                        RT5668_M_ADCMIX_R_SHIFT, 1, 1),
+                        RT5663_M_ADCMIX_R_SHIFT, 1, 1),
         SOC_DAPM_SINGLE("DAC R Switch", RT5663_AD_DA_MIXER,
-                        RT5668_M_DAC1_R_SHIFT, 1, 1),
+                        RT5663_M_DAC1_R_SHIFT, 1, 1),
 };
 
 static const struct snd_kcontrol_new rt5663_sto1_dac_l_mix[] = {
         SOC_DAPM_SINGLE("DAC L Switch", RT5663_STO_DAC_MIXER,
-                        RT5668_M_DAC_L1_STO_L_SHIFT, 1, 1),
+                        RT5663_M_DAC_L1_STO_L_SHIFT, 1, 1),
         SOC_DAPM_SINGLE("DAC R Switch", RT5663_STO_DAC_MIXER,
-                        RT5668_M_DAC_R1_STO_L_SHIFT, 1, 1),
+                        RT5663_M_DAC_R1_STO_L_SHIFT, 1, 1),
 };
 
 static const struct snd_kcontrol_new rt5663_sto1_dac_r_mix[] = {
         SOC_DAPM_SINGLE("DAC L Switch", RT5663_STO_DAC_MIXER,
-                        RT5668_M_DAC_L1_STO_R_SHIFT, 1, 1),
+                        RT5663_M_DAC_L1_STO_R_SHIFT, 1, 1),
         SOC_DAPM_SINGLE("DAC R Switch", RT5663_STO_DAC_MIXER,
-                        RT5668_M_DAC_R1_STO_R_SHIFT, 1, 1),
+                        RT5663_M_DAC_R1_STO_R_SHIFT, 1, 1),
 };
 
 /* Out Switch */
-static const struct snd_kcontrol_new rt5668_hpo_switch =
-        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5668_HP_AMP_2,
-                RT5668_EN_DAC_HPO_SHIFT, 1, 0);
+static const struct snd_kcontrol_new rt5663_hpo_switch =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5663_HP_AMP_2,
+                RT5663_EN_DAC_HPO_SHIFT, 1, 0);
 
 /* Stereo ADC source */
-static const char * const rt5668_sto1_adc_src[] = {
+static const char * const rt5663_sto1_adc_src[] = {
         "ADC L", "ADC R"
 };
 
-static SOC_ENUM_SINGLE_DECL(rt5668_sto1_adcl_enum, RT5663_STO1_ADC_MIXER,
-        RT5668_STO1_ADC_L_SRC_SHIFT, rt5668_sto1_adc_src);
+static SOC_ENUM_SINGLE_DECL(rt5663_sto1_adcl_enum, RT5663_STO1_ADC_MIXER,
+        RT5663_STO1_ADC_L_SRC_SHIFT, rt5663_sto1_adc_src);
 
-static const struct snd_kcontrol_new rt5668_sto1_adcl_mux =
-        SOC_DAPM_ENUM("STO1 ADC L Mux", rt5668_sto1_adcl_enum);
+static const struct snd_kcontrol_new rt5663_sto1_adcl_mux =
+        SOC_DAPM_ENUM("STO1 ADC L Mux", rt5663_sto1_adcl_enum);
 
-static SOC_ENUM_SINGLE_DECL(rt5668_sto1_adcr_enum, RT5663_STO1_ADC_MIXER,
-        RT5668_STO1_ADC_R_SRC_SHIFT, rt5668_sto1_adc_src);
+static SOC_ENUM_SINGLE_DECL(rt5663_sto1_adcr_enum, RT5663_STO1_ADC_MIXER,
+        RT5663_STO1_ADC_R_SRC_SHIFT, rt5663_sto1_adc_src);
 
-static const struct snd_kcontrol_new rt5668_sto1_adcr_mux =
-        SOC_DAPM_ENUM("STO1 ADC R Mux", rt5668_sto1_adcr_enum);
+static const struct snd_kcontrol_new rt5663_sto1_adcr_mux =
+        SOC_DAPM_ENUM("STO1 ADC R Mux", rt5663_sto1_adcr_enum);
 
 /* RT5663: Analog DACL1 input source */
 static const char * const rt5663_alg_dacl_src[] = {
@@ -2015,12 +2016,12 @@ static int rt5663_hp_event(struct snd_soc_dapm_widget *w,
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
-                if (rt5663->codec_type == CODEC_TYPE_RT5668) {
+                if (rt5663->codec_ver == CODEC_VER_1) {
                         snd_soc_update_bits(codec, RT5663_HP_CHARGE_PUMP_1,
-                                RT5668_SEL_PM_HP_SHIFT, RT5668_SEL_PM_HP_HIGH);
+                                RT5663_SEL_PM_HP_SHIFT, RT5663_SEL_PM_HP_HIGH);
                         snd_soc_update_bits(codec, RT5663_HP_LOGIC_2,
-                                RT5668_HP_SIG_SRC1_MASK,
-                                RT5668_HP_SIG_SRC1_SILENCE);
+                                RT5663_HP_SIG_SRC1_MASK,
+                                RT5663_HP_SIG_SRC1_SILENCE);
                 } else {
                         snd_soc_write(codec, RT5663_DEPOP_2, 0x3003);
                         snd_soc_update_bits(codec, RT5663_DEPOP_1, 0x000b,
@@ -2028,7 +2029,7 @@ static int rt5663_hp_event(struct snd_soc_dapm_widget *w,
                         snd_soc_update_bits(codec, RT5663_DEPOP_1, 0x0030,
                                 0x0030);
                         snd_soc_update_bits(codec, RT5663_HP_CHARGE_PUMP_1,
-                                RT5668_OVCD_HP_MASK, RT5668_OVCD_HP_DIS);
+                                RT5663_OVCD_HP_MASK, RT5663_OVCD_HP_DIS);
                         snd_soc_write(codec, RT5663_HP_CHARGE_PUMP_2, 0x1371);
                         snd_soc_write(codec, RT5663_HP_BIAS, 0xabba);
                         snd_soc_write(codec, RT5663_CHARGE_PUMP_1, 0x2224);
@@ -2041,14 +2042,14 @@ static int rt5663_hp_event(struct snd_soc_dapm_widget *w,
                 break;
 
         case SND_SOC_DAPM_PRE_PMD:
-                if (rt5663->codec_type == CODEC_TYPE_RT5668) {
+                if (rt5663->codec_ver == CODEC_VER_1) {
                         snd_soc_update_bits(codec, RT5663_HP_LOGIC_2,
-                                RT5668_HP_SIG_SRC1_MASK,
-                                RT5668_HP_SIG_SRC1_REG);
+                                RT5663_HP_SIG_SRC1_MASK,
+                                RT5663_HP_SIG_SRC1_REG);
                 } else {
                         snd_soc_update_bits(codec, RT5663_DEPOP_1, 0x3000, 0x0);
                         snd_soc_update_bits(codec, RT5663_HP_CHARGE_PUMP_1,
-                                RT5668_OVCD_HP_MASK, RT5668_OVCD_HP_EN);
+                                RT5663_OVCD_HP_MASK, RT5663_OVCD_HP_EN);
                         snd_soc_update_bits(codec, RT5663_DEPOP_1, 0x0030, 0x0);
                         snd_soc_update_bits(codec, RT5663_DEPOP_1, 0x000b,
                                 0x000b);
@@ -2062,7 +2063,7 @@ static int rt5663_hp_event(struct snd_soc_dapm_widget *w,
         return 0;
 }
 
-static int rt5668_bst2_power(struct snd_soc_dapm_widget *w,
+static int rt5663_bst2_power(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
         struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
@@ -2070,13 +2071,13 @@ static int rt5668_bst2_power(struct snd_soc_dapm_widget *w,
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
                 snd_soc_update_bits(codec, RT5663_PWR_ANLG_2,
-                        RT5668_PWR_BST2_MASK | RT5668_PWR_BST2_OP_MASK,
-                        RT5668_PWR_BST2 | RT5668_PWR_BST2_OP);
+                        RT5663_PWR_BST2_MASK | RT5663_PWR_BST2_OP_MASK,
+                        RT5663_PWR_BST2 | RT5663_PWR_BST2_OP);
                 break;
 
         case SND_SOC_DAPM_PRE_PMD:
                 snd_soc_update_bits(codec, RT5663_PWR_ANLG_2,
-                        RT5668_PWR_BST2_MASK | RT5668_PWR_BST2_OP_MASK, 0);
+                        RT5663_PWR_BST2_MASK | RT5663_PWR_BST2_OP_MASK, 0);
                 break;
 
         default:
@@ -2110,14 +2111,14 @@ static int rt5663_pre_div_power(struct snd_soc_dapm_widget *w,
 }
 
 static const struct snd_soc_dapm_widget rt5663_dapm_widgets[] = {
-        SND_SOC_DAPM_SUPPLY("PLL", RT5663_PWR_ANLG_3, RT5668_PWR_PLL_SHIFT, 0,
+        SND_SOC_DAPM_SUPPLY("PLL", RT5663_PWR_ANLG_3, RT5663_PWR_PLL_SHIFT, 0,
                 NULL, 0),
 
         /* micbias */
         SND_SOC_DAPM_MICBIAS("MICBIAS1", RT5663_PWR_ANLG_2,
-                RT5668_PWR_MB1_SHIFT, 0),
+                RT5663_PWR_MB1_SHIFT, 0),
         SND_SOC_DAPM_MICBIAS("MICBIAS2", RT5663_PWR_ANLG_2,
-                RT5668_PWR_MB2_SHIFT, 0),
+                RT5663_PWR_MB2_SHIFT, 0),
 
         /* Input Lines */
         SND_SOC_DAPM_INPUT("IN1P"),
@@ -2125,14 +2126,14 @@ static const struct snd_soc_dapm_widget rt5663_dapm_widgets[] = {
 
         /* REC Mixer Power */
         SND_SOC_DAPM_SUPPLY("RECMIX1L Power", RT5663_PWR_ANLG_2,
-                RT5668_PWR_RECMIX1_SHIFT, 0, NULL, 0),
+                RT5663_PWR_RECMIX1_SHIFT, 0, NULL, 0),
 
         /* ADCs */
         SND_SOC_DAPM_ADC("ADC L", NULL, SND_SOC_NOPM, 0, 0),
         SND_SOC_DAPM_SUPPLY("ADC L Power", RT5663_PWR_DIG_1,
-                RT5668_PWR_ADC_L1_SHIFT, 0, NULL, 0),
+                RT5663_PWR_ADC_L1_SHIFT, 0, NULL, 0),
         SND_SOC_DAPM_SUPPLY("ADC Clock", RT5663_CHOP_ADC,
-                RT5668_CKGEN_ADCC_SHIFT, 0, NULL, 0),
+                RT5663_CKGEN_ADCC_SHIFT, 0, NULL, 0),
 
         /* ADC Mixer */
         SND_SOC_DAPM_MIXER("STO1 ADC MIXL", SND_SOC_NOPM,
@@ -2141,10 +2142,10 @@ static const struct snd_soc_dapm_widget rt5663_dapm_widgets[] = {
 
         /* ADC Filter Power */
         SND_SOC_DAPM_SUPPLY("STO1 ADC Filter", RT5663_PWR_DIG_2,
-                RT5668_PWR_ADC_S1F_SHIFT, 0, NULL, 0),
+                RT5663_PWR_ADC_S1F_SHIFT, 0, NULL, 0),
 
         /* Digital Interface */
-        SND_SOC_DAPM_SUPPLY("I2S", RT5663_PWR_DIG_1, RT5668_PWR_I2S1_SHIFT, 0,
+        SND_SOC_DAPM_SUPPLY("I2S", RT5663_PWR_DIG_1, RT5663_PWR_I2S1_SHIFT, 0,
                 NULL, 0),
         SND_SOC_DAPM_PGA("IF DAC", SND_SOC_NOPM, 0, 0, NULL, 0),
         SND_SOC_DAPM_PGA("IF1 DAC1 L", SND_SOC_NOPM, 0, 0, NULL, 0),
@@ -2166,7 +2167,7 @@ static const struct snd_soc_dapm_widget rt5663_dapm_widgets[] = {
 
         /* DAC Mixer */
         SND_SOC_DAPM_SUPPLY("STO1 DAC Filter", RT5663_PWR_DIG_2,
-                RT5668_PWR_DAC_S1F_SHIFT, 0, NULL, 0),
+                RT5663_PWR_DAC_S1F_SHIFT, 0, NULL, 0),
         SND_SOC_DAPM_MIXER("STO1 DAC MIXL", SND_SOC_NOPM, 0, 0,
                 rt5663_sto1_dac_l_mix, ARRAY_SIZE(rt5663_sto1_dac_l_mix)),
         SND_SOC_DAPM_MIXER("STO1 DAC MIXR", SND_SOC_NOPM, 0, 0,
@@ -2174,9 +2175,9 @@ static const struct snd_soc_dapm_widget rt5663_dapm_widgets[] = {
 
         /* DACs */
         SND_SOC_DAPM_SUPPLY("STO1 DAC L Power", RT5663_PWR_DIG_1,
-                RT5668_PWR_DAC_L1_SHIFT, 0, NULL, 0),
+                RT5663_PWR_DAC_L1_SHIFT, 0, NULL, 0),
         SND_SOC_DAPM_SUPPLY("STO1 DAC R Power", RT5663_PWR_DIG_1,
-                RT5668_PWR_DAC_R1_SHIFT, 0, NULL, 0),
+                RT5663_PWR_DAC_R1_SHIFT, 0, NULL, 0),
         SND_SOC_DAPM_DAC("DAC L", NULL, SND_SOC_NOPM, 0, 0),
         SND_SOC_DAPM_DAC("DAC R", NULL, SND_SOC_NOPM, 0, 0),
 
@@ -2189,21 +2190,21 @@ static const struct snd_soc_dapm_widget rt5663_dapm_widgets[] = {
         SND_SOC_DAPM_OUTPUT("HPOR"),
 };
 
-static const struct snd_soc_dapm_widget rt5668_specific_dapm_widgets[] = {
+static const struct snd_soc_dapm_widget rt5663_v2_specific_dapm_widgets[] = {
         SND_SOC_DAPM_SUPPLY("LDO2", RT5663_PWR_ANLG_3,
-                RT5668_PWR_LDO2_SHIFT, 0, NULL, 0),
-        SND_SOC_DAPM_SUPPLY("Mic Det Power", RT5668_PWR_VOL,
-                RT5668_PWR_MIC_DET_SHIFT, 0, NULL, 0),
+                RT5663_PWR_LDO2_SHIFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Mic Det Power", RT5663_PWR_VOL,
+                RT5663_V2_PWR_MIC_DET_SHIFT, 0, NULL, 0),
         SND_SOC_DAPM_SUPPLY("LDO DAC", RT5663_PWR_DIG_1,
-                RT5668_PWR_LDO_DACREF_SHIFT, 0, NULL, 0),
+                RT5663_PWR_LDO_DACREF_SHIFT, 0, NULL, 0),
 
         /* ASRC */
         SND_SOC_DAPM_SUPPLY("I2S ASRC", RT5663_ASRC_1,
-                RT5668_I2S1_ASRC_SHIFT, 0, NULL, 0),
+                RT5663_I2S1_ASRC_SHIFT, 0, NULL, 0),
         SND_SOC_DAPM_SUPPLY("DAC ASRC", RT5663_ASRC_1,
-                RT5668_DAC_STO1_ASRC_SHIFT, 0, NULL, 0),
+                RT5663_DAC_STO1_ASRC_SHIFT, 0, NULL, 0),
         SND_SOC_DAPM_SUPPLY("ADC ASRC", RT5663_ASRC_1,
-                RT5668_ADC_STO1_ASRC_SHIFT, 0, NULL, 0),
+                RT5663_ADC_STO1_ASRC_SHIFT, 0, NULL, 0),
 
         /* Input Lines */
         SND_SOC_DAPM_INPUT("IN2P"),
@@ -2212,51 +2213,51 @@ static const struct snd_soc_dapm_widget rt5668_specific_dapm_widgets[] = {
         /* Boost */
         SND_SOC_DAPM_PGA("BST1 CBJ", SND_SOC_NOPM, 0, 0, NULL, 0),
         SND_SOC_DAPM_SUPPLY("CBJ Power", RT5663_PWR_ANLG_3,
-                RT5668_PWR_CBJ_SHIFT, 0, NULL, 0),
+                RT5663_PWR_CBJ_SHIFT, 0, NULL, 0),
         SND_SOC_DAPM_PGA("BST2", SND_SOC_NOPM, 0, 0, NULL, 0),
         SND_SOC_DAPM_SUPPLY("BST2 Power", SND_SOC_NOPM, 0, 0,
-                rt5668_bst2_power, SND_SOC_DAPM_PRE_PMD |
+                rt5663_bst2_power, SND_SOC_DAPM_PRE_PMD |
                 SND_SOC_DAPM_POST_PMU),
 
         /* REC Mixer */
-        SND_SOC_DAPM_MIXER("RECMIX1L", SND_SOC_NOPM, 0, 0, rt5668_recmix1l,
-                ARRAY_SIZE(rt5668_recmix1l)),
-        SND_SOC_DAPM_MIXER("RECMIX1R", SND_SOC_NOPM, 0, 0, rt5668_recmix1r,
-                ARRAY_SIZE(rt5668_recmix1r)),
+        SND_SOC_DAPM_MIXER("RECMIX1L", SND_SOC_NOPM, 0, 0, rt5663_recmix1l,
+                ARRAY_SIZE(rt5663_recmix1l)),
+        SND_SOC_DAPM_MIXER("RECMIX1R", SND_SOC_NOPM, 0, 0, rt5663_recmix1r,
+                ARRAY_SIZE(rt5663_recmix1r)),
         SND_SOC_DAPM_SUPPLY("RECMIX1R Power", RT5663_PWR_ANLG_2,
-                RT5668_PWR_RECMIX2_SHIFT, 0, NULL, 0),
+                RT5663_PWR_RECMIX2_SHIFT, 0, NULL, 0),
 
         /* ADC */
         SND_SOC_DAPM_ADC("ADC R", NULL, SND_SOC_NOPM, 0, 0),
         SND_SOC_DAPM_SUPPLY("ADC R Power", RT5663_PWR_DIG_1,
-                RT5668_PWR_ADC_R1_SHIFT, 0, NULL, 0),
+                RT5663_PWR_ADC_R1_SHIFT, 0, NULL, 0),
 
         /* ADC Mux */
         SND_SOC_DAPM_PGA("STO1 ADC L1", RT5663_STO1_ADC_MIXER,
-                RT5668_STO1_ADC_L1_SRC_SHIFT, 0, NULL, 0),
+                RT5663_STO1_ADC_L1_SRC_SHIFT, 0, NULL, 0),
         SND_SOC_DAPM_PGA("STO1 ADC R1", RT5663_STO1_ADC_MIXER,
-                RT5668_STO1_ADC_R1_SRC_SHIFT, 0, NULL, 0),
+                RT5663_STO1_ADC_R1_SRC_SHIFT, 0, NULL, 0),
         SND_SOC_DAPM_PGA("STO1 ADC L2", RT5663_STO1_ADC_MIXER,
-                RT5668_STO1_ADC_L2_SRC_SHIFT, 1, NULL, 0),
+                RT5663_STO1_ADC_L2_SRC_SHIFT, 1, NULL, 0),
         SND_SOC_DAPM_PGA("STO1 ADC R2", RT5663_STO1_ADC_MIXER,
-                RT5668_STO1_ADC_R2_SRC_SHIFT, 1, NULL, 0),
+                RT5663_STO1_ADC_R2_SRC_SHIFT, 1, NULL, 0),
 
         SND_SOC_DAPM_MUX("STO1 ADC L Mux", SND_SOC_NOPM, 0, 0,
-                &rt5668_sto1_adcl_mux),
+                &rt5663_sto1_adcl_mux),
         SND_SOC_DAPM_MUX("STO1 ADC R Mux", SND_SOC_NOPM, 0, 0,
-                &rt5668_sto1_adcr_mux),
+                &rt5663_sto1_adcr_mux),
 
         /* ADC Mix */
         SND_SOC_DAPM_MIXER("STO1 ADC MIXR", SND_SOC_NOPM, 0, 0,
-                rt5668_sto1_adc_r_mix, ARRAY_SIZE(rt5668_sto1_adc_r_mix)),
+                rt5663_sto1_adc_r_mix, ARRAY_SIZE(rt5663_sto1_adc_r_mix)),
 
         /* Analog DAC Clock */
         SND_SOC_DAPM_SUPPLY("DAC Clock", RT5663_CHOP_DAC_L,
-                RT5668_CKGEN_DAC1_SHIFT, 0, NULL, 0),
+                RT5663_CKGEN_DAC1_SHIFT, 0, NULL, 0),
 
         /* Headphone out */
         SND_SOC_DAPM_SWITCH("HPO Playback", SND_SOC_NOPM, 0, 0,
-                &rt5668_hpo_switch),
+                &rt5663_hpo_switch),
 };
 
 static const struct snd_soc_dapm_widget rt5663_specific_dapm_widgets[] = {
@@ -2267,7 +2268,7 @@ static const struct snd_soc_dapm_widget rt5663_specific_dapm_widgets[] = {
 
         /* LDO */
         SND_SOC_DAPM_SUPPLY("LDO ADC", RT5663_PWR_DIG_1,
-                RT5668_PWR_LDO_DACREF_SHIFT, 0, NULL, 0),
+                RT5663_PWR_LDO_DACREF_SHIFT, 0, NULL, 0),
 
         /* ASRC */
         SND_SOC_DAPM_SUPPLY("I2S ASRC", RT5663_ASRC_1,
@@ -2341,7 +2342,7 @@ static const struct snd_soc_dapm_route rt5663_dapm_routes[] = {
         { "HP Amp", NULL, "DAC R" },
 };
 
-static const struct snd_soc_dapm_route rt5668_specific_dapm_routes[] = {
+static const struct snd_soc_dapm_route rt5663_v2_specific_dapm_routes[] = {
         { "MICBIAS1", NULL, "LDO2" },
         { "MICBIAS2", NULL, "LDO2" },
 
@@ -2440,26 +2441,26 @@ static int rt5663_hw_params(struct snd_pcm_substream *substream,
 
         switch (params_width(params)) {
         case 8:
-                val_len = RT5668_I2S_DL_8;
+                val_len = RT5663_I2S_DL_8;
                 break;
         case 16:
-                val_len = RT5668_I2S_DL_16;
+                val_len = RT5663_I2S_DL_16;
                 break;
         case 20:
-                val_len = RT5668_I2S_DL_20;
+                val_len = RT5663_I2S_DL_20;
                 break;
         case 24:
-                val_len = RT5668_I2S_DL_24;
+                val_len = RT5663_I2S_DL_24;
                 break;
         default:
                 return -EINVAL;
         }
 
         snd_soc_update_bits(codec, RT5663_I2S1_SDP,
-                RT5668_I2S_DL_MASK, val_len);
+                RT5663_I2S_DL_MASK, val_len);
 
         snd_soc_update_bits(codec, RT5663_ADDA_CLK_1,
-                RT5668_I2S_PD1_MASK, pre_div << RT5668_I2S_PD1_SHIFT);
+                RT5663_I2S_PD1_MASK, pre_div << RT5663_I2S_PD1_SHIFT);
 
         return 0;
 }
@@ -2473,7 +2474,7 @@ static int rt5663_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
         case SND_SOC_DAIFMT_CBM_CFM:
                 break;
         case SND_SOC_DAIFMT_CBS_CFS:
-                reg_val |= RT5668_I2S_MS_S;
+                reg_val |= RT5663_I2S_MS_S;
                 break;
         default:
                 return -EINVAL;
@@ -2483,7 +2484,7 @@ static int rt5663_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
         case SND_SOC_DAIFMT_NB_NF:
                 break;
         case SND_SOC_DAIFMT_IB_NF:
-                reg_val |= RT5668_I2S_BP_INV;
+                reg_val |= RT5663_I2S_BP_INV;
                 break;
         default:
                 return -EINVAL;
@@ -2493,20 +2494,20 @@ static int rt5663_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
         case SND_SOC_DAIFMT_I2S:
                 break;
         case SND_SOC_DAIFMT_LEFT_J:
-                reg_val |= RT5668_I2S_DF_LEFT;
+                reg_val |= RT5663_I2S_DF_LEFT;
                 break;
         case SND_SOC_DAIFMT_DSP_A:
-                reg_val |= RT5668_I2S_DF_PCM_A;
+                reg_val |= RT5663_I2S_DF_PCM_A;
                 break;
         case SND_SOC_DAIFMT_DSP_B:
-                reg_val |= RT5668_I2S_DF_PCM_B;
+                reg_val |= RT5663_I2S_DF_PCM_B;
                 break;
         default:
                 return -EINVAL;
         }
 
-        snd_soc_update_bits(codec, RT5663_I2S1_SDP, RT5668_I2S_MS_MASK |
-                RT5668_I2S_BP_MASK | RT5668_I2S_DF_MASK, reg_val);
+        snd_soc_update_bits(codec, RT5663_I2S1_SDP, RT5663_I2S_MS_MASK |
+                RT5663_I2S_BP_MASK | RT5663_I2S_DF_MASK, reg_val);
 
         return 0;
 }
@@ -2535,7 +2536,7 @@ static int rt5663_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
                 dev_err(codec->dev, "Invalid clock id (%d)\n", clk_id);
                 return -EINVAL;
         }
-        snd_soc_update_bits(codec, RT5663_GLB_CLK, RT5668_SCLK_SRC_MASK,
+        snd_soc_update_bits(codec, RT5663_GLB_CLK, RT5663_SCLK_SRC_MASK,
                 reg_val);
         rt5663->sysclk = freq;
         rt5663->sysclk_src = clk_id;
@@ -2569,17 +2570,17 @@ static int rt5663_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
                 return 0;
         }
 
-        switch (rt5663->codec_type) {
-        case CODEC_TYPE_RT5668:
-                mask = RT5668_PLL1_SRC_MASK;
-                shift = RT5668_PLL1_SRC_SHIFT;
+        switch (rt5663->codec_ver) {
+        case CODEC_VER_1:
+                mask = RT5663_V2_PLL1_SRC_MASK;
+                shift = RT5663_V2_PLL1_SRC_SHIFT;
                 break;
-        case CODEC_TYPE_RT5663:
+        case CODEC_VER_0:
                 mask = RT5663_PLL1_SRC_MASK;
                 shift = RT5663_PLL1_SRC_SHIFT;
                 break;
         default:
-                dev_err(codec->dev, "Unknown CODEC_TYPE\n");
+                dev_err(codec->dev, "Unknown CODEC Version\n");
                 return -EINVAL;
         }
 
@@ -2607,10 +2608,10 @@ static int rt5663_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
                 pll_code.k_code);
 
         snd_soc_write(codec, RT5663_PLL_1,
-                pll_code.n_code << RT5668_PLL_N_SHIFT | pll_code.k_code);
+                pll_code.n_code << RT5663_PLL_N_SHIFT | pll_code.k_code);
         snd_soc_write(codec, RT5663_PLL_2,
-                (pll_code.m_bp ? 0 : pll_code.m_code) << RT5668_PLL_M_SHIFT |
-                pll_code.m_bp << RT5668_PLL_M_BP_SHIFT);
+                (pll_code.m_bp ? 0 : pll_code.m_code) << RT5663_PLL_M_SHIFT |
+                pll_code.m_bp << RT5663_PLL_M_BP_SHIFT);
 
         rt5663->pll_in = freq_in;
         rt5663->pll_out = freq_out;
@@ -2627,20 +2628,20 @@ static int rt5663_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
         unsigned int val = 0, reg;
 
         if (rx_mask || tx_mask)
-                val |= RT5668_TDM_MODE_TDM;
+                val |= RT5663_TDM_MODE_TDM;
 
         switch (slots) {
         case 4:
-                val |= RT5668_TDM_IN_CH_4;
-                val |= RT5668_TDM_OUT_CH_4;
+                val |= RT5663_TDM_IN_CH_4;
+                val |= RT5663_TDM_OUT_CH_4;
                 break;
         case 6:
-                val |= RT5668_TDM_IN_CH_6;
-                val |= RT5668_TDM_OUT_CH_6;
+                val |= RT5663_TDM_IN_CH_6;
+                val |= RT5663_TDM_OUT_CH_6;
                 break;
         case 8:
-                val |= RT5668_TDM_IN_CH_8;
-                val |= RT5668_TDM_OUT_CH_8;
+                val |= RT5663_TDM_IN_CH_8;
+                val |= RT5663_TDM_OUT_CH_8;
                 break;
         case 2:
                 break;
@@ -2650,16 +2651,16 @@ static int rt5663_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
 
         switch (slot_width) {
         case 20:
-                val |= RT5668_TDM_IN_LEN_20;
-                val |= RT5668_TDM_OUT_LEN_20;
+                val |= RT5663_TDM_IN_LEN_20;
+                val |= RT5663_TDM_OUT_LEN_20;
                 break;
         case 24:
-                val |= RT5668_TDM_IN_LEN_24;
-                val |= RT5668_TDM_OUT_LEN_24;
+                val |= RT5663_TDM_IN_LEN_24;
+                val |= RT5663_TDM_OUT_LEN_24;
                 break;
         case 32:
-                val |= RT5668_TDM_IN_LEN_32;
-                val |= RT5668_TDM_OUT_LEN_32;
+                val |= RT5663_TDM_IN_LEN_32;
+                val |= RT5663_TDM_OUT_LEN_32;
                 break;
         case 16:
                 break;
@@ -2667,21 +2668,21 @@ static int rt5663_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
                 return -EINVAL;
         }
 
-        switch (rt5663->codec_type) {
-        case CODEC_TYPE_RT5668:
+        switch (rt5663->codec_ver) {
+        case CODEC_VER_1:
                 reg = RT5663_TDM_2;
                 break;
-        case CODEC_TYPE_RT5663:
+        case CODEC_VER_0:
                 reg = RT5663_TDM_1;
                 break;
         default:
-                dev_err(codec->dev, "Unknown CODEC_TYPE\n");
+                dev_err(codec->dev, "Unknown CODEC Version\n");
                 return -EINVAL;
         }
 
-        snd_soc_update_bits(codec, reg, RT5668_TDM_MODE_MASK |
-                RT5668_TDM_IN_CH_MASK | RT5668_TDM_OUT_CH_MASK |
-                RT5668_TDM_IN_LEN_MASK | RT5668_TDM_OUT_LEN_MASK, val);
+        snd_soc_update_bits(codec, reg, RT5663_TDM_MODE_MASK |
+                RT5663_TDM_IN_CH_MASK | RT5663_TDM_OUT_CH_MASK |
+                RT5663_TDM_IN_LEN_MASK | RT5663_TDM_OUT_LEN_MASK, val);
 
         return 0;
 }
@@ -2694,8 +2695,8 @@ static int rt5663_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)
 
         dev_dbg(codec->dev, "%s ratio = %d\n", __func__, ratio);
 
-        if (rt5663->codec_type == CODEC_TYPE_RT5668)
-                reg = RT5668_TDM_8;
+        if (rt5663->codec_ver == CODEC_VER_1)
+                reg = RT5663_TDM_9;
         else
                 reg = RT5663_TDM_5;
 
@@ -2736,47 +2737,47 @@ static int rt5663_set_bias_level(struct snd_soc_codec *codec,
         switch (level) {
         case SND_SOC_BIAS_ON:
                 snd_soc_update_bits(codec, RT5663_PWR_ANLG_1,
-                        RT5668_PWR_FV1_MASK | RT5668_PWR_FV2_MASK,
-                        RT5668_PWR_FV1 | RT5668_PWR_FV2);
+                        RT5663_PWR_FV1_MASK | RT5663_PWR_FV2_MASK,
+                        RT5663_PWR_FV1 | RT5663_PWR_FV2);
                 break;
 
         case SND_SOC_BIAS_PREPARE:
-                if (rt5663->codec_type == CODEC_TYPE_RT5668) {
+                if (rt5663->codec_ver == CODEC_VER_1) {
                         snd_soc_update_bits(codec, RT5663_DIG_MISC,
-                                RT5668_DIG_GATE_CTRL_MASK,
-                                RT5668_DIG_GATE_CTRL_EN);
+                                RT5663_DIG_GATE_CTRL_MASK,
+                                RT5663_DIG_GATE_CTRL_EN);
                         snd_soc_update_bits(codec, RT5663_SIG_CLK_DET,
-                                RT5668_EN_ANA_CLK_DET_MASK |
-                                RT5668_PWR_CLK_DET_MASK,
-                                RT5668_EN_ANA_CLK_DET_AUTO |
-                                RT5668_PWR_CLK_DET_EN);
+                                RT5663_EN_ANA_CLK_DET_MASK |
+                                RT5663_PWR_CLK_DET_MASK,
+                                RT5663_EN_ANA_CLK_DET_AUTO |
+                                RT5663_PWR_CLK_DET_EN);
                 }
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                if (rt5663->codec_type == CODEC_TYPE_RT5668)
+                if (rt5663->codec_ver == CODEC_VER_1)
                         snd_soc_update_bits(codec, RT5663_DIG_MISC,
-                                RT5668_DIG_GATE_CTRL_MASK,
-                                RT5668_DIG_GATE_CTRL_DIS);
+                                RT5663_DIG_GATE_CTRL_MASK,
+                                RT5663_DIG_GATE_CTRL_DIS);
                 snd_soc_update_bits(codec, RT5663_PWR_ANLG_1,
-                        RT5668_PWR_VREF1_MASK | RT5668_PWR_VREF2_MASK |
-                        RT5668_PWR_FV1_MASK | RT5668_PWR_FV2_MASK |
-                        RT5668_PWR_MB_MASK, RT5668_PWR_VREF1 |
-                        RT5668_PWR_VREF2 | RT5668_PWR_MB);
+                        RT5663_PWR_VREF1_MASK | RT5663_PWR_VREF2_MASK |
+                        RT5663_PWR_FV1_MASK | RT5663_PWR_FV2_MASK |
+                        RT5663_PWR_MB_MASK, RT5663_PWR_VREF1 |
+                        RT5663_PWR_VREF2 | RT5663_PWR_MB);
                 usleep_range(10000, 10005);
-                if (rt5663->codec_type == CODEC_TYPE_RT5668) {
+                if (rt5663->codec_ver == CODEC_VER_1) {
                         snd_soc_update_bits(codec, RT5663_SIG_CLK_DET,
-                                RT5668_EN_ANA_CLK_DET_MASK |
-                                RT5668_PWR_CLK_DET_MASK,
-                                RT5668_EN_ANA_CLK_DET_DIS |
-                                RT5668_PWR_CLK_DET_DIS);
+                                RT5663_EN_ANA_CLK_DET_MASK |
+                                RT5663_PWR_CLK_DET_MASK,
+                                RT5663_EN_ANA_CLK_DET_DIS |
+                                RT5663_PWR_CLK_DET_DIS);
                 }
                 break;
 
         case SND_SOC_BIAS_OFF:
                 snd_soc_update_bits(codec, RT5663_PWR_ANLG_1,
-                        RT5668_PWR_VREF1_MASK | RT5668_PWR_VREF2_MASK |
-                        RT5668_PWR_FV1 | RT5668_PWR_FV2, 0x0);
+                        RT5663_PWR_VREF1_MASK | RT5663_PWR_VREF2_MASK |
+                        RT5663_PWR_FV1 | RT5663_PWR_FV2, 0x0);
                 break;
 
         default:
@@ -2793,18 +2794,18 @@ static int rt5663_probe(struct snd_soc_codec *codec)
 
         rt5663->codec = codec;
 
-        switch (rt5663->codec_type) {
-        case CODEC_TYPE_RT5668:
+        switch (rt5663->codec_ver) {
+        case CODEC_VER_1:
                 snd_soc_dapm_new_controls(dapm,
-                        rt5668_specific_dapm_widgets,
-                        ARRAY_SIZE(rt5668_specific_dapm_widgets));
+                        rt5663_v2_specific_dapm_widgets,
+                        ARRAY_SIZE(rt5663_v2_specific_dapm_widgets));
                 snd_soc_dapm_add_routes(dapm,
-                        rt5668_specific_dapm_routes,
-                        ARRAY_SIZE(rt5668_specific_dapm_routes));
-                snd_soc_add_codec_controls(codec, rt5668_specific_controls,
-                        ARRAY_SIZE(rt5668_specific_controls));
+                        rt5663_v2_specific_dapm_routes,
+                        ARRAY_SIZE(rt5663_v2_specific_dapm_routes));
+                snd_soc_add_codec_controls(codec, rt5663_v2_specific_controls,
+                        ARRAY_SIZE(rt5663_v2_specific_controls));
                 break;
-        case CODEC_TYPE_RT5663:
+        case CODEC_VER_0:
                 snd_soc_dapm_new_controls(dapm,
                         rt5663_specific_dapm_widgets,
                         ARRAY_SIZE(rt5663_specific_dapm_widgets));
@@ -2905,16 +2906,16 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5663 = {
         }
 };
 
-static const struct regmap_config rt5668_regmap = {
+static const struct regmap_config rt5663_v2_regmap = {
         .reg_bits = 16,
         .val_bits = 16,
         .use_single_rw = true,
         .max_register = 0x07fa,
-        .volatile_reg = rt5668_volatile_register,
-        .readable_reg = rt5668_readable_register,
+        .volatile_reg = rt5663_v2_volatile_register,
+        .readable_reg = rt5663_v2_readable_register,
         .cache_type = REGCACHE_RBTREE,
-        .reg_defaults = rt5668_reg,
-        .num_reg_defaults = ARRAY_SIZE(rt5668_reg),
+        .reg_defaults = rt5663_v2_reg,
+        .num_reg_defaults = ARRAY_SIZE(rt5663_v2_reg),
 };
 
 static const struct regmap_config rt5663_regmap = {
@@ -2939,7 +2940,6 @@ static const struct regmap_config temp_regmap = {
 };
 
 static const struct i2c_device_id rt5663_i2c_id[] = {
-        { "rt5668", 0 },
         { "rt5663", 0 },
         {}
 };
@@ -2947,7 +2947,6 @@ MODULE_DEVICE_TABLE(i2c, rt5663_i2c_id);
 
 #if defined(CONFIG_OF)
 static const struct of_device_id rt5663_of_match[] = {
-        { .compatible = "realtek,rt5668", },
         { .compatible = "realtek,rt5663", },
         {},
 };
@@ -2956,80 +2955,79 @@ MODULE_DEVICE_TABLE(of, rt5663_of_match);
 
 #ifdef CONFIG_ACPI
 static struct acpi_device_id rt5663_acpi_match[] = {
-        { "10EC5668", 0},
         { "10EC5663", 0},
         {},
 };
 MODULE_DEVICE_TABLE(acpi, rt5663_acpi_match);
 #endif
 
-static void rt5668_calibrate(struct rt5663_priv *rt5668)
+static void rt5663_v2_calibrate(struct rt5663_priv *rt5663)
 {
-        regmap_write(rt5668->regmap, RT5663_BIAS_CUR_8, 0xa402);
-        regmap_write(rt5668->regmap, RT5663_PWR_DIG_1, 0x0100);
-        regmap_write(rt5668->regmap, RT5663_RECMIX, 0x4040);
-        regmap_write(rt5668->regmap, RT5663_DIG_MISC, 0x0001);
-        regmap_write(rt5668->regmap, RT5663_RC_CLK, 0x0380);
-        regmap_write(rt5668->regmap, RT5663_GLB_CLK, 0x8000);
-        regmap_write(rt5668->regmap, RT5663_ADDA_CLK_1, 0x1000);
-        regmap_write(rt5668->regmap, RT5663_CHOP_DAC_L, 0x3030);
-        regmap_write(rt5668->regmap, RT5663_CALIB_ADC, 0x3c05);
-        regmap_write(rt5668->regmap, RT5663_PWR_ANLG_1, 0xa23e);
+        regmap_write(rt5663->regmap, RT5663_BIAS_CUR_8, 0xa402);
+        regmap_write(rt5663->regmap, RT5663_PWR_DIG_1, 0x0100);
+        regmap_write(rt5663->regmap, RT5663_RECMIX, 0x4040);
+        regmap_write(rt5663->regmap, RT5663_DIG_MISC, 0x0001);
+        regmap_write(rt5663->regmap, RT5663_RC_CLK, 0x0380);
+        regmap_write(rt5663->regmap, RT5663_GLB_CLK, 0x8000);
+        regmap_write(rt5663->regmap, RT5663_ADDA_CLK_1, 0x1000);
+        regmap_write(rt5663->regmap, RT5663_CHOP_DAC_L, 0x3030);
+        regmap_write(rt5663->regmap, RT5663_CALIB_ADC, 0x3c05);
+        regmap_write(rt5663->regmap, RT5663_PWR_ANLG_1, 0xa23e);
         msleep(40);
-        regmap_write(rt5668->regmap, RT5663_PWR_ANLG_1, 0xf23e);
-        regmap_write(rt5668->regmap, RT5663_HP_CALIB_2, 0x0321);
-        regmap_write(rt5668->regmap, RT5663_HP_CALIB_1, 0xfc00);
+        regmap_write(rt5663->regmap, RT5663_PWR_ANLG_1, 0xf23e);
+        regmap_write(rt5663->regmap, RT5663_HP_CALIB_2, 0x0321);
+        regmap_write(rt5663->regmap, RT5663_HP_CALIB_1, 0xfc00);
         msleep(500);
 }
 
-static void rt5663_calibrate(struct rt5663_priv *rt5668)
+static void rt5663_calibrate(struct rt5663_priv *rt5663)
 {
         int value, count;
 
-        regmap_write(rt5668->regmap, RT5663_RC_CLK, 0x0280);
-        regmap_write(rt5668->regmap, RT5663_GLB_CLK, 0x8000);
-        regmap_write(rt5668->regmap, RT5663_DIG_MISC, 0x8001);
-        regmap_write(rt5668->regmap, RT5663_VREF_RECMIX, 0x0032);
-        regmap_write(rt5668->regmap, RT5663_PWR_ANLG_1, 0xa2be);
+        regmap_write(rt5663->regmap, RT5663_RC_CLK, 0x0280);
+        regmap_write(rt5663->regmap, RT5663_GLB_CLK, 0x8000);
+        regmap_write(rt5663->regmap, RT5663_DIG_MISC, 0x8001);
+        regmap_write(rt5663->regmap, RT5663_VREF_RECMIX, 0x0032);
+        regmap_write(rt5663->regmap, RT5663_PWR_ANLG_1, 0xa2be);
         msleep(20);
-        regmap_write(rt5668->regmap, RT5663_PWR_ANLG_1, 0xf2be);
-        regmap_write(rt5668->regmap, RT5663_PWR_DIG_2, 0x8400);
-        regmap_write(rt5668->regmap, RT5663_CHOP_ADC, 0x3000);
-        regmap_write(rt5668->regmap, RT5663_DEPOP_1, 0x003b);
-        regmap_write(rt5668->regmap, RT5663_PWR_DIG_1, 0x8df8);
-        regmap_write(rt5668->regmap, RT5663_PWR_ANLG_2, 0x0003);
-        regmap_write(rt5668->regmap, RT5663_PWR_ANLG_3, 0x018c);
-        regmap_write(rt5668->regmap, RT5663_ADDA_CLK_1, 0x1111);
-        regmap_write(rt5668->regmap, RT5663_PRE_DIV_GATING_1, 0xffff);
-        regmap_write(rt5668->regmap, RT5663_PRE_DIV_GATING_2, 0xffff);
-        regmap_write(rt5668->regmap, RT5663_DEPOP_2, 0x3003);
-        regmap_write(rt5668->regmap, RT5663_DEPOP_1, 0x003b);
-        regmap_write(rt5668->regmap, RT5663_HP_CHARGE_PUMP_1, 0x1e32);
-        regmap_write(rt5668->regmap, RT5663_HP_CHARGE_PUMP_2, 0x1371);
-        regmap_write(rt5668->regmap, RT5663_DACREF_LDO, 0x3b0b);
-        regmap_write(rt5668->regmap, RT5663_STO_DAC_MIXER, 0x2080);
-        regmap_write(rt5668->regmap, RT5663_BYPASS_STO_DAC, 0x000c);
-        regmap_write(rt5668->regmap, RT5663_HP_BIAS, 0xabba);
-        regmap_write(rt5668->regmap, RT5663_CHARGE_PUMP_1, 0x2224);
-        regmap_write(rt5668->regmap, RT5663_HP_OUT_EN, 0x8088);
-        regmap_write(rt5668->regmap, RT5663_STO_DRE_9, 0x0017);
-        regmap_write(rt5668->regmap, RT5663_STO_DRE_10, 0x0017);
-        regmap_write(rt5668->regmap, RT5663_STO1_ADC_MIXER, 0x4040);
-        regmap_write(rt5668->regmap, RT5663_RECMIX, 0x0005);
-        regmap_write(rt5668->regmap, RT5663_ADDA_RST, 0xc000);
-        regmap_write(rt5668->regmap, RT5663_STO1_HPF_ADJ1, 0x3320);
-        regmap_write(rt5668->regmap, RT5663_HP_CALIB_2, 0x00c9);
-        regmap_write(rt5668->regmap, RT5663_DUMMY_1, 0x004c);
-        regmap_write(rt5668->regmap, RT5663_ANA_BIAS_CUR_1, 0x7766);
-        regmap_write(rt5668->regmap, RT5663_BIAS_CUR_8, 0x4702);
+        regmap_write(rt5663->regmap, RT5663_PWR_ANLG_1, 0xf2be);
+        regmap_write(rt5663->regmap, RT5663_PWR_DIG_2, 0x8400);
+        regmap_write(rt5663->regmap, RT5663_CHOP_ADC, 0x3000);
+        regmap_write(rt5663->regmap, RT5663_DEPOP_1, 0x003b);
+        regmap_write(rt5663->regmap, RT5663_PWR_DIG_1, 0x8df8);
+        regmap_write(rt5663->regmap, RT5663_PWR_ANLG_2, 0x0003);
+        regmap_write(rt5663->regmap, RT5663_PWR_ANLG_3, 0x018c);
+        regmap_write(rt5663->regmap, RT5663_ADDA_CLK_1, 0x1111);
+        regmap_write(rt5663->regmap, RT5663_PRE_DIV_GATING_1, 0xffff);
+        regmap_write(rt5663->regmap, RT5663_PRE_DIV_GATING_2, 0xffff);
+        regmap_write(rt5663->regmap, RT5663_DEPOP_2, 0x3003);
+        regmap_write(rt5663->regmap, RT5663_DEPOP_1, 0x003b);
+        regmap_write(rt5663->regmap, RT5663_HP_CHARGE_PUMP_1, 0x1e32);
+        regmap_write(rt5663->regmap, RT5663_HP_CHARGE_PUMP_2, 0x1371);
+        regmap_write(rt5663->regmap, RT5663_DACREF_LDO, 0x3b0b);
+        regmap_write(rt5663->regmap, RT5663_STO_DAC_MIXER, 0x2080);
+        regmap_write(rt5663->regmap, RT5663_BYPASS_STO_DAC, 0x000c);
+        regmap_write(rt5663->regmap, RT5663_HP_BIAS, 0xabba);
+        regmap_write(rt5663->regmap, RT5663_CHARGE_PUMP_1, 0x2224);
+        regmap_write(rt5663->regmap, RT5663_HP_OUT_EN, 0x8088);
+        regmap_write(rt5663->regmap, RT5663_STO_DRE_9, 0x0017);
+        regmap_write(rt5663->regmap, RT5663_STO_DRE_10, 0x0017);
+        regmap_write(rt5663->regmap, RT5663_STO1_ADC_MIXER, 0x4040);
+        regmap_write(rt5663->regmap, RT5663_RECMIX, 0x0005);
+        regmap_write(rt5663->regmap, RT5663_ADDA_RST, 0xc000);
+        regmap_write(rt5663->regmap, RT5663_STO1_HPF_ADJ1, 0x3320);
+        regmap_write(rt5663->regmap, RT5663_HP_CALIB_2, 0x00c9);
+        regmap_write(rt5663->regmap, RT5663_DUMMY_1, 0x004c);
+        regmap_write(rt5663->regmap, RT5663_ANA_BIAS_CUR_1, 0x7766);
+        regmap_write(rt5663->regmap, RT5663_BIAS_CUR_8, 0x4702);
         msleep(200);
-        regmap_write(rt5668->regmap, RT5663_HP_CALIB_1, 0x0069);
-        regmap_write(rt5668->regmap, RT5663_HP_CALIB_3, 0x06c2);
-        regmap_write(rt5668->regmap, RT5663_HP_CALIB_1_1, 0x7b00);
-        regmap_write(rt5668->regmap, RT5663_HP_CALIB_1_1, 0xfb00);
+        regmap_write(rt5663->regmap, RT5663_HP_CALIB_1, 0x0069);
+        regmap_write(rt5663->regmap, RT5663_HP_CALIB_3, 0x06c2);
+        regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0x7b00);
+        regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0xfb00);
         count = 0;
         while (true) {
-                regmap_read(rt5668->regmap, RT5663_HP_CALIB_1_1, &value);
+                regmap_read(rt5663->regmap, RT5663_HP_CALIB_1_1, &value);
                 if (value & 0x8000)
                         usleep_range(10000, 10005);
                 else
@@ -3066,17 +3064,17 @@ static int rt5663_i2c_probe(struct i2c_client *i2c,
         }
         regmap_read(regmap, RT5663_VENDOR_ID_2, &val);
         switch (val) {
-        case RT5668_DEVICE_ID:
-                rt5663->regmap = devm_regmap_init_i2c(i2c, &rt5668_regmap);
-                rt5663->codec_type = CODEC_TYPE_RT5668;
+        case RT5663_DEVICE_ID_2:
+                rt5663->regmap = devm_regmap_init_i2c(i2c, &rt5663_v2_regmap);
+                rt5663->codec_ver = CODEC_VER_1;
                 break;
-        case RT5663_DEVICE_ID:
+        case RT5663_DEVICE_ID_1:
                 rt5663->regmap = devm_regmap_init_i2c(i2c, &rt5663_regmap);
-                rt5663->codec_type = CODEC_TYPE_RT5663;
+                rt5663->codec_ver = CODEC_VER_0;
                 break;
         default:
                 dev_err(&i2c->dev,
-                        "Device with ID register %#x is not rt5663 or rt5668\n",
+                        "Device with ID register %#x is not rt5663\n",
                         val);
                 return -ENODEV;
         }
@@ -3091,11 +3089,11 @@ static int rt5663_i2c_probe(struct i2c_client *i2c,
         /* reset and calibrate */
         regmap_write(rt5663->regmap, RT5663_RESET, 0);
         regcache_cache_bypass(rt5663->regmap, true);
-        switch (rt5663->codec_type) {
-        case CODEC_TYPE_RT5668:
-                rt5668_calibrate(rt5663);
+        switch (rt5663->codec_ver) {
+        case CODEC_VER_1:
+                rt5663_v2_calibrate(rt5663);
                 break;
-        case CODEC_TYPE_RT5663:
+        case CODEC_VER_0:
                 rt5663_calibrate(rt5663);
                 break;
         default:
@@ -3106,46 +3104,55 @@ static int rt5663_i2c_probe(struct i2c_client *i2c,
         dev_dbg(&i2c->dev, "calibrate done\n");
 
         /* GPIO1 as IRQ */
-        regmap_update_bits(rt5663->regmap, RT5663_GPIO_1, RT5668_GP1_PIN_MASK,
-                RT5668_GP1_PIN_IRQ);
+        regmap_update_bits(rt5663->regmap, RT5663_GPIO_1, RT5663_GP1_PIN_MASK,
+                RT5663_GP1_PIN_IRQ);
         /* 4btn inline command debounce */
         regmap_update_bits(rt5663->regmap, RT5663_IL_CMD_5,
-                RT5668_4BTN_CLK_DEB_MASK, RT5668_4BTN_CLK_DEB_65MS);
+                RT5663_4BTN_CLK_DEB_MASK, RT5663_4BTN_CLK_DEB_65MS);
 
-        switch (rt5663->codec_type) {
-        case CODEC_TYPE_RT5668:
+        switch (rt5663->codec_ver) {
+        case CODEC_VER_1:
                 regmap_write(rt5663->regmap, RT5663_BIAS_CUR_8, 0xa402);
                 /* JD1 */
                 regmap_update_bits(rt5663->regmap, RT5663_AUTO_1MRC_CLK,
-                        RT5668_IRQ_POW_SAV_MASK | RT5668_IRQ_POW_SAV_JD1_MASK,
-                        RT5668_IRQ_POW_SAV_EN | RT5668_IRQ_POW_SAV_JD1_EN);
+                        RT5663_IRQ_POW_SAV_MASK | RT5663_IRQ_POW_SAV_JD1_MASK,
+                        RT5663_IRQ_POW_SAV_EN | RT5663_IRQ_POW_SAV_JD1_EN);
                 regmap_update_bits(rt5663->regmap, RT5663_PWR_ANLG_2,
-                        RT5668_PWR_JD1_MASK, RT5668_PWR_JD1);
+                        RT5663_PWR_JD1_MASK, RT5663_PWR_JD1);
                 regmap_update_bits(rt5663->regmap, RT5663_IRQ_1,
-                        RT5668_EN_CB_JD_MASK, RT5668_EN_CB_JD_EN);
+                        RT5663_EN_CB_JD_MASK, RT5663_EN_CB_JD_EN);
 
                 regmap_update_bits(rt5663->regmap, RT5663_HP_LOGIC_2,
-                        RT5668_HP_SIG_SRC1_MASK, RT5668_HP_SIG_SRC1_REG);
+                        RT5663_HP_SIG_SRC1_MASK, RT5663_HP_SIG_SRC1_REG);
                 regmap_update_bits(rt5663->regmap, RT5663_RECMIX,
-                        RT5668_VREF_BIAS_MASK | RT5668_CBJ_DET_MASK |
-                        RT5668_DET_TYPE_MASK, RT5668_VREF_BIAS_REG |
-                        RT5668_CBJ_DET_EN | RT5668_DET_TYPE_QFN);
+                        RT5663_VREF_BIAS_MASK | RT5663_CBJ_DET_MASK |
+                        RT5663_DET_TYPE_MASK, RT5663_VREF_BIAS_REG |
+                        RT5663_CBJ_DET_EN | RT5663_DET_TYPE_QFN);
                 /* Set GPIO4 and GPIO8 as input for combo jack */
                 regmap_update_bits(rt5663->regmap, RT5663_GPIO_2,
-                        RT5668_GP4_PIN_CONF_MASK, RT5668_GP4_PIN_CONF_INPUT);
-                regmap_update_bits(rt5663->regmap, RT5668_GPIO_3,
-                        RT5668_GP8_PIN_CONF_MASK, RT5668_GP8_PIN_CONF_INPUT);
+                        RT5663_GP4_PIN_CONF_MASK, RT5663_GP4_PIN_CONF_INPUT);
+                regmap_update_bits(rt5663->regmap, RT5663_GPIO_3,
+                        RT5663_GP8_PIN_CONF_MASK, RT5663_GP8_PIN_CONF_INPUT);
                 regmap_update_bits(rt5663->regmap, RT5663_PWR_ANLG_1,
-                        RT5668_LDO1_DVO_MASK | RT5668_AMP_HP_MASK,
-                        RT5668_LDO1_DVO_0_9V | RT5668_AMP_HP_3X);
+                        RT5663_LDO1_DVO_MASK | RT5663_AMP_HP_MASK,
+                        RT5663_LDO1_DVO_0_9V | RT5663_AMP_HP_3X);
                         break;
-        case CODEC_TYPE_RT5663:
+        case CODEC_VER_0:
+                regmap_update_bits(rt5663->regmap, RT5663_DIG_MISC,
+                        RT5663_DIG_GATE_CTRL_MASK, RT5663_DIG_GATE_CTRL_EN);
+                regmap_update_bits(rt5663->regmap, RT5663_AUTO_1MRC_CLK,
+                        RT5663_IRQ_POW_SAV_MASK, RT5663_IRQ_POW_SAV_EN);
+                regmap_update_bits(rt5663->regmap, RT5663_IRQ_1,
+                        RT5663_EN_IRQ_JD1_MASK, RT5663_EN_IRQ_JD1_EN);
+                regmap_update_bits(rt5663->regmap, RT5663_GPIO_1,
+                        RT5663_GPIO1_TYPE_MASK, RT5663_GPIO1_TYPE_EN);
                 regmap_write(rt5663->regmap, RT5663_VREF_RECMIX, 0x0032);
                 regmap_write(rt5663->regmap, RT5663_PWR_ANLG_1, 0xa2be);
                 msleep(20);
                 regmap_write(rt5663->regmap, RT5663_PWR_ANLG_1, 0xf2be);
                 regmap_update_bits(rt5663->regmap, RT5663_GPIO_2,
-                        RT5663_GP1_PIN_CONF_MASK, RT5663_GP1_PIN_CONF_OUTPUT);
+                        RT5663_GP1_PIN_CONF_MASK | RT5663_SEL_GPIO1_MASK,
+                        RT5663_GP1_PIN_CONF_OUTPUT | RT5663_SEL_GPIO1_EN);
                 /* DACREF LDO control */
                 regmap_update_bits(rt5663->regmap, RT5663_DACREF_LDO, 0x3e0e,
                         0x3a0a);
diff --git a/sound/soc/codecs/rt5663.h b/sound/soc/codecs/rt5663.h
index 2cc8f28080f6..d77fae619f2f 100644
--- a/sound/soc/codecs/rt5663.h
+++ b/sound/soc/codecs/rt5663.h
@@ -18,655 +18,652 @@
 #define RT5663_VENDOR_ID_1                      0x00fe
 #define RT5663_VENDOR_ID_2                      0x00ff
 
-#define RT5668_LOUT_CTRL                        0x0001
-#define RT5668_HP_AMP_2                         0x0003
-#define RT5668_MONO_OUT                         0x0004
-#define RT5668_MONO_GAIN                        0x0007
-
-#define RT5668_AEC_BST                          0x000b
-#define RT5668_IN1_IN2                          0x000c
-#define RT5668_IN3_IN4                          0x000d
-#define RT5668_INL1_INR1                        0x000f
-#define RT5668_CBJ_TYPE_2                       0x0011
-#define RT5668_CBJ_TYPE_3                       0x0012
-#define RT5668_CBJ_TYPE_4                       0x0013
-#define RT5668_CBJ_TYPE_5                       0x0014
-#define RT5668_CBJ_TYPE_8                       0x0017
+#define RT5663_LOUT_CTRL                        0x0001
+#define RT5663_HP_AMP_2                         0x0003
+#define RT5663_MONO_OUT                         0x0004
+#define RT5663_MONO_GAIN                        0x0007
+
+#define RT5663_AEC_BST                          0x000b
+#define RT5663_IN1_IN2                          0x000c
+#define RT5663_IN3_IN4                          0x000d
+#define RT5663_INL1_INR1                        0x000f
+#define RT5663_CBJ_TYPE_2                       0x0011
+#define RT5663_CBJ_TYPE_3                       0x0012
+#define RT5663_CBJ_TYPE_4                       0x0013
+#define RT5663_CBJ_TYPE_5                       0x0014
+#define RT5663_CBJ_TYPE_8                       0x0017
 
 /* I/O - ADC/DAC/DMIC */
-#define RT5668_DAC3_DIG_VOL                     0x001a
-#define RT5668_DAC3_CTRL                        0x001b
-#define RT5668_MONO_ADC_DIG_VOL                 0x001d
-#define RT5668_STO2_ADC_DIG_VOL                 0x001e
-#define RT5668_MONO_ADC_BST_GAIN                0x0020
-#define RT5668_STO2_ADC_BST_GAIN                0x0021
-#define RT5668_SIDETONE_CTRL                    0x0024
+#define RT5663_DAC3_DIG_VOL                     0x001a
+#define RT5663_DAC3_CTRL                        0x001b
+#define RT5663_MONO_ADC_DIG_VOL                 0x001d
+#define RT5663_STO2_ADC_DIG_VOL                 0x001e
+#define RT5663_MONO_ADC_BST_GAIN                0x0020
+#define RT5663_STO2_ADC_BST_GAIN                0x0021
+#define RT5663_SIDETONE_CTRL                    0x0024
 /* Mixer - D-D */
-#define RT5668_MONO1_ADC_MIXER                  0x0027
-#define RT5668_STO2_ADC_MIXER                   0x0028
-#define RT5668_MONO_DAC_MIXER                   0x002b
-#define RT5668_DAC2_SRC_CTRL                    0x002e
-#define RT5668_IF_3_4_DATA_CTL                  0x002f
-#define RT5668_IF_5_DATA_CTL                    0x0030
-#define RT5668_PDM_OUT_CTL                      0x0031
-#define RT5668_PDM_I2C_DATA_CTL1                0x0032
-#define RT5668_PDM_I2C_DATA_CTL2                0x0033
-#define RT5668_PDM_I2C_DATA_CTL3                0x0034
-#define RT5668_PDM_I2C_DATA_CTL4                0x0035
+#define RT5663_MONO1_ADC_MIXER                  0x0027
+#define RT5663_STO2_ADC_MIXER                   0x0028
+#define RT5663_MONO_DAC_MIXER                   0x002b
+#define RT5663_DAC2_SRC_CTRL                    0x002e
+#define RT5663_IF_3_4_DATA_CTL                  0x002f
+#define RT5663_IF_5_DATA_CTL                    0x0030
+#define RT5663_PDM_OUT_CTL                      0x0031
+#define RT5663_PDM_I2C_DATA_CTL1                0x0032
+#define RT5663_PDM_I2C_DATA_CTL2                0x0033
+#define RT5663_PDM_I2C_DATA_CTL3                0x0034
+#define RT5663_PDM_I2C_DATA_CTL4                0x0035
 
 /*Mixer - Analog*/
-#define RT5668_RECMIX1_NEW                      0x003a
-#define RT5668_RECMIX1L_0                       0x003b
-#define RT5668_RECMIX1L                         0x003c
-#define RT5668_RECMIX1R_0                       0x003d
-#define RT5668_RECMIX1R                         0x003e
-#define RT5668_RECMIX2_NEW                      0x003f
-#define RT5668_RECMIX2_L_2                      0x0041
-#define RT5668_RECMIX2_R                        0x0042
-#define RT5668_RECMIX2_R_2                      0x0043
-#define RT5668_CALIB_REC_LR                     0x0044
-#define RT5668_ALC_BK_GAIN                      0x0049
-#define RT5668_MONOMIX_GAIN                     0x004a
-#define RT5668_MONOMIX_IN_GAIN                  0x004b
-#define RT5668_OUT_MIXL_GAIN                    0x004d
-#define RT5668_OUT_LMIX_IN_GAIN                 0x004e
-#define RT5668_OUT_RMIX_IN_GAIN                 0x004f
-#define RT5668_OUT_RMIX_IN_GAIN1                0x0050
-#define RT5668_LOUT_MIXER_CTRL                  0x0052
+#define RT5663_RECMIX1_NEW                      0x003a
+#define RT5663_RECMIX1L_0                       0x003b
+#define RT5663_RECMIX1L                         0x003c
+#define RT5663_RECMIX1R_0                       0x003d
+#define RT5663_RECMIX1R                         0x003e
+#define RT5663_RECMIX2_NEW                      0x003f
+#define RT5663_RECMIX2_L_2                      0x0041
+#define RT5663_RECMIX2_R                        0x0042
+#define RT5663_RECMIX2_R_2                      0x0043
+#define RT5663_CALIB_REC_LR                     0x0044
+#define RT5663_ALC_BK_GAIN                      0x0049
+#define RT5663_MONOMIX_GAIN                     0x004a
+#define RT5663_MONOMIX_IN_GAIN                  0x004b
+#define RT5663_OUT_MIXL_GAIN                    0x004d
+#define RT5663_OUT_LMIX_IN_GAIN                 0x004e
+#define RT5663_OUT_RMIX_IN_GAIN                 0x004f
+#define RT5663_OUT_RMIX_IN_GAIN1                0x0050
+#define RT5663_LOUT_MIXER_CTRL                  0x0052
 /* Power */
-#define RT5668_PWR_VOL                          0x0067
+#define RT5663_PWR_VOL                          0x0067
 
-#define RT5668_ADCDAC_RST                       0x006d
+#define RT5663_ADCDAC_RST                       0x006d
 /* Format - ADC/DAC */
-#define RT5668_I2S34_SDP                        0x0071
-#define RT5668_I2S5_SDP                         0x0072
-/* Format - TDM Control */
-#define RT5668_TDM_5                            0x007c
-#define RT5668_TDM_6                            0x007d
-#define RT5668_TDM_7                            0x007e
-#define RT5668_TDM_8                            0x007f
+#define RT5663_I2S34_SDP                        0x0071
+#define RT5663_I2S5_SDP                         0x0072
 
 /* Function - Analog */
-#define RT5668_ASRC_3                           0x0085
-#define RT5668_ASRC_6                           0x0088
-#define RT5668_ASRC_7                           0x0089
-#define RT5668_PLL_TRK_13                       0x0099
-#define RT5668_I2S_M_CLK_CTL                    0x00a0
-#define RT5668_FDIV_I2S34_M_CLK                 0x00a1
-#define RT5668_FDIV_I2S34_M_CLK2                0x00a2
-#define RT5668_FDIV_I2S5_M_CLK                  0x00a3
-#define RT5668_FDIV_I2S5_M_CLK2                 0x00a4
+#define RT5663_ASRC_3                           0x0085
+#define RT5663_ASRC_6                           0x0088
+#define RT5663_ASRC_7                           0x0089
+#define RT5663_PLL_TRK_13                       0x0099
+#define RT5663_I2S_M_CLK_CTL                    0x00a0
+#define RT5663_FDIV_I2S34_M_CLK                 0x00a1
+#define RT5663_FDIV_I2S34_M_CLK2                0x00a2
+#define RT5663_FDIV_I2S5_M_CLK                  0x00a3
+#define RT5663_FDIV_I2S5_M_CLK2                 0x00a4
 
 /* Function - Digital */
-#define RT5668_IRQ_4                            0x00b9
-#define RT5668_GPIO_3                           0x00c2
-#define RT5668_GPIO_4                           0x00c3
-#define RT5668_GPIO_STA                         0x00c4
-#define RT5668_HP_AMP_DET1                      0x00d0
-#define RT5668_HP_AMP_DET2                      0x00d1
-#define RT5668_HP_AMP_DET3                      0x00d2
-#define RT5668_MID_BD_HP_AMP                    0x00d3
-#define RT5668_LOW_BD_HP_AMP                    0x00d4
-#define RT5668_SOF_VOL_ZC2                      0x00da
-#define RT5668_ADC_STO2_ADJ1                    0x00ee
-#define RT5668_ADC_STO2_ADJ2                    0x00ef
+#define RT5663_V2_IRQ_4                         0x00b9
+#define RT5663_GPIO_3                           0x00c2
+#define RT5663_GPIO_4                           0x00c3
+#define RT5663_GPIO_STA2                        0x00c4
+#define RT5663_HP_AMP_DET1                      0x00d0
+#define RT5663_HP_AMP_DET2                      0x00d1
+#define RT5663_HP_AMP_DET3                      0x00d2
+#define RT5663_MID_BD_HP_AMP                    0x00d3
+#define RT5663_LOW_BD_HP_AMP                    0x00d4
+#define RT5663_SOF_VOL_ZC2                      0x00da
+#define RT5663_ADC_STO2_ADJ1                    0x00ee
+#define RT5663_ADC_STO2_ADJ2                    0x00ef
 /* General Control */
-#define RT5668_A_JD_CTRL                        0x00f0
-#define RT5668_JD1_TRES_CTRL                    0x00f1
-#define RT5668_JD2_TRES_CTRL                    0x00f2
-#define RT5668_JD_CTRL2                         0x00f7
-#define RT5668_DUM_REG_2                        0x00fb
-#define RT5668_DUM_REG_3                        0x00fc
-
-
-#define RT5668_DACADC_DIG_VOL2                  0x0101
-#define RT5668_DIG_IN_PIN2                      0x0133
-#define RT5668_PAD_DRV_CTL1                     0x0136
-#define RT5668_SOF_RAM_DEPOP                    0x0138
-#define RT5668_VOL_TEST                         0x013f
-#define RT5668_TEST_MODE_3                      0x0147
-#define RT5668_TEST_MODE_4                      0x0148
-#define RT5668_MONO_DYNA_1                      0x0170
-#define RT5668_MONO_DYNA_2                      0x0171
-#define RT5668_MONO_DYNA_3                      0x0172
-#define RT5668_MONO_DYNA_4                      0x0173
-#define RT5668_MONO_DYNA_5                      0x0174
-#define RT5668_MONO_DYNA_6                      0x0175
-#define RT5668_STO1_SIL_DET                     0x0190
-#define RT5668_MONOL_SIL_DET                    0x0191
-#define RT5668_MONOR_SIL_DET                    0x0192
-#define RT5668_STO2_DAC_SIL                     0x0193
-#define RT5668_PWR_SAV_CTL1                     0x0194
-#define RT5668_PWR_SAV_CTL2                     0x0195
-#define RT5668_PWR_SAV_CTL3                     0x0196
-#define RT5668_PWR_SAV_CTL4                     0x0197
-#define RT5668_PWR_SAV_CTL5                     0x0198
-#define RT5668_PWR_SAV_CTL6                     0x0199
-#define RT5668_MONO_AMP_CAL1                    0x01a0
-#define RT5668_MONO_AMP_CAL2                    0x01a1
-#define RT5668_MONO_AMP_CAL3                    0x01a2
-#define RT5668_MONO_AMP_CAL4                    0x01a3
-#define RT5668_MONO_AMP_CAL5                    0x01a4
-#define RT5668_MONO_AMP_CAL6                    0x01a5
-#define RT5668_MONO_AMP_CAL7                    0x01a6
-#define RT5668_MONO_AMP_CAL_ST1                 0x01a7
-#define RT5668_MONO_AMP_CAL_ST2                 0x01a8
-#define RT5668_MONO_AMP_CAL_ST3                 0x01a9
-#define RT5668_MONO_AMP_CAL_ST4                 0x01aa
-#define RT5668_MONO_AMP_CAL_ST5                 0x01ab
-#define RT5668_HP_IMP_SEN_13                    0x01b9
-#define RT5668_HP_IMP_SEN_14                    0x01ba
-#define RT5668_HP_IMP_SEN_6                     0x01bb
-#define RT5668_HP_IMP_SEN_7                     0x01bc
-#define RT5668_HP_IMP_SEN_8                     0x01bd
-#define RT5668_HP_IMP_SEN_9                     0x01be
-#define RT5668_HP_IMP_SEN_10                    0x01bf
-#define RT5668_HP_LOGIC_3                       0x01dc
-#define RT5668_HP_CALIB_ST10                    0x01f3
-#define RT5668_HP_CALIB_ST11                    0x01f4
-#define RT5668_PRO_REG_TBL_4                    0x0203
-#define RT5668_PRO_REG_TBL_5                    0x0204
-#define RT5668_PRO_REG_TBL_6                    0x0205
-#define RT5668_PRO_REG_TBL_7                    0x0206
-#define RT5668_PRO_REG_TBL_8                    0x0207
-#define RT5668_PRO_REG_TBL_9                    0x0208
-#define RT5668_SAR_ADC_INL_1                    0x0210
-#define RT5668_SAR_ADC_INL_2                    0x0211
-#define RT5668_SAR_ADC_INL_3                    0x0212
-#define RT5668_SAR_ADC_INL_4                    0x0213
-#define RT5668_SAR_ADC_INL_5                    0x0214
-#define RT5668_SAR_ADC_INL_6                    0x0215
-#define RT5668_SAR_ADC_INL_7                    0x0216
-#define RT5668_SAR_ADC_INL_8                    0x0217
-#define RT5668_SAR_ADC_INL_9                    0x0218
-#define RT5668_SAR_ADC_INL_10                   0x0219
-#define RT5668_SAR_ADC_INL_11                   0x021a
-#define RT5668_SAR_ADC_INL_12                   0x021b
-#define RT5668_DRC_CTRL_1                       0x02ff
-#define RT5668_DRC1_CTRL_2                      0x0301
-#define RT5668_DRC1_CTRL_3                      0x0302
-#define RT5668_DRC1_CTRL_4                      0x0303
-#define RT5668_DRC1_CTRL_5                      0x0304
-#define RT5668_DRC1_CTRL_6                      0x0305
-#define RT5668_DRC1_HD_CTRL_1                   0x0306
-#define RT5668_DRC1_HD_CTRL_2                   0x0307
-#define RT5668_DRC1_PRI_REG_1                   0x0310
-#define RT5668_DRC1_PRI_REG_2                   0x0311
-#define RT5668_DRC1_PRI_REG_3                   0x0312
-#define RT5668_DRC1_PRI_REG_4                   0x0313
-#define RT5668_DRC1_PRI_REG_5                   0x0314
-#define RT5668_DRC1_PRI_REG_6                   0x0315
-#define RT5668_DRC1_PRI_REG_7                   0x0316
-#define RT5668_DRC1_PRI_REG_8                   0x0317
-#define RT5668_ALC_PGA_CTL_1                    0x0330
-#define RT5668_ALC_PGA_CTL_2                    0x0331
-#define RT5668_ALC_PGA_CTL_3                    0x0332
-#define RT5668_ALC_PGA_CTL_4                    0x0333
-#define RT5668_ALC_PGA_CTL_5                    0x0334
-#define RT5668_ALC_PGA_CTL_6                    0x0335
-#define RT5668_ALC_PGA_CTL_7                    0x0336
-#define RT5668_ALC_PGA_CTL_8                    0x0337
-#define RT5668_ALC_PGA_REG_1                    0x0338
-#define RT5668_ALC_PGA_REG_2                    0x0339
-#define RT5668_ALC_PGA_REG_3                    0x033a
-#define RT5668_ADC_EQ_RECOV_1                   0x03c0
-#define RT5668_ADC_EQ_RECOV_2                   0x03c1
-#define RT5668_ADC_EQ_RECOV_3                   0x03c2
-#define RT5668_ADC_EQ_RECOV_4                   0x03c3
-#define RT5668_ADC_EQ_RECOV_5                   0x03c4
-#define RT5668_ADC_EQ_RECOV_6                   0x03c5
-#define RT5668_ADC_EQ_RECOV_7                   0x03c6
-#define RT5668_ADC_EQ_RECOV_8                   0x03c7
-#define RT5668_ADC_EQ_RECOV_9                   0x03c8
-#define RT5668_ADC_EQ_RECOV_10                  0x03c9
-#define RT5668_ADC_EQ_RECOV_11                  0x03ca
-#define RT5668_ADC_EQ_RECOV_12                  0x03cb
-#define RT5668_ADC_EQ_RECOV_13                  0x03cc
-#define RT5668_VID_HIDDEN                       0x03fe
-#define RT5668_VID_CUSTOMER                     0x03ff
-#define RT5668_SCAN_MODE                        0x07f0
-#define RT5668_I2C_BYPA                         0x07fa
+#define RT5663_A_JD_CTRL                        0x00f0
+#define RT5663_JD1_TRES_CTRL                    0x00f1
+#define RT5663_JD2_TRES_CTRL                    0x00f2
+#define RT5663_V2_JD_CTRL2                      0x00f7
+#define RT5663_DUM_REG_2                        0x00fb
+#define RT5663_DUM_REG_3                        0x00fc
+
+
+#define RT5663_DACADC_DIG_VOL2                  0x0101
+#define RT5663_DIG_IN_PIN2                      0x0133
+#define RT5663_PAD_DRV_CTL1                     0x0136
+#define RT5663_SOF_RAM_DEPOP                    0x0138
+#define RT5663_VOL_TEST                         0x013f
+#define RT5663_MONO_DYNA_1                      0x0170
+#define RT5663_MONO_DYNA_2                      0x0171
+#define RT5663_MONO_DYNA_3                      0x0172
+#define RT5663_MONO_DYNA_4                      0x0173
+#define RT5663_MONO_DYNA_5                      0x0174
+#define RT5663_MONO_DYNA_6                      0x0175
+#define RT5663_STO1_SIL_DET                     0x0190
+#define RT5663_MONOL_SIL_DET                    0x0191
+#define RT5663_MONOR_SIL_DET                    0x0192
+#define RT5663_STO2_DAC_SIL                     0x0193
+#define RT5663_PWR_SAV_CTL1                     0x0194
+#define RT5663_PWR_SAV_CTL2                     0x0195
+#define RT5663_PWR_SAV_CTL3                     0x0196
+#define RT5663_PWR_SAV_CTL4                     0x0197
+#define RT5663_PWR_SAV_CTL5                     0x0198
+#define RT5663_PWR_SAV_CTL6                     0x0199
+#define RT5663_MONO_AMP_CAL1                    0x01a0
+#define RT5663_MONO_AMP_CAL2                    0x01a1
+#define RT5663_MONO_AMP_CAL3                    0x01a2
+#define RT5663_MONO_AMP_CAL4                    0x01a3
+#define RT5663_MONO_AMP_CAL5                    0x01a4
+#define RT5663_MONO_AMP_CAL6                    0x01a5
+#define RT5663_MONO_AMP_CAL7                    0x01a6
+#define RT5663_MONO_AMP_CAL_ST1                 0x01a7
+#define RT5663_MONO_AMP_CAL_ST2                 0x01a8
+#define RT5663_MONO_AMP_CAL_ST3                 0x01a9
+#define RT5663_MONO_AMP_CAL_ST4                 0x01aa
+#define RT5663_MONO_AMP_CAL_ST5                 0x01ab
+#define RT5663_V2_HP_IMP_SEN_13                 0x01b9
+#define RT5663_V2_HP_IMP_SEN_14                 0x01ba
+#define RT5663_V2_HP_IMP_SEN_6                  0x01bb
+#define RT5663_V2_HP_IMP_SEN_7                  0x01bc
+#define RT5663_V2_HP_IMP_SEN_8                  0x01bd
+#define RT5663_V2_HP_IMP_SEN_9                  0x01be
+#define RT5663_V2_HP_IMP_SEN_10                 0x01bf
+#define RT5663_HP_LOGIC_3                       0x01dc
+#define RT5663_HP_CALIB_ST10                    0x01f3
+#define RT5663_HP_CALIB_ST11                    0x01f4
+#define RT5663_PRO_REG_TBL_4                    0x0203
+#define RT5663_PRO_REG_TBL_5                    0x0204
+#define RT5663_PRO_REG_TBL_6                    0x0205
+#define RT5663_PRO_REG_TBL_7                    0x0206
+#define RT5663_PRO_REG_TBL_8                    0x0207
+#define RT5663_PRO_REG_TBL_9                    0x0208
+#define RT5663_SAR_ADC_INL_1                    0x0210
+#define RT5663_SAR_ADC_INL_2                    0x0211
+#define RT5663_SAR_ADC_INL_3                    0x0212
+#define RT5663_SAR_ADC_INL_4                    0x0213
+#define RT5663_SAR_ADC_INL_5                    0x0214
+#define RT5663_SAR_ADC_INL_6                    0x0215
+#define RT5663_SAR_ADC_INL_7                    0x0216
+#define RT5663_SAR_ADC_INL_8                    0x0217
+#define RT5663_SAR_ADC_INL_9                    0x0218
+#define RT5663_SAR_ADC_INL_10                   0x0219
+#define RT5663_SAR_ADC_INL_11                   0x021a
+#define RT5663_SAR_ADC_INL_12                   0x021b
+#define RT5663_DRC_CTRL_1                       0x02ff
+#define RT5663_DRC1_CTRL_2                      0x0301
+#define RT5663_DRC1_CTRL_3                      0x0302
+#define RT5663_DRC1_CTRL_4                      0x0303
+#define RT5663_DRC1_CTRL_5                      0x0304
+#define RT5663_DRC1_CTRL_6                      0x0305
+#define RT5663_DRC1_HD_CTRL_1                   0x0306
+#define RT5663_DRC1_HD_CTRL_2                   0x0307
+#define RT5663_DRC1_PRI_REG_1                   0x0310
+#define RT5663_DRC1_PRI_REG_2                   0x0311
+#define RT5663_DRC1_PRI_REG_3                   0x0312
+#define RT5663_DRC1_PRI_REG_4                   0x0313
+#define RT5663_DRC1_PRI_REG_5                   0x0314
+#define RT5663_DRC1_PRI_REG_6                   0x0315
+#define RT5663_DRC1_PRI_REG_7                   0x0316
+#define RT5663_DRC1_PRI_REG_8                   0x0317
+#define RT5663_ALC_PGA_CTL_1                    0x0330
+#define RT5663_ALC_PGA_CTL_2                    0x0331
+#define RT5663_ALC_PGA_CTL_3                    0x0332
+#define RT5663_ALC_PGA_CTL_4                    0x0333
+#define RT5663_ALC_PGA_CTL_5                    0x0334
+#define RT5663_ALC_PGA_CTL_6                    0x0335
+#define RT5663_ALC_PGA_CTL_7                    0x0336
+#define RT5663_ALC_PGA_CTL_8                    0x0337
+#define RT5663_ALC_PGA_REG_1                    0x0338
+#define RT5663_ALC_PGA_REG_2                    0x0339
+#define RT5663_ALC_PGA_REG_3                    0x033a
+#define RT5663_ADC_EQ_RECOV_1                   0x03c0
+#define RT5663_ADC_EQ_RECOV_2                   0x03c1
+#define RT5663_ADC_EQ_RECOV_3                   0x03c2
+#define RT5663_ADC_EQ_RECOV_4                   0x03c3
+#define RT5663_ADC_EQ_RECOV_5                   0x03c4
+#define RT5663_ADC_EQ_RECOV_6                   0x03c5
+#define RT5663_ADC_EQ_RECOV_7                   0x03c6
+#define RT5663_ADC_EQ_RECOV_8                   0x03c7
+#define RT5663_ADC_EQ_RECOV_9                   0x03c8
+#define RT5663_ADC_EQ_RECOV_10                  0x03c9
+#define RT5663_ADC_EQ_RECOV_11                  0x03ca
+#define RT5663_ADC_EQ_RECOV_12                  0x03cb
+#define RT5663_ADC_EQ_RECOV_13                  0x03cc
+#define RT5663_VID_HIDDEN                       0x03fe
+#define RT5663_VID_CUSTOMER                     0x03ff
+#define RT5663_SCAN_MODE                        0x07f0
+#define RT5663_I2C_BYPA                         0x07fa
 
 /* Headphone Amp Control 2 (0x0003) */
-#define RT5668_EN_DAC_HPO_MASK                  (0x1 << 14)
-#define RT5668_EN_DAC_HPO_SHIFT                 14
-#define RT5668_EN_DAC_HPO_DIS                   (0x0 << 14)
-#define RT5668_EN_DAC_HPO_EN                    (0x1 << 14)
+#define RT5663_EN_DAC_HPO_MASK                  (0x1 << 14)
+#define RT5663_EN_DAC_HPO_SHIFT                 14
+#define RT5663_EN_DAC_HPO_DIS                   (0x0 << 14)
+#define RT5663_EN_DAC_HPO_EN                    (0x1 << 14)
 
 /*Headphone Amp L/R Analog Gain and Digital NG2 Gain Control (0x0005 0x0006)*/
-#define RT5668_GAIN_HP                          (0x1f << 8)
-#define RT5668_GAIN_HP_SHIFT                    8
+#define RT5663_GAIN_HP                          (0x1f << 8)
+#define RT5663_GAIN_HP_SHIFT                    8
 
 /* AEC BST Control (0x000b) */
-#define RT5668_GAIN_CBJ_MASK                    (0xf << 8)
-#define RT5668_GAIN_CBJ_SHIFT                   8
+#define RT5663_GAIN_CBJ_MASK                    (0xf << 8)
+#define RT5663_GAIN_CBJ_SHIFT                   8
 
 /* IN1 Control / MIC GND REF (0x000c) */
-#define RT5668_IN1_DF_MASK                      (0x1 << 15)
-#define RT5668_IN1_DF_SHIFT                     15
+#define RT5663_IN1_DF_MASK                      (0x1 << 15)
+#define RT5663_IN1_DF_SHIFT                     15
 
 /* Combo Jack and Type Detection Control 1 (0x0010) */
-#define RT5668_CBJ_DET_MASK                     (0x1 << 15)
-#define RT5668_CBJ_DET_SHIFT                    15
-#define RT5668_CBJ_DET_DIS                      (0x0 << 15)
-#define RT5668_CBJ_DET_EN                       (0x1 << 15)
-#define RT5668_DET_TYPE_MASK                    (0x1 << 12)
-#define RT5668_DET_TYPE_SHIFT                   12
-#define RT5668_DET_TYPE_WLCSP                   (0x0 << 12)
-#define RT5668_DET_TYPE_QFN                     (0x1 << 12)
-#define RT5668_VREF_BIAS_MASK                   (0x1 << 6)
-#define RT5668_VREF_BIAS_SHIFT                  6
-#define RT5668_VREF_BIAS_FSM                    (0x0 << 6)
-#define RT5668_VREF_BIAS_REG                    (0x1 << 6)
+#define RT5663_CBJ_DET_MASK                     (0x1 << 15)
+#define RT5663_CBJ_DET_SHIFT                    15
+#define RT5663_CBJ_DET_DIS                      (0x0 << 15)
+#define RT5663_CBJ_DET_EN                       (0x1 << 15)
+#define RT5663_DET_TYPE_MASK                    (0x1 << 12)
+#define RT5663_DET_TYPE_SHIFT                   12
+#define RT5663_DET_TYPE_WLCSP                   (0x0 << 12)
+#define RT5663_DET_TYPE_QFN                     (0x1 << 12)
+#define RT5663_VREF_BIAS_MASK                   (0x1 << 6)
+#define RT5663_VREF_BIAS_SHIFT                  6
+#define RT5663_VREF_BIAS_FSM                    (0x0 << 6)
+#define RT5663_VREF_BIAS_REG                    (0x1 << 6)
 
 /* REC Left Mixer Control 2 (0x003c) */
-#define RT5668_RECMIX1L_BST1_CBJ                (0x1 << 7)
-#define RT5668_RECMIX1L_BST1_CBJ_SHIFT          7
-#define RT5668_RECMIX1L_BST2                    (0x1 << 4)
-#define RT5668_RECMIX1L_BST2_SHIFT              4
+#define RT5663_RECMIX1L_BST1_CBJ                (0x1 << 7)
+#define RT5663_RECMIX1L_BST1_CBJ_SHIFT          7
+#define RT5663_RECMIX1L_BST2                    (0x1 << 4)
+#define RT5663_RECMIX1L_BST2_SHIFT              4
 
 /* REC Right Mixer Control 2 (0x003e) */
-#define RT5668_RECMIX1R_BST2                    (0x1 << 4)
-#define RT5668_RECMIX1R_BST2_SHIFT              4
+#define RT5663_RECMIX1R_BST2                    (0x1 << 4)
+#define RT5663_RECMIX1R_BST2_SHIFT              4
 
 /* DAC1 Digital Volume (0x0019) */
-#define RT5668_DAC_L1_VOL_MASK                  (0xff << 8)
-#define RT5668_DAC_L1_VOL_SHIFT                 8
-#define RT5668_DAC_R1_VOL_MASK                  (0xff)
-#define RT5668_DAC_R1_VOL_SHIFT                 0
+#define RT5663_DAC_L1_VOL_MASK                  (0xff << 8)
+#define RT5663_DAC_L1_VOL_SHIFT                 8
+#define RT5663_DAC_R1_VOL_MASK                  (0xff)
+#define RT5663_DAC_R1_VOL_SHIFT                 0
 
 /* ADC Digital Volume Control (0x001c) */
-#define RT5668_ADC_L_MUTE_MASK                  (0x1 << 15)
-#define RT5668_ADC_L_MUTE_SHIFT                 15
-#define RT5668_ADC_L_VOL_MASK                   (0x7f << 8)
-#define RT5668_ADC_L_VOL_SHIFT                  8
-#define RT5668_ADC_R_MUTE_MASK                  (0x1 << 7)
-#define RT5668_ADC_R_MUTE_SHIFT                 7
-#define RT5668_ADC_R_VOL_MASK                   (0x7f)
-#define RT5668_ADC_R_VOL_SHIFT                  0
+#define RT5663_ADC_L_MUTE_MASK                  (0x1 << 15)
+#define RT5663_ADC_L_MUTE_SHIFT                 15
+#define RT5663_ADC_L_VOL_MASK                   (0x7f << 8)
+#define RT5663_ADC_L_VOL_SHIFT                  8
+#define RT5663_ADC_R_MUTE_MASK                  (0x1 << 7)
+#define RT5663_ADC_R_MUTE_SHIFT                 7
+#define RT5663_ADC_R_VOL_MASK                   (0x7f)
+#define RT5663_ADC_R_VOL_SHIFT                  0
 
 /* Stereo ADC Mixer Control (0x0026) */
-#define RT5668_M_STO1_ADC_L1                    (0x1 << 15)
-#define RT5668_M_STO1_ADC_L1_SHIFT              15
-#define RT5668_M_STO1_ADC_L2                    (0x1 << 14)
-#define RT5668_M_STO1_ADC_L2_SHIFT              14
-#define RT5668_STO1_ADC_L1_SRC                  (0x1 << 13)
-#define RT5668_STO1_ADC_L1_SRC_SHIFT            13
-#define RT5668_STO1_ADC_L2_SRC                  (0x1 << 12)
-#define RT5668_STO1_ADC_L2_SRC_SHIFT            12
-#define RT5668_STO1_ADC_L_SRC                   (0x3 << 10)
-#define RT5668_STO1_ADC_L_SRC_SHIFT             10
-#define RT5668_M_STO1_ADC_R1                    (0x1 << 7)
-#define RT5668_M_STO1_ADC_R1_SHIFT              7
-#define RT5668_M_STO1_ADC_R2                    (0x1 << 6)
-#define RT5668_M_STO1_ADC_R2_SHIFT              6
-#define RT5668_STO1_ADC_R1_SRC                  (0x1 << 5)
-#define RT5668_STO1_ADC_R1_SRC_SHIFT            5
-#define RT5668_STO1_ADC_R2_SRC                  (0x1 << 4)
-#define RT5668_STO1_ADC_R2_SRC_SHIFT            4
-#define RT5668_STO1_ADC_R_SRC                   (0x3 << 2)
-#define RT5668_STO1_ADC_R_SRC_SHIFT             2
+#define RT5663_M_STO1_ADC_L1                    (0x1 << 15)
+#define RT5663_M_STO1_ADC_L1_SHIFT              15
+#define RT5663_M_STO1_ADC_L2                    (0x1 << 14)
+#define RT5663_M_STO1_ADC_L2_SHIFT              14
+#define RT5663_STO1_ADC_L1_SRC                  (0x1 << 13)
+#define RT5663_STO1_ADC_L1_SRC_SHIFT            13
+#define RT5663_STO1_ADC_L2_SRC                  (0x1 << 12)
+#define RT5663_STO1_ADC_L2_SRC_SHIFT            12
+#define RT5663_STO1_ADC_L_SRC                   (0x3 << 10)
+#define RT5663_STO1_ADC_L_SRC_SHIFT             10
+#define RT5663_M_STO1_ADC_R1                    (0x1 << 7)
+#define RT5663_M_STO1_ADC_R1_SHIFT              7
+#define RT5663_M_STO1_ADC_R2                    (0x1 << 6)
+#define RT5663_M_STO1_ADC_R2_SHIFT              6
+#define RT5663_STO1_ADC_R1_SRC                  (0x1 << 5)
+#define RT5663_STO1_ADC_R1_SRC_SHIFT            5
+#define RT5663_STO1_ADC_R2_SRC                  (0x1 << 4)
+#define RT5663_STO1_ADC_R2_SRC_SHIFT            4
+#define RT5663_STO1_ADC_R_SRC                   (0x3 << 2)
+#define RT5663_STO1_ADC_R_SRC_SHIFT             2
 
 /* ADC Mixer to DAC Mixer Control (0x0029) */
-#define RT5668_M_ADCMIX_L                       (0x1 << 15)
-#define RT5668_M_ADCMIX_L_SHIFT                 15
-#define RT5668_M_DAC1_L                         (0x1 << 14)
-#define RT5668_M_DAC1_L_SHIFT                   14
-#define RT5668_M_ADCMIX_R                       (0x1 << 7)
-#define RT5668_M_ADCMIX_R_SHIFT                 7
-#define RT5668_M_DAC1_R                         (0x1 << 6)
-#define RT5668_M_DAC1_R_SHIFT                   6
+#define RT5663_M_ADCMIX_L                       (0x1 << 15)
+#define RT5663_M_ADCMIX_L_SHIFT                 15
+#define RT5663_M_DAC1_L                         (0x1 << 14)
+#define RT5663_M_DAC1_L_SHIFT                   14
+#define RT5663_M_ADCMIX_R                       (0x1 << 7)
+#define RT5663_M_ADCMIX_R_SHIFT                 7
+#define RT5663_M_DAC1_R                         (0x1 << 6)
+#define RT5663_M_DAC1_R_SHIFT                   6
 
 /* Stereo DAC Mixer Control (0x002a) */
-#define RT5668_M_DAC_L1_STO_L                   (0x1 << 15)
-#define RT5668_M_DAC_L1_STO_L_SHIFT             15
-#define RT5668_M_DAC_R1_STO_L                   (0x1 << 13)
-#define RT5668_M_DAC_R1_STO_L_SHIFT             13
-#define RT5668_M_DAC_L1_STO_R                   (0x1 << 7)
-#define RT5668_M_DAC_L1_STO_R_SHIFT             7
-#define RT5668_M_DAC_R1_STO_R                   (0x1 << 5)
-#define RT5668_M_DAC_R1_STO_R_SHIFT             5
+#define RT5663_M_DAC_L1_STO_L                   (0x1 << 15)
+#define RT5663_M_DAC_L1_STO_L_SHIFT             15
+#define RT5663_M_DAC_R1_STO_L                   (0x1 << 13)
+#define RT5663_M_DAC_R1_STO_L_SHIFT             13
+#define RT5663_M_DAC_L1_STO_R                   (0x1 << 7)
+#define RT5663_M_DAC_L1_STO_R_SHIFT             7
+#define RT5663_M_DAC_R1_STO_R                   (0x1 << 5)
+#define RT5663_M_DAC_R1_STO_R_SHIFT             5
 
 /* Power Management for Digital 1 (0x0061) */
-#define RT5668_PWR_I2S1                         (0x1 << 15)
-#define RT5668_PWR_I2S1_SHIFT                   15
-#define RT5668_PWR_DAC_L1                       (0x1 << 11)
-#define RT5668_PWR_DAC_L1_SHIFT                 11
-#define RT5668_PWR_DAC_R1                       (0x1 << 10)
-#define RT5668_PWR_DAC_R1_SHIFT                 10
-#define RT5668_PWR_LDO_DACREF_MASK              (0x1 << 8)
-#define RT5668_PWR_LDO_DACREF_SHIFT             8
-#define RT5668_PWR_LDO_DACREF_ON                (0x1 << 8)
-#define RT5668_PWR_LDO_DACREF_DOWN              (0x0 << 8)
-#define RT5668_PWR_LDO_SHIFT                    8
-#define RT5668_PWR_ADC_L1                       (0x1 << 4)
-#define RT5668_PWR_ADC_L1_SHIFT                 4
-#define RT5668_PWR_ADC_R1                       (0x1 << 3)
-#define RT5668_PWR_ADC_R1_SHIFT                 3
+#define RT5663_PWR_I2S1                         (0x1 << 15)
+#define RT5663_PWR_I2S1_SHIFT                   15
+#define RT5663_PWR_DAC_L1                       (0x1 << 11)
+#define RT5663_PWR_DAC_L1_SHIFT                 11
+#define RT5663_PWR_DAC_R1                       (0x1 << 10)
+#define RT5663_PWR_DAC_R1_SHIFT                 10
+#define RT5663_PWR_LDO_DACREF_MASK              (0x1 << 8)
+#define RT5663_PWR_LDO_DACREF_SHIFT             8
+#define RT5663_PWR_LDO_DACREF_ON                (0x1 << 8)
+#define RT5663_PWR_LDO_DACREF_DOWN              (0x0 << 8)
+#define RT5663_PWR_LDO_SHIFT                    8
+#define RT5663_PWR_ADC_L1                       (0x1 << 4)
+#define RT5663_PWR_ADC_L1_SHIFT                 4
+#define RT5663_PWR_ADC_R1                       (0x1 << 3)
+#define RT5663_PWR_ADC_R1_SHIFT                 3
 
 /* Power Management for Digital 2 (0x0062) */
-#define RT5668_PWR_ADC_S1F                      (0x1 << 15)
-#define RT5668_PWR_ADC_S1F_SHIFT                15
-#define RT5668_PWR_DAC_S1F                      (0x1 << 10)
-#define RT5668_PWR_DAC_S1F_SHIFT                10
+#define RT5663_PWR_ADC_S1F                      (0x1 << 15)
+#define RT5663_PWR_ADC_S1F_SHIFT                15
+#define RT5663_PWR_DAC_S1F                      (0x1 << 10)
+#define RT5663_PWR_DAC_S1F_SHIFT                10
 
 /* Power Management for Analog 1 (0x0063) */
-#define RT5668_PWR_VREF1                        (0x1 << 15)
-#define RT5668_PWR_VREF1_MASK                   (0x1 << 15)
-#define RT5668_PWR_VREF1_SHIFT                  15
-#define RT5668_PWR_FV1                          (0x1 << 14)
-#define RT5668_PWR_FV1_MASK                     (0x1 << 14)
-#define RT5668_PWR_FV1_SHIFT                    14
-#define RT5668_PWR_VREF2                        (0x1 << 13)
-#define RT5668_PWR_VREF2_MASK                   (0x1 << 13)
-#define RT5668_PWR_VREF2_SHIFT                  13
-#define RT5668_PWR_FV2                          (0x1 << 12)
-#define RT5668_PWR_FV2_MASK                     (0x1 << 12)
-#define RT5668_PWR_FV2_SHIFT                    12
-#define RT5668_PWR_MB                           (0x1 << 9)
-#define RT5668_PWR_MB_MASK                      (0x1 << 9)
-#define RT5668_PWR_MB_SHIFT                     9
-#define RT5668_AMP_HP_MASK                      (0x3 << 2)
-#define RT5668_AMP_HP_SHIFT                     2
-#define RT5668_AMP_HP_1X                        (0x0 << 2)
-#define RT5668_AMP_HP_3X                        (0x1 << 2)
-#define RT5668_AMP_HP_5X                        (0x3 << 2)
-#define RT5668_LDO1_DVO_MASK                    (0x3)
-#define RT5668_LDO1_DVO_SHIFT                   0
-#define RT5668_LDO1_DVO_0_9V                    (0x0)
-#define RT5668_LDO1_DVO_1_0V                    (0x1)
-#define RT5668_LDO1_DVO_1_2V                    (0x2)
-#define RT5668_LDO1_DVO_1_4V                    (0x3)
+#define RT5663_PWR_VREF1                        (0x1 << 15)
+#define RT5663_PWR_VREF1_MASK                   (0x1 << 15)
+#define RT5663_PWR_VREF1_SHIFT                  15
+#define RT5663_PWR_FV1                          (0x1 << 14)
+#define RT5663_PWR_FV1_MASK                     (0x1 << 14)
+#define RT5663_PWR_FV1_SHIFT                    14
+#define RT5663_PWR_VREF2                        (0x1 << 13)
+#define RT5663_PWR_VREF2_MASK                   (0x1 << 13)
+#define RT5663_PWR_VREF2_SHIFT                  13
+#define RT5663_PWR_FV2                          (0x1 << 12)
+#define RT5663_PWR_FV2_MASK                     (0x1 << 12)
+#define RT5663_PWR_FV2_SHIFT                    12
+#define RT5663_PWR_MB                           (0x1 << 9)
+#define RT5663_PWR_MB_MASK                      (0x1 << 9)
+#define RT5663_PWR_MB_SHIFT                     9
+#define RT5663_AMP_HP_MASK                      (0x3 << 2)
+#define RT5663_AMP_HP_SHIFT                     2
+#define RT5663_AMP_HP_1X                        (0x0 << 2)
+#define RT5663_AMP_HP_3X                        (0x1 << 2)
+#define RT5663_AMP_HP_5X                        (0x3 << 2)
+#define RT5663_LDO1_DVO_MASK                    (0x3)
+#define RT5663_LDO1_DVO_SHIFT                   0
+#define RT5663_LDO1_DVO_0_9V                    (0x0)
+#define RT5663_LDO1_DVO_1_0V                    (0x1)
+#define RT5663_LDO1_DVO_1_2V                    (0x2)
+#define RT5663_LDO1_DVO_1_4V                    (0x3)
 
 /* Power Management for Analog 2 (0x0064) */
-#define RT5668_PWR_BST1                         (0x1 << 15)
-#define RT5668_PWR_BST1_MASK                    (0x1 << 15)
-#define RT5668_PWR_BST1_SHIFT                   15
-#define RT5668_PWR_BST1_OFF                     (0x0 << 15)
-#define RT5668_PWR_BST1_ON                      (0x1 << 15)
-#define RT5668_PWR_BST2                         (0x1 << 14)
-#define RT5668_PWR_BST2_MASK                    (0x1 << 14)
-#define RT5668_PWR_BST2_SHIFT                   14
-#define RT5668_PWR_MB1                          (0x1 << 11)
-#define RT5668_PWR_MB1_SHIFT                    11
-#define RT5668_PWR_MB2                          (0x1 << 10)
-#define RT5668_PWR_MB2_SHIFT                    10
-#define RT5668_PWR_BST2_OP                      (0x1 << 6)
-#define RT5668_PWR_BST2_OP_MASK                 (0x1 << 6)
-#define RT5668_PWR_BST2_OP_SHIFT                6
-#define RT5668_PWR_JD1                          (0x1 << 3)
-#define RT5668_PWR_JD1_MASK                     (0x1 << 3)
-#define RT5668_PWR_JD1_SHIFT                    3
-#define RT5668_PWR_JD2                          (0x1 << 2)
-#define RT5668_PWR_JD2_MASK                     (0x1 << 2)
-#define RT5668_PWR_JD2_SHIFT                    2
-#define RT5668_PWR_RECMIX1                      (0x1 << 1)
-#define RT5668_PWR_RECMIX1_SHIFT                1
-#define RT5668_PWR_RECMIX2                      (0x1)
-#define RT5668_PWR_RECMIX2_SHIFT                0
+#define RT5663_PWR_BST1                         (0x1 << 15)
+#define RT5663_PWR_BST1_MASK                    (0x1 << 15)
+#define RT5663_PWR_BST1_SHIFT                   15
+#define RT5663_PWR_BST1_OFF                     (0x0 << 15)
+#define RT5663_PWR_BST1_ON                      (0x1 << 15)
+#define RT5663_PWR_BST2                         (0x1 << 14)
+#define RT5663_PWR_BST2_MASK                    (0x1 << 14)
+#define RT5663_PWR_BST2_SHIFT                   14
+#define RT5663_PWR_MB1                          (0x1 << 11)
+#define RT5663_PWR_MB1_SHIFT                    11
+#define RT5663_PWR_MB2                          (0x1 << 10)
+#define RT5663_PWR_MB2_SHIFT                    10
+#define RT5663_PWR_BST2_OP                      (0x1 << 6)
+#define RT5663_PWR_BST2_OP_MASK                 (0x1 << 6)
+#define RT5663_PWR_BST2_OP_SHIFT                6
+#define RT5663_PWR_JD1                          (0x1 << 3)
+#define RT5663_PWR_JD1_MASK                     (0x1 << 3)
+#define RT5663_PWR_JD1_SHIFT                    3
+#define RT5663_PWR_JD2                          (0x1 << 2)
+#define RT5663_PWR_JD2_MASK                     (0x1 << 2)
+#define RT5663_PWR_JD2_SHIFT                    2
+#define RT5663_PWR_RECMIX1                      (0x1 << 1)
+#define RT5663_PWR_RECMIX1_SHIFT                1
+#define RT5663_PWR_RECMIX2                      (0x1)
+#define RT5663_PWR_RECMIX2_SHIFT                0
 
 /* Power Management for Analog 3 (0x0065) */
-#define RT5668_PWR_CBJ_MASK                     (0x1 << 9)
-#define RT5668_PWR_CBJ_SHIFT                    9
-#define RT5668_PWR_CBJ_OFF                      (0x0 << 9)
-#define RT5668_PWR_CBJ_ON                       (0x1 << 9)
-#define RT5668_PWR_PLL                          (0x1 << 6)
-#define RT5668_PWR_PLL_SHIFT                    6
-#define RT5668_PWR_LDO2                         (0x1 << 2)
-#define RT5668_PWR_LDO2_SHIFT                   2
+#define RT5663_PWR_CBJ_MASK                     (0x1 << 9)
+#define RT5663_PWR_CBJ_SHIFT                    9
+#define RT5663_PWR_CBJ_OFF                      (0x0 << 9)
+#define RT5663_PWR_CBJ_ON                       (0x1 << 9)
+#define RT5663_PWR_PLL                          (0x1 << 6)
+#define RT5663_PWR_PLL_SHIFT                    6
+#define RT5663_PWR_LDO2                         (0x1 << 2)
+#define RT5663_PWR_LDO2_SHIFT                   2
 
 /* Power Management for Volume (0x0067) */
-#define RT5668_PWR_MIC_DET                      (0x1 << 5)
-#define RT5668_PWR_MIC_DET_SHIFT                5
+#define RT5663_V2_PWR_MIC_DET                   (0x1 << 5)
+#define RT5663_V2_PWR_MIC_DET_SHIFT             5
 
 /* MCLK and System Clock Detection Control (0x006b) */
-#define RT5668_EN_ANA_CLK_DET_MASK              (0x1 << 15)
-#define RT5668_EN_ANA_CLK_DET_SHIFT             15
-#define RT5668_EN_ANA_CLK_DET_DIS               (0x0 << 15)
-#define RT5668_EN_ANA_CLK_DET_AUTO              (0x1 << 15)
-#define RT5668_PWR_CLK_DET_MASK                 (0x1)
-#define RT5668_PWR_CLK_DET_SHIFT                0
-#define RT5668_PWR_CLK_DET_DIS                  (0x0)
-#define RT5668_PWR_CLK_DET_EN                   (0x1)
+#define RT5663_EN_ANA_CLK_DET_MASK              (0x1 << 15)
+#define RT5663_EN_ANA_CLK_DET_SHIFT             15
+#define RT5663_EN_ANA_CLK_DET_DIS               (0x0 << 15)
+#define RT5663_EN_ANA_CLK_DET_AUTO              (0x1 << 15)
+#define RT5663_PWR_CLK_DET_MASK                 (0x1)
+#define RT5663_PWR_CLK_DET_SHIFT                0
+#define RT5663_PWR_CLK_DET_DIS                  (0x0)
+#define RT5663_PWR_CLK_DET_EN                   (0x1)
 
 /* I2S1 Audio Serial Data Port Control (0x0070) */
-#define RT5668_I2S_MS_MASK                      (0x1 << 15)
-#define RT5668_I2S_MS_SHIFT                     15
-#define RT5668_I2S_MS_M                         (0x0 << 15)
-#define RT5668_I2S_MS_S                         (0x1 << 15)
-#define RT5668_I2S_BP_MASK                      (0x1 << 8)
-#define RT5668_I2S_BP_SHIFT                     8
-#define RT5668_I2S_BP_NOR                       (0x0 << 8)
-#define RT5668_I2S_BP_INV                       (0x1 << 8)
-#define RT5668_I2S_DL_MASK                      (0x3 << 4)
-#define RT5668_I2S_DL_SHIFT                     4
-#define RT5668_I2S_DL_16                        (0x0 << 4)
-#define RT5668_I2S_DL_20                        (0x1 << 4)
-#define RT5668_I2S_DL_24                        (0x2 << 4)
-#define RT5668_I2S_DL_8                         (0x3 << 4)
-#define RT5668_I2S_DF_MASK                      (0x7)
-#define RT5668_I2S_DF_SHIFT                     0
-#define RT5668_I2S_DF_I2S                       (0x0)
-#define RT5668_I2S_DF_LEFT                      (0x1)
-#define RT5668_I2S_DF_PCM_A                     (0x2)
-#define RT5668_I2S_DF_PCM_B                     (0x3)
-#define RT5668_I2S_DF_PCM_A_N                   (0x6)
-#define RT5668_I2S_DF_PCM_B_N                   (0x7)
+#define RT5663_I2S_MS_MASK                      (0x1 << 15)
+#define RT5663_I2S_MS_SHIFT                     15
+#define RT5663_I2S_MS_M                         (0x0 << 15)
+#define RT5663_I2S_MS_S                         (0x1 << 15)
+#define RT5663_I2S_BP_MASK                      (0x1 << 8)
+#define RT5663_I2S_BP_SHIFT                     8
+#define RT5663_I2S_BP_NOR                       (0x0 << 8)
+#define RT5663_I2S_BP_INV                       (0x1 << 8)
+#define RT5663_I2S_DL_MASK                      (0x3 << 4)
+#define RT5663_I2S_DL_SHIFT                     4
+#define RT5663_I2S_DL_16                        (0x0 << 4)
+#define RT5663_I2S_DL_20                        (0x1 << 4)
+#define RT5663_I2S_DL_24                        (0x2 << 4)
+#define RT5663_I2S_DL_8                         (0x3 << 4)
+#define RT5663_I2S_DF_MASK                      (0x7)
+#define RT5663_I2S_DF_SHIFT                     0
+#define RT5663_I2S_DF_I2S                       (0x0)
+#define RT5663_I2S_DF_LEFT                      (0x1)
+#define RT5663_I2S_DF_PCM_A                     (0x2)
+#define RT5663_I2S_DF_PCM_B                     (0x3)
+#define RT5663_I2S_DF_PCM_A_N                   (0x6)
+#define RT5663_I2S_DF_PCM_B_N                   (0x7)
 
 /* ADC/DAC Clock Control 1 (0x0073) */
-#define RT5668_I2S_PD1_MASK                     (0x7 << 12)
-#define RT5668_I2S_PD1_SHIFT                    12
-#define RT5668_M_I2S_DIV_MASK                   (0x7 << 8)
-#define RT5668_M_I2S_DIV_SHIFT                  8
-#define RT5668_CLK_SRC_MASK                     (0x3 << 4)
-#define RT5668_CLK_SRC_MCLK                     (0x0 << 4)
-#define RT5668_CLK_SRC_PLL_OUT                  (0x1 << 4)
-#define RT5668_CLK_SRC_DIV                      (0x2 << 4)
-#define RT5668_CLK_SRC_RC                       (0x3 << 4)
-#define RT5668_DAC_OSR_MASK                     (0x3 << 2)
-#define RT5668_DAC_OSR_SHIFT                    2
-#define RT5668_DAC_OSR_128                      (0x0 << 2)
-#define RT5668_DAC_OSR_64                       (0x1 << 2)
-#define RT5668_DAC_OSR_32                       (0x2 << 2)
-#define RT5668_ADC_OSR_MASK                     (0x3)
-#define RT5668_ADC_OSR_SHIFT                    0
-#define RT5668_ADC_OSR_128                      (0x0)
-#define RT5668_ADC_OSR_64                       (0x1)
-#define RT5668_ADC_OSR_32                       (0x2)
+#define RT5663_I2S_PD1_MASK                     (0x7 << 12)
+#define RT5663_I2S_PD1_SHIFT                    12
+#define RT5663_M_I2S_DIV_MASK                   (0x7 << 8)
+#define RT5663_M_I2S_DIV_SHIFT                  8
+#define RT5663_CLK_SRC_MASK                     (0x3 << 4)
+#define RT5663_CLK_SRC_MCLK                     (0x0 << 4)
+#define RT5663_CLK_SRC_PLL_OUT                  (0x1 << 4)
+#define RT5663_CLK_SRC_DIV                      (0x2 << 4)
+#define RT5663_CLK_SRC_RC                       (0x3 << 4)
+#define RT5663_DAC_OSR_MASK                     (0x3 << 2)
+#define RT5663_DAC_OSR_SHIFT                    2
+#define RT5663_DAC_OSR_128                      (0x0 << 2)
+#define RT5663_DAC_OSR_64                       (0x1 << 2)
+#define RT5663_DAC_OSR_32                       (0x2 << 2)
+#define RT5663_ADC_OSR_MASK                     (0x3)
+#define RT5663_ADC_OSR_SHIFT                    0
+#define RT5663_ADC_OSR_128                      (0x0)
+#define RT5663_ADC_OSR_64                       (0x1)
+#define RT5663_ADC_OSR_32                       (0x2)
 
 /* TDM1 control 1 (0x0078) */
-#define RT5668_TDM_MODE_MASK                    (0x1 << 15)
-#define RT5668_TDM_MODE_SHIFT                   15
-#define RT5668_TDM_MODE_I2S                     (0x0 << 15)
-#define RT5668_TDM_MODE_TDM                     (0x1 << 15)
-#define RT5668_TDM_IN_CH_MASK                   (0x3 << 10)
-#define RT5668_TDM_IN_CH_SHIFT                  10
-#define RT5668_TDM_IN_CH_2                      (0x0 << 10)
-#define RT5668_TDM_IN_CH_4                      (0x1 << 10)
-#define RT5668_TDM_IN_CH_6                      (0x2 << 10)
-#define RT5668_TDM_IN_CH_8                      (0x3 << 10)
-#define RT5668_TDM_OUT_CH_MASK                  (0x3 << 8)
-#define RT5668_TDM_OUT_CH_SHIFT                 8
-#define RT5668_TDM_OUT_CH_2                     (0x0 << 8)
-#define RT5668_TDM_OUT_CH_4                     (0x1 << 8)
-#define RT5668_TDM_OUT_CH_6                     (0x2 << 8)
-#define RT5668_TDM_OUT_CH_8                     (0x3 << 8)
-#define RT5668_TDM_IN_LEN_MASK                  (0x3 << 6)
-#define RT5668_TDM_IN_LEN_SHIFT                 6
-#define RT5668_TDM_IN_LEN_16                    (0x0 << 6)
-#define RT5668_TDM_IN_LEN_20                    (0x1 << 6)
-#define RT5668_TDM_IN_LEN_24                    (0x2 << 6)
-#define RT5668_TDM_IN_LEN_32                    (0x3 << 6)
-#define RT5668_TDM_OUT_LEN_MASK                 (0x3 << 4)
-#define RT5668_TDM_OUT_LEN_SHIFT                4
-#define RT5668_TDM_OUT_LEN_16                   (0x0 << 4)
-#define RT5668_TDM_OUT_LEN_20                   (0x1 << 4)
-#define RT5668_TDM_OUT_LEN_24                   (0x2 << 4)
-#define RT5668_TDM_OUT_LEN_32                   (0x3 << 4)
+#define RT5663_TDM_MODE_MASK                    (0x1 << 15)
+#define RT5663_TDM_MODE_SHIFT                   15
+#define RT5663_TDM_MODE_I2S                     (0x0 << 15)
+#define RT5663_TDM_MODE_TDM                     (0x1 << 15)
+#define RT5663_TDM_IN_CH_MASK                   (0x3 << 10)
+#define RT5663_TDM_IN_CH_SHIFT                  10
+#define RT5663_TDM_IN_CH_2                      (0x0 << 10)
+#define RT5663_TDM_IN_CH_4                      (0x1 << 10)
+#define RT5663_TDM_IN_CH_6                      (0x2 << 10)
+#define RT5663_TDM_IN_CH_8                      (0x3 << 10)
+#define RT5663_TDM_OUT_CH_MASK                  (0x3 << 8)
+#define RT5663_TDM_OUT_CH_SHIFT                 8
+#define RT5663_TDM_OUT_CH_2                     (0x0 << 8)
+#define RT5663_TDM_OUT_CH_4                     (0x1 << 8)
+#define RT5663_TDM_OUT_CH_6                     (0x2 << 8)
+#define RT5663_TDM_OUT_CH_8                     (0x3 << 8)
+#define RT5663_TDM_IN_LEN_MASK                  (0x3 << 6)
+#define RT5663_TDM_IN_LEN_SHIFT                 6
+#define RT5663_TDM_IN_LEN_16                    (0x0 << 6)
+#define RT5663_TDM_IN_LEN_20                    (0x1 << 6)
+#define RT5663_TDM_IN_LEN_24                    (0x2 << 6)
+#define RT5663_TDM_IN_LEN_32                    (0x3 << 6)
+#define RT5663_TDM_OUT_LEN_MASK                 (0x3 << 4)
+#define RT5663_TDM_OUT_LEN_SHIFT                4
+#define RT5663_TDM_OUT_LEN_16                   (0x0 << 4)
+#define RT5663_TDM_OUT_LEN_20                   (0x1 << 4)
+#define RT5663_TDM_OUT_LEN_24                   (0x2 << 4)
+#define RT5663_TDM_OUT_LEN_32                   (0x3 << 4)
 
 /* Global Clock Control (0x0080) */
-#define RT5668_SCLK_SRC_MASK                    (0x3 << 14)
-#define RT5668_SCLK_SRC_SHIFT                   14
-#define RT5668_SCLK_SRC_MCLK                    (0x0 << 14)
-#define RT5668_SCLK_SRC_PLL1                    (0x1 << 14)
-#define RT5668_SCLK_SRC_RCCLK                   (0x2 << 14)
-#define RT5668_PLL1_SRC_MASK                    (0x7 << 8)
-#define RT5668_PLL1_SRC_SHIFT                   8
-#define RT5668_PLL1_SRC_MCLK                    (0x0 << 8)
-#define RT5668_PLL1_SRC_BCLK1                   (0x1 << 8)
-#define RT5668_PLL1_PD_MASK                     (0x1 << 4)
-#define RT5668_PLL1_PD_SHIFT                    4
-
-#define RT5668_PLL_INP_MAX                      40000000
-#define RT5668_PLL_INP_MIN                      256000
+#define RT5663_SCLK_SRC_MASK                    (0x3 << 14)
+#define RT5663_SCLK_SRC_SHIFT                   14
+#define RT5663_SCLK_SRC_MCLK                    (0x0 << 14)
+#define RT5663_SCLK_SRC_PLL1                    (0x1 << 14)
+#define RT5663_SCLK_SRC_RCCLK                   (0x2 << 14)
+#define RT5663_PLL1_SRC_MASK                    (0x7 << 11)
+#define RT5663_PLL1_SRC_SHIFT                   11
+#define RT5663_PLL1_SRC_MCLK                    (0x0 << 11)
+#define RT5663_PLL1_SRC_BCLK1                   (0x1 << 11)
+#define RT5663_V2_PLL1_SRC_MASK                 (0x7 << 8)
+#define RT5663_V2_PLL1_SRC_SHIFT                8
+#define RT5663_V2_PLL1_SRC_MCLK                 (0x0 << 8)
+#define RT5663_V2_PLL1_SRC_BCLK1                (0x1 << 8)
+#define RT5663_PLL1_PD_MASK                     (0x1 << 4)
+#define RT5663_PLL1_PD_SHIFT                    4
+
+#define RT5663_PLL_INP_MAX                      40000000
+#define RT5663_PLL_INP_MIN                      256000
 /* PLL M/N/K Code Control 1 (0x0081) */
-#define RT5668_PLL_N_MAX                        0x001ff
-#define RT5668_PLL_N_MASK                       (RT5668_PLL_N_MAX << 7)
-#define RT5668_PLL_N_SHIFT                      7
-#define RT5668_PLL_K_MAX                        0x001f
-#define RT5668_PLL_K_MASK                       (RT5668_PLL_K_MAX)
-#define RT5668_PLL_K_SHIFT                      0
+#define RT5663_PLL_N_MAX                        0x001ff
+#define RT5663_PLL_N_MASK                       (RT5663_PLL_N_MAX << 7)
+#define RT5663_PLL_N_SHIFT                      7
+#define RT5663_PLL_K_MAX                        0x001f
+#define RT5663_PLL_K_MASK                       (RT5663_PLL_K_MAX)
+#define RT5663_PLL_K_SHIFT                      0
 
 /* PLL M/N/K Code Control 2 (0x0082) */
-#define RT5668_PLL_M_MAX                        0x00f
-#define RT5668_PLL_M_MASK                       (RT5668_PLL_M_MAX << 12)
-#define RT5668_PLL_M_SHIFT                      12
-#define RT5668_PLL_M_BP                         (0x1 << 11)
-#define RT5668_PLL_M_BP_SHIFT                   11
+#define RT5663_PLL_M_MAX                        0x00f
+#define RT5663_PLL_M_MASK                       (RT5663_PLL_M_MAX << 12)
+#define RT5663_PLL_M_SHIFT                      12
+#define RT5663_PLL_M_BP                         (0x1 << 11)
+#define RT5663_PLL_M_BP_SHIFT                   11
 
 /* PLL tracking mode 1 (0x0083) */
-#define RT5668_I2S1_ASRC_MASK                   (0x1 << 13)
-#define RT5668_I2S1_ASRC_SHIFT                  13
-#define RT5668_DAC_STO1_ASRC_MASK               (0x1 << 12)
-#define RT5668_DAC_STO1_ASRC_SHIFT              12
-#define RT5668_ADC_STO1_ASRC_MASK               (0x1 << 4)
-#define RT5668_ADC_STO1_ASRC_SHIFT              4
+#define RT5663_V2_I2S1_ASRC_MASK                        (0x1 << 13)
+#define RT5663_V2_I2S1_ASRC_SHIFT                       13
+#define RT5663_V2_DAC_STO1_ASRC_MASK            (0x1 << 12)
+#define RT5663_V2_DAC_STO1_ASRC_SHIFT           12
+#define RT5663_V2_ADC_STO1_ASRC_MASK            (0x1 << 4)
+#define RT5663_V2_ADC_STO1_ASRC_SHIFT           4
 
 /* PLL tracking mode 2 (0x0084)*/
-#define RT5668_DA_STO1_TRACK_MASK               (0x7 << 12)
-#define RT5668_DA_STO1_TRACK_SHIFT              12
-#define RT5668_DA_STO1_TRACK_SYSCLK             (0x0 << 12)
-#define RT5668_DA_STO1_TRACK_I2S1               (0x1 << 12)
+#define RT5663_DA_STO1_TRACK_MASK               (0x7 << 12)
+#define RT5663_DA_STO1_TRACK_SHIFT              12
+#define RT5663_DA_STO1_TRACK_SYSCLK             (0x0 << 12)
+#define RT5663_DA_STO1_TRACK_I2S1               (0x1 << 12)
 
 /* PLL tracking mode 3 (0x0085)*/
-#define RT5668_AD_STO1_TRACK_MASK               (0x7 << 12)
-#define RT5668_AD_STO1_TRACK_SHIFT              12
-#define RT5668_AD_STO1_TRACK_SYSCLK             (0x0 << 12)
-#define RT5668_AD_STO1_TRACK_I2S1               (0x1 << 12)
+#define RT5663_V2_AD_STO1_TRACK_MASK            (0x7 << 12)
+#define RT5663_V2_AD_STO1_TRACK_SHIFT           12
+#define RT5663_V2_AD_STO1_TRACK_SYSCLK          (0x0 << 12)
+#define RT5663_V2_AD_STO1_TRACK_I2S1            (0x1 << 12)
 
 /* HPOUT Charge pump control 1 (0x0091) */
-#define RT5668_OSW_HP_L_MASK                    (0x1 << 11)
-#define RT5668_OSW_HP_L_SHIFT                   11
-#define RT5668_OSW_HP_L_EN                      (0x1 << 11)
-#define RT5668_OSW_HP_L_DIS                     (0x0 << 11)
-#define RT5668_OSW_HP_R_MASK                    (0x1 << 10)
-#define RT5668_OSW_HP_R_SHIFT                   10
-#define RT5668_OSW_HP_R_EN                      (0x1 << 10)
-#define RT5668_OSW_HP_R_DIS                     (0x0 << 10)
-#define RT5668_SEL_PM_HP_MASK                   (0x3 << 8)
-#define RT5668_SEL_PM_HP_SHIFT                  8
-#define RT5668_SEL_PM_HP_0_6                    (0x0 << 8)
-#define RT5668_SEL_PM_HP_0_9                    (0x1 << 8)
-#define RT5668_SEL_PM_HP_1_8                    (0x2 << 8)
-#define RT5668_SEL_PM_HP_HIGH                   (0x3 << 8)
-#define RT5668_OVCD_HP_MASK                     (0x1 << 2)
-#define RT5668_OVCD_HP_SHIFT                    2
-#define RT5668_OVCD_HP_EN                       (0x1 << 2)
-#define RT5668_OVCD_HP_DIS                      (0x0 << 2)
+#define RT5663_OSW_HP_L_MASK                    (0x1 << 11)
+#define RT5663_OSW_HP_L_SHIFT                   11
+#define RT5663_OSW_HP_L_EN                      (0x1 << 11)
+#define RT5663_OSW_HP_L_DIS                     (0x0 << 11)
+#define RT5663_OSW_HP_R_MASK                    (0x1 << 10)
+#define RT5663_OSW_HP_R_SHIFT                   10
+#define RT5663_OSW_HP_R_EN                      (0x1 << 10)
+#define RT5663_OSW_HP_R_DIS                     (0x0 << 10)
+#define RT5663_SEL_PM_HP_MASK                   (0x3 << 8)
+#define RT5663_SEL_PM_HP_SHIFT                  8
+#define RT5663_SEL_PM_HP_0_6                    (0x0 << 8)
+#define RT5663_SEL_PM_HP_0_9                    (0x1 << 8)
+#define RT5663_SEL_PM_HP_1_8                    (0x2 << 8)
+#define RT5663_SEL_PM_HP_HIGH                   (0x3 << 8)
+#define RT5663_OVCD_HP_MASK                     (0x1 << 2)
+#define RT5663_OVCD_HP_SHIFT                    2
+#define RT5663_OVCD_HP_EN                       (0x1 << 2)
+#define RT5663_OVCD_HP_DIS                      (0x0 << 2)
 
 /* RC Clock Control (0x0094) */
-#define RT5668_DIG_25M_CLK_MASK                 (0x1 << 9)
-#define RT5668_DIG_25M_CLK_SHIFT                9
-#define RT5668_DIG_25M_CLK_DIS                  (0x0 << 9)
-#define RT5668_DIG_25M_CLK_EN                   (0x1 << 9)
-#define RT5668_DIG_1M_CLK_MASK                  (0x1 << 8)
-#define RT5668_DIG_1M_CLK_SHIFT                 8
-#define RT5668_DIG_1M_CLK_DIS                   (0x0 << 8)
-#define RT5668_DIG_1M_CLK_EN                    (0x1 << 8)
+#define RT5663_DIG_25M_CLK_MASK                 (0x1 << 9)
+#define RT5663_DIG_25M_CLK_SHIFT                9
+#define RT5663_DIG_25M_CLK_DIS                  (0x0 << 9)
+#define RT5663_DIG_25M_CLK_EN                   (0x1 << 9)
+#define RT5663_DIG_1M_CLK_MASK                  (0x1 << 8)
+#define RT5663_DIG_1M_CLK_SHIFT                 8
+#define RT5663_DIG_1M_CLK_DIS                   (0x0 << 8)
+#define RT5663_DIG_1M_CLK_EN                    (0x1 << 8)
 
 /* Auto Turn On 1M RC CLK (0x009f) */
-#define RT5668_IRQ_POW_SAV_MASK                 (0x1 << 15)
-#define RT5668_IRQ_POW_SAV_SHIFT                15
-#define RT5668_IRQ_POW_SAV_DIS                  (0x0 << 15)
-#define RT5668_IRQ_POW_SAV_EN                   (0x1 << 15)
-#define RT5668_IRQ_POW_SAV_JD1_MASK             (0x1 << 14)
-#define RT5668_IRQ_POW_SAV_JD1_SHIFT            14
-#define RT5668_IRQ_POW_SAV_JD1_DIS              (0x0 << 14)
-#define RT5668_IRQ_POW_SAV_JD1_EN               (0x1 << 14)
+#define RT5663_IRQ_POW_SAV_MASK                 (0x1 << 15)
+#define RT5663_IRQ_POW_SAV_SHIFT                15
+#define RT5663_IRQ_POW_SAV_DIS                  (0x0 << 15)
+#define RT5663_IRQ_POW_SAV_EN                   (0x1 << 15)
+#define RT5663_IRQ_POW_SAV_JD1_MASK             (0x1 << 14)
+#define RT5663_IRQ_POW_SAV_JD1_SHIFT            14
+#define RT5663_IRQ_POW_SAV_JD1_DIS              (0x0 << 14)
+#define RT5663_IRQ_POW_SAV_JD1_EN               (0x1 << 14)
 
 /* IRQ Control 1 (0x00b6) */
-#define RT5668_EN_CB_JD_MASK                    (0x1 << 3)
-#define RT5668_EN_CB_JD_SHIFT                   3
-#define RT5668_EN_CB_JD_EN                      (0x1 << 3)
-#define RT5668_EN_CB_JD_DIS                     (0x0 << 3)
+#define RT5663_EN_CB_JD_MASK                    (0x1 << 3)
+#define RT5663_EN_CB_JD_SHIFT                   3
+#define RT5663_EN_CB_JD_EN                      (0x1 << 3)
+#define RT5663_EN_CB_JD_DIS                     (0x0 << 3)
 
 /* IRQ Control 3 (0x00b8) */
-#define RT5668_EN_IRQ_INLINE_MASK               (0x1 << 6)
-#define RT5668_EN_IRQ_INLINE_SHIFT              6
-#define RT5668_EN_IRQ_INLINE_BYP                (0x0 << 6)
-#define RT5668_EN_IRQ_INLINE_NOR                (0x1 << 6)
+#define RT5663_V2_EN_IRQ_INLINE_MASK            (0x1 << 6)
+#define RT5663_V2_EN_IRQ_INLINE_SHIFT           6
+#define RT5663_V2_EN_IRQ_INLINE_BYP             (0x0 << 6)
+#define RT5663_V2_EN_IRQ_INLINE_NOR             (0x1 << 6)
 
 /* GPIO Control 1 (0x00c0) */
-#define RT5668_GP1_PIN_MASK                     (0x1 << 15)
-#define RT5668_GP1_PIN_SHIFT                    15
-#define RT5668_GP1_PIN_GPIO1                    (0x0 << 15)
-#define RT5668_GP1_PIN_IRQ                      (0x1 << 15)
+#define RT5663_GP1_PIN_MASK                     (0x1 << 15)
+#define RT5663_GP1_PIN_SHIFT                    15
+#define RT5663_GP1_PIN_GPIO1                    (0x0 << 15)
+#define RT5663_GP1_PIN_IRQ                      (0x1 << 15)
 
 /* GPIO Control 2 (0x00c1) */
-#define RT5668_GP4_PIN_CONF_MASK                (0x1 << 5)
-#define RT5668_GP4_PIN_CONF_SHIFT               5
-#define RT5668_GP4_PIN_CONF_INPUT               (0x0 << 5)
-#define RT5668_GP4_PIN_CONF_OUTPUT              (0x1 << 5)
+#define RT5663_GP4_PIN_CONF_MASK                (0x1 << 5)
+#define RT5663_GP4_PIN_CONF_SHIFT               5
+#define RT5663_GP4_PIN_CONF_INPUT               (0x0 << 5)
+#define RT5663_GP4_PIN_CONF_OUTPUT              (0x1 << 5)
 
 /* GPIO Control 2 (0x00c2) */
-#define RT5668_GP8_PIN_CONF_MASK                (0x1 << 13)
-#define RT5668_GP8_PIN_CONF_SHIFT               13
-#define RT5668_GP8_PIN_CONF_INPUT               (0x0 << 13)
-#define RT5668_GP8_PIN_CONF_OUTPUT              (0x1 << 13)
+#define RT5663_GP8_PIN_CONF_MASK                (0x1 << 13)
+#define RT5663_GP8_PIN_CONF_SHIFT               13
+#define RT5663_GP8_PIN_CONF_INPUT               (0x0 << 13)
+#define RT5663_GP8_PIN_CONF_OUTPUT              (0x1 << 13)
 
 /* 4 Buttons Inline Command Function 1 (0x00df) */
-#define RT5668_4BTN_CLK_DEB_MASK                (0x3 << 2)
-#define RT5668_4BTN_CLK_DEB_SHIFT               2
-#define RT5668_4BTN_CLK_DEB_8MS                 (0x0 << 2)
-#define RT5668_4BTN_CLK_DEB_16MS                (0x1 << 2)
-#define RT5668_4BTN_CLK_DEB_32MS                (0x2 << 2)
-#define RT5668_4BTN_CLK_DEB_65MS                (0x3 << 2)
+#define RT5663_4BTN_CLK_DEB_MASK                (0x3 << 2)
+#define RT5663_4BTN_CLK_DEB_SHIFT               2
+#define RT5663_4BTN_CLK_DEB_8MS                 (0x0 << 2)
+#define RT5663_4BTN_CLK_DEB_16MS                (0x1 << 2)
+#define RT5663_4BTN_CLK_DEB_32MS                (0x2 << 2)
+#define RT5663_4BTN_CLK_DEB_65MS                (0x3 << 2)
 
 /* Inline Command Function 6 (0x00e0) */
-#define RT5668_EN_4BTN_INL_MASK                 (0x1 << 15)
-#define RT5668_EN_4BTN_INL_SHIFT                15
-#define RT5668_EN_4BTN_INL_DIS                  (0x0 << 15)
-#define RT5668_EN_4BTN_INL_EN                   (0x1 << 15)
-#define RT5668_RESET_4BTN_INL_MASK              (0x1 << 14)
-#define RT5668_RESET_4BTN_INL_SHIFT             14
-#define RT5668_RESET_4BTN_INL_RESET             (0x0 << 14)
-#define RT5668_RESET_4BTN_INL_NOR               (0x1 << 14)
+#define RT5663_EN_4BTN_INL_MASK                 (0x1 << 15)
+#define RT5663_EN_4BTN_INL_SHIFT                15
+#define RT5663_EN_4BTN_INL_DIS                  (0x0 << 15)
+#define RT5663_EN_4BTN_INL_EN                   (0x1 << 15)
+#define RT5663_RESET_4BTN_INL_MASK              (0x1 << 14)
+#define RT5663_RESET_4BTN_INL_SHIFT             14
+#define RT5663_RESET_4BTN_INL_RESET             (0x0 << 14)
+#define RT5663_RESET_4BTN_INL_NOR               (0x1 << 14)
 
 /* Digital Misc Control (0x00fa) */
-#define RT5668_DIG_GATE_CTRL_MASK               0x1
-#define RT5668_DIG_GATE_CTRL_SHIFT              (0)
-#define RT5668_DIG_GATE_CTRL_DIS                0x0
-#define RT5668_DIG_GATE_CTRL_EN                 0x1
+#define RT5663_DIG_GATE_CTRL_MASK               0x1
+#define RT5663_DIG_GATE_CTRL_SHIFT              (0)
+#define RT5663_DIG_GATE_CTRL_DIS                0x0
+#define RT5663_DIG_GATE_CTRL_EN                 0x1
 
 /* Chopper and Clock control for DAC L (0x013a)*/
-#define RT5668_CKXEN_DAC1_MASK                  (0x1 << 13)
-#define RT5668_CKXEN_DAC1_SHIFT                 13
-#define RT5668_CKGEN_DAC1_MASK                  (0x1 << 12)
-#define RT5668_CKGEN_DAC1_SHIFT                 12
+#define RT5663_CKXEN_DAC1_MASK                  (0x1 << 13)
+#define RT5663_CKXEN_DAC1_SHIFT                 13
+#define RT5663_CKGEN_DAC1_MASK                  (0x1 << 12)
+#define RT5663_CKGEN_DAC1_SHIFT                 12
 
 /* Chopper and Clock control for ADC (0x013b)*/
-#define RT5668_CKXEN_ADCC_MASK                  (0x1 << 13)
-#define RT5668_CKXEN_ADCC_SHIFT                 13
-#define RT5668_CKGEN_ADCC_MASK                  (0x1 << 12)
-#define RT5668_CKGEN_ADCC_SHIFT                 12
+#define RT5663_CKXEN_ADCC_MASK                  (0x1 << 13)
+#define RT5663_CKXEN_ADCC_SHIFT                 13
+#define RT5663_CKGEN_ADCC_MASK                  (0x1 << 12)
+#define RT5663_CKGEN_ADCC_SHIFT                 12
 
 /* HP Behavior Logic Control 2 (0x01db) */
-#define RT5668_HP_SIG_SRC1_MASK                 (0x3)
-#define RT5668_HP_SIG_SRC1_SHIFT                0
-#define RT5668_HP_SIG_SRC1_HP_DC                (0x0)
-#define RT5668_HP_SIG_SRC1_HP_CALIB             (0x1)
-#define RT5668_HP_SIG_SRC1_REG                  (0x2)
-#define RT5668_HP_SIG_SRC1_SILENCE              (0x3)
+#define RT5663_HP_SIG_SRC1_MASK                 (0x3)
+#define RT5663_HP_SIG_SRC1_SHIFT                0
+#define RT5663_HP_SIG_SRC1_HP_DC                (0x0)
+#define RT5663_HP_SIG_SRC1_HP_CALIB             (0x1)
+#define RT5663_HP_SIG_SRC1_REG                  (0x2)
+#define RT5663_HP_SIG_SRC1_SILENCE              (0x3)
 
 /* RT5663 specific register */
 #define RT5663_HP_OUT_EN                        0x0002
@@ -707,6 +704,10 @@
 #define RT5663_TDM_3                            0x0079
 #define RT5663_TDM_4                            0x007a
 #define RT5663_TDM_5                            0x007b
+#define RT5663_TDM_6                            0x007c
+#define RT5663_TDM_7                            0x007d
+#define RT5663_TDM_8                            0x007e
+#define RT5663_TDM_9                            0x007f
 #define RT5663_GLB_CLK                          0x0080
 #define RT5663_PLL_1                            0x0081
 #define RT5663_PLL_2                            0x0082
@@ -739,7 +740,7 @@
 #define RT5663_INT_ST_2                         0x00bf
 #define RT5663_GPIO_1                           0x00c0
 #define RT5663_GPIO_2                           0x00c1
-#define RT5663_GPIO_STA                         0x00c5
+#define RT5663_GPIO_STA1                        0x00c5
 #define RT5663_SIN_GEN_1                        0x00cb
 #define RT5663_SIN_GEN_2                        0x00cc
 #define RT5663_SIN_GEN_3                        0x00cd
@@ -800,6 +801,8 @@
 #define RT5663_TEST_MODE_1                      0x0144
 #define RT5663_TEST_MODE_2                      0x0145
 #define RT5663_TEST_MODE_3                      0x0146
+#define RT5663_TEST_MODE_4                      0x0147
+#define RT5663_TEST_MODE_5                      0x0148
 #define RT5663_STO_DRE_1                        0x0160
 #define RT5663_STO_DRE_2                        0x0161
 #define RT5663_STO_DRE_3                        0x0162
@@ -921,19 +924,19 @@
 #define RT5663_ADC_EQ_POST_VOL_L                0x03f2
 #define RT5663_ADC_EQ_POST_VOL_R                0x03f3
 
-/* RT5663: RECMIX Control (0x0010) */
+/* RECMIX Control (0x0010) */
 #define RT5663_RECMIX1_BST1_MASK                (0x1)
 #define RT5663_RECMIX1_BST1_SHIFT               0
 #define RT5663_RECMIX1_BST1_ON                  (0x0)
 #define RT5663_RECMIX1_BST1_OFF                 (0x1)
 
-/* RT5663: Bypass Stereo1 DAC Mixer Control (0x002d) */
+/* Bypass Stereo1 DAC Mixer Control (0x002d) */
 #define RT5663_DACL1_SRC_MASK                   (0x1 << 3)
 #define RT5663_DACL1_SRC_SHIFT                  3
 #define RT5663_DACR1_SRC_MASK                   (0x1 << 2)
 #define RT5663_DACR1_SRC_SHIFT                  2
 
-/* RT5663: TDM control 2 (0x0078) */
+/* TDM control 2 (0x0078) */
 #define RT5663_DATA_SWAP_ADCDAT1_MASK           (0x3 << 14)
 #define RT5663_DATA_SWAP_ADCDAT1_SHIFT          14
 #define RT5663_DATA_SWAP_ADCDAT1_LR             (0x0 << 14)
@@ -941,7 +944,7 @@
 #define RT5663_DATA_SWAP_ADCDAT1_LL             (0x2 << 14)
 #define RT5663_DATA_SWAP_ADCDAT1_RR             (0x3 << 14)
 
-/* RT5663: TDM control 5 (0x007b) */
+/* TDM control 5 (0x007b) */
 #define RT5663_TDM_LENGTN_MASK                  (0x3)
 #define RT5663_TDM_LENGTN_SHIFT                 0
 #define RT5663_TDM_LENGTN_16                    (0x0)
@@ -949,17 +952,6 @@
 #define RT5663_TDM_LENGTN_24                    (0x2)
 #define RT5663_TDM_LENGTN_32                    (0x3)
 
-/* RT5663: Global Clock Control (0x0080) */
-#define RT5663_SCLK_SRC_MASK                    (0x3 << 14)
-#define RT5663_SCLK_SRC_SHIFT                   14
-#define RT5663_SCLK_SRC_MCLK                    (0x0 << 14)
-#define RT5663_SCLK_SRC_PLL1                    (0x1 << 14)
-#define RT5663_SCLK_SRC_RCCLK                   (0x2 << 14)
-#define RT5663_PLL1_SRC_MASK                    (0x7 << 11)
-#define RT5663_PLL1_SRC_SHIFT                   11
-#define RT5663_PLL1_SRC_MCLK                    (0x0 << 11)
-#define RT5663_PLL1_SRC_BCLK1                   (0x1 << 11)
-
 /* PLL tracking mode 1 (0x0083) */
 #define RT5663_I2S1_ASRC_MASK                   (0x1 << 11)
 #define RT5663_I2S1_ASRC_SHIFT                  11
@@ -978,37 +970,47 @@
 #define RT5663_AD_STO1_TRACK_SYSCLK             (0x0)
 #define RT5663_AD_STO1_TRACK_I2S1               (0x1)
 
-/* RT5663: HPOUT Charge pump control 1 (0x0091) */
+/* HPOUT Charge pump control 1 (0x0091) */
 #define RT5663_SI_HP_MASK                       (0x1 << 12)
 #define RT5663_SI_HP_SHIFT                      12
 #define RT5663_SI_HP_EN                         (0x1 << 12)
 #define RT5663_SI_HP_DIS                        (0x0 << 12)
 
-/* RT5663: GPIO Control 2 (0x00b6) */
+/* GPIO Control 2 (0x00b6) */
 #define RT5663_GP1_PIN_CONF_MASK                (0x1 << 2)
 #define RT5663_GP1_PIN_CONF_SHIFT               2
 #define RT5663_GP1_PIN_CONF_OUTPUT              (0x1 << 2)
 #define RT5663_GP1_PIN_CONF_INPUT               (0x0 << 2)
 
-/* RT5663: GPIO Control 2 (0x00b7) */
+/* GPIO Control 2 (0x00b7) */
 #define RT5663_EN_IRQ_INLINE_MASK               (0x1 << 3)
 #define RT5663_EN_IRQ_INLINE_SHIFT              3
 #define RT5663_EN_IRQ_INLINE_NOR                (0x1 << 3)
 #define RT5663_EN_IRQ_INLINE_BYP                (0x0 << 3)
 
-/* RT5663: IRQ Control 1 (0x00c1) */
+/* GPIO Control 1 (0x00c0) */
+#define RT5663_GPIO1_TYPE_MASK                  (0x1 << 15)
+#define RT5663_GPIO1_TYPE_SHIFT                 15
+#define RT5663_GPIO1_TYPE_EN                    (0x1 << 15)
+#define RT5663_GPIO1_TYPE_DIS                   (0x0 << 15)
+
+/* IRQ Control 1 (0x00c1) */
 #define RT5663_EN_IRQ_JD1_MASK                  (0x1 << 6)
 #define RT5663_EN_IRQ_JD1_SHIFT                 6
 #define RT5663_EN_IRQ_JD1_EN                    (0x1 << 6)
 #define RT5663_EN_IRQ_JD1_DIS                   (0x0 << 6)
+#define RT5663_SEL_GPIO1_MASK                   (0x1 << 2)
+#define RT5663_SEL_GPIO1_SHIFT                  6
+#define RT5663_SEL_GPIO1_EN                     (0x1 << 2)
+#define RT5663_SEL_GPIO1_DIS                    (0x0 << 2)
 
-/* RT5663: Inline Command Function 2 (0x00dc) */
+/* Inline Command Function 2 (0x00dc) */
 #define RT5663_PWR_MIC_DET_MASK                 (0x1)
 #define RT5663_PWR_MIC_DET_SHIFT                0
 #define RT5663_PWR_MIC_DET_ON                   (0x1)
 #define RT5663_PWR_MIC_DET_OFF                  (0x0)
 
-/* RT5663: Embeeded Jack and Type Detection Control 1 (0x00e6)*/
+/* Embeeded Jack and Type Detection Control 1 (0x00e6)*/
 #define RT5663_CBJ_DET_MASK                     (0x1 << 15)
 #define RT5663_CBJ_DET_SHIFT                    15
 #define RT5663_CBJ_DET_DIS                      (0x0 << 15)
@@ -1022,17 +1024,17 @@
 #define RT5663_POL_EXT_JD_EN                    (0x1 << 10)
 #define RT5663_POL_EXT_JD_DIS                   (0x0 << 10)
 
-/* RT5663: DACREF LDO Control (0x0112)*/
+/* DACREF LDO Control (0x0112)*/
 #define RT5663_PWR_LDO_DACREFL_MASK             (0x1 << 9)
 #define RT5663_PWR_LDO_DACREFL_SHIFT            9
 #define RT5663_PWR_LDO_DACREFR_MASK             (0x1 << 1)
 #define RT5663_PWR_LDO_DACREFR_SHIFT            1
 
-/* RT5663: Stereo Dynamic Range Enhancement Control 9 (0x0168, 0x0169)*/
+/* Stereo Dynamic Range Enhancement Control 9 (0x0168, 0x0169)*/
 #define RT5663_DRE_GAIN_HP_MASK                 (0x1f)
 #define RT5663_DRE_GAIN_HP_SHIFT                0
 
-/* RT5663: Combo Jack Control (0x0250) */
+/* Combo Jack Control (0x0250) */
 #define RT5663_INBUF_CBJ_BST1_MASK              (0x1 << 11)
 #define RT5663_INBUF_CBJ_BST1_SHIFT             11
 #define RT5663_INBUF_CBJ_BST1_ON                (0x1 << 11)
@@ -1042,11 +1044,11 @@
 #define RT5663_CBJ_SENSE_BST1_L                 (0x1 << 10)
 #define RT5663_CBJ_SENSE_BST1_R                 (0x0 << 10)
 
-/* RT5663: Combo Jack Control (0x0251) */
+/* Combo Jack Control (0x0251) */
 #define RT5663_GAIN_BST1_MASK                   (0xf)
 #define RT5663_GAIN_BST1_SHIFT                  0
 
-/* RT5663: Dummy register 1 (0x02fa) */
+/* Dummy register 1 (0x02fa) */
 #define RT5663_EMB_CLK_MASK                     (0x1 << 9)
 #define RT5663_EMB_CLK_SHIFT                    9
 #define RT5663_EMB_CLK_EN                       (0x1 << 9)
diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c
new file mode 100644
index 000000000000..324461e985b3
--- /dev/null
+++ b/sound/soc/codecs/rt5665.c
@@ -0,0 +1,4874 @@
+/*
+ * rt5665.c  --  RT5665/RT5658 ALSA SoC audio codec driver
+ *
+ * Copyright 2016 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 <linux/acpi.h>
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+#include <linux/regulator/consumer.h>
+#include <linux/mutex.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 <sound/rt5665.h>
+
+#include "rl6231.h"
+#include "rt5665.h"
+
+#define RT5665_NUM_SUPPLIES 3
+
+static const char *rt5665_supply_names[RT5665_NUM_SUPPLIES] = {
+        "AVDD",
+        "MICVDD",
+        "VBAT",
+};
+
+struct rt5665_priv {
+        struct snd_soc_codec *codec;
+        struct rt5665_platform_data pdata;
+        struct regmap *regmap;
+        struct gpio_desc *gpiod_ldo1_en;
+        struct gpio_desc *gpiod_reset;
+        struct snd_soc_jack *hs_jack;
+        struct regulator_bulk_data supplies[RT5665_NUM_SUPPLIES];
+        struct delayed_work jack_detect_work;
+        struct delayed_work calibrate_work;
+        struct delayed_work jd_check_work;
+        struct mutex calibrate_mutex;
+
+        int sysclk;
+        int sysclk_src;
+        int lrck[RT5665_AIFS];
+        int bclk[RT5665_AIFS];
+        int master[RT5665_AIFS];
+        int id;
+
+        int pll_src;
+        int pll_in;
+        int pll_out;
+
+        int jack_type;
+        int irq_work_delay_time;
+        unsigned int sar_adc_value;
+};
+
+static const struct reg_default rt5665_reg[] = {
+        {0x0000, 0x0000},
+        {0x0001, 0xc8c8},
+        {0x0002, 0x8080},
+        {0x0003, 0x8000},
+        {0x0004, 0xc80a},
+        {0x0005, 0x0000},
+        {0x0006, 0x0000},
+        {0x0007, 0x0000},
+        {0x000a, 0x0000},
+        {0x000b, 0x0000},
+        {0x000c, 0x0000},
+        {0x000d, 0x0000},
+        {0x000f, 0x0808},
+        {0x0010, 0x4040},
+        {0x0011, 0x0000},
+        {0x0012, 0x1404},
+        {0x0013, 0x1000},
+        {0x0014, 0xa00a},
+        {0x0015, 0x0404},
+        {0x0016, 0x0404},
+        {0x0017, 0x0011},
+        {0x0018, 0xafaf},
+        {0x0019, 0xafaf},
+        {0x001a, 0xafaf},
+        {0x001b, 0x0011},
+        {0x001c, 0x2f2f},
+        {0x001d, 0x2f2f},
+        {0x001e, 0x2f2f},
+        {0x001f, 0x0000},
+        {0x0020, 0x0000},
+        {0x0021, 0x0000},
+        {0x0022, 0x5757},
+        {0x0023, 0x0039},
+        {0x0026, 0xc0c0},
+        {0x0027, 0xc0c0},
+        {0x0028, 0xc0c0},
+        {0x0029, 0x8080},
+        {0x002a, 0xaaaa},
+        {0x002b, 0xaaaa},
+        {0x002c, 0xaba8},
+        {0x002d, 0x0000},
+        {0x002e, 0x0000},
+        {0x002f, 0x0000},
+        {0x0030, 0x0000},
+        {0x0031, 0x5000},
+        {0x0032, 0x0000},
+        {0x0033, 0x0000},
+        {0x0034, 0x0000},
+        {0x0035, 0x0000},
+        {0x003a, 0x0000},
+        {0x003b, 0x0000},
+        {0x003c, 0x00ff},
+        {0x003d, 0x0000},
+        {0x003e, 0x00ff},
+        {0x003f, 0x0000},
+        {0x0040, 0x0000},
+        {0x0041, 0x00ff},
+        {0x0042, 0x0000},
+        {0x0043, 0x00ff},
+        {0x0044, 0x0c0c},
+        {0x0049, 0xc00b},
+        {0x004a, 0x0000},
+        {0x004b, 0x031f},
+        {0x004d, 0x0000},
+        {0x004e, 0x001f},
+        {0x004f, 0x0000},
+        {0x0050, 0x001f},
+        {0x0052, 0xf000},
+        {0x0061, 0x0000},
+        {0x0062, 0x0000},
+        {0x0063, 0x003e},
+        {0x0064, 0x0000},
+        {0x0065, 0x0000},
+        {0x0066, 0x003f},
+        {0x0067, 0x0000},
+        {0x006b, 0x0000},
+        {0x006d, 0xff00},
+        {0x006e, 0x2808},
+        {0x006f, 0x000a},
+        {0x0070, 0x8000},
+        {0x0071, 0x8000},
+        {0x0072, 0x8000},
+        {0x0073, 0x7000},
+        {0x0074, 0x7770},
+        {0x0075, 0x0002},
+        {0x0076, 0x0001},
+        {0x0078, 0x00f0},
+        {0x0079, 0x0000},
+        {0x007a, 0x0000},
+        {0x007b, 0x0000},
+        {0x007c, 0x0000},
+        {0x007d, 0x0123},
+        {0x007e, 0x4500},
+        {0x007f, 0x8003},
+        {0x0080, 0x0000},
+        {0x0081, 0x0000},
+        {0x0082, 0x0000},
+        {0x0083, 0x0000},
+        {0x0084, 0x0000},
+        {0x0085, 0x0000},
+        {0x0086, 0x0008},
+        {0x0087, 0x0000},
+        {0x0088, 0x0000},
+        {0x0089, 0x0000},
+        {0x008a, 0x0000},
+        {0x008b, 0x0000},
+        {0x008c, 0x0003},
+        {0x008e, 0x0060},
+        {0x008f, 0x1000},
+        {0x0091, 0x0c26},
+        {0x0092, 0x0073},
+        {0x0093, 0x0000},
+        {0x0094, 0x0080},
+        {0x0098, 0x0000},
+        {0x0099, 0x0000},
+        {0x009a, 0x0007},
+        {0x009f, 0x0000},
+        {0x00a0, 0x0000},
+        {0x00a1, 0x0002},
+        {0x00a2, 0x0001},
+        {0x00a3, 0x0002},
+        {0x00a4, 0x0001},
+        {0x00ae, 0x2040},
+        {0x00af, 0x0000},
+        {0x00b6, 0x0000},
+        {0x00b7, 0x0000},
+        {0x00b8, 0x0000},
+        {0x00b9, 0x0000},
+        {0x00ba, 0x0002},
+        {0x00bb, 0x0000},
+        {0x00be, 0x0000},
+        {0x00c0, 0x0000},
+        {0x00c1, 0x0aaa},
+        {0x00c2, 0xaa80},
+        {0x00c3, 0x0003},
+        {0x00c4, 0x0000},
+        {0x00d0, 0x0000},
+        {0x00d1, 0x2244},
+        {0x00d3, 0x3300},
+        {0x00d4, 0x2200},
+        {0x00d9, 0x0809},
+        {0x00da, 0x0000},
+        {0x00db, 0x0008},
+        {0x00dc, 0x00c0},
+        {0x00dd, 0x6724},
+        {0x00de, 0x3131},
+        {0x00df, 0x0008},
+        {0x00e0, 0x4000},
+        {0x00e1, 0x3131},
+        {0x00e2, 0x600c},
+        {0x00ea, 0xb320},
+        {0x00eb, 0x0000},
+        {0x00ec, 0xb300},
+        {0x00ed, 0x0000},
+        {0x00ee, 0xb320},
+        {0x00ef, 0x0000},
+        {0x00f0, 0x0201},
+        {0x00f1, 0x0ddd},
+        {0x00f2, 0x0ddd},
+        {0x00f6, 0x0000},
+        {0x00f7, 0x0000},
+        {0x00f8, 0x0000},
+        {0x00fa, 0x0000},
+        {0x00fb, 0x0000},
+        {0x00fc, 0x0000},
+        {0x00fd, 0x0000},
+        {0x00fe, 0x10ec},
+        {0x00ff, 0x6451},
+        {0x0100, 0xaaaa},
+        {0x0101, 0x000a},
+        {0x010a, 0xaaaa},
+        {0x010b, 0xa0a0},
+        {0x010c, 0xaeae},
+        {0x010d, 0xaaaa},
+        {0x010e, 0xaaaa},
+        {0x010f, 0xaaaa},
+        {0x0110, 0xe002},
+        {0x0111, 0xa402},
+        {0x0112, 0xaaaa},
+        {0x0113, 0x2000},
+        {0x0117, 0x0f00},
+        {0x0125, 0x0410},
+        {0x0132, 0x0000},
+        {0x0133, 0x0000},
+        {0x0137, 0x5540},
+        {0x0138, 0x3700},
+        {0x0139, 0x79a1},
+        {0x013a, 0x2020},
+        {0x013b, 0x2020},
+        {0x013c, 0x2005},
+        {0x013f, 0x0000},
+        {0x0145, 0x0002},
+        {0x0146, 0x0000},
+        {0x0147, 0x0000},
+        {0x0148, 0x0000},
+        {0x0150, 0x0000},
+        {0x0160, 0x4eff},
+        {0x0161, 0x0080},
+        {0x0162, 0x0200},
+        {0x0163, 0x0800},
+        {0x0164, 0x0000},
+        {0x0165, 0x0000},
+        {0x0166, 0x0000},
+        {0x0167, 0x000f},
+        {0x0170, 0x4e87},
+        {0x0171, 0x0080},
+        {0x0172, 0x0200},
+        {0x0173, 0x0800},
+        {0x0174, 0x00ff},
+        {0x0175, 0x0000},
+        {0x0190, 0x413d},
+        {0x0191, 0x4139},
+        {0x0192, 0x4135},
+        {0x0193, 0x413d},
+        {0x0194, 0x0000},
+        {0x0195, 0x0000},
+        {0x0196, 0x0000},
+        {0x0197, 0x0000},
+        {0x0198, 0x0000},
+        {0x0199, 0x0000},
+        {0x01a0, 0x1e64},
+        {0x01a1, 0x06a3},
+        {0x01a2, 0x0000},
+        {0x01a3, 0x0000},
+        {0x01a4, 0x0000},
+        {0x01a5, 0x0000},
+        {0x01a6, 0x0000},
+        {0x01a7, 0x8000},
+        {0x01a8, 0x0000},
+        {0x01a9, 0x0000},
+        {0x01aa, 0x0000},
+        {0x01ab, 0x0000},
+        {0x01b5, 0x0000},
+        {0x01b6, 0x01c3},
+        {0x01b7, 0x02a0},
+        {0x01b8, 0x03e9},
+        {0x01b9, 0x1389},
+        {0x01ba, 0xc351},
+        {0x01bb, 0x0009},
+        {0x01bc, 0x0018},
+        {0x01bd, 0x002a},
+        {0x01be, 0x004c},
+        {0x01bf, 0x0097},
+        {0x01c0, 0x433d},
+        {0x01c1, 0x0000},
+        {0x01c2, 0x0000},
+        {0x01c3, 0x0000},
+        {0x01c4, 0x0000},
+        {0x01c5, 0x0000},
+        {0x01c6, 0x0000},
+        {0x01c7, 0x0000},
+        {0x01c8, 0x40af},
+        {0x01c9, 0x0702},
+        {0x01ca, 0x0000},
+        {0x01cb, 0x0000},
+        {0x01cc, 0x5757},
+        {0x01cd, 0x5757},
+        {0x01ce, 0x5757},
+        {0x01cf, 0x5757},
+        {0x01d0, 0x5757},
+        {0x01d1, 0x5757},
+        {0x01d2, 0x5757},
+        {0x01d3, 0x5757},
+        {0x01d4, 0x5757},
+        {0x01d5, 0x5757},
+        {0x01d6, 0x003c},
+        {0x01da, 0x0000},
+        {0x01db, 0x0000},
+        {0x01dc, 0x0000},
+        {0x01de, 0x7c00},
+        {0x01df, 0x0320},
+        {0x01e0, 0x06a1},
+        {0x01e1, 0x0000},
+        {0x01e2, 0x0000},
+        {0x01e3, 0x0000},
+        {0x01e4, 0x0000},
+        {0x01e6, 0x0001},
+        {0x01e7, 0x0000},
+        {0x01e8, 0x0000},
+        {0x01ea, 0xbf3f},
+        {0x01eb, 0x0000},
+        {0x01ec, 0x0000},
+        {0x01ed, 0x0000},
+        {0x01ee, 0x0000},
+        {0x01ef, 0x0000},
+        {0x01f0, 0x0000},
+        {0x01f1, 0x0000},
+        {0x01f2, 0x0000},
+        {0x01f3, 0x0000},
+        {0x01f4, 0x0000},
+        {0x0200, 0x0000},
+        {0x0201, 0x0000},
+        {0x0202, 0x0000},
+        {0x0203, 0x0000},
+        {0x0204, 0x0000},
+        {0x0205, 0x0000},
+        {0x0206, 0x0000},
+        {0x0207, 0x0000},
+        {0x0208, 0x0000},
+        {0x0210, 0x60b1},
+        {0x0211, 0xa005},
+        {0x0212, 0x024c},
+        {0x0213, 0xf7ff},
+        {0x0214, 0x024c},
+        {0x0215, 0x0102},
+        {0x0216, 0x00a3},
+        {0x0217, 0x0048},
+        {0x0218, 0xa2c0},
+        {0x0219, 0x0400},
+        {0x021a, 0x00c8},
+        {0x021b, 0x00c0},
+        {0x02ff, 0x0110},
+        {0x0300, 0x001f},
+        {0x0301, 0x032c},
+        {0x0302, 0x5f21},
+        {0x0303, 0x4000},
+        {0x0304, 0x4000},
+        {0x0305, 0x06d5},
+        {0x0306, 0x8000},
+        {0x0307, 0x0700},
+        {0x0310, 0x4560},
+        {0x0311, 0xa4a8},
+        {0x0312, 0x7418},
+        {0x0313, 0x0000},
+        {0x0314, 0x0006},
+        {0x0315, 0xffff},
+        {0x0316, 0xc400},
+        {0x0317, 0x0000},
+        {0x0330, 0x00a6},
+        {0x0331, 0x04c3},
+        {0x0332, 0x27c8},
+        {0x0333, 0xbf50},
+        {0x0334, 0x0045},
+        {0x0335, 0x0007},
+        {0x0336, 0x7418},
+        {0x0337, 0x0501},
+        {0x0338, 0x0000},
+        {0x0339, 0x0010},
+        {0x033a, 0x1010},
+        {0x03c0, 0x7e00},
+        {0x03c1, 0x8000},
+        {0x03c2, 0x8000},
+        {0x03c3, 0x8000},
+        {0x03c4, 0x8000},
+        {0x03c5, 0x8000},
+        {0x03c6, 0x8000},
+        {0x03c7, 0x8000},
+        {0x03c8, 0x8000},
+        {0x03c9, 0x8000},
+        {0x03ca, 0x8000},
+        {0x03cb, 0x8000},
+        {0x03cc, 0x8000},
+        {0x03d0, 0x0000},
+        {0x03d1, 0x0000},
+        {0x03d2, 0x0000},
+        {0x03d3, 0x0000},
+        {0x03d4, 0x2000},
+        {0x03d5, 0x2000},
+        {0x03d6, 0x0000},
+        {0x03d7, 0x0000},
+        {0x03d8, 0x2000},
+        {0x03d9, 0x2000},
+        {0x03da, 0x2000},
+        {0x03db, 0x2000},
+        {0x03dc, 0x0000},
+        {0x03dd, 0x0000},
+        {0x03de, 0x0000},
+        {0x03df, 0x2000},
+        {0x03e0, 0x0000},
+        {0x03e1, 0x0000},
+        {0x03e2, 0x0000},
+        {0x03e3, 0x0000},
+        {0x03e4, 0x0000},
+        {0x03e5, 0x0000},
+        {0x03e6, 0x0000},
+        {0x03e7, 0x0000},
+        {0x03e8, 0x0000},
+        {0x03e9, 0x0000},
+        {0x03ea, 0x0000},
+        {0x03eb, 0x0000},
+        {0x03ec, 0x0000},
+        {0x03ed, 0x0000},
+        {0x03ee, 0x0000},
+        {0x03ef, 0x0000},
+        {0x03f0, 0x0800},
+        {0x03f1, 0x0800},
+        {0x03f2, 0x0800},
+        {0x03f3, 0x0800},
+};
+
+static bool rt5665_volatile_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case RT5665_RESET:
+        case RT5665_EJD_CTRL_2:
+        case RT5665_GPIO_STA:
+        case RT5665_INT_ST_1:
+        case RT5665_IL_CMD_1:
+        case RT5665_4BTN_IL_CMD_1:
+        case RT5665_PSV_IL_CMD_1:
+        case RT5665_AJD1_CTRL:
+        case RT5665_JD_CTRL_3:
+        case RT5665_STO_NG2_CTRL_1:
+        case RT5665_SAR_IL_CMD_4:
+        case RT5665_DEVICE_ID:
+        case RT5665_STO1_DAC_SIL_DET ... RT5665_STO2_DAC_SIL_DET:
+        case RT5665_MONO_AMP_CALIB_STA1 ... RT5665_MONO_AMP_CALIB_STA6:
+        case RT5665_HP_IMP_SENS_CTRL_12 ... RT5665_HP_IMP_SENS_CTRL_15:
+        case RT5665_HP_CALIB_STA_1 ... RT5665_HP_CALIB_STA_11:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static bool rt5665_readable_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case RT5665_RESET:
+        case RT5665_VENDOR_ID:
+        case RT5665_VENDOR_ID_1:
+        case RT5665_DEVICE_ID:
+        case RT5665_LOUT:
+        case RT5665_HP_CTRL_1:
+        case RT5665_HP_CTRL_2:
+        case RT5665_MONO_OUT:
+        case RT5665_HPL_GAIN:
+        case RT5665_HPR_GAIN:
+        case RT5665_MONO_GAIN:
+        case RT5665_CAL_BST_CTRL:
+        case RT5665_CBJ_BST_CTRL:
+        case RT5665_IN1_IN2:
+        case RT5665_IN3_IN4:
+        case RT5665_INL1_INR1_VOL:
+        case RT5665_EJD_CTRL_1:
+        case RT5665_EJD_CTRL_2:
+        case RT5665_EJD_CTRL_3:
+        case RT5665_EJD_CTRL_4:
+        case RT5665_EJD_CTRL_5:
+        case RT5665_EJD_CTRL_6:
+        case RT5665_EJD_CTRL_7:
+        case RT5665_DAC2_CTRL:
+        case RT5665_DAC2_DIG_VOL:
+        case RT5665_DAC1_DIG_VOL:
+        case RT5665_DAC3_DIG_VOL:
+        case RT5665_DAC3_CTRL:
+        case RT5665_STO1_ADC_DIG_VOL:
+        case RT5665_MONO_ADC_DIG_VOL:
+        case RT5665_STO2_ADC_DIG_VOL:
+        case RT5665_STO1_ADC_BOOST:
+        case RT5665_MONO_ADC_BOOST:
+        case RT5665_STO2_ADC_BOOST:
+        case RT5665_HP_IMP_GAIN_1:
+        case RT5665_HP_IMP_GAIN_2:
+        case RT5665_STO1_ADC_MIXER:
+        case RT5665_MONO_ADC_MIXER:
+        case RT5665_STO2_ADC_MIXER:
+        case RT5665_AD_DA_MIXER:
+        case RT5665_STO1_DAC_MIXER:
+        case RT5665_MONO_DAC_MIXER:
+        case RT5665_STO2_DAC_MIXER:
+        case RT5665_A_DAC1_MUX:
+        case RT5665_A_DAC2_MUX:
+        case RT5665_DIG_INF2_DATA:
+        case RT5665_DIG_INF3_DATA:
+        case RT5665_PDM_OUT_CTRL:
+        case RT5665_PDM_DATA_CTRL_1:
+        case RT5665_PDM_DATA_CTRL_2:
+        case RT5665_PDM_DATA_CTRL_3:
+        case RT5665_PDM_DATA_CTRL_4:
+        case RT5665_REC1_GAIN:
+        case RT5665_REC1_L1_MIXER:
+        case RT5665_REC1_L2_MIXER:
+        case RT5665_REC1_R1_MIXER:
+        case RT5665_REC1_R2_MIXER:
+        case RT5665_REC2_GAIN:
+        case RT5665_REC2_L1_MIXER:
+        case RT5665_REC2_L2_MIXER:
+        case RT5665_REC2_R1_MIXER:
+        case RT5665_REC2_R2_MIXER:
+        case RT5665_CAL_REC:
+        case RT5665_ALC_BACK_GAIN:
+        case RT5665_MONOMIX_GAIN:
+        case RT5665_MONOMIX_IN_GAIN:
+        case RT5665_OUT_L_GAIN:
+        case RT5665_OUT_L_MIXER:
+        case RT5665_OUT_R_GAIN:
+        case RT5665_OUT_R_MIXER:
+        case RT5665_LOUT_MIXER:
+        case RT5665_PWR_DIG_1:
+        case RT5665_PWR_DIG_2:
+        case RT5665_PWR_ANLG_1:
+        case RT5665_PWR_ANLG_2:
+        case RT5665_PWR_ANLG_3:
+        case RT5665_PWR_MIXER:
+        case RT5665_PWR_VOL:
+        case RT5665_CLK_DET:
+        case RT5665_HPF_CTRL1:
+        case RT5665_DMIC_CTRL_1:
+        case RT5665_DMIC_CTRL_2:
+        case RT5665_I2S1_SDP:
+        case RT5665_I2S2_SDP:
+        case RT5665_I2S3_SDP:
+        case RT5665_ADDA_CLK_1:
+        case RT5665_ADDA_CLK_2:
+        case RT5665_I2S1_F_DIV_CTRL_1:
+        case RT5665_I2S1_F_DIV_CTRL_2:
+        case RT5665_TDM_CTRL_1:
+        case RT5665_TDM_CTRL_2:
+        case RT5665_TDM_CTRL_3:
+        case RT5665_TDM_CTRL_4:
+        case RT5665_TDM_CTRL_5:
+        case RT5665_TDM_CTRL_6:
+        case RT5665_TDM_CTRL_7:
+        case RT5665_TDM_CTRL_8:
+        case RT5665_GLB_CLK:
+        case RT5665_PLL_CTRL_1:
+        case RT5665_PLL_CTRL_2:
+        case RT5665_ASRC_1:
+        case RT5665_ASRC_2:
+        case RT5665_ASRC_3:
+        case RT5665_ASRC_4:
+        case RT5665_ASRC_5:
+        case RT5665_ASRC_6:
+        case RT5665_ASRC_7:
+        case RT5665_ASRC_8:
+        case RT5665_ASRC_9:
+        case RT5665_ASRC_10:
+        case RT5665_DEPOP_1:
+        case RT5665_DEPOP_2:
+        case RT5665_HP_CHARGE_PUMP_1:
+        case RT5665_HP_CHARGE_PUMP_2:
+        case RT5665_MICBIAS_1:
+        case RT5665_MICBIAS_2:
+        case RT5665_ASRC_12:
+        case RT5665_ASRC_13:
+        case RT5665_ASRC_14:
+        case RT5665_RC_CLK_CTRL:
+        case RT5665_I2S_M_CLK_CTRL_1:
+        case RT5665_I2S2_F_DIV_CTRL_1:
+        case RT5665_I2S2_F_DIV_CTRL_2:
+        case RT5665_I2S3_F_DIV_CTRL_1:
+        case RT5665_I2S3_F_DIV_CTRL_2:
+        case RT5665_EQ_CTRL_1:
+        case RT5665_EQ_CTRL_2:
+        case RT5665_IRQ_CTRL_1:
+        case RT5665_IRQ_CTRL_2:
+        case RT5665_IRQ_CTRL_3:
+        case RT5665_IRQ_CTRL_4:
+        case RT5665_IRQ_CTRL_5:
+        case RT5665_IRQ_CTRL_6:
+        case RT5665_INT_ST_1:
+        case RT5665_GPIO_CTRL_1:
+        case RT5665_GPIO_CTRL_2:
+        case RT5665_GPIO_CTRL_3:
+        case RT5665_GPIO_CTRL_4:
+        case RT5665_GPIO_STA:
+        case RT5665_HP_AMP_DET_CTRL_1:
+        case RT5665_HP_AMP_DET_CTRL_2:
+        case RT5665_MID_HP_AMP_DET:
+        case RT5665_LOW_HP_AMP_DET:
+        case RT5665_SV_ZCD_1:
+        case RT5665_SV_ZCD_2:
+        case RT5665_IL_CMD_1:
+        case RT5665_IL_CMD_2:
+        case RT5665_IL_CMD_3:
+        case RT5665_IL_CMD_4:
+        case RT5665_4BTN_IL_CMD_1:
+        case RT5665_4BTN_IL_CMD_2:
+        case RT5665_4BTN_IL_CMD_3:
+        case RT5665_PSV_IL_CMD_1:
+        case RT5665_ADC_STO1_HP_CTRL_1:
+        case RT5665_ADC_STO1_HP_CTRL_2:
+        case RT5665_ADC_MONO_HP_CTRL_1:
+        case RT5665_ADC_MONO_HP_CTRL_2:
+        case RT5665_ADC_STO2_HP_CTRL_1:
+        case RT5665_ADC_STO2_HP_CTRL_2:
+        case RT5665_AJD1_CTRL:
+        case RT5665_JD1_THD:
+        case RT5665_JD2_THD:
+        case RT5665_JD_CTRL_1:
+        case RT5665_JD_CTRL_2:
+        case RT5665_JD_CTRL_3:
+        case RT5665_DIG_MISC:
+        case RT5665_DUMMY_2:
+        case RT5665_DUMMY_3:
+        case RT5665_DAC_ADC_DIG_VOL1:
+        case RT5665_DAC_ADC_DIG_VOL2:
+        case RT5665_BIAS_CUR_CTRL_1:
+        case RT5665_BIAS_CUR_CTRL_2:
+        case RT5665_BIAS_CUR_CTRL_3:
+        case RT5665_BIAS_CUR_CTRL_4:
+        case RT5665_BIAS_CUR_CTRL_5:
+        case RT5665_BIAS_CUR_CTRL_6:
+        case RT5665_BIAS_CUR_CTRL_7:
+        case RT5665_BIAS_CUR_CTRL_8:
+        case RT5665_BIAS_CUR_CTRL_9:
+        case RT5665_BIAS_CUR_CTRL_10:
+        case RT5665_VREF_REC_OP_FB_CAP_CTRL:
+        case RT5665_CHARGE_PUMP_1:
+        case RT5665_DIG_IN_CTRL_1:
+        case RT5665_DIG_IN_CTRL_2:
+        case RT5665_PAD_DRIVING_CTRL:
+        case RT5665_SOFT_RAMP_DEPOP:
+        case RT5665_PLL:
+        case RT5665_CHOP_DAC:
+        case RT5665_CHOP_ADC:
+        case RT5665_CALIB_ADC_CTRL:
+        case RT5665_VOL_TEST:
+        case RT5665_TEST_MODE_CTRL_1:
+        case RT5665_TEST_MODE_CTRL_2:
+        case RT5665_TEST_MODE_CTRL_3:
+        case RT5665_TEST_MODE_CTRL_4:
+        case RT5665_BASSBACK_CTRL:
+        case RT5665_STO_NG2_CTRL_1:
+        case RT5665_STO_NG2_CTRL_2:
+        case RT5665_STO_NG2_CTRL_3:
+        case RT5665_STO_NG2_CTRL_4:
+        case RT5665_STO_NG2_CTRL_5:
+        case RT5665_STO_NG2_CTRL_6:
+        case RT5665_STO_NG2_CTRL_7:
+        case RT5665_STO_NG2_CTRL_8:
+        case RT5665_MONO_NG2_CTRL_1:
+        case RT5665_MONO_NG2_CTRL_2:
+        case RT5665_MONO_NG2_CTRL_3:
+        case RT5665_MONO_NG2_CTRL_4:
+        case RT5665_MONO_NG2_CTRL_5:
+        case RT5665_MONO_NG2_CTRL_6:
+        case RT5665_STO1_DAC_SIL_DET:
+        case RT5665_MONOL_DAC_SIL_DET:
+        case RT5665_MONOR_DAC_SIL_DET:
+        case RT5665_STO2_DAC_SIL_DET:
+        case RT5665_SIL_PSV_CTRL1:
+        case RT5665_SIL_PSV_CTRL2:
+        case RT5665_SIL_PSV_CTRL3:
+        case RT5665_SIL_PSV_CTRL4:
+        case RT5665_SIL_PSV_CTRL5:
+        case RT5665_SIL_PSV_CTRL6:
+        case RT5665_MONO_AMP_CALIB_CTRL_1:
+        case RT5665_MONO_AMP_CALIB_CTRL_2:
+        case RT5665_MONO_AMP_CALIB_CTRL_3:
+        case RT5665_MONO_AMP_CALIB_CTRL_4:
+        case RT5665_MONO_AMP_CALIB_CTRL_5:
+        case RT5665_MONO_AMP_CALIB_CTRL_6:
+        case RT5665_MONO_AMP_CALIB_CTRL_7:
+        case RT5665_MONO_AMP_CALIB_STA1:
+        case RT5665_MONO_AMP_CALIB_STA2:
+        case RT5665_MONO_AMP_CALIB_STA3:
+        case RT5665_MONO_AMP_CALIB_STA4:
+        case RT5665_MONO_AMP_CALIB_STA6:
+        case RT5665_HP_IMP_SENS_CTRL_01:
+        case RT5665_HP_IMP_SENS_CTRL_02:
+        case RT5665_HP_IMP_SENS_CTRL_03:
+        case RT5665_HP_IMP_SENS_CTRL_04:
+        case RT5665_HP_IMP_SENS_CTRL_05:
+        case RT5665_HP_IMP_SENS_CTRL_06:
+        case RT5665_HP_IMP_SENS_CTRL_07:
+        case RT5665_HP_IMP_SENS_CTRL_08:
+        case RT5665_HP_IMP_SENS_CTRL_09:
+        case RT5665_HP_IMP_SENS_CTRL_10:
+        case RT5665_HP_IMP_SENS_CTRL_11:
+        case RT5665_HP_IMP_SENS_CTRL_12:
+        case RT5665_HP_IMP_SENS_CTRL_13:
+        case RT5665_HP_IMP_SENS_CTRL_14:
+        case RT5665_HP_IMP_SENS_CTRL_15:
+        case RT5665_HP_IMP_SENS_CTRL_16:
+        case RT5665_HP_IMP_SENS_CTRL_17:
+        case RT5665_HP_IMP_SENS_CTRL_18:
+        case RT5665_HP_IMP_SENS_CTRL_19:
+        case RT5665_HP_IMP_SENS_CTRL_20:
+        case RT5665_HP_IMP_SENS_CTRL_21:
+        case RT5665_HP_IMP_SENS_CTRL_22:
+        case RT5665_HP_IMP_SENS_CTRL_23:
+        case RT5665_HP_IMP_SENS_CTRL_24:
+        case RT5665_HP_IMP_SENS_CTRL_25:
+        case RT5665_HP_IMP_SENS_CTRL_26:
+        case RT5665_HP_IMP_SENS_CTRL_27:
+        case RT5665_HP_IMP_SENS_CTRL_28:
+        case RT5665_HP_IMP_SENS_CTRL_29:
+        case RT5665_HP_IMP_SENS_CTRL_30:
+        case RT5665_HP_IMP_SENS_CTRL_31:
+        case RT5665_HP_IMP_SENS_CTRL_32:
+        case RT5665_HP_IMP_SENS_CTRL_33:
+        case RT5665_HP_IMP_SENS_CTRL_34:
+        case RT5665_HP_LOGIC_CTRL_1:
+        case RT5665_HP_LOGIC_CTRL_2:
+        case RT5665_HP_LOGIC_CTRL_3:
+        case RT5665_HP_CALIB_CTRL_1:
+        case RT5665_HP_CALIB_CTRL_2:
+        case RT5665_HP_CALIB_CTRL_3:
+        case RT5665_HP_CALIB_CTRL_4:
+        case RT5665_HP_CALIB_CTRL_5:
+        case RT5665_HP_CALIB_CTRL_6:
+        case RT5665_HP_CALIB_CTRL_7:
+        case RT5665_HP_CALIB_CTRL_9:
+        case RT5665_HP_CALIB_CTRL_10:
+        case RT5665_HP_CALIB_CTRL_11:
+        case RT5665_HP_CALIB_STA_1:
+        case RT5665_HP_CALIB_STA_2:
+        case RT5665_HP_CALIB_STA_3:
+        case RT5665_HP_CALIB_STA_4:
+        case RT5665_HP_CALIB_STA_5:
+        case RT5665_HP_CALIB_STA_6:
+        case RT5665_HP_CALIB_STA_7:
+        case RT5665_HP_CALIB_STA_8:
+        case RT5665_HP_CALIB_STA_9:
+        case RT5665_HP_CALIB_STA_10:
+        case RT5665_HP_CALIB_STA_11:
+        case RT5665_PGM_TAB_CTRL1:
+        case RT5665_PGM_TAB_CTRL2:
+        case RT5665_PGM_TAB_CTRL3:
+        case RT5665_PGM_TAB_CTRL4:
+        case RT5665_PGM_TAB_CTRL5:
+        case RT5665_PGM_TAB_CTRL6:
+        case RT5665_PGM_TAB_CTRL7:
+        case RT5665_PGM_TAB_CTRL8:
+        case RT5665_PGM_TAB_CTRL9:
+        case RT5665_SAR_IL_CMD_1:
+        case RT5665_SAR_IL_CMD_2:
+        case RT5665_SAR_IL_CMD_3:
+        case RT5665_SAR_IL_CMD_4:
+        case RT5665_SAR_IL_CMD_5:
+        case RT5665_SAR_IL_CMD_6:
+        case RT5665_SAR_IL_CMD_7:
+        case RT5665_SAR_IL_CMD_8:
+        case RT5665_SAR_IL_CMD_9:
+        case RT5665_SAR_IL_CMD_10:
+        case RT5665_SAR_IL_CMD_11:
+        case RT5665_SAR_IL_CMD_12:
+        case RT5665_DRC1_CTRL_0:
+        case RT5665_DRC1_CTRL_1:
+        case RT5665_DRC1_CTRL_2:
+        case RT5665_DRC1_CTRL_3:
+        case RT5665_DRC1_CTRL_4:
+        case RT5665_DRC1_CTRL_5:
+        case RT5665_DRC1_CTRL_6:
+        case RT5665_DRC1_HARD_LMT_CTRL_1:
+        case RT5665_DRC1_HARD_LMT_CTRL_2:
+        case RT5665_DRC1_PRIV_1:
+        case RT5665_DRC1_PRIV_2:
+        case RT5665_DRC1_PRIV_3:
+        case RT5665_DRC1_PRIV_4:
+        case RT5665_DRC1_PRIV_5:
+        case RT5665_DRC1_PRIV_6:
+        case RT5665_DRC1_PRIV_7:
+        case RT5665_DRC1_PRIV_8:
+        case RT5665_ALC_PGA_CTRL_1:
+        case RT5665_ALC_PGA_CTRL_2:
+        case RT5665_ALC_PGA_CTRL_3:
+        case RT5665_ALC_PGA_CTRL_4:
+        case RT5665_ALC_PGA_CTRL_5:
+        case RT5665_ALC_PGA_CTRL_6:
+        case RT5665_ALC_PGA_CTRL_7:
+        case RT5665_ALC_PGA_CTRL_8:
+        case RT5665_ALC_PGA_STA_1:
+        case RT5665_ALC_PGA_STA_2:
+        case RT5665_ALC_PGA_STA_3:
+        case RT5665_EQ_AUTO_RCV_CTRL1:
+        case RT5665_EQ_AUTO_RCV_CTRL2:
+        case RT5665_EQ_AUTO_RCV_CTRL3:
+        case RT5665_EQ_AUTO_RCV_CTRL4:
+        case RT5665_EQ_AUTO_RCV_CTRL5:
+        case RT5665_EQ_AUTO_RCV_CTRL6:
+        case RT5665_EQ_AUTO_RCV_CTRL7:
+        case RT5665_EQ_AUTO_RCV_CTRL8:
+        case RT5665_EQ_AUTO_RCV_CTRL9:
+        case RT5665_EQ_AUTO_RCV_CTRL10:
+        case RT5665_EQ_AUTO_RCV_CTRL11:
+        case RT5665_EQ_AUTO_RCV_CTRL12:
+        case RT5665_EQ_AUTO_RCV_CTRL13:
+        case RT5665_ADC_L_EQ_LPF1_A1:
+        case RT5665_R_EQ_LPF1_A1:
+        case RT5665_L_EQ_LPF1_H0:
+        case RT5665_R_EQ_LPF1_H0:
+        case RT5665_L_EQ_BPF1_A1:
+        case RT5665_R_EQ_BPF1_A1:
+        case RT5665_L_EQ_BPF1_A2:
+        case RT5665_R_EQ_BPF1_A2:
+        case RT5665_L_EQ_BPF1_H0:
+        case RT5665_R_EQ_BPF1_H0:
+        case RT5665_L_EQ_BPF2_A1:
+        case RT5665_R_EQ_BPF2_A1:
+        case RT5665_L_EQ_BPF2_A2:
+        case RT5665_R_EQ_BPF2_A2:
+        case RT5665_L_EQ_BPF2_H0:
+        case RT5665_R_EQ_BPF2_H0:
+        case RT5665_L_EQ_BPF3_A1:
+        case RT5665_R_EQ_BPF3_A1:
+        case RT5665_L_EQ_BPF3_A2:
+        case RT5665_R_EQ_BPF3_A2:
+        case RT5665_L_EQ_BPF3_H0:
+        case RT5665_R_EQ_BPF3_H0:
+        case RT5665_L_EQ_BPF4_A1:
+        case RT5665_R_EQ_BPF4_A1:
+        case RT5665_L_EQ_BPF4_A2:
+        case RT5665_R_EQ_BPF4_A2:
+        case RT5665_L_EQ_BPF4_H0:
+        case RT5665_R_EQ_BPF4_H0:
+        case RT5665_L_EQ_HPF1_A1:
+        case RT5665_R_EQ_HPF1_A1:
+        case RT5665_L_EQ_HPF1_H0:
+        case RT5665_R_EQ_HPF1_H0:
+        case RT5665_L_EQ_PRE_VOL:
+        case RT5665_R_EQ_PRE_VOL:
+        case RT5665_L_EQ_POST_VOL:
+        case RT5665_R_EQ_POST_VOL:
+        case RT5665_SCAN_MODE_CTRL:
+        case RT5665_I2C_MODE:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static const DECLARE_TLV_DB_SCALE(hp_vol_tlv, -2250, 150, 0);
+static const DECLARE_TLV_DB_SCALE(mono_vol_tlv, -1400, 150, 0);
+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);
+static const DECLARE_TLV_DB_SCALE(in_bst_tlv, -1200, 75, 0);
+
+/* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */
+static const DECLARE_TLV_DB_RANGE(bst_tlv,
+        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 rt5665_data_select[] = {
+        "L/R", "R/L", "L/L", "R/R"
+};
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if1_1_01_adc_enum,
+        RT5665_TDM_CTRL_2, RT5665_I2S1_1_DS_ADC_SLOT01_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if1_1_23_adc_enum,
+        RT5665_TDM_CTRL_2, RT5665_I2S1_1_DS_ADC_SLOT23_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if1_1_45_adc_enum,
+        RT5665_TDM_CTRL_2, RT5665_I2S1_1_DS_ADC_SLOT45_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if1_1_67_adc_enum,
+        RT5665_TDM_CTRL_2, RT5665_I2S1_1_DS_ADC_SLOT67_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if1_2_01_adc_enum,
+        RT5665_TDM_CTRL_2, RT5665_I2S1_2_DS_ADC_SLOT01_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if1_2_23_adc_enum,
+        RT5665_TDM_CTRL_2, RT5665_I2S1_2_DS_ADC_SLOT23_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if1_2_45_adc_enum,
+        RT5665_TDM_CTRL_2, RT5665_I2S1_2_DS_ADC_SLOT45_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if1_2_67_adc_enum,
+        RT5665_TDM_CTRL_2, RT5665_I2S1_2_DS_ADC_SLOT67_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if2_1_dac_enum,
+        RT5665_DIG_INF2_DATA, RT5665_IF2_1_DAC_SEL_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if2_1_adc_enum,
+        RT5665_DIG_INF2_DATA, RT5665_IF2_1_ADC_SEL_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if2_2_dac_enum,
+        RT5665_DIG_INF2_DATA, RT5665_IF2_2_DAC_SEL_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if2_2_adc_enum,
+        RT5665_DIG_INF2_DATA, RT5665_IF2_2_ADC_SEL_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if3_dac_enum,
+        RT5665_DIG_INF3_DATA, RT5665_IF3_DAC_SEL_SFT, rt5665_data_select);
+
+static const SOC_ENUM_SINGLE_DECL(rt5665_if3_adc_enum,
+        RT5665_DIG_INF3_DATA, RT5665_IF3_ADC_SEL_SFT, rt5665_data_select);
+
+static const struct snd_kcontrol_new rt5665_if1_1_01_adc_swap_mux =
+        SOC_DAPM_ENUM("IF1_1 01 ADC Swap Mux", rt5665_if1_1_01_adc_enum);
+
+static const struct snd_kcontrol_new rt5665_if1_1_23_adc_swap_mux =
+        SOC_DAPM_ENUM("IF1_1 23 ADC Swap Mux", rt5665_if1_1_23_adc_enum);
+
+static const struct snd_kcontrol_new rt5665_if1_1_45_adc_swap_mux =
+        SOC_DAPM_ENUM("IF1_1 45 ADC Swap Mux", rt5665_if1_1_45_adc_enum);
+
+static const struct snd_kcontrol_new rt5665_if1_1_67_adc_swap_mux =
+        SOC_DAPM_ENUM("IF1_1 67 ADC Swap Mux", rt5665_if1_1_67_adc_enum);
+
+static const struct snd_kcontrol_new rt5665_if1_2_01_adc_swap_mux =
+        SOC_DAPM_ENUM("IF1_2 01 ADC Swap Mux", rt5665_if1_2_01_adc_enum);
+
+static const struct snd_kcontrol_new rt5665_if1_2_23_adc_swap_mux =
+        SOC_DAPM_ENUM("IF1_2 23 ADC1 Swap Mux", rt5665_if1_2_23_adc_enum);
+
+static const struct snd_kcontrol_new rt5665_if1_2_45_adc_swap_mux =
+        SOC_DAPM_ENUM("IF1_2 45 ADC1 Swap Mux", rt5665_if1_2_45_adc_enum);
+
+static const struct snd_kcontrol_new rt5665_if1_2_67_adc_swap_mux =
+        SOC_DAPM_ENUM("IF1_2 67 ADC1 Swap Mux", rt5665_if1_2_67_adc_enum);
+
+static const struct snd_kcontrol_new rt5665_if2_1_dac_swap_mux =
+        SOC_DAPM_ENUM("IF2_1 DAC Swap Source", rt5665_if2_1_dac_enum);
+
+static const struct snd_kcontrol_new rt5665_if2_1_adc_swap_mux =
+        SOC_DAPM_ENUM("IF2_1 ADC Swap Source", rt5665_if2_1_adc_enum);
+
+static const struct snd_kcontrol_new rt5665_if2_2_dac_swap_mux =
+        SOC_DAPM_ENUM("IF2_2 DAC Swap Source", rt5665_if2_2_dac_enum);
+
+static const struct snd_kcontrol_new rt5665_if2_2_adc_swap_mux =
+        SOC_DAPM_ENUM("IF2_2 ADC Swap Source", rt5665_if2_2_adc_enum);
+
+static const struct snd_kcontrol_new rt5665_if3_dac_swap_mux =
+        SOC_DAPM_ENUM("IF3 DAC Swap Source", rt5665_if3_dac_enum);
+
+static const struct snd_kcontrol_new rt5665_if3_adc_swap_mux =
+        SOC_DAPM_ENUM("IF3 ADC Swap Source", rt5665_if3_adc_enum);
+
+static int rt5665_hp_vol_put(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+        int ret = snd_soc_put_volsw(kcontrol, ucontrol);
+
+        if (snd_soc_read(codec, RT5665_STO_NG2_CTRL_1) & RT5665_NG2_EN) {
+                snd_soc_update_bits(codec, RT5665_STO_NG2_CTRL_1,
+                        RT5665_NG2_EN_MASK, RT5665_NG2_DIS);
+                snd_soc_update_bits(codec, RT5665_STO_NG2_CTRL_1,
+                        RT5665_NG2_EN_MASK, RT5665_NG2_EN);
+        }
+
+        return ret;
+}
+
+static int rt5665_mono_vol_put(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+        int ret = snd_soc_put_volsw(kcontrol, ucontrol);
+
+        if (snd_soc_read(codec, RT5665_MONO_NG2_CTRL_1) & RT5665_NG2_EN) {
+                snd_soc_update_bits(codec, RT5665_MONO_NG2_CTRL_1,
+                        RT5665_NG2_EN_MASK, RT5665_NG2_DIS);
+                snd_soc_update_bits(codec, RT5665_MONO_NG2_CTRL_1,
+                        RT5665_NG2_EN_MASK, RT5665_NG2_EN);
+        }
+
+        return ret;
+}
+
+/**
+ * rt5665_sel_asrc_clk_src - select ASRC clock source for a set of filters
+ * @codec: SoC audio codec device.
+ * @filter_mask: mask of filters.
+ * @clk_src: clock source
+ *
+ * The ASRC function is for asynchronous MCLK and LRCK. Also, since RT5665 can
+ * only support standard 32fs or 64fs i2s format, ASRC should be enabled to
+ * support special i2s clock format such as Intel's 100fs(100 * sampling rate).
+ * ASRC function will track i2s clock and generate a corresponding system clock
+ * for codec. This function provides an API to select the clock source for a
+ * set of filters specified by the mask. And the codec driver will turn on ASRC
+ * for these filters if ASRC is selected as their clock source.
+ */
+int rt5665_sel_asrc_clk_src(struct snd_soc_codec *codec,
+                unsigned int filter_mask, unsigned int clk_src)
+{
+        unsigned int asrc2_mask = 0;
+        unsigned int asrc2_value = 0;
+        unsigned int asrc3_mask = 0;
+        unsigned int asrc3_value = 0;
+
+        switch (clk_src) {
+        case RT5665_CLK_SEL_SYS:
+        case RT5665_CLK_SEL_I2S1_ASRC:
+        case RT5665_CLK_SEL_I2S2_ASRC:
+        case RT5665_CLK_SEL_I2S3_ASRC:
+        case RT5665_CLK_SEL_SYS2:
+        case RT5665_CLK_SEL_SYS3:
+        case RT5665_CLK_SEL_SYS4:
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        if (filter_mask & RT5665_DA_STEREO1_FILTER) {
+                asrc2_mask |= RT5665_DA_STO1_CLK_SEL_MASK;
+                asrc2_value = (asrc2_value & ~RT5665_DA_STO1_CLK_SEL_MASK)
+                        | (clk_src << RT5665_DA_STO1_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5665_DA_STEREO2_FILTER) {
+                asrc2_mask |= RT5665_DA_STO2_CLK_SEL_MASK;
+                asrc2_value = (asrc2_value & ~RT5665_DA_STO2_CLK_SEL_MASK)
+                        | (clk_src << RT5665_DA_STO2_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5665_DA_MONO_L_FILTER) {
+                asrc2_mask |= RT5665_DA_MONOL_CLK_SEL_MASK;
+                asrc2_value = (asrc2_value & ~RT5665_DA_MONOL_CLK_SEL_MASK)
+                        | (clk_src << RT5665_DA_MONOL_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5665_DA_MONO_R_FILTER) {
+                asrc2_mask |= RT5665_DA_MONOR_CLK_SEL_MASK;
+                asrc2_value = (asrc2_value & ~RT5665_DA_MONOR_CLK_SEL_MASK)
+                        | (clk_src << RT5665_DA_MONOR_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5665_AD_STEREO1_FILTER) {
+                asrc3_mask |= RT5665_AD_STO1_CLK_SEL_MASK;
+                asrc3_value = (asrc2_value & ~RT5665_AD_STO1_CLK_SEL_MASK)
+                        | (clk_src << RT5665_AD_STO1_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5665_AD_STEREO2_FILTER) {
+                asrc3_mask |= RT5665_AD_STO2_CLK_SEL_MASK;
+                asrc3_value = (asrc2_value & ~RT5665_AD_STO2_CLK_SEL_MASK)
+                        | (clk_src << RT5665_AD_STO2_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5665_AD_MONO_L_FILTER) {
+                asrc3_mask |= RT5665_AD_MONOL_CLK_SEL_MASK;
+                asrc3_value = (asrc3_value & ~RT5665_AD_MONOL_CLK_SEL_MASK)
+                        | (clk_src << RT5665_AD_MONOL_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5665_AD_MONO_R_FILTER)  {
+                asrc3_mask |= RT5665_AD_MONOR_CLK_SEL_MASK;
+                asrc3_value = (asrc3_value & ~RT5665_AD_MONOR_CLK_SEL_MASK)
+                        | (clk_src << RT5665_AD_MONOR_CLK_SEL_SFT);
+        }
+
+        if (asrc2_mask)
+                snd_soc_update_bits(codec, RT5665_ASRC_2,
+                        asrc2_mask, asrc2_value);
+
+        if (asrc3_mask)
+                snd_soc_update_bits(codec, RT5665_ASRC_3,
+                        asrc3_mask, asrc3_value);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rt5665_sel_asrc_clk_src);
+
+static int rt5665_button_detect(struct snd_soc_codec *codec)
+{
+        int btn_type, val;
+
+        val = snd_soc_read(codec, RT5665_4BTN_IL_CMD_1);
+        btn_type = val & 0xfff0;
+        snd_soc_write(codec, RT5665_4BTN_IL_CMD_1, val);
+
+        return btn_type;
+}
+
+static void rt5665_enable_push_button_irq(struct snd_soc_codec *codec,
+        bool enable)
+{
+        if (enable) {
+                snd_soc_write(codec, RT5665_4BTN_IL_CMD_1, 0x000b);
+                snd_soc_write(codec, RT5665_IL_CMD_1, 0x0048);
+                snd_soc_update_bits(codec, RT5665_4BTN_IL_CMD_2,
+                                RT5665_4BTN_IL_MASK | RT5665_4BTN_IL_RST_MASK,
+                                RT5665_4BTN_IL_EN | RT5665_4BTN_IL_NOR);
+                snd_soc_update_bits(codec, RT5665_IRQ_CTRL_3,
+                                RT5665_IL_IRQ_MASK, RT5665_IL_IRQ_EN);
+        } else {
+                snd_soc_update_bits(codec, RT5665_IRQ_CTRL_3,
+                                RT5665_IL_IRQ_MASK, RT5665_IL_IRQ_DIS);
+                snd_soc_update_bits(codec, RT5665_4BTN_IL_CMD_2,
+                                RT5665_4BTN_IL_MASK, RT5665_4BTN_IL_DIS);
+                snd_soc_update_bits(codec, RT5665_4BTN_IL_CMD_2,
+                                RT5665_4BTN_IL_RST_MASK, RT5665_4BTN_IL_RST);
+        }
+}
+
+/**
+ * rt5665_headset_detect - Detect headset.
+ * @codec: SoC audio codec device.
+ * @jack_insert: Jack insert or not.
+ *
+ * Detect whether is headset or not when jack inserted.
+ *
+ * Returns detect status.
+ */
+static int rt5665_headset_detect(struct snd_soc_codec *codec, int jack_insert)
+{
+        struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
+        unsigned int sar_hs_type, val;
+
+        if (jack_insert) {
+                snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");
+                snd_soc_dapm_sync(dapm);
+
+                regmap_update_bits(rt5665->regmap, RT5665_MICBIAS_2, 0x100,
+                        0x100);
+
+                regmap_read(rt5665->regmap, RT5665_GPIO_STA, &val);
+                if (val & 0x4) {
+                        regmap_update_bits(rt5665->regmap, RT5665_EJD_CTRL_1,
+                                0x100, 0);
+
+                        regmap_read(rt5665->regmap, RT5665_GPIO_STA, &val);
+                        while (val & 0x4) {
+                                usleep_range(10000, 15000);
+                                regmap_read(rt5665->regmap, RT5665_GPIO_STA,
+                                        &val);
+                        }
+                }
+
+                regmap_update_bits(rt5665->regmap, RT5665_EJD_CTRL_1,
+                        0x180, 0x180);
+                regmap_write(rt5665->regmap, RT5665_EJD_CTRL_3, 0x3424);
+                regmap_write(rt5665->regmap, RT5665_SAR_IL_CMD_1, 0xa291);
+
+                rt5665->sar_adc_value = snd_soc_read(rt5665->codec,
+                        RT5665_SAR_IL_CMD_4) & 0x7ff;
+
+                sar_hs_type = rt5665->pdata.sar_hs_type ?
+                        rt5665->pdata.sar_hs_type : 729;
+
+                if (rt5665->sar_adc_value > sar_hs_type) {
+                        rt5665->jack_type = SND_JACK_HEADSET;
+                        rt5665_enable_push_button_irq(codec, true);
+                        } else {
+                        rt5665->jack_type = SND_JACK_HEADPHONE;
+                        regmap_write(rt5665->regmap, RT5665_SAR_IL_CMD_1,
+                                0x2291);
+                        regmap_update_bits(rt5665->regmap, RT5665_MICBIAS_2,
+                                0x100, 0);
+                        snd_soc_dapm_disable_pin(dapm, "MICBIAS1");
+                        snd_soc_dapm_sync(dapm);
+                }
+        } else {
+                regmap_write(rt5665->regmap, RT5665_SAR_IL_CMD_1, 0x2291);
+                regmap_update_bits(rt5665->regmap, RT5665_MICBIAS_2, 0x100, 0);
+                snd_soc_dapm_disable_pin(dapm, "MICBIAS1");
+                snd_soc_dapm_sync(dapm);
+                if (rt5665->jack_type == SND_JACK_HEADSET)
+                        rt5665_enable_push_button_irq(codec, false);
+                rt5665->jack_type = 0;
+        }
+
+        dev_dbg(codec->dev, "jack_type = %d\n", rt5665->jack_type);
+        return rt5665->jack_type;
+}
+
+static irqreturn_t rt5665_irq(int irq, void *data)
+{
+        struct rt5665_priv *rt5665 = data;
+
+        mod_delayed_work(system_power_efficient_wq,
+                           &rt5665->jack_detect_work, msecs_to_jiffies(250));
+
+        return IRQ_HANDLED;
+}
+
+static void rt5665_jd_check_handler(struct work_struct *work)
+{
+        struct rt5665_priv *rt5665 = container_of(work, struct rt5665_priv,
+                calibrate_work.work);
+
+        if (snd_soc_read(rt5665->codec, RT5665_AJD1_CTRL) & 0x0010) {
+                /* jack out */
+                rt5665->jack_type = rt5665_headset_detect(rt5665->codec, 0);
+
+                snd_soc_jack_report(rt5665->hs_jack, rt5665->jack_type,
+                                SND_JACK_HEADSET |
+                                SND_JACK_BTN_0 | SND_JACK_BTN_1 |
+                                SND_JACK_BTN_2 | SND_JACK_BTN_3);
+        } else {
+                schedule_delayed_work(&rt5665->jd_check_work, 500);
+        }
+}
+
+int rt5665_set_jack_detect(struct snd_soc_codec *codec,
+        struct snd_soc_jack *hs_jack)
+{
+        struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+
+        switch (rt5665->pdata.jd_src) {
+        case RT5665_JD1:
+                regmap_update_bits(rt5665->regmap, RT5665_GPIO_CTRL_1,
+                        RT5665_GP1_PIN_MASK, RT5665_GP1_PIN_IRQ);
+                regmap_update_bits(rt5665->regmap, RT5665_RC_CLK_CTRL,
+                                0xc000, 0xc000);
+                regmap_update_bits(rt5665->regmap, RT5665_PWR_ANLG_2,
+                        RT5665_PWR_JD1, RT5665_PWR_JD1);
+                regmap_update_bits(rt5665->regmap, RT5665_IRQ_CTRL_1, 0x8, 0x8);
+                break;
+
+        case RT5665_JD_NULL:
+                break;
+
+        default:
+                dev_warn(codec->dev, "Wrong JD source\n");
+                break;
+        }
+
+        rt5665->hs_jack = hs_jack;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rt5665_set_jack_detect);
+
+static void rt5665_jack_detect_handler(struct work_struct *work)
+{
+        struct rt5665_priv *rt5665 =
+                container_of(work, struct rt5665_priv, jack_detect_work.work);
+        int val, btn_type;
+
+        while (!rt5665->codec) {
+                pr_debug("%s codec = null\n", __func__);
+                usleep_range(10000, 15000);
+        }
+
+        while (!rt5665->codec->component.card->instantiated) {
+                pr_debug("%s\n", __func__);
+                usleep_range(10000, 15000);
+        }
+
+        mutex_lock(&rt5665->calibrate_mutex);
+
+        val = snd_soc_read(rt5665->codec, RT5665_AJD1_CTRL) & 0x0010;
+        if (!val) {
+                /* jack in */
+                if (rt5665->jack_type == 0) {
+                        /* jack was out, report jack type */
+                        rt5665->jack_type =
+                                rt5665_headset_detect(rt5665->codec, 1);
+                } else {
+                        /* jack is already in, report button event */
+                        rt5665->jack_type = SND_JACK_HEADSET;
+                        btn_type = rt5665_button_detect(rt5665->codec);
+                        /**
+                         * rt5665 can report three kinds of button behavior,
+                         * one click, double click and hold. However,
+                         * currently we will report button pressed/released
+                         * event. So all the three button behaviors are
+                         * treated as button pressed.
+                         */
+                        switch (btn_type) {
+                        case 0x8000:
+                        case 0x4000:
+                        case 0x2000:
+                                rt5665->jack_type |= SND_JACK_BTN_0;
+                                break;
+                        case 0x1000:
+                        case 0x0800:
+                        case 0x0400:
+                                rt5665->jack_type |= SND_JACK_BTN_1;
+                                break;
+                        case 0x0200:
+                        case 0x0100:
+                        case 0x0080:
+                                rt5665->jack_type |= SND_JACK_BTN_2;
+                                break;
+                        case 0x0040:
+                        case 0x0020:
+                        case 0x0010:
+                                rt5665->jack_type |= SND_JACK_BTN_3;
+                                break;
+                        case 0x0000: /* unpressed */
+                                break;
+                        default:
+                                btn_type = 0;
+                                dev_err(rt5665->codec->dev,
+                                        "Unexpected button code 0x%04x\n",
+                                        btn_type);
+                                break;
+                        }
+                }
+        } else {
+                /* jack out */
+                rt5665->jack_type = rt5665_headset_detect(rt5665->codec, 0);
+        }
+
+        snd_soc_jack_report(rt5665->hs_jack, rt5665->jack_type,
+                        SND_JACK_HEADSET |
+                            SND_JACK_BTN_0 | SND_JACK_BTN_1 |
+                            SND_JACK_BTN_2 | SND_JACK_BTN_3);
+
+        if (rt5665->jack_type & (SND_JACK_BTN_0 | SND_JACK_BTN_1 |
+                SND_JACK_BTN_2 | SND_JACK_BTN_3))
+                schedule_delayed_work(&rt5665->jd_check_work, 0);
+        else
+                cancel_delayed_work_sync(&rt5665->jd_check_work);
+
+        mutex_unlock(&rt5665->calibrate_mutex);
+}
+
+static const struct snd_kcontrol_new rt5665_snd_controls[] = {
+        /* Headphone Output Volume */
+        SOC_DOUBLE_R_EXT_TLV("Headphone Playback Volume", RT5665_HPL_GAIN,
+                RT5665_HPR_GAIN, RT5665_G_HP_SFT, 15, 1, snd_soc_get_volsw,
+                rt5665_hp_vol_put, hp_vol_tlv),
+
+        /* Mono Output Volume */
+        SOC_SINGLE_EXT_TLV("Mono Playback Volume", RT5665_MONO_GAIN,
+                RT5665_L_VOL_SFT, 15, 1, snd_soc_get_volsw,
+                rt5665_mono_vol_put, mono_vol_tlv),
+
+        /* Output Volume */
+        SOC_DOUBLE_TLV("OUT Playback Volume", RT5665_LOUT, RT5665_L_VOL_SFT,
+                RT5665_R_VOL_SFT, 39, 1, out_vol_tlv),
+
+        /* DAC Digital Volume */
+        SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5665_DAC1_DIG_VOL,
+                RT5665_L_VOL_SFT, RT5665_R_VOL_SFT, 175, 0, dac_vol_tlv),
+        SOC_DOUBLE_TLV("DAC2 Playback Volume", RT5665_DAC2_DIG_VOL,
+                RT5665_L_VOL_SFT, RT5665_R_VOL_SFT, 175, 0, dac_vol_tlv),
+        SOC_DOUBLE("DAC2 Playback Switch", RT5665_DAC2_CTRL,
+                RT5665_M_DAC2_L_VOL_SFT, RT5665_M_DAC2_R_VOL_SFT, 1, 1),
+
+        /* IN1/IN2/IN3/IN4 Volume */
+        SOC_SINGLE_TLV("IN1 Boost Volume", RT5665_IN1_IN2,
+                RT5665_BST1_SFT, 69, 0, in_bst_tlv),
+        SOC_SINGLE_TLV("IN2 Boost Volume", RT5665_IN1_IN2,
+                RT5665_BST2_SFT, 69, 0, in_bst_tlv),
+        SOC_SINGLE_TLV("IN3 Boost Volume", RT5665_IN3_IN4,
+                RT5665_BST3_SFT, 69, 0, in_bst_tlv),
+        SOC_SINGLE_TLV("IN4 Boost Volume", RT5665_IN3_IN4,
+                RT5665_BST4_SFT, 69, 0, in_bst_tlv),
+        SOC_SINGLE_TLV("CBJ Boost Volume", RT5665_CBJ_BST_CTRL,
+                RT5665_BST_CBJ_SFT, 8, 0, bst_tlv),
+
+        /* INL/INR Volume Control */
+        SOC_DOUBLE_TLV("IN Capture Volume", RT5665_INL1_INR1_VOL,
+                RT5665_INL_VOL_SFT, RT5665_INR_VOL_SFT, 31, 1, in_vol_tlv),
+
+        /* ADC Digital Volume Control */
+        SOC_DOUBLE("STO1 ADC Capture Switch", RT5665_STO1_ADC_DIG_VOL,
+                RT5665_L_MUTE_SFT, RT5665_R_MUTE_SFT, 1, 1),
+        SOC_DOUBLE_TLV("STO1 ADC Capture Volume", RT5665_STO1_ADC_DIG_VOL,
+                RT5665_L_VOL_SFT, RT5665_R_VOL_SFT, 127, 0, adc_vol_tlv),
+        SOC_DOUBLE("Mono ADC Capture Switch", RT5665_MONO_ADC_DIG_VOL,
+                RT5665_L_MUTE_SFT, RT5665_R_MUTE_SFT, 1, 1),
+        SOC_DOUBLE_TLV("Mono ADC Capture Volume", RT5665_MONO_ADC_DIG_VOL,
+                RT5665_L_VOL_SFT, RT5665_R_VOL_SFT, 127, 0, adc_vol_tlv),
+        SOC_DOUBLE("STO2 ADC Capture Switch", RT5665_STO2_ADC_DIG_VOL,
+                RT5665_L_MUTE_SFT, RT5665_R_MUTE_SFT, 1, 1),
+        SOC_DOUBLE_TLV("STO2 ADC Capture Volume", RT5665_STO2_ADC_DIG_VOL,
+                RT5665_L_VOL_SFT, RT5665_R_VOL_SFT, 127, 0, adc_vol_tlv),
+
+        /* ADC Boost Volume Control */
+        SOC_DOUBLE_TLV("STO1 ADC Boost Gain Volume", RT5665_STO1_ADC_BOOST,
+                RT5665_STO1_ADC_L_BST_SFT, RT5665_STO1_ADC_R_BST_SFT,
+                3, 0, adc_bst_tlv),
+
+        SOC_DOUBLE_TLV("Mono ADC Boost Gain Volume", RT5665_MONO_ADC_BOOST,
+                RT5665_MONO_ADC_L_BST_SFT, RT5665_MONO_ADC_R_BST_SFT,
+                3, 0, adc_bst_tlv),
+
+        SOC_DOUBLE_TLV("STO2 ADC Boost Gain Volume", RT5665_STO2_ADC_BOOST,
+                RT5665_STO2_ADC_L_BST_SFT, RT5665_STO2_ADC_R_BST_SFT,
+                3, 0, adc_bst_tlv),
+};
+
+/**
+ * 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 = snd_soc_dapm_to_codec(w->dapm);
+        struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+        int pd, idx = -EINVAL;
+
+        pd = rl6231_get_pre_div(rt5665->regmap,
+                RT5665_ADDA_CLK_1, RT5665_I2S_PD1_SFT);
+        idx = rl6231_calc_dmic_clk(rt5665->sysclk / pd);
+
+        if (idx < 0)
+                dev_err(codec->dev, "Failed to set DMIC clock\n");
+        else {
+                snd_soc_update_bits(codec, RT5665_DMIC_CTRL_1,
+                        RT5665_DMIC_CLK_MASK, idx << RT5665_DMIC_CLK_SFT);
+        }
+        return idx;
+}
+
+static int rt5665_charge_pump_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                snd_soc_update_bits(codec, RT5665_HP_CHARGE_PUMP_1,
+                        RT5665_PM_HP_MASK | RT5665_OSW_L_MASK,
+                        RT5665_PM_HP_HV | RT5665_OSW_L_EN);
+                break;
+        case SND_SOC_DAPM_POST_PMD:
+                snd_soc_update_bits(codec, RT5665_HP_CHARGE_PUMP_1,
+                        RT5665_PM_HP_MASK | RT5665_OSW_L_MASK,
+                        RT5665_PM_HP_LV | RT5665_OSW_L_DIS);
+                break;
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *w,
+                         struct snd_soc_dapm_widget *sink)
+{
+        unsigned int val;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        val = snd_soc_read(codec, RT5665_GLB_CLK);
+        val &= RT5665_SCLK_SRC_MASK;
+        if (val == RT5665_SCLK_SRC_PLL1)
+                return 1;
+        else
+                return 0;
+}
+
+static int is_using_asrc(struct snd_soc_dapm_widget *w,
+                         struct snd_soc_dapm_widget *sink)
+{
+        unsigned int reg, shift, val;
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (w->shift) {
+        case RT5665_ADC_MONO_R_ASRC_SFT:
+                reg = RT5665_ASRC_3;
+                shift = RT5665_AD_MONOR_CLK_SEL_SFT;
+                break;
+        case RT5665_ADC_MONO_L_ASRC_SFT:
+                reg = RT5665_ASRC_3;
+                shift = RT5665_AD_MONOL_CLK_SEL_SFT;
+                break;
+        case RT5665_ADC_STO1_ASRC_SFT:
+                reg = RT5665_ASRC_3;
+                shift = RT5665_AD_STO1_CLK_SEL_SFT;
+                break;
+        case RT5665_ADC_STO2_ASRC_SFT:
+                reg = RT5665_ASRC_3;
+                shift = RT5665_AD_STO2_CLK_SEL_SFT;
+                break;
+        case RT5665_DAC_MONO_R_ASRC_SFT:
+                reg = RT5665_ASRC_2;
+                shift = RT5665_DA_MONOR_CLK_SEL_SFT;
+                break;
+        case RT5665_DAC_MONO_L_ASRC_SFT:
+                reg = RT5665_ASRC_2;
+                shift = RT5665_DA_MONOL_CLK_SEL_SFT;
+                break;
+        case RT5665_DAC_STO1_ASRC_SFT:
+                reg = RT5665_ASRC_2;
+                shift = RT5665_DA_STO1_CLK_SEL_SFT;
+                break;
+        case RT5665_DAC_STO2_ASRC_SFT:
+                reg = RT5665_ASRC_2;
+                shift = RT5665_DA_STO2_CLK_SEL_SFT;
+                break;
+        default:
+                return 0;
+        }
+
+        val = (snd_soc_read(codec, reg) >> shift) & 0xf;
+        switch (val) {
+        case RT5665_CLK_SEL_I2S1_ASRC:
+        case RT5665_CLK_SEL_I2S2_ASRC:
+        case RT5665_CLK_SEL_I2S3_ASRC:
+                /* I2S_Pre_Div1 should be 1 in asrc mode */
+                snd_soc_update_bits(codec, RT5665_ADDA_CLK_1,
+                        RT5665_I2S_PD1_MASK, RT5665_I2S_PD1_2);
+                return 1;
+        default:
+                return 0;
+        }
+
+}
+
+/* Digital Mixer */
+static const struct snd_kcontrol_new rt5665_sto1_adc_l_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5665_STO1_ADC_MIXER,
+                        RT5665_M_STO1_ADC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5665_STO1_ADC_MIXER,
+                        RT5665_M_STO1_ADC_L2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_sto1_adc_r_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5665_STO1_ADC_MIXER,
+                        RT5665_M_STO1_ADC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5665_STO1_ADC_MIXER,
+                        RT5665_M_STO1_ADC_R2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_sto2_adc_l_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5665_STO2_ADC_MIXER,
+                        RT5665_M_STO2_ADC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5665_STO2_ADC_MIXER,
+                        RT5665_M_STO2_ADC_L2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_sto2_adc_r_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5665_STO2_ADC_MIXER,
+                        RT5665_M_STO2_ADC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5665_STO2_ADC_MIXER,
+                        RT5665_M_STO2_ADC_R2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_mono_adc_l_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5665_MONO_ADC_MIXER,
+                        RT5665_M_MONO_ADC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5665_MONO_ADC_MIXER,
+                        RT5665_M_MONO_ADC_L2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_mono_adc_r_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5665_MONO_ADC_MIXER,
+                        RT5665_M_MONO_ADC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5665_MONO_ADC_MIXER,
+                        RT5665_M_MONO_ADC_R2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("Stereo ADC Switch", RT5665_AD_DA_MIXER,
+                        RT5665_M_ADCMIX_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC1 Switch", RT5665_AD_DA_MIXER,
+                        RT5665_M_DAC1_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("Stereo ADC Switch", RT5665_AD_DA_MIXER,
+                        RT5665_M_ADCMIX_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC1 Switch", RT5665_AD_DA_MIXER,
+                        RT5665_M_DAC1_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_sto1_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5665_STO1_DAC_MIXER,
+                        RT5665_M_DAC_L1_STO_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5665_STO1_DAC_MIXER,
+                        RT5665_M_DAC_R1_STO_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5665_STO1_DAC_MIXER,
+                        RT5665_M_DAC_L2_STO_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5665_STO1_DAC_MIXER,
+                        RT5665_M_DAC_R2_STO_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_sto1_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5665_STO1_DAC_MIXER,
+                        RT5665_M_DAC_L1_STO_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5665_STO1_DAC_MIXER,
+                        RT5665_M_DAC_R1_STO_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5665_STO1_DAC_MIXER,
+                        RT5665_M_DAC_L2_STO_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5665_STO1_DAC_MIXER,
+                        RT5665_M_DAC_R2_STO_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_sto2_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5665_STO2_DAC_MIXER,
+                        RT5665_M_DAC_L1_STO2_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5665_STO2_DAC_MIXER,
+                        RT5665_M_DAC_L2_STO2_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L3 Switch", RT5665_STO2_DAC_MIXER,
+                        RT5665_M_DAC_L3_STO2_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_sto2_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5665_STO2_DAC_MIXER,
+                        RT5665_M_DAC_R1_STO2_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5665_STO2_DAC_MIXER,
+                        RT5665_M_DAC_R2_STO2_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R3 Switch", RT5665_STO2_DAC_MIXER,
+                        RT5665_M_DAC_R3_STO2_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_mono_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5665_MONO_DAC_MIXER,
+                        RT5665_M_DAC_L1_MONO_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5665_MONO_DAC_MIXER,
+                        RT5665_M_DAC_R1_MONO_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5665_MONO_DAC_MIXER,
+                        RT5665_M_DAC_L2_MONO_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5665_MONO_DAC_MIXER,
+                        RT5665_M_DAC_R2_MONO_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_mono_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5665_MONO_DAC_MIXER,
+                        RT5665_M_DAC_L1_MONO_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5665_MONO_DAC_MIXER,
+                        RT5665_M_DAC_R1_MONO_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5665_MONO_DAC_MIXER,
+                        RT5665_M_DAC_L2_MONO_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5665_MONO_DAC_MIXER,
+                        RT5665_M_DAC_R2_MONO_R_SFT, 1, 1),
+};
+
+/* Analog Input Mixer */
+static const struct snd_kcontrol_new rt5665_rec1_l_mix[] = {
+        SOC_DAPM_SINGLE("CBJ Switch", RT5665_REC1_L2_MIXER,
+                        RT5665_M_CBJ_RM1_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INL Switch", RT5665_REC1_L2_MIXER,
+                        RT5665_M_INL_RM1_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INR Switch", RT5665_REC1_L2_MIXER,
+                        RT5665_M_INR_RM1_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST4 Switch", RT5665_REC1_L2_MIXER,
+                        RT5665_M_BST4_RM1_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST3 Switch", RT5665_REC1_L2_MIXER,
+                        RT5665_M_BST3_RM1_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5665_REC1_L2_MIXER,
+                        RT5665_M_BST2_RM1_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5665_REC1_L2_MIXER,
+                        RT5665_M_BST1_RM1_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_rec1_r_mix[] = {
+        SOC_DAPM_SINGLE("MONOVOL Switch", RT5665_REC1_R2_MIXER,
+                        RT5665_M_AEC_REF_RM1_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INR Switch", RT5665_REC1_R2_MIXER,
+                        RT5665_M_INR_RM1_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST4 Switch", RT5665_REC1_R2_MIXER,
+                        RT5665_M_BST4_RM1_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST3 Switch", RT5665_REC1_R2_MIXER,
+                        RT5665_M_BST3_RM1_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5665_REC1_R2_MIXER,
+                        RT5665_M_BST2_RM1_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5665_REC1_R2_MIXER,
+                        RT5665_M_BST1_RM1_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_rec2_l_mix[] = {
+        SOC_DAPM_SINGLE("INL Switch", RT5665_REC2_L2_MIXER,
+                        RT5665_M_INL_RM2_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INR Switch", RT5665_REC2_L2_MIXER,
+                        RT5665_M_INR_RM2_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("CBJ Switch", RT5665_REC2_L2_MIXER,
+                        RT5665_M_CBJ_RM2_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST4 Switch", RT5665_REC2_L2_MIXER,
+                        RT5665_M_BST4_RM2_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST3 Switch", RT5665_REC2_L2_MIXER,
+                        RT5665_M_BST3_RM2_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5665_REC2_L2_MIXER,
+                        RT5665_M_BST2_RM2_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5665_REC2_L2_MIXER,
+                        RT5665_M_BST1_RM2_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_rec2_r_mix[] = {
+        SOC_DAPM_SINGLE("MONOVOL Switch", RT5665_REC2_R2_MIXER,
+                        RT5665_M_MONOVOL_RM2_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INL Switch", RT5665_REC2_R2_MIXER,
+                        RT5665_M_INL_RM2_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INR Switch", RT5665_REC2_R2_MIXER,
+                        RT5665_M_INR_RM2_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST4 Switch", RT5665_REC2_R2_MIXER,
+                        RT5665_M_BST4_RM2_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST3 Switch", RT5665_REC2_R2_MIXER,
+                        RT5665_M_BST3_RM2_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5665_REC2_R2_MIXER,
+                        RT5665_M_BST2_RM2_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5665_REC2_R2_MIXER,
+                        RT5665_M_BST1_RM2_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_monovol_mix[] = {
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5665_MONOMIX_IN_GAIN,
+                        RT5665_M_DAC_L2_MM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("RECMIX2L Switch", RT5665_MONOMIX_IN_GAIN,
+                        RT5665_M_RECMIC2L_MM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5665_MONOMIX_IN_GAIN,
+                        RT5665_M_BST1_MM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5665_MONOMIX_IN_GAIN,
+                        RT5665_M_BST2_MM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST3 Switch", RT5665_MONOMIX_IN_GAIN,
+                        RT5665_M_BST3_MM_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_out_l_mix[] = {
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5665_OUT_L_MIXER,
+                        RT5665_M_DAC_L2_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INL Switch", RT5665_OUT_L_MIXER,
+                        RT5665_M_IN_L_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5665_OUT_L_MIXER,
+                        RT5665_M_BST1_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5665_OUT_L_MIXER,
+                        RT5665_M_BST2_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST3 Switch", RT5665_OUT_L_MIXER,
+                        RT5665_M_BST3_OM_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_out_r_mix[] = {
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5665_OUT_R_MIXER,
+                        RT5665_M_DAC_R2_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INR Switch", RT5665_OUT_R_MIXER,
+                        RT5665_M_IN_R_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5665_OUT_R_MIXER,
+                        RT5665_M_BST2_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST3 Switch", RT5665_OUT_R_MIXER,
+                        RT5665_M_BST3_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST4 Switch", RT5665_OUT_R_MIXER,
+                        RT5665_M_BST4_OM_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_mono_mix[] = {
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5665_MONOMIX_IN_GAIN,
+                        RT5665_M_DAC_L2_MA_SFT, 1, 1),
+        SOC_DAPM_SINGLE("MONOVOL Switch", RT5665_MONOMIX_IN_GAIN,
+                        RT5665_M_MONOVOL_MA_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_lout_l_mix[] = {
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5665_LOUT_MIXER,
+                        RT5665_M_DAC_L2_LM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("OUTVOL L Switch", RT5665_LOUT_MIXER,
+                        RT5665_M_OV_L_LM_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5665_lout_r_mix[] = {
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5665_LOUT_MIXER,
+                        RT5665_M_DAC_R2_LM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("OUTVOL R Switch", RT5665_LOUT_MIXER,
+                        RT5665_M_OV_R_LM_SFT, 1, 1),
+};
+
+/*DAC L2, DAC R2*/
+/*MX-17 [6:4], MX-17 [2:0]*/
+static const char * const rt5665_dac2_src[] = {
+        "IF1 DAC2", "IF2_1 DAC", "IF2_2 DAC", "IF3 DAC", "Mono ADC MIX"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_dac_l2_enum, RT5665_DAC2_CTRL,
+        RT5665_DAC_L2_SEL_SFT, rt5665_dac2_src);
+
+static const struct snd_kcontrol_new rt5665_dac_l2_mux =
+        SOC_DAPM_ENUM("Digital DAC L2 Source", rt5665_dac_l2_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_dac_r2_enum, RT5665_DAC2_CTRL,
+        RT5665_DAC_R2_SEL_SFT, rt5665_dac2_src);
+
+static const struct snd_kcontrol_new rt5665_dac_r2_mux =
+        SOC_DAPM_ENUM("Digital DAC R2 Source", rt5665_dac_r2_enum);
+
+/*DAC L3, DAC R3*/
+/*MX-1B [6:4], MX-1B [2:0]*/
+static const char * const rt5665_dac3_src[] = {
+        "IF1 DAC2", "IF2_1 DAC", "IF2_2 DAC", "IF3 DAC", "STO2 ADC MIX"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_dac_l3_enum, RT5665_DAC3_CTRL,
+        RT5665_DAC_L3_SEL_SFT, rt5665_dac3_src);
+
+static const struct snd_kcontrol_new rt5665_dac_l3_mux =
+        SOC_DAPM_ENUM("Digital DAC L3 Source", rt5665_dac_l3_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_dac_r3_enum, RT5665_DAC3_CTRL,
+        RT5665_DAC_R3_SEL_SFT, rt5665_dac3_src);
+
+static const struct snd_kcontrol_new rt5665_dac_r3_mux =
+        SOC_DAPM_ENUM("Digital DAC R3 Source", rt5665_dac_r3_enum);
+
+/* STO1 ADC1 Source */
+/* MX-26 [13] [5] */
+static const char * const rt5665_sto1_adc1_src[] = {
+        "DD Mux", "ADC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto1_adc1l_enum, RT5665_STO1_ADC_MIXER,
+        RT5665_STO1_ADC1L_SRC_SFT, rt5665_sto1_adc1_src);
+
+static const struct snd_kcontrol_new rt5665_sto1_adc1l_mux =
+        SOC_DAPM_ENUM("Stereo1 ADC1L Source", rt5665_sto1_adc1l_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto1_adc1r_enum, RT5665_STO1_ADC_MIXER,
+        RT5665_STO1_ADC1R_SRC_SFT, rt5665_sto1_adc1_src);
+
+static const struct snd_kcontrol_new rt5665_sto1_adc1r_mux =
+        SOC_DAPM_ENUM("Stereo1 ADC1L Source", rt5665_sto1_adc1r_enum);
+
+/* STO1 ADC Source */
+/* MX-26 [11:10] [3:2] */
+static const char * const rt5665_sto1_adc_src[] = {
+        "ADC1 L", "ADC1 R", "ADC2 L", "ADC2 R"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto1_adcl_enum, RT5665_STO1_ADC_MIXER,
+        RT5665_STO1_ADCL_SRC_SFT, rt5665_sto1_adc_src);
+
+static const struct snd_kcontrol_new rt5665_sto1_adcl_mux =
+        SOC_DAPM_ENUM("Stereo1 ADCL Source", rt5665_sto1_adcl_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto1_adcr_enum, RT5665_STO1_ADC_MIXER,
+        RT5665_STO1_ADCR_SRC_SFT, rt5665_sto1_adc_src);
+
+static const struct snd_kcontrol_new rt5665_sto1_adcr_mux =
+        SOC_DAPM_ENUM("Stereo1 ADCR Source", rt5665_sto1_adcr_enum);
+
+/* STO1 ADC2 Source */
+/* MX-26 [12] [4] */
+static const char * const rt5665_sto1_adc2_src[] = {
+        "DAC MIX", "DMIC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto1_adc2l_enum, RT5665_STO1_ADC_MIXER,
+        RT5665_STO1_ADC2L_SRC_SFT, rt5665_sto1_adc2_src);
+
+static const struct snd_kcontrol_new rt5665_sto1_adc2l_mux =
+        SOC_DAPM_ENUM("Stereo1 ADC2L Source", rt5665_sto1_adc2l_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto1_adc2r_enum, RT5665_STO1_ADC_MIXER,
+        RT5665_STO1_ADC2R_SRC_SFT, rt5665_sto1_adc2_src);
+
+static const struct snd_kcontrol_new rt5665_sto1_adc2r_mux =
+        SOC_DAPM_ENUM("Stereo1 ADC2R Source", rt5665_sto1_adc2r_enum);
+
+/* STO1 DMIC Source */
+/* MX-26 [8] */
+static const char * const rt5665_sto1_dmic_src[] = {
+        "DMIC1", "DMIC2"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto1_dmic_enum, RT5665_STO1_ADC_MIXER,
+        RT5665_STO1_DMIC_SRC_SFT, rt5665_sto1_dmic_src);
+
+static const struct snd_kcontrol_new rt5665_sto1_dmic_mux =
+        SOC_DAPM_ENUM("Stereo1 DMIC Mux", rt5665_sto1_dmic_enum);
+
+/* MX-26 [9] */
+static const char * const rt5665_sto1_dd_l_src[] = {
+        "STO2 DAC", "MONO DAC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto1_dd_l_enum, RT5665_STO1_ADC_MIXER,
+        RT5665_STO1_DD_L_SRC_SFT, rt5665_sto1_dd_l_src);
+
+static const struct snd_kcontrol_new rt5665_sto1_dd_l_mux =
+        SOC_DAPM_ENUM("Stereo1 DD L Source", rt5665_sto1_dd_l_enum);
+
+/* MX-26 [1:0] */
+static const char * const rt5665_sto1_dd_r_src[] = {
+        "STO2 DAC", "MONO DAC", "AEC REF"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto1_dd_r_enum, RT5665_STO1_ADC_MIXER,
+        RT5665_STO1_DD_R_SRC_SFT, rt5665_sto1_dd_r_src);
+
+static const struct snd_kcontrol_new rt5665_sto1_dd_r_mux =
+        SOC_DAPM_ENUM("Stereo1 DD R Source", rt5665_sto1_dd_r_enum);
+
+/* MONO ADC L2 Source */
+/* MX-27 [12] */
+static const char * const rt5665_mono_adc_l2_src[] = {
+        "DAC MIXL", "DMIC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_mono_adc_l2_enum, RT5665_MONO_ADC_MIXER,
+        RT5665_MONO_ADC_L2_SRC_SFT, rt5665_mono_adc_l2_src);
+
+static const struct snd_kcontrol_new rt5665_mono_adc_l2_mux =
+        SOC_DAPM_ENUM("Mono ADC L2 Source", rt5665_mono_adc_l2_enum);
+
+
+/* MONO ADC L1 Source */
+/* MX-27 [13] */
+static const char * const rt5665_mono_adc_l1_src[] = {
+        "DD Mux", "ADC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_mono_adc_l1_enum, RT5665_MONO_ADC_MIXER,
+        RT5665_MONO_ADC_L1_SRC_SFT, rt5665_mono_adc_l1_src);
+
+static const struct snd_kcontrol_new rt5665_mono_adc_l1_mux =
+        SOC_DAPM_ENUM("Mono ADC L1 Source", rt5665_mono_adc_l1_enum);
+
+/* MX-27 [9][1]*/
+static const char * const rt5665_mono_dd_src[] = {
+        "STO2 DAC", "MONO DAC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_mono_dd_l_enum, RT5665_MONO_ADC_MIXER,
+        RT5665_MONO_DD_L_SRC_SFT, rt5665_mono_dd_src);
+
+static const struct snd_kcontrol_new rt5665_mono_dd_l_mux =
+        SOC_DAPM_ENUM("Mono DD L Source", rt5665_mono_dd_l_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_mono_dd_r_enum, RT5665_MONO_ADC_MIXER,
+        RT5665_MONO_DD_R_SRC_SFT, rt5665_mono_dd_src);
+
+static const struct snd_kcontrol_new rt5665_mono_dd_r_mux =
+        SOC_DAPM_ENUM("Mono DD R Source", rt5665_mono_dd_r_enum);
+
+/* MONO ADC L Source, MONO ADC R Source*/
+/* MX-27 [11:10], MX-27 [3:2] */
+static const char * const rt5665_mono_adc_src[] = {
+        "ADC1 L", "ADC1 R", "ADC2 L", "ADC2 R"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_mono_adc_l_enum, RT5665_MONO_ADC_MIXER,
+        RT5665_MONO_ADC_L_SRC_SFT, rt5665_mono_adc_src);
+
+static const struct snd_kcontrol_new rt5665_mono_adc_l_mux =
+        SOC_DAPM_ENUM("Mono ADC L Source", rt5665_mono_adc_l_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_mono_adcr_enum, RT5665_MONO_ADC_MIXER,
+        RT5665_MONO_ADC_R_SRC_SFT, rt5665_mono_adc_src);
+
+static const struct snd_kcontrol_new rt5665_mono_adc_r_mux =
+        SOC_DAPM_ENUM("Mono ADC R Source", rt5665_mono_adcr_enum);
+
+/* MONO DMIC L Source */
+/* MX-27 [8] */
+static const char * const rt5665_mono_dmic_l_src[] = {
+        "DMIC1 L", "DMIC2 L"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_mono_dmic_l_enum, RT5665_MONO_ADC_MIXER,
+        RT5665_MONO_DMIC_L_SRC_SFT, rt5665_mono_dmic_l_src);
+
+static const struct snd_kcontrol_new rt5665_mono_dmic_l_mux =
+        SOC_DAPM_ENUM("Mono DMIC L Source", rt5665_mono_dmic_l_enum);
+
+/* MONO ADC R2 Source */
+/* MX-27 [4] */
+static const char * const rt5665_mono_adc_r2_src[] = {
+        "DAC MIXR", "DMIC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_mono_adc_r2_enum, RT5665_MONO_ADC_MIXER,
+        RT5665_MONO_ADC_R2_SRC_SFT, rt5665_mono_adc_r2_src);
+
+static const struct snd_kcontrol_new rt5665_mono_adc_r2_mux =
+        SOC_DAPM_ENUM("Mono ADC R2 Source", rt5665_mono_adc_r2_enum);
+
+/* MONO ADC R1 Source */
+/* MX-27 [5] */
+static const char * const rt5665_mono_adc_r1_src[] = {
+        "DD Mux", "ADC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_mono_adc_r1_enum, RT5665_MONO_ADC_MIXER,
+        RT5665_MONO_ADC_R1_SRC_SFT, rt5665_mono_adc_r1_src);
+
+static const struct snd_kcontrol_new rt5665_mono_adc_r1_mux =
+        SOC_DAPM_ENUM("Mono ADC R1 Source", rt5665_mono_adc_r1_enum);
+
+/* MONO DMIC R Source */
+/* MX-27 [0] */
+static const char * const rt5665_mono_dmic_r_src[] = {
+        "DMIC1 R", "DMIC2 R"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_mono_dmic_r_enum, RT5665_MONO_ADC_MIXER,
+        RT5665_MONO_DMIC_R_SRC_SFT, rt5665_mono_dmic_r_src);
+
+static const struct snd_kcontrol_new rt5665_mono_dmic_r_mux =
+        SOC_DAPM_ENUM("Mono DMIC R Source", rt5665_mono_dmic_r_enum);
+
+
+/* STO2 ADC1 Source */
+/* MX-28 [13] [5] */
+static const char * const rt5665_sto2_adc1_src[] = {
+        "DD Mux", "ADC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto2_adc1l_enum, RT5665_STO2_ADC_MIXER,
+        RT5665_STO2_ADC1L_SRC_SFT, rt5665_sto2_adc1_src);
+
+static const struct snd_kcontrol_new rt5665_sto2_adc1l_mux =
+        SOC_DAPM_ENUM("Stereo2 ADC1L Source", rt5665_sto2_adc1l_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto2_adc1r_enum, RT5665_STO2_ADC_MIXER,
+        RT5665_STO2_ADC1R_SRC_SFT, rt5665_sto2_adc1_src);
+
+static const struct snd_kcontrol_new rt5665_sto2_adc1r_mux =
+        SOC_DAPM_ENUM("Stereo2 ADC1L Source", rt5665_sto2_adc1r_enum);
+
+/* STO2 ADC Source */
+/* MX-28 [11:10] [3:2] */
+static const char * const rt5665_sto2_adc_src[] = {
+        "ADC1 L", "ADC1 R", "ADC2 L"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto2_adcl_enum, RT5665_STO2_ADC_MIXER,
+        RT5665_STO2_ADCL_SRC_SFT, rt5665_sto2_adc_src);
+
+static const struct snd_kcontrol_new rt5665_sto2_adcl_mux =
+        SOC_DAPM_ENUM("Stereo2 ADCL Source", rt5665_sto2_adcl_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto2_adcr_enum, RT5665_STO2_ADC_MIXER,
+        RT5665_STO2_ADCR_SRC_SFT, rt5665_sto2_adc_src);
+
+static const struct snd_kcontrol_new rt5665_sto2_adcr_mux =
+        SOC_DAPM_ENUM("Stereo2 ADCR Source", rt5665_sto2_adcr_enum);
+
+/* STO2 ADC2 Source */
+/* MX-28 [12] [4] */
+static const char * const rt5665_sto2_adc2_src[] = {
+        "DAC MIX", "DMIC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto2_adc2l_enum, RT5665_STO2_ADC_MIXER,
+        RT5665_STO2_ADC2L_SRC_SFT, rt5665_sto2_adc2_src);
+
+static const struct snd_kcontrol_new rt5665_sto2_adc2l_mux =
+        SOC_DAPM_ENUM("Stereo2 ADC2L Source", rt5665_sto2_adc2l_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto2_adc2r_enum, RT5665_STO2_ADC_MIXER,
+        RT5665_STO2_ADC2R_SRC_SFT, rt5665_sto2_adc2_src);
+
+static const struct snd_kcontrol_new rt5665_sto2_adc2r_mux =
+        SOC_DAPM_ENUM("Stereo2 ADC2R Source", rt5665_sto2_adc2r_enum);
+
+/* STO2 DMIC Source */
+/* MX-28 [8] */
+static const char * const rt5665_sto2_dmic_src[] = {
+        "DMIC1", "DMIC2"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto2_dmic_enum, RT5665_STO2_ADC_MIXER,
+        RT5665_STO2_DMIC_SRC_SFT, rt5665_sto2_dmic_src);
+
+static const struct snd_kcontrol_new rt5665_sto2_dmic_mux =
+        SOC_DAPM_ENUM("Stereo2 DMIC Source", rt5665_sto2_dmic_enum);
+
+/* MX-28 [9] */
+static const char * const rt5665_sto2_dd_l_src[] = {
+        "STO2 DAC", "MONO DAC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto2_dd_l_enum, RT5665_STO2_ADC_MIXER,
+        RT5665_STO2_DD_L_SRC_SFT, rt5665_sto2_dd_l_src);
+
+static const struct snd_kcontrol_new rt5665_sto2_dd_l_mux =
+        SOC_DAPM_ENUM("Stereo2 DD L Source", rt5665_sto2_dd_l_enum);
+
+/* MX-28 [1] */
+static const char * const rt5665_sto2_dd_r_src[] = {
+        "STO2 DAC", "MONO DAC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_sto2_dd_r_enum, RT5665_STO2_ADC_MIXER,
+        RT5665_STO2_DD_R_SRC_SFT, rt5665_sto2_dd_r_src);
+
+static const struct snd_kcontrol_new rt5665_sto2_dd_r_mux =
+        SOC_DAPM_ENUM("Stereo2 DD R Source", rt5665_sto2_dd_r_enum);
+
+/* DAC R1 Source, DAC L1 Source*/
+/* MX-29 [11:10], MX-29 [9:8]*/
+static const char * const rt5665_dac1_src[] = {
+        "IF1 DAC1", "IF2_1 DAC", "IF2_2 DAC", "IF3 DAC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_dac_r1_enum, RT5665_AD_DA_MIXER,
+        RT5665_DAC1_R_SEL_SFT, rt5665_dac1_src);
+
+static const struct snd_kcontrol_new rt5665_dac_r1_mux =
+        SOC_DAPM_ENUM("DAC R1 Source", rt5665_dac_r1_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_dac_l1_enum, RT5665_AD_DA_MIXER,
+        RT5665_DAC1_L_SEL_SFT, rt5665_dac1_src);
+
+static const struct snd_kcontrol_new rt5665_dac_l1_mux =
+        SOC_DAPM_ENUM("DAC L1 Source", rt5665_dac_l1_enum);
+
+/* DAC Digital Mixer L Source, DAC Digital Mixer R Source*/
+/* MX-2D [13:12], MX-2D [9:8]*/
+static const char * const rt5665_dig_dac_mix_src[] = {
+        "Stereo1 DAC Mixer", "Stereo2 DAC Mixer", "Mono DAC Mixer"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_dig_dac_mixl_enum, RT5665_A_DAC1_MUX,
+        RT5665_DAC_MIX_L_SFT, rt5665_dig_dac_mix_src);
+
+static const struct snd_kcontrol_new rt5665_dig_dac_mixl_mux =
+        SOC_DAPM_ENUM("DAC Digital Mixer L Source", rt5665_dig_dac_mixl_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_dig_dac_mixr_enum, RT5665_A_DAC1_MUX,
+        RT5665_DAC_MIX_R_SFT, rt5665_dig_dac_mix_src);
+
+static const struct snd_kcontrol_new rt5665_dig_dac_mixr_mux =
+        SOC_DAPM_ENUM("DAC Digital Mixer R Source", rt5665_dig_dac_mixr_enum);
+
+/* Analog DAC L1 Source, Analog DAC R1 Source*/
+/* MX-2D [5:4], MX-2D [1:0]*/
+static const char * const rt5665_alg_dac1_src[] = {
+        "Stereo1 DAC Mixer", "DAC1", "DMIC1"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_alg_dac_l1_enum, RT5665_A_DAC1_MUX,
+        RT5665_A_DACL1_SFT, rt5665_alg_dac1_src);
+
+static const struct snd_kcontrol_new rt5665_alg_dac_l1_mux =
+        SOC_DAPM_ENUM("Analog DAC L1 Source", rt5665_alg_dac_l1_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_alg_dac_r1_enum, RT5665_A_DAC1_MUX,
+        RT5665_A_DACR1_SFT, rt5665_alg_dac1_src);
+
+static const struct snd_kcontrol_new rt5665_alg_dac_r1_mux =
+        SOC_DAPM_ENUM("Analog DAC R1 Source", rt5665_alg_dac_r1_enum);
+
+/* Analog DAC LR Source, Analog DAC R2 Source*/
+/* MX-2E [5:4], MX-2E [0]*/
+static const char * const rt5665_alg_dac2_src[] = {
+        "Mono DAC Mixer", "DAC2"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_alg_dac_l2_enum, RT5665_A_DAC2_MUX,
+        RT5665_A_DACL2_SFT, rt5665_alg_dac2_src);
+
+static const struct snd_kcontrol_new rt5665_alg_dac_l2_mux =
+        SOC_DAPM_ENUM("Analog DAC L2 Source", rt5665_alg_dac_l2_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_alg_dac_r2_enum, RT5665_A_DAC2_MUX,
+        RT5665_A_DACR2_SFT, rt5665_alg_dac2_src);
+
+static const struct snd_kcontrol_new rt5665_alg_dac_r2_mux =
+        SOC_DAPM_ENUM("Analog DAC R2 Source", rt5665_alg_dac_r2_enum);
+
+/* Interface2 ADC Data Input*/
+/* MX-2F [14:12] */
+static const char * const rt5665_if2_1_adc_in_src[] = {
+        "STO1 ADC", "STO2 ADC", "MONO ADC", "IF1 DAC1",
+        "IF1 DAC2", "IF2_2 DAC", "IF3 DAC", "DAC1 MIX"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_if2_1_adc_in_enum, RT5665_DIG_INF2_DATA,
+        RT5665_IF3_ADC_IN_SFT, rt5665_if2_1_adc_in_src);
+
+static const struct snd_kcontrol_new rt5665_if2_1_adc_in_mux =
+        SOC_DAPM_ENUM("IF2_1 ADC IN Source", rt5665_if2_1_adc_in_enum);
+
+/* MX-2F [6:4] */
+static const char * const rt5665_if2_2_adc_in_src[] = {
+        "STO1 ADC", "STO2 ADC", "MONO ADC", "IF1 DAC1",
+        "IF1 DAC2", "IF2_1 DAC", "IF3 DAC", "DAC1 MIX"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_if2_2_adc_in_enum, RT5665_DIG_INF2_DATA,
+        RT5665_IF2_2_ADC_IN_SFT, rt5665_if2_2_adc_in_src);
+
+static const struct snd_kcontrol_new rt5665_if2_2_adc_in_mux =
+        SOC_DAPM_ENUM("IF2_1 ADC IN Source", rt5665_if2_2_adc_in_enum);
+
+/* Interface3 ADC Data Input*/
+/* MX-30 [6:4] */
+static const char * const rt5665_if3_adc_in_src[] = {
+        "STO1 ADC", "STO2 ADC", "MONO ADC", "IF1 DAC1",
+        "IF1 DAC2", "IF2_1 DAC", "IF2_2 DAC", "DAC1 MIX"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_if3_adc_in_enum, RT5665_DIG_INF3_DATA,
+        RT5665_IF3_ADC_IN_SFT, rt5665_if3_adc_in_src);
+
+static const struct snd_kcontrol_new rt5665_if3_adc_in_mux =
+        SOC_DAPM_ENUM("IF3 ADC IN Source", rt5665_if3_adc_in_enum);
+
+/* PDM 1 L/R*/
+/* MX-31 [11:10] [9:8] */
+static const char * const rt5665_pdm_src[] = {
+        "Stereo1 DAC", "Stereo2 DAC", "Mono DAC"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_pdm_l_enum, RT5665_PDM_OUT_CTRL,
+        RT5665_PDM1_L_SFT, rt5665_pdm_src);
+
+static const struct snd_kcontrol_new rt5665_pdm_l_mux =
+        SOC_DAPM_ENUM("PDM L Source", rt5665_pdm_l_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_pdm_r_enum, RT5665_PDM_OUT_CTRL,
+        RT5665_PDM1_R_SFT, rt5665_pdm_src);
+
+static const struct snd_kcontrol_new rt5665_pdm_r_mux =
+        SOC_DAPM_ENUM("PDM R Source", rt5665_pdm_r_enum);
+
+
+/* I2S1 TDM ADCDAT Source */
+/* MX-7a[10] */
+static const char * const rt5665_if1_1_adc1_data_src[] = {
+        "STO1 ADC", "IF2_1 DAC",
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_if1_1_adc1_data_enum, RT5665_TDM_CTRL_3,
+        RT5665_IF1_ADC1_SEL_SFT, rt5665_if1_1_adc1_data_src);
+
+static const struct snd_kcontrol_new rt5665_if1_1_adc1_mux =
+        SOC_DAPM_ENUM("IF1_1 ADC1 Source", rt5665_if1_1_adc1_data_enum);
+
+/* MX-7a[9] */
+static const char * const rt5665_if1_1_adc2_data_src[] = {
+        "STO2 ADC", "IF2_2 DAC",
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_if1_1_adc2_data_enum, RT5665_TDM_CTRL_3,
+        RT5665_IF1_ADC2_SEL_SFT, rt5665_if1_1_adc2_data_src);
+
+static const struct snd_kcontrol_new rt5665_if1_1_adc2_mux =
+        SOC_DAPM_ENUM("IF1_1 ADC2 Source", rt5665_if1_1_adc2_data_enum);
+
+/* MX-7a[8] */
+static const char * const rt5665_if1_1_adc3_data_src[] = {
+        "MONO ADC", "IF3 DAC",
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_if1_1_adc3_data_enum, RT5665_TDM_CTRL_3,
+        RT5665_IF1_ADC3_SEL_SFT, rt5665_if1_1_adc3_data_src);
+
+static const struct snd_kcontrol_new rt5665_if1_1_adc3_mux =
+        SOC_DAPM_ENUM("IF1_1 ADC3 Source", rt5665_if1_1_adc3_data_enum);
+
+/* MX-7b[10] */
+static const char * const rt5665_if1_2_adc1_data_src[] = {
+        "STO1 ADC", "IF1 DAC",
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_if1_2_adc1_data_enum, RT5665_TDM_CTRL_4,
+        RT5665_IF1_ADC1_SEL_SFT, rt5665_if1_2_adc1_data_src);
+
+static const struct snd_kcontrol_new rt5665_if1_2_adc1_mux =
+        SOC_DAPM_ENUM("IF1_2 ADC1 Source", rt5665_if1_2_adc1_data_enum);
+
+/* MX-7b[9] */
+static const char * const rt5665_if1_2_adc2_data_src[] = {
+        "STO2 ADC", "IF2_1 DAC",
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_if1_2_adc2_data_enum, RT5665_TDM_CTRL_4,
+        RT5665_IF1_ADC2_SEL_SFT, rt5665_if1_2_adc2_data_src);
+
+static const struct snd_kcontrol_new rt5665_if1_2_adc2_mux =
+        SOC_DAPM_ENUM("IF1_2 ADC2 Source", rt5665_if1_2_adc2_data_enum);
+
+/* MX-7b[8] */
+static const char * const rt5665_if1_2_adc3_data_src[] = {
+        "MONO ADC", "IF2_2 DAC",
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_if1_2_adc3_data_enum, RT5665_TDM_CTRL_4,
+        RT5665_IF1_ADC3_SEL_SFT, rt5665_if1_2_adc3_data_src);
+
+static const struct snd_kcontrol_new rt5665_if1_2_adc3_mux =
+        SOC_DAPM_ENUM("IF1_2 ADC3 Source", rt5665_if1_2_adc3_data_enum);
+
+/* MX-7b[7] */
+static const char * const rt5665_if1_2_adc4_data_src[] = {
+        "DAC1", "IF3 DAC",
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_if1_2_adc4_data_enum, RT5665_TDM_CTRL_4,
+        RT5665_IF1_ADC4_SEL_SFT, rt5665_if1_2_adc4_data_src);
+
+static const struct snd_kcontrol_new rt5665_if1_2_adc4_mux =
+        SOC_DAPM_ENUM("IF1_2 ADC4 Source", rt5665_if1_2_adc4_data_enum);
+
+/* MX-7a[4:0] MX-7b[4:0] */
+static const char * const rt5665_tdm_adc_data_src[] = {
+        "1234", "1243", "1324", "1342", "1432", "1423",
+        "2134", "2143", "2314", "2341", "2431", "2413",
+        "3124", "3142", "3214", "3241", "3412", "3421",
+        "4123", "4132", "4213", "4231", "4312", "4321"
+};
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_tdm1_adc_data_enum, RT5665_TDM_CTRL_3,
+        RT5665_TDM_ADC_SEL_SFT, rt5665_tdm_adc_data_src);
+
+static const struct snd_kcontrol_new rt5665_tdm1_adc_mux =
+        SOC_DAPM_ENUM("TDM1 ADC Mux", rt5665_tdm1_adc_data_enum);
+
+static const SOC_ENUM_SINGLE_DECL(
+        rt5665_tdm2_adc_data_enum, RT5665_TDM_CTRL_4,
+        RT5665_TDM_ADC_SEL_SFT, rt5665_tdm_adc_data_src);
+
+static const struct snd_kcontrol_new rt5665_tdm2_adc_mux =
+        SOC_DAPM_ENUM("TDM2 ADCDAT Source", rt5665_tdm2_adc_data_enum);
+
+/* Out Volume Switch */
+static const struct snd_kcontrol_new monovol_switch =
+        SOC_DAPM_SINGLE("Switch", RT5665_MONO_OUT, RT5665_VOL_L_SFT, 1, 1);
+
+static const struct snd_kcontrol_new outvol_l_switch =
+        SOC_DAPM_SINGLE("Switch", RT5665_LOUT, RT5665_VOL_L_SFT, 1, 1);
+
+static const struct snd_kcontrol_new outvol_r_switch =
+        SOC_DAPM_SINGLE("Switch", RT5665_LOUT, RT5665_VOL_R_SFT, 1, 1);
+
+/* Out Switch */
+static const struct snd_kcontrol_new mono_switch =
+        SOC_DAPM_SINGLE("Switch", RT5665_MONO_OUT, RT5665_L_MUTE_SFT, 1, 1);
+
+static const struct snd_kcontrol_new hpo_switch =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5665_HP_CTRL_2,
+                                        RT5665_VOL_L_SFT, 1, 0);
+
+static const struct snd_kcontrol_new lout_l_switch =
+        SOC_DAPM_SINGLE("Switch", RT5665_LOUT, RT5665_L_MUTE_SFT, 1, 1);
+
+static const struct snd_kcontrol_new lout_r_switch =
+        SOC_DAPM_SINGLE("Switch", RT5665_LOUT, RT5665_R_MUTE_SFT, 1, 1);
+
+static const struct snd_kcontrol_new pdm_l_switch =
+        SOC_DAPM_SINGLE("Switch", RT5665_PDM_OUT_CTRL,
+                        RT5665_M_PDM1_L_SFT, 1, 1);
+
+static const struct snd_kcontrol_new pdm_r_switch =
+        SOC_DAPM_SINGLE("Switch", RT5665_PDM_OUT_CTRL,
+                        RT5665_M_PDM1_R_SFT, 1, 1);
+
+static int rt5665_mono_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                snd_soc_update_bits(codec, RT5665_MONO_NG2_CTRL_1,
+                        RT5665_NG2_EN_MASK, RT5665_NG2_EN);
+                snd_soc_update_bits(codec, RT5665_MONO_AMP_CALIB_CTRL_1, 0x40,
+                        0x0);
+                snd_soc_update_bits(codec, RT5665_MONO_OUT, 0x10, 0x10);
+                snd_soc_update_bits(codec, RT5665_MONO_OUT, 0x20, 0x20);
+                break;
+
+        case SND_SOC_DAPM_POST_PMD:
+                snd_soc_update_bits(codec, RT5665_MONO_OUT, 0x20, 0);
+                snd_soc_update_bits(codec, RT5665_MONO_OUT, 0x10, 0);
+                snd_soc_update_bits(codec, RT5665_MONO_AMP_CALIB_CTRL_1, 0x40,
+                        0x40);
+                snd_soc_update_bits(codec, RT5665_MONO_NG2_CTRL_1,
+                        RT5665_NG2_EN_MASK, RT5665_NG2_DIS);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+
+}
+
+static int rt5665_hp_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                snd_soc_update_bits(codec, RT5665_STO_NG2_CTRL_1,
+                        RT5665_NG2_EN_MASK, RT5665_NG2_EN);
+                snd_soc_write(codec, RT5665_HP_LOGIC_CTRL_2, 0x0003);
+                break;
+
+        case SND_SOC_DAPM_POST_PMD:
+                snd_soc_write(codec, RT5665_HP_LOGIC_CTRL_2, 0x0002);
+                snd_soc_update_bits(codec, RT5665_STO_NG2_CTRL_1,
+                        RT5665_NG2_EN_MASK, RT5665_NG2_DIS);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+
+}
+
+static int rt5665_lout_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                snd_soc_update_bits(codec, RT5665_DEPOP_1,
+                        RT5665_PUMP_EN, RT5665_PUMP_EN);
+                break;
+
+        case SND_SOC_DAPM_PRE_PMD:
+                snd_soc_update_bits(codec, RT5665_DEPOP_1,
+                        RT5665_PUMP_EN, 0);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+
+}
+
+static int set_dmic_power(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                /*Add delay to avoid pop noise*/
+                msleep(150);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt5655_set_verf(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                switch (w->shift) {
+                case RT5665_PWR_VREF1_BIT:
+                        snd_soc_update_bits(codec, RT5665_PWR_ANLG_1,
+                                RT5665_PWR_FV1, 0);
+                        break;
+
+                case RT5665_PWR_VREF2_BIT:
+                        snd_soc_update_bits(codec, RT5665_PWR_ANLG_1,
+                                RT5665_PWR_FV2, 0);
+                        break;
+
+                case RT5665_PWR_VREF3_BIT:
+                        snd_soc_update_bits(codec, RT5665_PWR_ANLG_1,
+                                RT5665_PWR_FV3, 0);
+                        break;
+
+                default:
+                        break;
+                }
+                break;
+
+        case SND_SOC_DAPM_POST_PMU:
+                usleep_range(15000, 20000);
+                switch (w->shift) {
+                case RT5665_PWR_VREF1_BIT:
+                        snd_soc_update_bits(codec, RT5665_PWR_ANLG_1,
+                                RT5665_PWR_FV1, RT5665_PWR_FV1);
+                        break;
+
+                case RT5665_PWR_VREF2_BIT:
+                        snd_soc_update_bits(codec, RT5665_PWR_ANLG_1,
+                                RT5665_PWR_FV2, RT5665_PWR_FV2);
+                        break;
+
+                case RT5665_PWR_VREF3_BIT:
+                        snd_soc_update_bits(codec, RT5665_PWR_ANLG_1,
+                                RT5665_PWR_FV3, RT5665_PWR_FV3);
+                        break;
+
+                default:
+                        break;
+                }
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+
+static const struct snd_soc_dapm_widget rt5665_dapm_widgets[] = {
+        SND_SOC_DAPM_SUPPLY("LDO2", RT5665_PWR_ANLG_3, RT5665_PWR_LDO2_BIT, 0,
+                NULL, 0),
+        SND_SOC_DAPM_SUPPLY("PLL", RT5665_PWR_ANLG_3, RT5665_PWR_PLL_BIT, 0,
+                NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Mic Det Power", RT5665_PWR_VOL,
+                RT5665_PWR_MIC_DET_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Vref1", RT5665_PWR_ANLG_1, RT5665_PWR_VREF1_BIT, 0,
+                rt5655_set_verf, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_SUPPLY("Vref2", RT5665_PWR_ANLG_1, RT5665_PWR_VREF2_BIT, 0,
+                rt5655_set_verf, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_SUPPLY("Vref3", RT5665_PWR_ANLG_1, RT5665_PWR_VREF3_BIT, 0,
+                rt5655_set_verf, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),
+
+        /* ASRC */
+        SND_SOC_DAPM_SUPPLY_S("I2S1 ASRC", 1, RT5665_ASRC_1,
+                RT5665_I2S1_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("I2S2 ASRC", 1, RT5665_ASRC_1,
+                RT5665_I2S2_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("I2S3 ASRC", 1, RT5665_ASRC_1,
+                RT5665_I2S3_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("DAC STO1 ASRC", 1, RT5665_ASRC_1,
+                RT5665_DAC_STO1_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("DAC STO2 ASRC", 1, RT5665_ASRC_1,
+                RT5665_DAC_STO2_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("DAC Mono L ASRC", 1, RT5665_ASRC_1,
+                RT5665_DAC_MONO_L_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("DAC Mono R ASRC", 1, RT5665_ASRC_1,
+                RT5665_DAC_MONO_R_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("ADC STO1 ASRC", 1, RT5665_ASRC_1,
+                RT5665_ADC_STO1_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("ADC Mono L ASRC", 1, RT5665_ASRC_1,
+                RT5665_ADC_MONO_L_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("ADC Mono R ASRC", 1, RT5665_ASRC_1,
+                RT5665_ADC_MONO_R_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("DMIC STO1 ASRC", 1, RT5665_ASRC_1,
+                RT5665_DMIC_STO1_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("DMIC STO2 ASRC", 1, RT5665_ASRC_1,
+                RT5665_DMIC_STO2_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("DMIC MONO L ASRC", 1, RT5665_ASRC_1,
+                RT5665_DMIC_MONO_L_ASRC_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("DMIC MONO R ASRC", 1, RT5665_ASRC_1,
+                RT5665_DMIC_MONO_R_ASRC_SFT, 0, NULL, 0),
+
+        /* Input Side */
+        SND_SOC_DAPM_SUPPLY("MICBIAS1", RT5665_PWR_ANLG_2, RT5665_PWR_MB1_BIT,
+                0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("MICBIAS2", RT5665_PWR_ANLG_2, RT5665_PWR_MB2_BIT,
+                0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("MICBIAS3", RT5665_PWR_ANLG_2, RT5665_PWR_MB3_BIT,
+                0, NULL, 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("IN3P"),
+        SND_SOC_DAPM_INPUT("IN3N"),
+        SND_SOC_DAPM_INPUT("IN4P"),
+        SND_SOC_DAPM_INPUT("IN4N"),
+
+        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", RT5665_DMIC_CTRL_1,
+                RT5665_DMIC_1_EN_SFT, 0, set_dmic_power, SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_SUPPLY("DMIC2 Power", RT5665_DMIC_CTRL_1,
+                RT5665_DMIC_2_EN_SFT, 0, set_dmic_power, SND_SOC_DAPM_POST_PMU),
+
+        /* Boost */
+        SND_SOC_DAPM_PGA("BST1", SND_SOC_NOPM,
+                0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("BST2", SND_SOC_NOPM,
+                0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("BST3", SND_SOC_NOPM,
+                0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("BST4", SND_SOC_NOPM,
+                0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("BST1 CBJ", SND_SOC_NOPM,
+                0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("BST1 Power", RT5665_PWR_ANLG_2,
+                RT5665_PWR_BST1_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("BST2 Power", RT5665_PWR_ANLG_2,
+                RT5665_PWR_BST2_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("BST3 Power", RT5665_PWR_ANLG_2,
+                RT5665_PWR_BST3_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("BST4 Power", RT5665_PWR_ANLG_2,
+                RT5665_PWR_BST4_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("BST1P Power", RT5665_PWR_ANLG_2,
+                RT5665_PWR_BST1_P_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("BST2P Power", RT5665_PWR_ANLG_2,
+                RT5665_PWR_BST2_P_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("BST3P Power", RT5665_PWR_ANLG_2,
+                RT5665_PWR_BST3_P_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("BST4P Power", RT5665_PWR_ANLG_2,
+                RT5665_PWR_BST4_P_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("CBJ Power", RT5665_PWR_ANLG_3,
+                RT5665_PWR_CBJ_BIT, 0, NULL, 0),
+
+
+        /* Input Volume */
+        SND_SOC_DAPM_PGA("INL VOL", RT5665_PWR_VOL, RT5665_PWR_IN_L_BIT,
+                0, NULL, 0),
+        SND_SOC_DAPM_PGA("INR VOL", RT5665_PWR_VOL, RT5665_PWR_IN_R_BIT,
+                0, NULL, 0),
+
+        /* REC Mixer */
+        SND_SOC_DAPM_MIXER("RECMIX1L", SND_SOC_NOPM, 0, 0, rt5665_rec1_l_mix,
+                ARRAY_SIZE(rt5665_rec1_l_mix)),
+        SND_SOC_DAPM_MIXER("RECMIX1R", SND_SOC_NOPM, 0, 0, rt5665_rec1_r_mix,
+                ARRAY_SIZE(rt5665_rec1_r_mix)),
+        SND_SOC_DAPM_MIXER("RECMIX2L", SND_SOC_NOPM, 0, 0, rt5665_rec2_l_mix,
+                ARRAY_SIZE(rt5665_rec2_l_mix)),
+        SND_SOC_DAPM_MIXER("RECMIX2R", SND_SOC_NOPM, 0, 0, rt5665_rec2_r_mix,
+                ARRAY_SIZE(rt5665_rec2_r_mix)),
+        SND_SOC_DAPM_SUPPLY("RECMIX1L Power", RT5665_PWR_ANLG_2,
+                RT5665_PWR_RM1_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("RECMIX1R Power", RT5665_PWR_ANLG_2,
+                RT5665_PWR_RM1_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("RECMIX2L Power", RT5665_PWR_MIXER,
+                RT5665_PWR_RM2_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("RECMIX2R Power", RT5665_PWR_MIXER,
+                RT5665_PWR_RM2_R_BIT, 0, NULL, 0),
+
+        /* ADCs */
+        SND_SOC_DAPM_ADC("ADC1 L", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_ADC("ADC1 R", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_ADC("ADC2 L", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_ADC("ADC2 R", NULL, SND_SOC_NOPM, 0, 0),
+
+        SND_SOC_DAPM_SUPPLY("ADC1 L Power", RT5665_PWR_DIG_1,
+                RT5665_PWR_ADC_L1_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC1 R Power", RT5665_PWR_DIG_1,
+                RT5665_PWR_ADC_R1_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC2 L Power", RT5665_PWR_DIG_1,
+                RT5665_PWR_ADC_L2_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC2 R Power", RT5665_PWR_DIG_1,
+                RT5665_PWR_ADC_R2_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC1 clock", RT5665_CHOP_ADC,
+                RT5665_CKGEN_ADC1_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC2 clock", RT5665_CHOP_ADC,
+                RT5665_CKGEN_ADC2_SFT, 0, NULL, 0),
+
+        /* ADC Mux */
+        SND_SOC_DAPM_MUX("Stereo1 DMIC L Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto1_dmic_mux),
+        SND_SOC_DAPM_MUX("Stereo1 DMIC R Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto1_dmic_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC L1 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto1_adc1l_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC R1 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto1_adc1r_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC L2 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto1_adc2l_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC R2 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto1_adc2r_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC L Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto1_adcl_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC R Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto1_adcr_mux),
+        SND_SOC_DAPM_MUX("Stereo1 DD L Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto1_dd_l_mux),
+        SND_SOC_DAPM_MUX("Stereo1 DD R Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto1_dd_r_mux),
+        SND_SOC_DAPM_MUX("Mono ADC L2 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_mono_adc_l2_mux),
+        SND_SOC_DAPM_MUX("Mono ADC R2 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_mono_adc_r2_mux),
+        SND_SOC_DAPM_MUX("Mono ADC L1 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_mono_adc_l1_mux),
+        SND_SOC_DAPM_MUX("Mono ADC R1 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_mono_adc_r1_mux),
+        SND_SOC_DAPM_MUX("Mono DMIC L Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_mono_dmic_l_mux),
+        SND_SOC_DAPM_MUX("Mono DMIC R Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_mono_dmic_r_mux),
+        SND_SOC_DAPM_MUX("Mono ADC L Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_mono_adc_l_mux),
+        SND_SOC_DAPM_MUX("Mono ADC R Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_mono_adc_r_mux),
+        SND_SOC_DAPM_MUX("Mono DD L Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_mono_dd_l_mux),
+        SND_SOC_DAPM_MUX("Mono DD R Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_mono_dd_r_mux),
+        SND_SOC_DAPM_MUX("Stereo2 DMIC L Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto2_dmic_mux),
+        SND_SOC_DAPM_MUX("Stereo2 DMIC R Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto2_dmic_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC L1 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto2_adc1l_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC R1 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto2_adc1r_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC L2 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto2_adc2l_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC R2 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto2_adc2r_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC L Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto2_adcl_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC R Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto2_adcr_mux),
+        SND_SOC_DAPM_MUX("Stereo2 DD L Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto2_dd_l_mux),
+        SND_SOC_DAPM_MUX("Stereo2 DD R Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_sto2_dd_r_mux),
+        /* ADC Mixer */
+        SND_SOC_DAPM_SUPPLY("ADC Stereo1 Filter", RT5665_PWR_DIG_2,
+                RT5665_PWR_ADC_S1F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC Stereo2 Filter", RT5665_PWR_DIG_2,
+                RT5665_PWR_ADC_S2F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("Stereo1 ADC MIXL", RT5665_STO1_ADC_DIG_VOL,
+                RT5665_L_MUTE_SFT, 1, rt5665_sto1_adc_l_mix,
+                ARRAY_SIZE(rt5665_sto1_adc_l_mix)),
+        SND_SOC_DAPM_MIXER("Stereo1 ADC MIXR", RT5665_STO1_ADC_DIG_VOL,
+                RT5665_R_MUTE_SFT, 1, rt5665_sto1_adc_r_mix,
+                ARRAY_SIZE(rt5665_sto1_adc_r_mix)),
+        SND_SOC_DAPM_MIXER("Stereo2 ADC MIXL", RT5665_STO2_ADC_DIG_VOL,
+                RT5665_L_MUTE_SFT, 1, rt5665_sto2_adc_l_mix,
+                ARRAY_SIZE(rt5665_sto2_adc_l_mix)),
+        SND_SOC_DAPM_MIXER("Stereo2 ADC MIXR", RT5665_STO2_ADC_DIG_VOL,
+                RT5665_R_MUTE_SFT, 1, rt5665_sto2_adc_r_mix,
+                ARRAY_SIZE(rt5665_sto2_adc_r_mix)),
+        SND_SOC_DAPM_SUPPLY("ADC Mono Left Filter", RT5665_PWR_DIG_2,
+                RT5665_PWR_ADC_MF_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("Mono ADC MIXL", RT5665_MONO_ADC_DIG_VOL,
+                RT5665_L_MUTE_SFT, 1, rt5665_mono_adc_l_mix,
+                ARRAY_SIZE(rt5665_mono_adc_l_mix)),
+        SND_SOC_DAPM_SUPPLY("ADC Mono Right Filter", RT5665_PWR_DIG_2,
+                RT5665_PWR_ADC_MF_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("Mono ADC MIXR", RT5665_MONO_ADC_DIG_VOL,
+                RT5665_R_MUTE_SFT, 1, rt5665_mono_adc_r_mix,
+                ARRAY_SIZE(rt5665_mono_adc_r_mix)),
+
+        /* ADC PGA */
+        SND_SOC_DAPM_PGA("Stereo1 ADC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo2 ADC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Mono ADC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        /* Digital Interface */
+        SND_SOC_DAPM_SUPPLY("I2S1_1", RT5665_PWR_DIG_1, RT5665_PWR_I2S1_1_BIT,
+                0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("I2S1_2", RT5665_PWR_DIG_1, RT5665_PWR_I2S1_2_BIT,
+                0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("I2S2_1", RT5665_PWR_DIG_1, RT5665_PWR_I2S2_1_BIT,
+                0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("I2S2_2", RT5665_PWR_DIG_1, RT5665_PWR_I2S2_2_BIT,
+                0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("I2S3", RT5665_PWR_DIG_1, RT5665_PWR_I2S3_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 DAC3", 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 DAC3 L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC3 R", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        SND_SOC_DAPM_PGA("IF2_1 DAC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2_2 DAC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2_1 DAC L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2_1 DAC R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2_2 DAC L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2_2 DAC R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2_1 ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2_2 ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        SND_SOC_DAPM_PGA("IF3 DAC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF3 DAC L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF3 DAC R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF3 ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        /* Digital Interface Select */
+        SND_SOC_DAPM_MUX("IF1_1_ADC1 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_if1_1_adc1_mux),
+        SND_SOC_DAPM_MUX("IF1_1_ADC2 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_if1_1_adc2_mux),
+        SND_SOC_DAPM_MUX("IF1_1_ADC3 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_if1_1_adc3_mux),
+        SND_SOC_DAPM_PGA("IF1_1_ADC4", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_MUX("IF1_2_ADC1 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_if1_2_adc1_mux),
+        SND_SOC_DAPM_MUX("IF1_2_ADC2 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_if1_2_adc2_mux),
+        SND_SOC_DAPM_MUX("IF1_2_ADC3 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_if1_2_adc3_mux),
+        SND_SOC_DAPM_MUX("IF1_2_ADC4 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_if1_2_adc4_mux),
+        SND_SOC_DAPM_MUX("TDM1 slot 01 Data Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_tdm1_adc_mux),
+        SND_SOC_DAPM_MUX("TDM1 slot 23 Data Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_tdm1_adc_mux),
+        SND_SOC_DAPM_MUX("TDM1 slot 45 Data Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_tdm1_adc_mux),
+        SND_SOC_DAPM_MUX("TDM1 slot 67 Data Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_tdm1_adc_mux),
+        SND_SOC_DAPM_MUX("TDM2 slot 01 Data Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_tdm2_adc_mux),
+        SND_SOC_DAPM_MUX("TDM2 slot 23 Data Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_tdm2_adc_mux),
+        SND_SOC_DAPM_MUX("TDM2 slot 45 Data Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_tdm2_adc_mux),
+        SND_SOC_DAPM_MUX("TDM2 slot 67 Data Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_tdm2_adc_mux),
+        SND_SOC_DAPM_MUX("IF2_1 ADC Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_if2_1_adc_in_mux),
+        SND_SOC_DAPM_MUX("IF2_2 ADC Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_if2_2_adc_in_mux),
+        SND_SOC_DAPM_MUX("IF3 ADC Mux", SND_SOC_NOPM, 0, 0,
+                &rt5665_if3_adc_in_mux),
+        SND_SOC_DAPM_MUX("IF1_1 0 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_1_01_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_1 1 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_1_01_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_1 2 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_1_23_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_1 3 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_1_23_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_1 4 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_1_45_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_1 5 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_1_45_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_1 6 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_1_67_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_1 7 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_1_67_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_2 0 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_2_01_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_2 1 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_2_01_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_2 2 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_2_23_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_2 3 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_2_23_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_2 4 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_2_45_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_2 5 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_2_45_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_2 6 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_2_67_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF1_2 7 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if1_2_67_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF2_1 DAC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if2_1_dac_swap_mux),
+        SND_SOC_DAPM_MUX("IF2_1 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if2_1_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF2_2 DAC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if2_2_dac_swap_mux),
+        SND_SOC_DAPM_MUX("IF2_2 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if2_2_adc_swap_mux),
+        SND_SOC_DAPM_MUX("IF3 DAC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if3_dac_swap_mux),
+        SND_SOC_DAPM_MUX("IF3 ADC Swap Mux", SND_SOC_NOPM, 0, 0,
+                        &rt5665_if3_adc_swap_mux),
+
+        /* Audio Interface */
+        SND_SOC_DAPM_AIF_OUT("AIF1_1TX slot 0", "AIF1_1 Capture",
+                                0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_1TX slot 1", "AIF1_1 Capture",
+                                1, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_1TX slot 2", "AIF1_1 Capture",
+                                2, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_1TX slot 3", "AIF1_1 Capture",
+                                3, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_1TX slot 4", "AIF1_1 Capture",
+                                4, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_1TX slot 5", "AIF1_1 Capture",
+                                5, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_1TX slot 6", "AIF1_1 Capture",
+                                6, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_1TX slot 7", "AIF1_1 Capture",
+                                7, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_2TX slot 0", "AIF1_2 Capture",
+                                0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_2TX slot 1", "AIF1_2 Capture",
+                                1, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_2TX slot 2", "AIF1_2 Capture",
+                                2, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_2TX slot 3", "AIF1_2 Capture",
+                                3, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_2TX slot 4", "AIF1_2 Capture",
+                                4, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_2TX slot 5", "AIF1_2 Capture",
+                                5, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_2TX slot 6", "AIF1_2 Capture",
+                                6, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1_2TX slot 7", "AIF1_2 Capture",
+                                7, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF2_1TX", "AIF2_1 Capture",
+                                0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF2_2TX", "AIF2_2 Capture",
+                                0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF3TX", "AIF3 Capture",
+                                0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("AIF1RX", "AIF1 Playback",
+                                0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("AIF2_1RX", "AIF2_1 Playback",
+                                0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("AIF2_2RX", "AIF2_2 Playback",
+                                0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("AIF3RX", "AIF3 Playback",
+                                0, SND_SOC_NOPM, 0, 0),
+
+        /* Output Side */
+        /* DAC mixer before sound effect  */
+        SND_SOC_DAPM_MIXER("DAC1 MIXL", SND_SOC_NOPM, 0, 0,
+                rt5665_dac_l_mix, ARRAY_SIZE(rt5665_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("DAC1 MIXR", SND_SOC_NOPM, 0, 0,
+                rt5665_dac_r_mix, ARRAY_SIZE(rt5665_dac_r_mix)),
+
+        /* DAC channel Mux */
+        SND_SOC_DAPM_MUX("DAC L1 Mux", SND_SOC_NOPM, 0, 0, &rt5665_dac_l1_mux),
+        SND_SOC_DAPM_MUX("DAC R1 Mux", SND_SOC_NOPM, 0, 0, &rt5665_dac_r1_mux),
+        SND_SOC_DAPM_MUX("DAC L2 Mux", SND_SOC_NOPM, 0, 0, &rt5665_dac_l2_mux),
+        SND_SOC_DAPM_MUX("DAC R2 Mux", SND_SOC_NOPM, 0, 0, &rt5665_dac_r2_mux),
+        SND_SOC_DAPM_MUX("DAC L3 Mux", SND_SOC_NOPM, 0, 0, &rt5665_dac_l3_mux),
+        SND_SOC_DAPM_MUX("DAC R3 Mux", SND_SOC_NOPM, 0, 0, &rt5665_dac_r3_mux),
+
+        SND_SOC_DAPM_MUX("DAC L1 Source", SND_SOC_NOPM, 0, 0,
+                &rt5665_alg_dac_l1_mux),
+        SND_SOC_DAPM_MUX("DAC R1 Source", SND_SOC_NOPM, 0, 0,
+                &rt5665_alg_dac_r1_mux),
+        SND_SOC_DAPM_MUX("DAC L2 Source", SND_SOC_NOPM, 0, 0,
+                &rt5665_alg_dac_l2_mux),
+        SND_SOC_DAPM_MUX("DAC R2 Source", SND_SOC_NOPM, 0, 0,
+                &rt5665_alg_dac_r2_mux),
+
+        /* DAC Mixer */
+        SND_SOC_DAPM_SUPPLY("DAC Stereo1 Filter", RT5665_PWR_DIG_2,
+                RT5665_PWR_DAC_S1F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DAC Stereo2 Filter", RT5665_PWR_DIG_2,
+                RT5665_PWR_DAC_S2F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DAC Mono Left Filter", RT5665_PWR_DIG_2,
+                RT5665_PWR_DAC_MF_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DAC Mono Right Filter", RT5665_PWR_DIG_2,
+                RT5665_PWR_DAC_MF_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("Stereo1 DAC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5665_sto1_dac_l_mix, ARRAY_SIZE(rt5665_sto1_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("Stereo1 DAC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5665_sto1_dac_r_mix, ARRAY_SIZE(rt5665_sto1_dac_r_mix)),
+        SND_SOC_DAPM_MIXER("Stereo2 DAC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5665_sto2_dac_l_mix, ARRAY_SIZE(rt5665_sto2_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("Stereo2 DAC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5665_sto2_dac_r_mix, ARRAY_SIZE(rt5665_sto2_dac_r_mix)),
+        SND_SOC_DAPM_MIXER("Mono DAC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5665_mono_dac_l_mix, ARRAY_SIZE(rt5665_mono_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("Mono DAC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5665_mono_dac_r_mix, ARRAY_SIZE(rt5665_mono_dac_r_mix)),
+        SND_SOC_DAPM_MUX("DAC MIXL", SND_SOC_NOPM, 0, 0,
+                &rt5665_dig_dac_mixl_mux),
+        SND_SOC_DAPM_MUX("DAC MIXR", SND_SOC_NOPM, 0, 0,
+                &rt5665_dig_dac_mixr_mux),
+
+        /* 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 L2 Power", RT5665_PWR_DIG_1,
+                RT5665_PWR_DAC_L2_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DAC R2 Power", RT5665_PWR_DIG_1,
+                RT5665_PWR_DAC_R2_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_DAC("DAC L2", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC("DAC R2", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_PGA("DAC1 MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        SND_SOC_DAPM_SUPPLY_S("DAC 1 Clock", 1, RT5665_CHOP_DAC,
+                RT5665_CKGEN_DAC1_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("DAC 2 Clock", 1, RT5665_CHOP_DAC,
+                RT5665_CKGEN_DAC2_SFT, 0, NULL, 0),
+
+        /* OUT Mixer */
+        SND_SOC_DAPM_MIXER("MONOVOL MIX", RT5665_PWR_MIXER, RT5665_PWR_MM_BIT,
+                0, rt5665_monovol_mix, ARRAY_SIZE(rt5665_monovol_mix)),
+        SND_SOC_DAPM_MIXER("OUT MIXL", RT5665_PWR_MIXER, RT5665_PWR_OM_L_BIT,
+                0, rt5665_out_l_mix, ARRAY_SIZE(rt5665_out_l_mix)),
+        SND_SOC_DAPM_MIXER("OUT MIXR", RT5665_PWR_MIXER, RT5665_PWR_OM_R_BIT,
+                0, rt5665_out_r_mix, ARRAY_SIZE(rt5665_out_r_mix)),
+
+        /* Output Volume */
+        SND_SOC_DAPM_SWITCH("MONOVOL", RT5665_PWR_VOL, RT5665_PWR_MV_BIT, 0,
+                &monovol_switch),
+        SND_SOC_DAPM_SWITCH("OUTVOL L", RT5665_PWR_VOL, RT5665_PWR_OV_L_BIT, 0,
+                &outvol_l_switch),
+        SND_SOC_DAPM_SWITCH("OUTVOL R", RT5665_PWR_VOL, RT5665_PWR_OV_R_BIT, 0,
+                &outvol_r_switch),
+
+        /* MONO/HPO/LOUT */
+        SND_SOC_DAPM_MIXER("Mono MIX", SND_SOC_NOPM, 0, 0, rt5665_mono_mix,
+                ARRAY_SIZE(rt5665_mono_mix)),
+        SND_SOC_DAPM_MIXER("LOUT L MIX", SND_SOC_NOPM, 0, 0, rt5665_lout_l_mix,
+                ARRAY_SIZE(rt5665_lout_l_mix)),
+        SND_SOC_DAPM_MIXER("LOUT R MIX", SND_SOC_NOPM, 0, 0, rt5665_lout_r_mix,
+                ARRAY_SIZE(rt5665_lout_r_mix)),
+        SND_SOC_DAPM_PGA_S("Mono Amp", 1, RT5665_PWR_ANLG_1, RT5665_PWR_MA_BIT,
+                0, rt5665_mono_event, SND_SOC_DAPM_POST_PMD |
+                SND_SOC_DAPM_PRE_PMU),
+        SND_SOC_DAPM_PGA_S("HP Amp", 1, SND_SOC_NOPM, 0, 0, rt5665_hp_event,
+                SND_SOC_DAPM_POST_PMD | SND_SOC_DAPM_PRE_PMU),
+        SND_SOC_DAPM_PGA_S("LOUT Amp", 1, RT5665_PWR_ANLG_1,
+                RT5665_PWR_LM_BIT, 0, rt5665_lout_event,
+                SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD |
+                SND_SOC_DAPM_POST_PMD | SND_SOC_DAPM_PRE_PMU),
+
+        SND_SOC_DAPM_SUPPLY("Charge Pump", SND_SOC_NOPM, 0, 0,
+                rt5665_charge_pump_event, SND_SOC_DAPM_PRE_PMU |
+                SND_SOC_DAPM_POST_PMD),
+
+        SND_SOC_DAPM_SWITCH("Mono Playback", SND_SOC_NOPM, 0, 0,
+                &mono_switch),
+        SND_SOC_DAPM_SWITCH("HPO Playback", SND_SOC_NOPM, 0, 0,
+                &hpo_switch),
+        SND_SOC_DAPM_SWITCH("LOUT L Playback", SND_SOC_NOPM, 0, 0,
+                &lout_l_switch),
+        SND_SOC_DAPM_SWITCH("LOUT R Playback", SND_SOC_NOPM, 0, 0,
+                &lout_r_switch),
+        SND_SOC_DAPM_SWITCH("PDM L Playback", SND_SOC_NOPM, 0, 0,
+                &pdm_l_switch),
+        SND_SOC_DAPM_SWITCH("PDM R Playback", SND_SOC_NOPM, 0, 0,
+                &pdm_r_switch),
+
+        /* PDM */
+        SND_SOC_DAPM_SUPPLY("PDM Power", RT5665_PWR_DIG_2,
+                RT5665_PWR_PDM1_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MUX("PDM L Mux", SND_SOC_NOPM,
+                0, 1, &rt5665_pdm_l_mux),
+        SND_SOC_DAPM_MUX("PDM R Mux", SND_SOC_NOPM,
+                0, 1, &rt5665_pdm_r_mux),
+
+        /* CLK DET */
+        SND_SOC_DAPM_SUPPLY("CLKDET SYS", RT5665_CLK_DET, RT5665_SYS_CLK_DET,
+                0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("CLKDET HP", RT5665_CLK_DET, RT5665_HP_CLK_DET,
+                0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("CLKDET MONO", RT5665_CLK_DET, RT5665_MONO_CLK_DET,
+                0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("CLKDET LOUT", RT5665_CLK_DET, RT5665_LOUT_CLK_DET,
+                0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("CLKDET", RT5665_CLK_DET, RT5665_POW_CLK_DET,
+                0, NULL, 0),
+
+        /* 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("MONOOUT"),
+        SND_SOC_DAPM_OUTPUT("PDML"),
+        SND_SOC_DAPM_OUTPUT("PDMR"),
+};
+
+static const struct snd_soc_dapm_route rt5665_dapm_routes[] = {
+        /*PLL*/
+        {"ADC Stereo1 Filter", NULL, "PLL", is_sys_clk_from_pll},
+        {"ADC Stereo2 Filter", NULL, "PLL", is_sys_clk_from_pll},
+        {"ADC Mono Left Filter", NULL, "PLL", is_sys_clk_from_pll},
+        {"ADC Mono Right Filter", NULL, "PLL", is_sys_clk_from_pll},
+        {"DAC Stereo1 Filter", NULL, "PLL", is_sys_clk_from_pll},
+        {"DAC Stereo2 Filter", NULL, "PLL", is_sys_clk_from_pll},
+        {"DAC Mono Left Filter", NULL, "PLL", is_sys_clk_from_pll},
+        {"DAC Mono Right Filter", NULL, "PLL", is_sys_clk_from_pll},
+
+        /*ASRC*/
+        {"ADC Stereo1 Filter", NULL, "ADC STO1 ASRC", is_using_asrc},
+        {"ADC Mono Left Filter", NULL, "ADC Mono L ASRC", is_using_asrc},
+        {"ADC Mono Right Filter", NULL, "ADC Mono R ASRC", is_using_asrc},
+        {"DAC Mono Left Filter", NULL, "DAC Mono L ASRC", is_using_asrc},
+        {"DAC Mono Right Filter", NULL, "DAC Mono R ASRC", is_using_asrc},
+        {"DAC Stereo1 Filter", NULL, "DAC STO1 ASRC", is_using_asrc},
+        {"DAC Stereo2 Filter", NULL, "DAC STO2 ASRC", is_using_asrc},
+
+        /*Vref*/
+        {"Mic Det Power", NULL, "Vref2"},
+        {"MICBIAS1", NULL, "Vref1"},
+        {"MICBIAS1", NULL, "Vref2"},
+        {"MICBIAS2", NULL, "Vref1"},
+        {"MICBIAS2", NULL, "Vref2"},
+        {"MICBIAS3", NULL, "Vref1"},
+        {"MICBIAS3", NULL, "Vref2"},
+
+        {"Stereo1 DMIC L Mux", NULL, "DMIC STO1 ASRC"},
+        {"Stereo1 DMIC R Mux", NULL, "DMIC STO1 ASRC"},
+        {"Stereo2 DMIC L Mux", NULL, "DMIC STO2 ASRC"},
+        {"Stereo2 DMIC R Mux", NULL, "DMIC STO2 ASRC"},
+        {"Mono DMIC L Mux", NULL, "DMIC MONO L ASRC"},
+        {"Mono DMIC R Mux", NULL, "DMIC MONO R ASRC"},
+
+        {"I2S1_1", NULL, "I2S1 ASRC"},
+        {"I2S1_2", NULL, "I2S1 ASRC"},
+        {"I2S2_1", NULL, "I2S2 ASRC"},
+        {"I2S2_2", NULL, "I2S2 ASRC"},
+        {"I2S3", NULL, "I2S3 ASRC"},
+
+        {"CLKDET SYS", NULL, "CLKDET"},
+        {"CLKDET HP", NULL, "CLKDET"},
+        {"CLKDET MONO", NULL, "CLKDET"},
+        {"CLKDET LOUT", NULL, "CLKDET"},
+
+        {"IN1P", NULL, "LDO2"},
+        {"IN2P", NULL, "LDO2"},
+        {"IN3P", NULL, "LDO2"},
+        {"IN4P", 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, "BST1 Power"},
+        {"BST1", NULL, "BST1P Power"},
+        {"BST2", NULL, "IN2P"},
+        {"BST2", NULL, "IN2N"},
+        {"BST2", NULL, "BST2 Power"},
+        {"BST2", NULL, "BST2P Power"},
+        {"BST3", NULL, "IN3P"},
+        {"BST3", NULL, "IN3N"},
+        {"BST3", NULL, "BST3 Power"},
+        {"BST3", NULL, "BST3P Power"},
+        {"BST4", NULL, "IN4P"},
+        {"BST4", NULL, "IN4N"},
+        {"BST4", NULL, "BST4 Power"},
+        {"BST4", NULL, "BST4P Power"},
+        {"BST1 CBJ", NULL, "IN1P"},
+        {"BST1 CBJ", NULL, "IN1N"},
+        {"BST1 CBJ", NULL, "CBJ Power"},
+        {"CBJ Power", NULL, "Vref2"},
+
+        {"INL VOL", NULL, "IN3P"},
+        {"INR VOL", NULL, "IN3N"},
+
+        {"RECMIX1L", "CBJ Switch", "BST1 CBJ"},
+        {"RECMIX1L", "INL Switch", "INL VOL"},
+        {"RECMIX1L", "INR Switch", "INR VOL"},
+        {"RECMIX1L", "BST4 Switch", "BST4"},
+        {"RECMIX1L", "BST3 Switch", "BST3"},
+        {"RECMIX1L", "BST2 Switch", "BST2"},
+        {"RECMIX1L", "BST1 Switch", "BST1"},
+        {"RECMIX1L", NULL, "RECMIX1L Power"},
+
+        {"RECMIX1R", "MONOVOL Switch", "MONOVOL"},
+        {"RECMIX1R", "INR Switch", "INR VOL"},
+        {"RECMIX1R", "BST4 Switch", "BST4"},
+        {"RECMIX1R", "BST3 Switch", "BST3"},
+        {"RECMIX1R", "BST2 Switch", "BST2"},
+        {"RECMIX1R", "BST1 Switch", "BST1"},
+        {"RECMIX1R", NULL, "RECMIX1R Power"},
+
+        {"RECMIX2L", "CBJ Switch", "BST1 CBJ"},
+        {"RECMIX2L", "INL Switch", "INL VOL"},
+        {"RECMIX2L", "INR Switch", "INR VOL"},
+        {"RECMIX2L", "BST4 Switch", "BST4"},
+        {"RECMIX2L", "BST3 Switch", "BST3"},
+        {"RECMIX2L", "BST2 Switch", "BST2"},
+        {"RECMIX2L", "BST1 Switch", "BST1"},
+        {"RECMIX2L", NULL, "RECMIX2L Power"},
+
+        {"RECMIX2R", "MONOVOL Switch", "MONOVOL"},
+        {"RECMIX2R", "INL Switch", "INL VOL"},
+        {"RECMIX2R", "INR Switch", "INR VOL"},
+        {"RECMIX2R", "BST4 Switch", "BST4"},
+        {"RECMIX2R", "BST3 Switch", "BST3"},
+        {"RECMIX2R", "BST2 Switch", "BST2"},
+        {"RECMIX2R", "BST1 Switch", "BST1"},
+        {"RECMIX2R", NULL, "RECMIX2R Power"},
+
+        {"ADC1 L", NULL, "RECMIX1L"},
+        {"ADC1 L", NULL, "ADC1 L Power"},
+        {"ADC1 L", NULL, "ADC1 clock"},
+        {"ADC1 R", NULL, "RECMIX1R"},
+        {"ADC1 R", NULL, "ADC1 R Power"},
+        {"ADC1 R", NULL, "ADC1 clock"},
+
+        {"ADC2 L", NULL, "RECMIX2L"},
+        {"ADC2 L", NULL, "ADC2 L Power"},
+        {"ADC2 L", NULL, "ADC2 clock"},
+        {"ADC2 R", NULL, "RECMIX2R"},
+        {"ADC2 R", NULL, "ADC2 R Power"},
+        {"ADC2 R", NULL, "ADC2 clock"},
+
+        {"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 L Mux", "DMIC1", "DMIC L1"},
+        {"Stereo1 DMIC L Mux", "DMIC2", "DMIC L2"},
+
+        {"Stereo1 DMIC R Mux", "DMIC1", "DMIC R1"},
+        {"Stereo1 DMIC R Mux", "DMIC2", "DMIC R2"},
+
+        {"Mono DMIC L Mux", "DMIC1 L", "DMIC L1"},
+        {"Mono DMIC L Mux", "DMIC2 L", "DMIC L2"},
+
+        {"Mono DMIC R Mux", "DMIC1 R", "DMIC R1"},
+        {"Mono DMIC R Mux", "DMIC2 R", "DMIC R2"},
+
+        {"Stereo2 DMIC L Mux", "DMIC1", "DMIC L1"},
+        {"Stereo2 DMIC L Mux", "DMIC2", "DMIC L2"},
+
+        {"Stereo2 DMIC R Mux", "DMIC1", "DMIC R1"},
+        {"Stereo2 DMIC R Mux", "DMIC2", "DMIC R2"},
+
+        {"Stereo1 ADC L Mux", "ADC1 L", "ADC1 L"},
+        {"Stereo1 ADC L Mux", "ADC1 R", "ADC1 R"},
+        {"Stereo1 ADC L Mux", "ADC2 L", "ADC2 L"},
+        {"Stereo1 ADC L Mux", "ADC2 R", "ADC2 R"},
+        {"Stereo1 ADC R Mux", "ADC1 L", "ADC1 L"},
+        {"Stereo1 ADC R Mux", "ADC1 R", "ADC1 R"},
+        {"Stereo1 ADC R Mux", "ADC2 L", "ADC2 L"},
+        {"Stereo1 ADC R Mux", "ADC2 R", "ADC2 R"},
+
+        {"Stereo1 DD L Mux", "STO2 DAC", "Stereo2 DAC MIXL"},
+        {"Stereo1 DD L Mux", "MONO DAC", "Mono DAC MIXL"},
+
+        {"Stereo1 DD R Mux", "STO2 DAC", "Stereo2 DAC MIXR"},
+        {"Stereo1 DD R Mux", "MONO DAC", "Mono DAC MIXR"},
+
+        {"Stereo1 ADC L1 Mux", "ADC", "Stereo1 ADC L Mux"},
+        {"Stereo1 ADC L1 Mux", "DD Mux", "Stereo1 DD L Mux"},
+        {"Stereo1 ADC L2 Mux", "DMIC", "Stereo1 DMIC L Mux"},
+        {"Stereo1 ADC L2 Mux", "DAC MIX", "DAC MIXL"},
+
+        {"Stereo1 ADC R1 Mux", "ADC", "Stereo1 ADC R Mux"},
+        {"Stereo1 ADC R1 Mux", "DD Mux", "Stereo1 DD R Mux"},
+        {"Stereo1 ADC R2 Mux", "DMIC", "Stereo1 DMIC R Mux"},
+        {"Stereo1 ADC R2 Mux", "DAC MIX", "DAC MIXR"},
+
+        {"Mono ADC L Mux", "ADC1 L", "ADC1 L"},
+        {"Mono ADC L Mux", "ADC1 R", "ADC1 R"},
+        {"Mono ADC L Mux", "ADC2 L", "ADC2 L"},
+        {"Mono ADC L Mux", "ADC2 R", "ADC2 R"},
+
+        {"Mono ADC R Mux", "ADC1 L", "ADC1 L"},
+        {"Mono ADC R Mux", "ADC1 R", "ADC1 R"},
+        {"Mono ADC R Mux", "ADC2 L", "ADC2 L"},
+        {"Mono ADC R Mux", "ADC2 R", "ADC2 R"},
+
+        {"Mono DD L Mux", "STO2 DAC", "Stereo2 DAC MIXL"},
+        {"Mono DD L Mux", "MONO DAC", "Mono DAC MIXL"},
+
+        {"Mono DD R Mux", "STO2 DAC", "Stereo2 DAC MIXR"},
+        {"Mono DD R Mux", "MONO DAC", "Mono DAC MIXR"},
+
+        {"Mono ADC L2 Mux", "DMIC", "Mono DMIC L Mux"},
+        {"Mono ADC L2 Mux", "DAC MIXL", "DAC MIXL"},
+        {"Mono ADC L1 Mux", "DD Mux", "Mono DD L Mux"},
+        {"Mono ADC L1 Mux", "ADC",  "Mono ADC L Mux"},
+
+        {"Mono ADC R1 Mux", "DD Mux", "Mono DD R Mux"},
+        {"Mono ADC R1 Mux", "ADC", "Mono ADC R Mux"},
+        {"Mono ADC R2 Mux", "DMIC", "Mono DMIC R Mux"},
+        {"Mono ADC R2 Mux", "DAC MIXR", "DAC MIXR"},
+
+        {"Stereo2 ADC L Mux", "ADC1 L", "ADC1 L"},
+        {"Stereo2 ADC L Mux", "ADC2 L", "ADC2 L"},
+        {"Stereo2 ADC L Mux", "ADC1 R", "ADC1 R"},
+        {"Stereo2 ADC R Mux", "ADC1 L", "ADC1 L"},
+        {"Stereo2 ADC R Mux", "ADC2 L", "ADC2 L"},
+        {"Stereo2 ADC R Mux", "ADC1 R", "ADC1 R"},
+
+        {"Stereo2 DD L Mux", "STO2 DAC", "Stereo2 DAC MIXL"},
+        {"Stereo2 DD L Mux", "MONO DAC", "Mono DAC MIXL"},
+
+        {"Stereo2 DD R Mux", "STO2 DAC", "Stereo2 DAC MIXR"},
+        {"Stereo2 DD R Mux", "MONO DAC", "Mono DAC MIXR"},
+
+        {"Stereo2 ADC L1 Mux", "ADC", "Stereo2 ADC L Mux"},
+        {"Stereo2 ADC L1 Mux", "DD Mux", "Stereo2 DD L Mux"},
+        {"Stereo2 ADC L2 Mux", "DMIC", "Stereo2 DMIC L Mux"},
+        {"Stereo2 ADC L2 Mux", "DAC MIX", "DAC MIXL"},
+
+        {"Stereo2 ADC R1 Mux", "ADC", "Stereo2 ADC R Mux"},
+        {"Stereo2 ADC R1 Mux", "DD Mux", "Stereo2 DD R Mux"},
+        {"Stereo2 ADC R2 Mux", "DMIC", "Stereo2 DMIC R Mux"},
+        {"Stereo2 ADC R2 Mux", "DAC MIX", "DAC MIXR"},
+
+        {"Stereo1 ADC MIXL", "ADC1 Switch", "Stereo1 ADC L1 Mux"},
+        {"Stereo1 ADC MIXL", "ADC2 Switch", "Stereo1 ADC L2 Mux"},
+        {"Stereo1 ADC MIXL", NULL, "ADC Stereo1 Filter"},
+
+        {"Stereo1 ADC MIXR", "ADC1 Switch", "Stereo1 ADC R1 Mux"},
+        {"Stereo1 ADC MIXR", "ADC2 Switch", "Stereo1 ADC R2 Mux"},
+        {"Stereo1 ADC MIXR", NULL, "ADC Stereo1 Filter"},
+
+        {"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"},
+
+        {"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"},
+
+        {"Stereo2 ADC MIXL", "ADC1 Switch", "Stereo2 ADC L1 Mux"},
+        {"Stereo2 ADC MIXL", "ADC2 Switch", "Stereo2 ADC L2 Mux"},
+        {"Stereo2 ADC MIXL", NULL, "ADC Stereo2 Filter"},
+
+        {"Stereo2 ADC MIXR", "ADC1 Switch", "Stereo2 ADC R1 Mux"},
+        {"Stereo2 ADC MIXR", "ADC2 Switch", "Stereo2 ADC R2 Mux"},
+        {"Stereo2 ADC MIXR", NULL, "ADC Stereo2 Filter"},
+
+        {"Stereo1 ADC MIX", NULL, "Stereo1 ADC MIXL"},
+        {"Stereo1 ADC MIX", NULL, "Stereo1 ADC MIXR"},
+        {"Stereo2 ADC MIX", NULL, "Stereo2 ADC MIXL"},
+        {"Stereo2 ADC MIX", NULL, "Stereo2 ADC MIXR"},
+        {"Mono ADC MIX", NULL, "Mono ADC MIXL"},
+        {"Mono ADC MIX", NULL, "Mono ADC MIXR"},
+
+        {"IF1_1_ADC1 Mux", "STO1 ADC", "Stereo1 ADC MIX"},
+        {"IF1_1_ADC1 Mux", "IF2_1 DAC", "IF2_1 DAC"},
+        {"IF1_1_ADC2 Mux", "STO2 ADC", "Stereo2 ADC MIX"},
+        {"IF1_1_ADC2 Mux", "IF2_2 DAC", "IF2_2 DAC"},
+        {"IF1_1_ADC3 Mux", "MONO ADC", "Mono ADC MIX"},
+        {"IF1_1_ADC3 Mux", "IF3 DAC", "IF3 DAC"},
+        {"IF1_1_ADC4", NULL, "DAC1 MIX"},
+
+        {"IF1_2_ADC1 Mux", "STO1 ADC", "Stereo1 ADC MIX"},
+        {"IF1_2_ADC1 Mux", "IF1 DAC", "IF1 DAC1"},
+        {"IF1_2_ADC2 Mux", "STO2 ADC", "Stereo2 ADC MIX"},
+        {"IF1_2_ADC2 Mux", "IF2_1 DAC", "IF2_1 DAC"},
+        {"IF1_2_ADC3 Mux", "MONO ADC", "Mono ADC MIX"},
+        {"IF1_2_ADC3 Mux", "IF2_2 DAC", "IF2_2 DAC"},
+        {"IF1_2_ADC4 Mux", "DAC1", "DAC1 MIX"},
+        {"IF1_2_ADC4 Mux", "IF3 DAC", "IF3 DAC"},
+
+        {"TDM1 slot 01 Data Mux", "1234", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 01 Data Mux", "1243", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 01 Data Mux", "1324", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 01 Data Mux", "1342", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 01 Data Mux", "1432", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 01 Data Mux", "1423", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 01 Data Mux", "2134", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 01 Data Mux", "2143", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 01 Data Mux", "2314", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 01 Data Mux", "2341", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 01 Data Mux", "2431", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 01 Data Mux", "2413", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 01 Data Mux", "3124", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 01 Data Mux", "3142", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 01 Data Mux", "3214", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 01 Data Mux", "3241", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 01 Data Mux", "3412", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 01 Data Mux", "3421", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 01 Data Mux", "4123", "IF1_1_ADC4"},
+        {"TDM1 slot 01 Data Mux", "4132", "IF1_1_ADC4"},
+        {"TDM1 slot 01 Data Mux", "4213", "IF1_1_ADC4"},
+        {"TDM1 slot 01 Data Mux", "4231", "IF1_1_ADC4"},
+        {"TDM1 slot 01 Data Mux", "4312", "IF1_1_ADC4"},
+        {"TDM1 slot 01 Data Mux", "4321", "IF1_1_ADC4"},
+        {"TDM1 slot 01 Data Mux", NULL, "I2S1_1"},
+
+        {"TDM1 slot 23 Data Mux", "1234", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 23 Data Mux", "1243", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 23 Data Mux", "1324", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 23 Data Mux", "1342", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 23 Data Mux", "1432", "IF1_1_ADC4"},
+        {"TDM1 slot 23 Data Mux", "1423", "IF1_1_ADC4"},
+        {"TDM1 slot 23 Data Mux", "2134", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 23 Data Mux", "2143", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 23 Data Mux", "2314", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 23 Data Mux", "2341", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 23 Data Mux", "2431", "IF1_1_ADC4"},
+        {"TDM1 slot 23 Data Mux", "2413", "IF1_1_ADC4"},
+        {"TDM1 slot 23 Data Mux", "3124", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 23 Data Mux", "3142", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 23 Data Mux", "3214", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 23 Data Mux", "3241", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 23 Data Mux", "3412", "IF1_1_ADC4"},
+        {"TDM1 slot 23 Data Mux", "3421", "IF1_1_ADC4"},
+        {"TDM1 slot 23 Data Mux", "4123", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 23 Data Mux", "4132", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 23 Data Mux", "4213", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 23 Data Mux", "4231", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 23 Data Mux", "4312", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 23 Data Mux", "4321", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 23 Data Mux", NULL, "I2S1_1"},
+
+        {"TDM1 slot 45 Data Mux", "1234", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 45 Data Mux", "1243", "IF1_1_ADC4"},
+        {"TDM1 slot 45 Data Mux", "1324", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 45 Data Mux", "1342", "IF1_1_ADC4"},
+        {"TDM1 slot 45 Data Mux", "1432", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 45 Data Mux", "1423", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 45 Data Mux", "2134", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 45 Data Mux", "2143", "IF1_1_ADC4"},
+        {"TDM1 slot 45 Data Mux", "2314", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 45 Data Mux", "2341", "IF1_1_ADC4"},
+        {"TDM1 slot 45 Data Mux", "2431", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 45 Data Mux", "2413", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 45 Data Mux", "3124", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 45 Data Mux", "3142", "IF1_1_ADC4"},
+        {"TDM1 slot 45 Data Mux", "3214", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 45 Data Mux", "3241", "IF1_1_ADC4"},
+        {"TDM1 slot 45 Data Mux", "3412", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 45 Data Mux", "3421", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 45 Data Mux", "4123", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 45 Data Mux", "4132", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 45 Data Mux", "4213", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 45 Data Mux", "4231", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 45 Data Mux", "4312", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 45 Data Mux", "4321", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 45 Data Mux", NULL, "I2S1_1"},
+
+        {"TDM1 slot 67 Data Mux", "1234", "IF1_1_ADC4"},
+        {"TDM1 slot 67 Data Mux", "1243", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 67 Data Mux", "1324", "IF1_1_ADC4"},
+        {"TDM1 slot 67 Data Mux", "1342", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 67 Data Mux", "1432", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 67 Data Mux", "1423", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 67 Data Mux", "2134", "IF1_1_ADC4"},
+        {"TDM1 slot 67 Data Mux", "2143", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 67 Data Mux", "2314", "IF1_1_ADC4"},
+        {"TDM1 slot 67 Data Mux", "2341", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 67 Data Mux", "2431", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 67 Data Mux", "2413", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 67 Data Mux", "3124", "IF1_1_ADC4"},
+        {"TDM1 slot 67 Data Mux", "3142", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 67 Data Mux", "3214", "IF1_1_ADC4"},
+        {"TDM1 slot 67 Data Mux", "3241", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 67 Data Mux", "3412", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 67 Data Mux", "3421", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 67 Data Mux", "4123", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 67 Data Mux", "4132", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 67 Data Mux", "4213", "IF1_1_ADC3 Mux"},
+        {"TDM1 slot 67 Data Mux", "4231", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 67 Data Mux", "4312", "IF1_1_ADC2 Mux"},
+        {"TDM1 slot 67 Data Mux", "4321", "IF1_1_ADC1 Mux"},
+        {"TDM1 slot 67 Data Mux", NULL, "I2S1_1"},
+
+
+        {"TDM2 slot 01 Data Mux", "1234", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 01 Data Mux", "1243", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 01 Data Mux", "1324", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 01 Data Mux", "1342", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 01 Data Mux", "1432", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 01 Data Mux", "1423", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 01 Data Mux", "2134", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 01 Data Mux", "2143", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 01 Data Mux", "2314", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 01 Data Mux", "2341", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 01 Data Mux", "2431", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 01 Data Mux", "2413", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 01 Data Mux", "3124", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 01 Data Mux", "3142", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 01 Data Mux", "3214", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 01 Data Mux", "3241", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 01 Data Mux", "3412", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 01 Data Mux", "3421", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 01 Data Mux", "4123", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 01 Data Mux", "4132", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 01 Data Mux", "4213", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 01 Data Mux", "4231", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 01 Data Mux", "4312", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 01 Data Mux", "4321", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 01 Data Mux", NULL, "I2S1_2"},
+
+        {"TDM2 slot 23 Data Mux", "1234", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 23 Data Mux", "1243", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 23 Data Mux", "1324", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 23 Data Mux", "1342", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 23 Data Mux", "1432", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 23 Data Mux", "1423", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 23 Data Mux", "2134", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 23 Data Mux", "2143", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 23 Data Mux", "2314", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 23 Data Mux", "2341", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 23 Data Mux", "2431", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 23 Data Mux", "2413", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 23 Data Mux", "3124", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 23 Data Mux", "3142", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 23 Data Mux", "3214", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 23 Data Mux", "3241", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 23 Data Mux", "3412", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 23 Data Mux", "3421", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 23 Data Mux", "4123", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 23 Data Mux", "4132", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 23 Data Mux", "4213", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 23 Data Mux", "4231", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 23 Data Mux", "4312", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 23 Data Mux", "4321", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 23 Data Mux", NULL, "I2S1_2"},
+
+        {"TDM2 slot 45 Data Mux", "1234", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 45 Data Mux", "1243", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 45 Data Mux", "1324", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 45 Data Mux", "1342", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 45 Data Mux", "1432", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 45 Data Mux", "1423", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 45 Data Mux", "2134", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 45 Data Mux", "2143", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 45 Data Mux", "2314", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 45 Data Mux", "2341", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 45 Data Mux", "2431", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 45 Data Mux", "2413", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 45 Data Mux", "3124", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 45 Data Mux", "3142", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 45 Data Mux", "3214", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 45 Data Mux", "3241", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 45 Data Mux", "3412", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 45 Data Mux", "3421", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 45 Data Mux", "4123", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 45 Data Mux", "4132", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 45 Data Mux", "4213", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 45 Data Mux", "4231", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 45 Data Mux", "4312", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 45 Data Mux", "4321", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 45 Data Mux", NULL, "I2S1_2"},
+
+        {"TDM2 slot 67 Data Mux", "1234", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 67 Data Mux", "1243", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 67 Data Mux", "1324", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 67 Data Mux", "1342", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 67 Data Mux", "1432", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 67 Data Mux", "1423", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 67 Data Mux", "2134", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 67 Data Mux", "2143", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 67 Data Mux", "2314", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 67 Data Mux", "2341", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 67 Data Mux", "2431", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 67 Data Mux", "2413", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 67 Data Mux", "3124", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 67 Data Mux", "3142", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 67 Data Mux", "3214", "IF1_2_ADC4 Mux"},
+        {"TDM2 slot 67 Data Mux", "3241", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 67 Data Mux", "3412", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 67 Data Mux", "3421", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 67 Data Mux", "4123", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 67 Data Mux", "4132", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 67 Data Mux", "4213", "IF1_2_ADC3 Mux"},
+        {"TDM2 slot 67 Data Mux", "4231", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 67 Data Mux", "4312", "IF1_2_ADC2 Mux"},
+        {"TDM2 slot 67 Data Mux", "4321", "IF1_2_ADC1 Mux"},
+        {"TDM2 slot 67 Data Mux", NULL, "I2S1_2"},
+
+        {"IF1_1 0 ADC Swap Mux", "L/R", "TDM1 slot 01 Data Mux"},
+        {"IF1_1 0 ADC Swap Mux", "L/L", "TDM1 slot 01 Data Mux"},
+        {"IF1_1 1 ADC Swap Mux", "R/L", "TDM1 slot 01 Data Mux"},
+        {"IF1_1 1 ADC Swap Mux", "R/R", "TDM1 slot 01 Data Mux"},
+        {"IF1_1 2 ADC Swap Mux", "L/R", "TDM1 slot 23 Data Mux"},
+        {"IF1_1 2 ADC Swap Mux", "R/L", "TDM1 slot 23 Data Mux"},
+        {"IF1_1 3 ADC Swap Mux", "L/L", "TDM1 slot 23 Data Mux"},
+        {"IF1_1 3 ADC Swap Mux", "R/R", "TDM1 slot 23 Data Mux"},
+        {"IF1_1 4 ADC Swap Mux", "L/R", "TDM1 slot 45 Data Mux"},
+        {"IF1_1 4 ADC Swap Mux", "R/L", "TDM1 slot 45 Data Mux"},
+        {"IF1_1 5 ADC Swap Mux", "L/L", "TDM1 slot 45 Data Mux"},
+        {"IF1_1 5 ADC Swap Mux", "R/R", "TDM1 slot 45 Data Mux"},
+        {"IF1_1 6 ADC Swap Mux", "L/R", "TDM1 slot 67 Data Mux"},
+        {"IF1_1 6 ADC Swap Mux", "R/L", "TDM1 slot 67 Data Mux"},
+        {"IF1_1 7 ADC Swap Mux", "L/L", "TDM1 slot 67 Data Mux"},
+        {"IF1_1 7 ADC Swap Mux", "R/R", "TDM1 slot 67 Data Mux"},
+        {"IF1_2 0 ADC Swap Mux", "L/R", "TDM2 slot 01 Data Mux"},
+        {"IF1_2 0 ADC Swap Mux", "R/L", "TDM2 slot 01 Data Mux"},
+        {"IF1_2 1 ADC Swap Mux", "L/L", "TDM2 slot 01 Data Mux"},
+        {"IF1_2 1 ADC Swap Mux", "R/R", "TDM2 slot 01 Data Mux"},
+        {"IF1_2 2 ADC Swap Mux", "L/R", "TDM2 slot 23 Data Mux"},
+        {"IF1_2 2 ADC Swap Mux", "R/L", "TDM2 slot 23 Data Mux"},
+        {"IF1_2 3 ADC Swap Mux", "L/L", "TDM2 slot 23 Data Mux"},
+        {"IF1_2 3 ADC Swap Mux", "R/R", "TDM2 slot 23 Data Mux"},
+        {"IF1_2 4 ADC Swap Mux", "L/R", "TDM2 slot 45 Data Mux"},
+        {"IF1_2 4 ADC Swap Mux", "R/L", "TDM2 slot 45 Data Mux"},
+        {"IF1_2 5 ADC Swap Mux", "L/L", "TDM2 slot 45 Data Mux"},
+        {"IF1_2 5 ADC Swap Mux", "R/R", "TDM2 slot 45 Data Mux"},
+        {"IF1_2 6 ADC Swap Mux", "L/R", "TDM2 slot 67 Data Mux"},
+        {"IF1_2 6 ADC Swap Mux", "R/L", "TDM2 slot 67 Data Mux"},
+        {"IF1_2 7 ADC Swap Mux", "L/L", "TDM2 slot 67 Data Mux"},
+        {"IF1_2 7 ADC Swap Mux", "R/R", "TDM2 slot 67 Data Mux"},
+
+        {"IF2_1 ADC Mux", "STO1 ADC", "Stereo1 ADC MIX"},
+        {"IF2_1 ADC Mux", "STO2 ADC", "Stereo2 ADC MIX"},
+        {"IF2_1 ADC Mux", "MONO ADC", "Mono ADC MIX"},
+        {"IF2_1 ADC Mux", "IF1 DAC1", "IF1 DAC1"},
+        {"IF2_1 ADC Mux", "IF1 DAC2", "IF1 DAC2"},
+        {"IF2_1 ADC Mux", "IF2_2 DAC", "IF2_2 DAC"},
+        {"IF2_1 ADC Mux", "IF3 DAC", "IF3 DAC"},
+        {"IF2_1 ADC Mux", "DAC1 MIX", "DAC1 MIX"},
+        {"IF2_1 ADC", NULL, "IF2_1 ADC Mux"},
+        {"IF2_1 ADC", NULL, "I2S2_1"},
+
+        {"IF2_2 ADC Mux", "STO1 ADC", "Stereo1 ADC MIX"},
+        {"IF2_2 ADC Mux", "STO2 ADC", "Stereo2 ADC MIX"},
+        {"IF2_2 ADC Mux", "MONO ADC", "Mono ADC MIX"},
+        {"IF2_2 ADC Mux", "IF1 DAC1", "IF1 DAC1"},
+        {"IF2_2 ADC Mux", "IF1 DAC2", "IF1 DAC2"},
+        {"IF2_2 ADC Mux", "IF2_1 DAC", "IF2_1 DAC"},
+        {"IF2_2 ADC Mux", "IF3 DAC", "IF3 DAC"},
+        {"IF2_2 ADC Mux", "DAC1 MIX", "DAC1 MIX"},
+        {"IF2_2 ADC", NULL, "IF2_2 ADC Mux"},
+        {"IF2_2 ADC", NULL, "I2S2_2"},
+
+        {"IF3 ADC Mux", "STO1 ADC", "Stereo1 ADC MIX"},
+        {"IF3 ADC Mux", "STO2 ADC", "Stereo2 ADC MIX"},
+        {"IF3 ADC Mux", "MONO ADC", "Mono ADC MIX"},
+        {"IF3 ADC Mux", "IF1 DAC1", "IF1 DAC1"},
+        {"IF3 ADC Mux", "IF1 DAC2", "IF1 DAC2"},
+        {"IF3 ADC Mux", "IF2_1 DAC", "IF2_1 DAC"},
+        {"IF3 ADC Mux", "IF2_2 DAC", "IF2_2 DAC"},
+        {"IF3 ADC Mux", "DAC1 MIX", "DAC1 MIX"},
+        {"IF3 ADC", NULL, "IF3 ADC Mux"},
+        {"IF3 ADC", NULL, "I2S3"},
+
+        {"AIF1_1TX slot 0", NULL, "IF1_1 0 ADC Swap Mux"},
+        {"AIF1_1TX slot 1", NULL, "IF1_1 1 ADC Swap Mux"},
+        {"AIF1_1TX slot 2", NULL, "IF1_1 2 ADC Swap Mux"},
+        {"AIF1_1TX slot 3", NULL, "IF1_1 3 ADC Swap Mux"},
+        {"AIF1_1TX slot 4", NULL, "IF1_1 4 ADC Swap Mux"},
+        {"AIF1_1TX slot 5", NULL, "IF1_1 5 ADC Swap Mux"},
+        {"AIF1_1TX slot 6", NULL, "IF1_1 6 ADC Swap Mux"},
+        {"AIF1_1TX slot 7", NULL, "IF1_1 7 ADC Swap Mux"},
+        {"AIF1_2TX slot 0", NULL, "IF1_2 0 ADC Swap Mux"},
+        {"AIF1_2TX slot 1", NULL, "IF1_2 1 ADC Swap Mux"},
+        {"AIF1_2TX slot 2", NULL, "IF1_2 2 ADC Swap Mux"},
+        {"AIF1_2TX slot 3", NULL, "IF1_2 3 ADC Swap Mux"},
+        {"AIF1_2TX slot 4", NULL, "IF1_2 4 ADC Swap Mux"},
+        {"AIF1_2TX slot 5", NULL, "IF1_2 5 ADC Swap Mux"},
+        {"AIF1_2TX slot 6", NULL, "IF1_2 6 ADC Swap Mux"},
+        {"AIF1_2TX slot 7", NULL, "IF1_2 7 ADC Swap Mux"},
+        {"IF2_1 ADC Swap Mux", "L/R", "IF2_1 ADC"},
+        {"IF2_1 ADC Swap Mux", "R/L", "IF2_1 ADC"},
+        {"IF2_1 ADC Swap Mux", "L/L", "IF2_1 ADC"},
+        {"IF2_1 ADC Swap Mux", "R/R", "IF2_1 ADC"},
+        {"AIF2_1TX", NULL, "IF2_1 ADC Swap Mux"},
+        {"IF2_2 ADC Swap Mux", "L/R", "IF2_2 ADC"},
+        {"IF2_2 ADC Swap Mux", "R/L", "IF2_2 ADC"},
+        {"IF2_2 ADC Swap Mux", "L/L", "IF2_2 ADC"},
+        {"IF2_2 ADC Swap Mux", "R/R", "IF2_2 ADC"},
+        {"AIF2_2TX", NULL, "IF2_2 ADC Swap Mux"},
+        {"IF3 ADC Swap Mux", "L/R", "IF3 ADC"},
+        {"IF3 ADC Swap Mux", "R/L", "IF3 ADC"},
+        {"IF3 ADC Swap Mux", "L/L", "IF3 ADC"},
+        {"IF3 ADC Swap Mux", "R/R", "IF3 ADC"},
+        {"AIF3TX", NULL, "IF3 ADC Swap Mux"},
+
+        {"IF1 DAC1", NULL, "AIF1RX"},
+        {"IF1 DAC2", NULL, "AIF1RX"},
+        {"IF1 DAC3", NULL, "AIF1RX"},
+        {"IF2_1 DAC Swap Mux", "L/R", "AIF2_1RX"},
+        {"IF2_1 DAC Swap Mux", "R/L", "AIF2_1RX"},
+        {"IF2_1 DAC Swap Mux", "L/L", "AIF2_1RX"},
+        {"IF2_1 DAC Swap Mux", "R/R", "AIF2_1RX"},
+        {"IF2_2 DAC Swap Mux", "L/R", "AIF2_2RX"},
+        {"IF2_2 DAC Swap Mux", "R/L", "AIF2_2RX"},
+        {"IF2_2 DAC Swap Mux", "L/L", "AIF2_2RX"},
+        {"IF2_2 DAC Swap Mux", "R/R", "AIF2_2RX"},
+        {"IF2_1 DAC", NULL, "IF2_1 DAC Swap Mux"},
+        {"IF2_2 DAC", NULL, "IF2_2 DAC Swap Mux"},
+        {"IF3 DAC Swap Mux", "L/R", "AIF3RX"},
+        {"IF3 DAC Swap Mux", "R/L", "AIF3RX"},
+        {"IF3 DAC Swap Mux", "L/L", "AIF3RX"},
+        {"IF3 DAC Swap Mux", "R/R", "AIF3RX"},
+        {"IF3 DAC", NULL, "IF3 DAC Swap Mux"},
+
+        {"IF1 DAC1", NULL, "I2S1_1"},
+        {"IF1 DAC2", NULL, "I2S1_1"},
+        {"IF1 DAC3", NULL, "I2S1_1"},
+        {"IF2_1 DAC", NULL, "I2S2_1"},
+        {"IF2_2 DAC", NULL, "I2S2_2"},
+        {"IF3 DAC", NULL, "I2S3"},
+
+        {"IF1 DAC1 L", NULL, "IF1 DAC1"},
+        {"IF1 DAC1 R", NULL, "IF1 DAC1"},
+        {"IF1 DAC2 L", NULL, "IF1 DAC2"},
+        {"IF1 DAC2 R", NULL, "IF1 DAC2"},
+        {"IF1 DAC3 L", NULL, "IF1 DAC3"},
+        {"IF1 DAC3 R", NULL, "IF1 DAC3"},
+        {"IF2_1 DAC L", NULL, "IF2_1 DAC"},
+        {"IF2_1 DAC R", NULL, "IF2_1 DAC"},
+        {"IF2_2 DAC L", NULL, "IF2_2 DAC"},
+        {"IF2_2 DAC R", NULL, "IF2_2 DAC"},
+        {"IF3 DAC L", NULL, "IF3 DAC"},
+        {"IF3 DAC R", NULL, "IF3 DAC"},
+
+        {"DAC L1 Mux", "IF1 DAC1", "IF1 DAC1 L"},
+        {"DAC L1 Mux", "IF2_1 DAC", "IF2_1 DAC L"},
+        {"DAC L1 Mux", "IF2_2 DAC", "IF2_2 DAC L"},
+        {"DAC L1 Mux", "IF3 DAC", "IF3 DAC L"},
+        {"DAC L1 Mux", NULL, "DAC Stereo1 Filter"},
+
+        {"DAC R1 Mux", "IF1 DAC1", "IF1 DAC1 R"},
+        {"DAC R1 Mux", "IF2_1 DAC", "IF2_1 DAC R"},
+        {"DAC R1 Mux", "IF2_2 DAC", "IF2_2 DAC R"},
+        {"DAC R1 Mux", "IF3 DAC", "IF3 DAC R"},
+        {"DAC R1 Mux", NULL, "DAC Stereo1 Filter"},
+
+        {"DAC1 MIXL", "Stereo ADC Switch", "Stereo1 ADC MIXL"},
+        {"DAC1 MIXL", "DAC1 Switch", "DAC L1 Mux"},
+        {"DAC1 MIXR", "Stereo ADC Switch", "Stereo1 ADC MIXR"},
+        {"DAC1 MIXR", "DAC1 Switch", "DAC R1 Mux"},
+
+        {"DAC1 MIX", NULL, "DAC1 MIXL"},
+        {"DAC1 MIX", NULL, "DAC1 MIXR"},
+
+        {"DAC L2 Mux", "IF1 DAC2", "IF1 DAC2 L"},
+        {"DAC L2 Mux", "IF2_1 DAC", "IF2_1 DAC L"},
+        {"DAC L2 Mux", "IF2_2 DAC", "IF2_2 DAC L"},
+        {"DAC L2 Mux", "IF3 DAC", "IF3 DAC L"},
+        {"DAC L2 Mux", "Mono ADC MIX", "Mono ADC MIXL"},
+        {"DAC L2 Mux", NULL, "DAC Mono Left Filter"},
+
+        {"DAC R2 Mux", "IF1 DAC2", "IF1 DAC2 R"},
+        {"DAC R2 Mux", "IF2_1 DAC", "IF2_1 DAC R"},
+        {"DAC R2 Mux", "IF2_2 DAC", "IF2_2 DAC R"},
+        {"DAC R2 Mux", "IF3 DAC", "IF3 DAC R"},
+        {"DAC R2 Mux", "Mono ADC MIX", "Mono ADC MIXR"},
+        {"DAC R2 Mux", NULL, "DAC Mono Right Filter"},
+
+        {"DAC L3 Mux", "IF1 DAC2", "IF1 DAC2 L"},
+        {"DAC L3 Mux", "IF2_1 DAC", "IF2_1 DAC L"},
+        {"DAC L3 Mux", "IF2_2 DAC", "IF2_2 DAC L"},
+        {"DAC L3 Mux", "IF3 DAC", "IF3 DAC L"},
+        {"DAC L3 Mux", "STO2 ADC MIX", "Stereo2 ADC MIXL"},
+        {"DAC L3 Mux", NULL, "DAC Stereo2 Filter"},
+
+        {"DAC R3 Mux", "IF1 DAC2", "IF1 DAC2 R"},
+        {"DAC R3 Mux", "IF2_1 DAC", "IF2_1 DAC R"},
+        {"DAC R3 Mux", "IF2_2 DAC", "IF2_2 DAC R"},
+        {"DAC R3 Mux", "IF3 DAC", "IF3 DAC R"},
+        {"DAC R3 Mux", "STO2 ADC MIX", "Stereo2 ADC MIXR"},
+        {"DAC R3 Mux", NULL, "DAC Stereo2 Filter"},
+
+        {"Stereo1 DAC MIXL", "DAC L1 Switch", "DAC1 MIXL"},
+        {"Stereo1 DAC MIXL", "DAC R1 Switch", "DAC1 MIXR"},
+        {"Stereo1 DAC MIXL", "DAC L2 Switch", "DAC L2 Mux"},
+        {"Stereo1 DAC MIXL", "DAC R2 Switch", "DAC R2 Mux"},
+
+        {"Stereo1 DAC MIXR", "DAC R1 Switch", "DAC1 MIXR"},
+        {"Stereo1 DAC MIXR", "DAC L1 Switch", "DAC1 MIXL"},
+        {"Stereo1 DAC MIXR", "DAC L2 Switch", "DAC L2 Mux"},
+        {"Stereo1 DAC MIXR", "DAC R2 Switch", "DAC R2 Mux"},
+
+        {"Stereo2 DAC MIXL", "DAC L1 Switch", "DAC1 MIXL"},
+        {"Stereo2 DAC MIXL", "DAC L2 Switch", "DAC L2 Mux"},
+        {"Stereo2 DAC MIXL", "DAC L3 Switch", "DAC L3 Mux"},
+
+        {"Stereo2 DAC MIXR", "DAC R1 Switch", "DAC1 MIXR"},
+        {"Stereo2 DAC MIXR", "DAC R2 Switch", "DAC R2 Mux"},
+        {"Stereo2 DAC MIXR", "DAC R3 Switch", "DAC R3 Mux"},
+
+        {"Mono DAC MIXL", "DAC L1 Switch", "DAC1 MIXL"},
+        {"Mono DAC MIXL", "DAC R1 Switch", "DAC1 MIXR"},
+        {"Mono DAC MIXL", "DAC L2 Switch", "DAC L2 Mux"},
+        {"Mono DAC MIXL", "DAC R2 Switch", "DAC R2 Mux"},
+        {"Mono DAC MIXR", "DAC L1 Switch", "DAC1 MIXL"},
+        {"Mono DAC MIXR", "DAC R1 Switch", "DAC1 MIXR"},
+        {"Mono DAC MIXR", "DAC L2 Switch", "DAC L2 Mux"},
+        {"Mono DAC MIXR", "DAC R2 Switch", "DAC R2 Mux"},
+
+        {"DAC MIXL", "Stereo1 DAC Mixer", "Stereo1 DAC MIXL"},
+        {"DAC MIXL", "Stereo2 DAC Mixer", "Stereo2 DAC MIXL"},
+        {"DAC MIXL", "Mono DAC Mixer", "Mono DAC MIXL"},
+        {"DAC MIXR", "Stereo1 DAC Mixer", "Stereo1 DAC MIXR"},
+        {"DAC MIXR", "Stereo2 DAC Mixer", "Stereo2 DAC MIXR"},
+        {"DAC MIXR", "Mono DAC Mixer", "Mono DAC MIXR"},
+
+        {"DAC L1 Source", "DAC1", "DAC1 MIXL"},
+        {"DAC L1 Source", "Stereo1 DAC Mixer", "Stereo1 DAC MIXL"},
+        {"DAC L1 Source", "DMIC1", "DMIC L1"},
+        {"DAC R1 Source", "DAC1", "DAC1 MIXR"},
+        {"DAC R1 Source", "Stereo1 DAC Mixer", "Stereo1 DAC MIXR"},
+        {"DAC R1 Source", "DMIC1", "DMIC R1"},
+
+        {"DAC L2 Source", "DAC2", "DAC L2 Mux"},
+        {"DAC L2 Source", "Mono DAC Mixer", "Mono DAC MIXL"},
+        {"DAC L2 Source", NULL, "DAC L2 Power"},
+        {"DAC R2 Source", "DAC2", "DAC R2 Mux"},
+        {"DAC R2 Source", "Mono DAC Mixer", "Mono DAC MIXR"},
+        {"DAC R2 Source", NULL, "DAC R2 Power"},
+
+        {"DAC L1", NULL, "DAC L1 Source"},
+        {"DAC R1", NULL, "DAC R1 Source"},
+        {"DAC L2", NULL, "DAC L2 Source"},
+        {"DAC R2", NULL, "DAC R2 Source"},
+
+        {"DAC L1", NULL, "DAC 1 Clock"},
+        {"DAC R1", NULL, "DAC 1 Clock"},
+        {"DAC L2", NULL, "DAC 2 Clock"},
+        {"DAC R2", NULL, "DAC 2 Clock"},
+
+        {"MONOVOL MIX", "DAC L2 Switch", "DAC L2"},
+        {"MONOVOL MIX", "RECMIX2L Switch", "RECMIX2L"},
+        {"MONOVOL MIX", "BST1 Switch", "BST1"},
+        {"MONOVOL MIX", "BST2 Switch", "BST2"},
+        {"MONOVOL MIX", "BST3 Switch", "BST3"},
+
+        {"OUT MIXL", "DAC L2 Switch", "DAC L2"},
+        {"OUT MIXL", "INL Switch", "INL VOL"},
+        {"OUT MIXL", "BST1 Switch", "BST1"},
+        {"OUT MIXL", "BST2 Switch", "BST2"},
+        {"OUT MIXL", "BST3 Switch", "BST3"},
+        {"OUT MIXR", "DAC R2 Switch", "DAC R2"},
+        {"OUT MIXR", "INR Switch", "INR VOL"},
+        {"OUT MIXR", "BST2 Switch", "BST2"},
+        {"OUT MIXR", "BST3 Switch", "BST3"},
+        {"OUT MIXR", "BST4 Switch", "BST4"},
+
+        {"MONOVOL", "Switch", "MONOVOL MIX"},
+        {"Mono MIX", "DAC L2 Switch", "DAC L2"},
+        {"Mono MIX", "MONOVOL Switch", "MONOVOL"},
+        {"Mono Amp", NULL, "Mono MIX"},
+        {"Mono Amp", NULL, "Vref2"},
+        {"Mono Amp", NULL, "CLKDET SYS"},
+        {"Mono Amp", NULL, "CLKDET MONO"},
+        {"Mono Playback", "Switch", "Mono Amp"},
+        {"MONOOUT", NULL, "Mono Playback"},
+
+        {"HP Amp", NULL, "DAC L1"},
+        {"HP Amp", NULL, "DAC R1"},
+        {"HP Amp", NULL, "Charge Pump"},
+        {"HP Amp", NULL, "CLKDET SYS"},
+        {"HP Amp", NULL, "CLKDET HP"},
+        {"HP Amp", NULL, "CBJ Power"},
+        {"HP Amp", NULL, "Vref2"},
+        {"HPO Playback", "Switch", "HP Amp"},
+        {"HPOL", NULL, "HPO Playback"},
+        {"HPOR", NULL, "HPO Playback"},
+
+        {"OUTVOL L", "Switch", "OUT MIXL"},
+        {"OUTVOL R", "Switch", "OUT MIXR"},
+        {"LOUT L MIX", "DAC L2 Switch", "DAC L2"},
+        {"LOUT L MIX", "OUTVOL L Switch", "OUTVOL L"},
+        {"LOUT R MIX", "DAC R2 Switch", "DAC R2"},
+        {"LOUT R MIX", "OUTVOL R Switch", "OUTVOL R"},
+        {"LOUT Amp", NULL, "LOUT L MIX"},
+        {"LOUT Amp", NULL, "LOUT R MIX"},
+        {"LOUT Amp", NULL, "Vref1"},
+        {"LOUT Amp", NULL, "Vref2"},
+        {"LOUT Amp", NULL, "CLKDET SYS"},
+        {"LOUT Amp", NULL, "CLKDET LOUT"},
+        {"LOUT L Playback", "Switch", "LOUT Amp"},
+        {"LOUT R Playback", "Switch", "LOUT Amp"},
+        {"LOUTL", NULL, "LOUT L Playback"},
+        {"LOUTR", NULL, "LOUT R Playback"},
+
+        {"PDM L Mux", "Mono DAC", "Mono DAC MIXL"},
+        {"PDM L Mux", "Stereo1 DAC", "Stereo1 DAC MIXL"},
+        {"PDM L Mux", "Stereo2 DAC", "Stereo2 DAC MIXL"},
+        {"PDM L Mux", NULL, "PDM Power"},
+        {"PDM R Mux", "Mono DAC", "Mono DAC MIXR"},
+        {"PDM R Mux", "Stereo1 DAC", "Stereo1 DAC MIXR"},
+        {"PDM R Mux", "Stereo2 DAC", "Stereo2 DAC MIXR"},
+        {"PDM R Mux", NULL, "PDM Power"},
+        {"PDM L Playback", "Switch", "PDM L Mux"},
+        {"PDM R Playback", "Switch", "PDM R Mux"},
+        {"PDML", NULL, "PDM L Playback"},
+        {"PDMR", NULL, "PDM R Playback"},
+};
+
+static int rt5665_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 rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+        unsigned int val_len = 0, val_clk, mask_clk, val_bits = 0x0100;
+        int pre_div, frame_size;
+
+        rt5665->lrck[dai->id] = params_rate(params);
+        pre_div = rl6231_get_clk_info(rt5665->sysclk, rt5665->lrck[dai->id]);
+        if (pre_div < 0) {
+                dev_err(codec->dev, "Unsupported clock setting %d for DAI %d\n",
+                        rt5665->lrck[dai->id], dai->id);
+                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;
+        }
+
+        dev_dbg(dai->dev, "lrck is %dHz and pre_div is %d for iis %d\n",
+                                rt5665->lrck[dai->id], pre_div, dai->id);
+
+        switch (params_width(params)) {
+        case 16:
+                val_bits = 0x0100;
+                break;
+        case 20:
+                val_len |= RT5665_I2S_DL_20;
+                val_bits = 0x1300;
+                break;
+        case 24:
+                val_len |= RT5665_I2S_DL_24;
+                val_bits = 0x2500;
+                break;
+        case 8:
+                val_len |= RT5665_I2S_DL_8;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (dai->id) {
+        case RT5665_AIF1_1:
+        case RT5665_AIF1_2:
+                mask_clk = RT5665_I2S_PD1_MASK;
+                val_clk = pre_div << RT5665_I2S_PD1_SFT;
+                snd_soc_update_bits(codec, RT5665_I2S1_SDP,
+                        RT5665_I2S_DL_MASK, val_len);
+                break;
+        case RT5665_AIF2_1:
+        case RT5665_AIF2_2:
+                mask_clk = RT5665_I2S_PD2_MASK;
+                val_clk = pre_div << RT5665_I2S_PD2_SFT;
+                snd_soc_update_bits(codec, RT5665_I2S2_SDP,
+                        RT5665_I2S_DL_MASK, val_len);
+                break;
+        case RT5665_AIF3:
+                mask_clk = RT5665_I2S_PD3_MASK;
+                val_clk = pre_div << RT5665_I2S_PD3_SFT;
+                snd_soc_update_bits(codec, RT5665_I2S3_SDP,
+                        RT5665_I2S_DL_MASK, val_len);
+                break;
+        default:
+                dev_err(codec->dev, "Invalid dai->id: %d\n", dai->id);
+                return -EINVAL;
+        }
+
+        snd_soc_update_bits(codec, RT5665_ADDA_CLK_1, mask_clk, val_clk);
+        snd_soc_update_bits(codec, RT5665_STO1_DAC_SIL_DET, 0x3700, val_bits);
+
+        switch (rt5665->lrck[dai->id]) {
+        case 192000:
+                snd_soc_update_bits(codec, RT5665_ADDA_CLK_1,
+                        RT5665_DAC_OSR_MASK | RT5665_ADC_OSR_MASK,
+                        RT5665_DAC_OSR_32 | RT5665_ADC_OSR_32);
+                break;
+        case 96000:
+                snd_soc_update_bits(codec, RT5665_ADDA_CLK_1,
+                        RT5665_DAC_OSR_MASK | RT5665_ADC_OSR_MASK,
+                        RT5665_DAC_OSR_64 | RT5665_ADC_OSR_64);
+                break;
+        default:
+                snd_soc_update_bits(codec, RT5665_ADDA_CLK_1,
+                        RT5665_DAC_OSR_MASK | RT5665_ADC_OSR_MASK,
+                        RT5665_DAC_OSR_128 | RT5665_ADC_OSR_128);
+                break;
+        }
+
+        return 0;
+}
+
+static int rt5665_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+        unsigned int reg_val = 0;
+
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBM_CFM:
+                rt5665->master[dai->id] = 1;
+                break;
+        case SND_SOC_DAIFMT_CBS_CFS:
+                reg_val |= RT5665_I2S_MS_S;
+                rt5665->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 |= RT5665_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 |= RT5665_I2S_DF_LEFT;
+                break;
+        case SND_SOC_DAIFMT_DSP_A:
+                reg_val |= RT5665_I2S_DF_PCM_A;
+                break;
+        case SND_SOC_DAIFMT_DSP_B:
+                reg_val |= RT5665_I2S_DF_PCM_B;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (dai->id) {
+        case RT5665_AIF1_1:
+        case RT5665_AIF1_2:
+                snd_soc_update_bits(codec, RT5665_I2S1_SDP,
+                        RT5665_I2S_MS_MASK | RT5665_I2S_BP_MASK |
+                        RT5665_I2S_DF_MASK, reg_val);
+                break;
+        case RT5665_AIF2_1:
+        case RT5665_AIF2_2:
+                snd_soc_update_bits(codec, RT5665_I2S2_SDP,
+                        RT5665_I2S_MS_MASK | RT5665_I2S_BP_MASK |
+                        RT5665_I2S_DF_MASK, reg_val);
+                break;
+        case RT5665_AIF3:
+                snd_soc_update_bits(codec, RT5665_I2S3_SDP,
+                        RT5665_I2S_MS_MASK | RT5665_I2S_BP_MASK |
+                        RT5665_I2S_DF_MASK, reg_val);
+                break;
+        default:
+                dev_err(codec->dev, "Invalid dai->id: %d\n", dai->id);
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int rt5665_set_dai_sysclk(struct snd_soc_dai *dai,
+                int clk_id, unsigned int freq, int dir)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+        unsigned int reg_val = 0;
+
+        if (freq == rt5665->sysclk && clk_id == rt5665->sysclk_src)
+                return 0;
+
+        switch (clk_id) {
+        case RT5665_SCLK_S_MCLK:
+                reg_val |= RT5665_SCLK_SRC_MCLK;
+                break;
+        case RT5665_SCLK_S_PLL1:
+                reg_val |= RT5665_SCLK_SRC_PLL1;
+                break;
+        case RT5665_SCLK_S_RCCLK:
+                reg_val |= RT5665_SCLK_SRC_RCCLK;
+                break;
+        default:
+                dev_err(codec->dev, "Invalid clock id (%d)\n", clk_id);
+                return -EINVAL;
+        }
+        snd_soc_update_bits(codec, RT5665_GLB_CLK,
+                RT5665_SCLK_SRC_MASK, reg_val);
+        rt5665->sysclk = freq;
+        rt5665->sysclk_src = clk_id;
+
+        dev_dbg(dai->dev, "Sysclk is %dHz and clock id is %d\n", freq, clk_id);
+
+        return 0;
+}
+
+static int rt5665_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 rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+        struct rl6231_pll_code pll_code;
+        int ret;
+
+        if (Source == rt5665->pll_src && freq_in == rt5665->pll_in &&
+            freq_out == rt5665->pll_out)
+                return 0;
+
+        if (!freq_in || !freq_out) {
+                dev_dbg(codec->dev, "PLL disabled\n");
+
+                rt5665->pll_in = 0;
+                rt5665->pll_out = 0;
+                snd_soc_update_bits(codec, RT5665_GLB_CLK,
+                        RT5665_SCLK_SRC_MASK, RT5665_SCLK_SRC_MCLK);
+                return 0;
+        }
+
+        switch (Source) {
+        case RT5665_PLL1_S_MCLK:
+                snd_soc_update_bits(codec, RT5665_GLB_CLK,
+                        RT5665_PLL1_SRC_MASK, RT5665_PLL1_SRC_MCLK);
+                break;
+        case RT5665_PLL1_S_BCLK1:
+                snd_soc_update_bits(codec, RT5665_GLB_CLK,
+                                RT5665_PLL1_SRC_MASK, RT5665_PLL1_SRC_BCLK1);
+                break;
+        case RT5665_PLL1_S_BCLK2:
+                snd_soc_update_bits(codec, RT5665_GLB_CLK,
+                                RT5665_PLL1_SRC_MASK, RT5665_PLL1_SRC_BCLK2);
+                break;
+        case RT5665_PLL1_S_BCLK3:
+                snd_soc_update_bits(codec, RT5665_GLB_CLK,
+                                RT5665_PLL1_SRC_MASK, RT5665_PLL1_SRC_BCLK3);
+                break;
+        default:
+                dev_err(codec->dev, "Unknown PLL Source %d\n", Source);
+                return -EINVAL;
+        }
+
+        ret = rl6231_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, RT5665_PLL_CTRL_1,
+                pll_code.n_code << RT5665_PLL_N_SFT | pll_code.k_code);
+        snd_soc_write(codec, RT5665_PLL_CTRL_2,
+                (pll_code.m_bp ? 0 : pll_code.m_code) << RT5665_PLL_M_SFT |
+                pll_code.m_bp << RT5665_PLL_M_BP_SFT);
+
+        rt5665->pll_in = freq_in;
+        rt5665->pll_out = freq_out;
+        rt5665->pll_src = Source;
+
+        return 0;
+}
+
+static int rt5665_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 |= RT5665_I2S1_MODE_TDM;
+
+        switch (slots) {
+        case 4:
+                val |= RT5665_TDM_IN_CH_4;
+                val |= RT5665_TDM_OUT_CH_4;
+                break;
+        case 6:
+                val |= RT5665_TDM_IN_CH_6;
+                val |= RT5665_TDM_OUT_CH_6;
+                break;
+        case 8:
+                val |= RT5665_TDM_IN_CH_8;
+                val |= RT5665_TDM_OUT_CH_8;
+                break;
+        case 2:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (slot_width) {
+        case 20:
+                val |= RT5665_TDM_IN_LEN_20;
+                val |= RT5665_TDM_OUT_LEN_20;
+                break;
+        case 24:
+                val |= RT5665_TDM_IN_LEN_24;
+                val |= RT5665_TDM_OUT_LEN_24;
+                break;
+        case 32:
+                val |= RT5665_TDM_IN_LEN_32;
+                val |= RT5665_TDM_OUT_LEN_32;
+                break;
+        case 16:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        snd_soc_update_bits(codec, RT5665_TDM_CTRL_1,
+                RT5665_I2S1_MODE_MASK | RT5665_TDM_IN_CH_MASK |
+                RT5665_TDM_OUT_CH_MASK | RT5665_TDM_IN_LEN_MASK |
+                RT5665_TDM_OUT_LEN_MASK, val);
+
+        return 0;
+}
+
+static int rt5665_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+
+        dev_dbg(codec->dev, "%s ratio=%d\n", __func__, ratio);
+
+        rt5665->bclk[dai->id] = ratio;
+
+        if (ratio == 64) {
+                switch (dai->id) {
+                case RT5665_AIF2_1:
+                case RT5665_AIF2_2:
+                        snd_soc_update_bits(codec, RT5665_ADDA_CLK_1,
+                                RT5665_I2S_BCLK_MS2_MASK,
+                                RT5665_I2S_BCLK_MS2_64);
+                        break;
+                case RT5665_AIF3:
+                        snd_soc_update_bits(codec, RT5665_ADDA_CLK_1,
+                                RT5665_I2S_BCLK_MS3_MASK,
+                                RT5665_I2S_BCLK_MS3_64);
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+static int rt5665_set_bias_level(struct snd_soc_codec *codec,
+                        enum snd_soc_bias_level level)
+{
+        struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+
+        switch (level) {
+        case SND_SOC_BIAS_PREPARE:
+                regmap_update_bits(rt5665->regmap, RT5665_DIG_MISC,
+                        RT5665_DIG_GATE_CTRL, RT5665_DIG_GATE_CTRL);
+                break;
+
+        case SND_SOC_BIAS_STANDBY:
+                regmap_update_bits(rt5665->regmap, RT5665_PWR_DIG_1,
+                        RT5665_PWR_LDO, RT5665_PWR_LDO);
+                regmap_update_bits(rt5665->regmap, RT5665_PWR_ANLG_1,
+                        RT5665_PWR_MB, RT5665_PWR_MB);
+                regmap_update_bits(rt5665->regmap, RT5665_DIG_MISC,
+                        RT5665_DIG_GATE_CTRL, 0);
+                break;
+        case SND_SOC_BIAS_OFF:
+                regmap_update_bits(rt5665->regmap, RT5665_PWR_DIG_1,
+                        RT5665_PWR_LDO, 0);
+                regmap_update_bits(rt5665->regmap, RT5665_PWR_ANLG_1,
+                        RT5665_PWR_MB, 0);
+                break;
+
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+static int rt5665_probe(struct snd_soc_codec *codec)
+{
+        struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+
+        rt5665->codec = codec;
+
+        schedule_delayed_work(&rt5665->calibrate_work, msecs_to_jiffies(100));
+
+        return 0;
+}
+
+static int rt5665_remove(struct snd_soc_codec *codec)
+{
+        struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+
+        regmap_write(rt5665->regmap, RT5665_RESET, 0);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int rt5665_suspend(struct snd_soc_codec *codec)
+{
+        struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+
+        regcache_cache_only(rt5665->regmap, true);
+        regcache_mark_dirty(rt5665->regmap);
+        return 0;
+}
+
+static int rt5665_resume(struct snd_soc_codec *codec)
+{
+        struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
+
+        regcache_cache_only(rt5665->regmap, false);
+        regcache_sync(rt5665->regmap);
+
+        return 0;
+}
+#else
+#define rt5665_suspend NULL
+#define rt5665_resume NULL
+#endif
+
+#define RT5665_STEREO_RATES SNDRV_PCM_RATE_8000_192000
+#define RT5665_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 rt5665_aif_dai_ops = {
+        .hw_params = rt5665_hw_params,
+        .set_fmt = rt5665_set_dai_fmt,
+        .set_sysclk = rt5665_set_dai_sysclk,
+        .set_tdm_slot = rt5665_set_tdm_slot,
+        .set_pll = rt5665_set_dai_pll,
+        .set_bclk_ratio = rt5665_set_bclk_ratio,
+};
+
+static struct snd_soc_dai_driver rt5665_dai[] = {
+        {
+                .name = "rt5665-aif1_1",
+                .id = RT5665_AIF1_1,
+                .playback = {
+                        .stream_name = "AIF1 Playback",
+                        .channels_min = 1,
+                        .channels_max = 8,
+                        .rates = RT5665_STEREO_RATES,
+                        .formats = RT5665_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF1_1 Capture",
+                        .channels_min = 1,
+                        .channels_max = 8,
+                        .rates = RT5665_STEREO_RATES,
+                        .formats = RT5665_FORMATS,
+                },
+                .ops = &rt5665_aif_dai_ops,
+        },
+        {
+                .name = "rt5665-aif1_2",
+                .id = RT5665_AIF1_2,
+                .capture = {
+                        .stream_name = "AIF1_2 Capture",
+                        .channels_min = 1,
+                        .channels_max = 8,
+                        .rates = RT5665_STEREO_RATES,
+                        .formats = RT5665_FORMATS,
+                },
+                .ops = &rt5665_aif_dai_ops,
+        },
+        {
+                .name = "rt5665-aif2_1",
+                .id = RT5665_AIF2_1,
+                .playback = {
+                        .stream_name = "AIF2_1 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5665_STEREO_RATES,
+                        .formats = RT5665_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF2_1 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5665_STEREO_RATES,
+                        .formats = RT5665_FORMATS,
+                },
+                .ops = &rt5665_aif_dai_ops,
+        },
+        {
+                .name = "rt5665-aif2_2",
+                .id = RT5665_AIF2_2,
+                .playback = {
+                        .stream_name = "AIF2_2 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5665_STEREO_RATES,
+                        .formats = RT5665_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF2_2 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5665_STEREO_RATES,
+                        .formats = RT5665_FORMATS,
+                },
+                .ops = &rt5665_aif_dai_ops,
+        },
+        {
+                .name = "rt5665-aif3",
+                .id = RT5665_AIF3,
+                .playback = {
+                        .stream_name = "AIF3 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5665_STEREO_RATES,
+                        .formats = RT5665_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF3 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5665_STEREO_RATES,
+                        .formats = RT5665_FORMATS,
+                },
+                .ops = &rt5665_aif_dai_ops,
+        },
+};
+
+static struct snd_soc_codec_driver soc_codec_dev_rt5665 = {
+        .probe = rt5665_probe,
+        .remove = rt5665_remove,
+        .suspend = rt5665_suspend,
+        .resume = rt5665_resume,
+        .set_bias_level = rt5665_set_bias_level,
+        .idle_bias_off = true,
+        .component_driver = {
+                .controls = rt5665_snd_controls,
+                .num_controls = ARRAY_SIZE(rt5665_snd_controls),
+                .dapm_widgets = rt5665_dapm_widgets,
+                .num_dapm_widgets = ARRAY_SIZE(rt5665_dapm_widgets),
+                .dapm_routes = rt5665_dapm_routes,
+                .num_dapm_routes = ARRAY_SIZE(rt5665_dapm_routes),
+        }
+};
+
+
+static const struct regmap_config rt5665_regmap = {
+        .reg_bits = 16,
+        .val_bits = 16,
+        .max_register = 0x0400,
+        .volatile_reg = rt5665_volatile_register,
+        .readable_reg = rt5665_readable_register,
+        .cache_type = REGCACHE_RBTREE,
+        .reg_defaults = rt5665_reg,
+        .num_reg_defaults = ARRAY_SIZE(rt5665_reg),
+        .use_single_rw = true,
+};
+
+static const struct i2c_device_id rt5665_i2c_id[] = {
+        {"rt5665", 0},
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, rt5665_i2c_id);
+
+static int rt5665_parse_dt(struct rt5665_priv *rt5665, struct device *dev)
+{
+        rt5665->pdata.in1_diff = of_property_read_bool(dev->of_node,
+                                        "realtek,in1-differential");
+        rt5665->pdata.in2_diff = of_property_read_bool(dev->of_node,
+                                        "realtek,in2-differential");
+        rt5665->pdata.in3_diff = of_property_read_bool(dev->of_node,
+                                        "realtek,in3-differential");
+        rt5665->pdata.in4_diff = of_property_read_bool(dev->of_node,
+                                        "realtek,in4-differential");
+
+        of_property_read_u32(dev->of_node, "realtek,dmic1-data-pin",
+                &rt5665->pdata.dmic1_data_pin);
+        of_property_read_u32(dev->of_node, "realtek,dmic2-data-pin",
+                &rt5665->pdata.dmic2_data_pin);
+        of_property_read_u32(dev->of_node, "realtek,jd-src",
+                &rt5665->pdata.jd_src);
+
+        rt5665->pdata.ldo1_en = of_get_named_gpio(dev->of_node,
+                "realtek,ldo1-en-gpios", 0);
+
+        return 0;
+}
+
+static void rt5665_calibrate(struct rt5665_priv *rt5665)
+{
+        int value, count;
+
+        mutex_lock(&rt5665->calibrate_mutex);
+
+        regcache_cache_bypass(rt5665->regmap, true);
+
+        regmap_write(rt5665->regmap, RT5665_RESET, 0);
+        regmap_write(rt5665->regmap, RT5665_BIAS_CUR_CTRL_8, 0xa602);
+        regmap_write(rt5665->regmap, RT5665_HP_CHARGE_PUMP_1, 0x0c26);
+        regmap_write(rt5665->regmap, RT5665_MONOMIX_IN_GAIN, 0x021f);
+        regmap_write(rt5665->regmap, RT5665_MONO_OUT, 0x480a);
+        regmap_write(rt5665->regmap, RT5665_PWR_MIXER, 0x083f);
+        regmap_write(rt5665->regmap, RT5665_PWR_DIG_1, 0x0180);
+        regmap_write(rt5665->regmap, RT5665_EJD_CTRL_1, 0x4040);
+        regmap_write(rt5665->regmap, RT5665_HP_LOGIC_CTRL_2, 0x0000);
+        regmap_write(rt5665->regmap, RT5665_DIG_MISC, 0x0001);
+        regmap_write(rt5665->regmap, RT5665_MICBIAS_2, 0x0380);
+        regmap_write(rt5665->regmap, RT5665_GLB_CLK, 0x8000);
+        regmap_write(rt5665->regmap, RT5665_ADDA_CLK_1, 0x1000);
+        regmap_write(rt5665->regmap, RT5665_CHOP_DAC, 0x3030);
+        regmap_write(rt5665->regmap, RT5665_CALIB_ADC_CTRL, 0x3c05);
+        regmap_write(rt5665->regmap, RT5665_PWR_ANLG_1, 0xaa3e);
+        usleep_range(15000, 20000);
+        regmap_write(rt5665->regmap, RT5665_PWR_ANLG_1, 0xfe7e);
+        regmap_write(rt5665->regmap, RT5665_HP_CALIB_CTRL_2, 0x0321);
+
+        regmap_write(rt5665->regmap, RT5665_HP_CALIB_CTRL_1, 0xfc00);
+        count = 0;
+        while (true) {
+                regmap_read(rt5665->regmap, RT5665_HP_CALIB_STA_1, &value);
+                if (value & 0x8000)
+                        usleep_range(10000, 10005);
+                else
+                        break;
+
+                if (count > 60) {
+                        pr_err("HP Calibration Failure\n");
+                        regmap_write(rt5665->regmap, RT5665_RESET, 0);
+                        regcache_cache_bypass(rt5665->regmap, false);
+                        goto out_unlock;
+                }
+
+                count++;
+        }
+
+        regmap_write(rt5665->regmap, RT5665_MONO_AMP_CALIB_CTRL_1, 0x9e24);
+        count = 0;
+        while (true) {
+                regmap_read(rt5665->regmap, RT5665_MONO_AMP_CALIB_STA1, &value);
+                if (value & 0x8000)
+                        usleep_range(10000, 10005);
+                else
+                        break;
+
+                if (count > 60) {
+                        pr_err("MONO Calibration Failure\n");
+                        regmap_write(rt5665->regmap, RT5665_RESET, 0);
+                        regcache_cache_bypass(rt5665->regmap, false);
+                        goto out_unlock;
+                }
+
+                count++;
+        }
+
+        regmap_write(rt5665->regmap, RT5665_RESET, 0);
+        regcache_cache_bypass(rt5665->regmap, false);
+
+        regcache_mark_dirty(rt5665->regmap);
+        regcache_sync(rt5665->regmap);
+
+        regmap_write(rt5665->regmap, RT5665_BIAS_CUR_CTRL_8, 0xa602);
+        regmap_write(rt5665->regmap, RT5665_ASRC_8, 0x0120);
+
+out_unlock:
+        mutex_unlock(&rt5665->calibrate_mutex);
+}
+
+static void rt5665_calibrate_handler(struct work_struct *work)
+{
+        struct rt5665_priv *rt5665 = container_of(work, struct rt5665_priv,
+                calibrate_work.work);
+
+        while (!rt5665->codec->component.card->instantiated) {
+                pr_debug("%s\n", __func__);
+                usleep_range(10000, 15000);
+        }
+
+        rt5665_calibrate(rt5665);
+}
+
+static int rt5665_i2c_probe(struct i2c_client *i2c,
+                    const struct i2c_device_id *id)
+{
+        struct rt5665_platform_data *pdata = dev_get_platdata(&i2c->dev);
+        struct rt5665_priv *rt5665;
+        int i, ret;
+        unsigned int val;
+
+        rt5665 = devm_kzalloc(&i2c->dev, sizeof(struct rt5665_priv),
+                GFP_KERNEL);
+
+        if (rt5665 == NULL)
+                return -ENOMEM;
+
+        i2c_set_clientdata(i2c, rt5665);
+
+        if (pdata)
+                rt5665->pdata = *pdata;
+        else
+                rt5665_parse_dt(rt5665, &i2c->dev);
+
+        for (i = 0; i < ARRAY_SIZE(rt5665->supplies); i++)
+                rt5665->supplies[i].supply = rt5665_supply_names[i];
+
+        ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(rt5665->supplies),
+                                      rt5665->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
+                return ret;
+        }
+
+        ret = regulator_bulk_enable(ARRAY_SIZE(rt5665->supplies),
+                                    rt5665->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret);
+                return ret;
+        }
+
+        if (gpio_is_valid(rt5665->pdata.ldo1_en)) {
+                if (devm_gpio_request_one(&i2c->dev, rt5665->pdata.ldo1_en,
+                                          GPIOF_OUT_INIT_HIGH, "rt5665"))
+                        dev_err(&i2c->dev, "Fail gpio_request gpio_ldo\n");
+        }
+
+        /* Sleep for 300 ms miniumum */
+        usleep_range(300000, 350000);
+
+        rt5665->regmap = devm_regmap_init_i2c(i2c, &rt5665_regmap);
+        if (IS_ERR(rt5665->regmap)) {
+                ret = PTR_ERR(rt5665->regmap);
+                dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
+                        ret);
+                return ret;
+        }
+
+        regmap_read(rt5665->regmap, RT5665_DEVICE_ID, &val);
+        if (val != DEVICE_ID) {
+                dev_err(&i2c->dev,
+                        "Device with ID register %x is not rt5665\n", val);
+                return -ENODEV;
+        }
+
+        regmap_read(rt5665->regmap, RT5665_RESET, &val);
+        switch (val) {
+        case 0x0:
+                rt5665->id = CODEC_5666;
+                break;
+        case 0x6:
+                rt5665->id = CODEC_5668;
+                break;
+        case 0x3:
+        default:
+                rt5665->id = CODEC_5665;
+                break;
+        }
+
+        regmap_write(rt5665->regmap, RT5665_RESET, 0);
+
+        /* line in diff mode*/
+        if (rt5665->pdata.in1_diff)
+                regmap_update_bits(rt5665->regmap, RT5665_IN1_IN2,
+                        RT5665_IN1_DF_MASK, RT5665_IN1_DF_MASK);
+        if (rt5665->pdata.in2_diff)
+                regmap_update_bits(rt5665->regmap, RT5665_IN1_IN2,
+                        RT5665_IN2_DF_MASK, RT5665_IN2_DF_MASK);
+        if (rt5665->pdata.in3_diff)
+                regmap_update_bits(rt5665->regmap, RT5665_IN3_IN4,
+                        RT5665_IN3_DF_MASK, RT5665_IN3_DF_MASK);
+        if (rt5665->pdata.in4_diff)
+                regmap_update_bits(rt5665->regmap, RT5665_IN3_IN4,
+                        RT5665_IN4_DF_MASK, RT5665_IN4_DF_MASK);
+
+        /* DMIC pin*/
+        if (rt5665->pdata.dmic1_data_pin != RT5665_DMIC1_NULL ||
+                rt5665->pdata.dmic2_data_pin != RT5665_DMIC2_NULL) {
+                regmap_update_bits(rt5665->regmap, RT5665_GPIO_CTRL_2,
+                        RT5665_GP9_PIN_MASK, RT5665_GP9_PIN_DMIC1_SCL);
+                regmap_update_bits(rt5665->regmap, RT5665_GPIO_CTRL_1,
+                                RT5665_GP8_PIN_MASK, RT5665_GP8_PIN_DMIC2_SCL);
+                switch (rt5665->pdata.dmic1_data_pin) {
+                case RT5665_DMIC1_DATA_IN2N:
+                        regmap_update_bits(rt5665->regmap, RT5665_DMIC_CTRL_1,
+                                RT5665_DMIC_1_DP_MASK, RT5665_DMIC_1_DP_IN2N);
+                        break;
+
+                case RT5665_DMIC1_DATA_GPIO4:
+                        regmap_update_bits(rt5665->regmap, RT5665_DMIC_CTRL_1,
+                                RT5665_DMIC_1_DP_MASK, RT5665_DMIC_1_DP_GPIO4);
+                        regmap_update_bits(rt5665->regmap, RT5665_GPIO_CTRL_1,
+                                RT5665_GP4_PIN_MASK, RT5665_GP4_PIN_DMIC1_SDA);
+                        break;
+
+                default:
+                        dev_dbg(&i2c->dev, "no DMIC1\n");
+                        break;
+                }
+
+                switch (rt5665->pdata.dmic2_data_pin) {
+                case RT5665_DMIC2_DATA_IN2P:
+                        regmap_update_bits(rt5665->regmap, RT5665_DMIC_CTRL_1,
+                                RT5665_DMIC_2_DP_MASK, RT5665_DMIC_2_DP_IN2P);
+                        break;
+
+                case RT5665_DMIC2_DATA_GPIO5:
+                        regmap_update_bits(rt5665->regmap,
+                                RT5665_DMIC_CTRL_1,
+                                RT5665_DMIC_2_DP_MASK,
+                                RT5665_DMIC_2_DP_GPIO5);
+                        regmap_update_bits(rt5665->regmap, RT5665_GPIO_CTRL_1,
+                                RT5665_GP5_PIN_MASK, RT5665_GP5_PIN_DMIC2_SDA);
+                        break;
+
+                default:
+                        dev_dbg(&i2c->dev, "no DMIC2\n");
+                        break;
+
+                }
+        }
+
+        regmap_write(rt5665->regmap, RT5665_HP_LOGIC_CTRL_2, 0x0002);
+        regmap_update_bits(rt5665->regmap, RT5665_EJD_CTRL_1,
+                0xf000 | RT5665_VREF_POW_MASK, 0xd000 | RT5665_VREF_POW_REG);
+        /* Work around for pow_pump */
+        regmap_update_bits(rt5665->regmap, RT5665_STO1_DAC_SIL_DET,
+                RT5665_DEB_STO_DAC_MASK, RT5665_DEB_80_MS);
+
+        regmap_update_bits(rt5665->regmap, RT5665_HP_CHARGE_PUMP_1,
+                RT5665_PM_HP_MASK, RT5665_PM_HP_HV);
+
+        /* Set GPIO4,8 as input for combo jack */
+        if (rt5665->id == CODEC_5666) {
+                regmap_update_bits(rt5665->regmap, RT5665_GPIO_CTRL_2,
+                        RT5665_GP4_PF_MASK, RT5665_GP4_PF_IN);
+                regmap_update_bits(rt5665->regmap, RT5665_GPIO_CTRL_3,
+                        RT5665_GP8_PF_MASK, RT5665_GP8_PF_IN);
+        }
+
+        /* Enhance performance*/
+        regmap_update_bits(rt5665->regmap, RT5665_PWR_ANLG_1,
+                RT5665_HP_DRIVER_MASK | RT5665_LDO1_DVO_MASK,
+                RT5665_HP_DRIVER_5X | RT5665_LDO1_DVO_09);
+
+        INIT_DELAYED_WORK(&rt5665->jack_detect_work,
+                                rt5665_jack_detect_handler);
+        INIT_DELAYED_WORK(&rt5665->calibrate_work,
+                                rt5665_calibrate_handler);
+        INIT_DELAYED_WORK(&rt5665->jd_check_work,
+                                rt5665_jd_check_handler);
+
+        mutex_init(&rt5665->calibrate_mutex);
+
+        if (i2c->irq) {
+                ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL,
+                        rt5665_irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
+                        | IRQF_ONESHOT, "rt5665", rt5665);
+                if (ret)
+                        dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret);
+
+        }
+
+        return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5665,
+                        rt5665_dai, ARRAY_SIZE(rt5665_dai));
+}
+
+static int rt5665_i2c_remove(struct i2c_client *i2c)
+{
+        snd_soc_unregister_codec(&i2c->dev);
+
+        return 0;
+}
+
+static void rt5665_i2c_shutdown(struct i2c_client *client)
+{
+        struct rt5665_priv *rt5665 = i2c_get_clientdata(client);
+
+        regmap_write(rt5665->regmap, RT5665_RESET, 0);
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id rt5665_of_match[] = {
+        {.compatible = "realtek,rt5665"},
+        {.compatible = "realtek,rt5666"},
+        {.compatible = "realtek,rt5668"},
+        {},
+};
+MODULE_DEVICE_TABLE(of, rt5665_of_match);
+#endif
+
+#ifdef CONFIG_ACPI
+static struct acpi_device_id rt5665_acpi_match[] = {
+        {"10EC5665", 0,},
+        {"10EC5666", 0,},
+        {"10EC5668", 0,},
+        {},
+};
+MODULE_DEVICE_TABLE(acpi, rt5665_acpi_match);
+#endif
+
+struct i2c_driver rt5665_i2c_driver = {
+        .driver = {
+                .name = "rt5665",
+                .of_match_table = of_match_ptr(rt5665_of_match),
+                .acpi_match_table = ACPI_PTR(rt5665_acpi_match),
+        },
+        .probe = rt5665_i2c_probe,
+        .remove = rt5665_i2c_remove,
+        .shutdown = rt5665_i2c_shutdown,
+        .id_table = rt5665_i2c_id,
+};
+module_i2c_driver(rt5665_i2c_driver);
+
+MODULE_DESCRIPTION("ASoC RT5665 driver");
+MODULE_AUTHOR("Bard Liao <bardliao@realtek.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/rt5665.h b/sound/soc/codecs/rt5665.h
new file mode 100644
index 000000000000..12f7080a0d3c
--- /dev/null
+++ b/sound/soc/codecs/rt5665.h
@@ -0,0 +1,1990 @@
+/*
+ * rt5665.h  --  RT5665/RT5658 ALSA SoC audio driver
+ *
+ * Copyright 2016 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 __RT5665_H__
+#define __RT5665_H__
+
+#include <sound/rt5665.h>
+
+#define DEVICE_ID 0x6451
+
+/* Info */
+#define RT5665_RESET                            0x0000
+#define RT5665_VENDOR_ID                        0x00fd
+#define RT5665_VENDOR_ID_1                      0x00fe
+#define RT5665_DEVICE_ID                        0x00ff
+/*  I/O - Output */
+#define RT5665_LOUT                             0x0001
+#define RT5665_HP_CTRL_1                        0x0002
+#define RT5665_HP_CTRL_2                        0x0003
+#define RT5665_MONO_OUT                         0x0004
+#define RT5665_HPL_GAIN                         0x0005
+#define RT5665_HPR_GAIN                         0x0006
+#define RT5665_MONO_GAIN                        0x0007
+
+/* I/O - Input */
+#define RT5665_CAL_BST_CTRL                     0x000a
+#define RT5665_CBJ_BST_CTRL                     0x000b
+#define RT5665_IN1_IN2                          0x000c
+#define RT5665_IN3_IN4                          0x000d
+#define RT5665_INL1_INR1_VOL                    0x000f
+/* I/O - Speaker */
+#define RT5665_EJD_CTRL_1                       0x0010
+#define RT5665_EJD_CTRL_2                       0x0011
+#define RT5665_EJD_CTRL_3                       0x0012
+#define RT5665_EJD_CTRL_4                       0x0013
+#define RT5665_EJD_CTRL_5                       0x0014
+#define RT5665_EJD_CTRL_6                       0x0015
+#define RT5665_EJD_CTRL_7                       0x0016
+/* I/O - ADC/DAC/DMIC */
+#define RT5665_DAC2_CTRL                        0x0017
+#define RT5665_DAC2_DIG_VOL                     0x0018
+#define RT5665_DAC1_DIG_VOL                     0x0019
+#define RT5665_DAC3_DIG_VOL                     0x001a
+#define RT5665_DAC3_CTRL                        0x001b
+#define RT5665_STO1_ADC_DIG_VOL                 0x001c
+#define RT5665_MONO_ADC_DIG_VOL                 0x001d
+#define RT5665_STO2_ADC_DIG_VOL                 0x001e
+#define RT5665_STO1_ADC_BOOST                   0x001f
+#define RT5665_MONO_ADC_BOOST                   0x0020
+#define RT5665_STO2_ADC_BOOST                   0x0021
+#define RT5665_HP_IMP_GAIN_1                    0x0022
+#define RT5665_HP_IMP_GAIN_2                    0x0023
+/* Mixer - D-D */
+#define RT5665_STO1_ADC_MIXER                   0x0026
+#define RT5665_MONO_ADC_MIXER                   0x0027
+#define RT5665_STO2_ADC_MIXER                   0x0028
+#define RT5665_AD_DA_MIXER                      0x0029
+#define RT5665_STO1_DAC_MIXER                   0x002a
+#define RT5665_MONO_DAC_MIXER                   0x002b
+#define RT5665_STO2_DAC_MIXER                   0x002c
+#define RT5665_A_DAC1_MUX                       0x002d
+#define RT5665_A_DAC2_MUX                       0x002e
+#define RT5665_DIG_INF2_DATA                    0x002f
+#define RT5665_DIG_INF3_DATA                    0x0030
+/* Mixer - PDM */
+#define RT5665_PDM_OUT_CTRL                     0x0031
+#define RT5665_PDM_DATA_CTRL_1                  0x0032
+#define RT5665_PDM_DATA_CTRL_2                  0x0033
+#define RT5665_PDM_DATA_CTRL_3                  0x0034
+#define RT5665_PDM_DATA_CTRL_4                  0x0035
+/* Mixer - ADC */
+#define RT5665_REC1_GAIN                        0x003a
+#define RT5665_REC1_L1_MIXER                    0x003b
+#define RT5665_REC1_L2_MIXER                    0x003c
+#define RT5665_REC1_R1_MIXER                    0x003d
+#define RT5665_REC1_R2_MIXER                    0x003e
+#define RT5665_REC2_GAIN                        0x003f
+#define RT5665_REC2_L1_MIXER                    0x0040
+#define RT5665_REC2_L2_MIXER                    0x0041
+#define RT5665_REC2_R1_MIXER                    0x0042
+#define RT5665_REC2_R2_MIXER                    0x0043
+#define RT5665_CAL_REC                          0x0044
+/* Mixer - DAC */
+#define RT5665_ALC_BACK_GAIN                    0x0049
+#define RT5665_MONOMIX_GAIN                     0x004a
+#define RT5665_MONOMIX_IN_GAIN                  0x004b
+#define RT5665_OUT_L_GAIN                       0x004d
+#define RT5665_OUT_L_MIXER                      0x004e
+#define RT5665_OUT_R_GAIN                       0x004f
+#define RT5665_OUT_R_MIXER                      0x0050
+#define RT5665_LOUT_MIXER                       0x0052
+/* Power */
+#define RT5665_PWR_DIG_1                        0x0061
+#define RT5665_PWR_DIG_2                        0x0062
+#define RT5665_PWR_ANLG_1                       0x0063
+#define RT5665_PWR_ANLG_2                       0x0064
+#define RT5665_PWR_ANLG_3                       0x0065
+#define RT5665_PWR_MIXER                        0x0066
+#define RT5665_PWR_VOL                          0x0067
+/* Clock Detect */
+#define RT5665_CLK_DET                          0x006b
+/* Filter */
+#define RT5665_HPF_CTRL1                        0x006d
+/* DMIC */
+#define RT5665_DMIC_CTRL_1                      0x006e
+#define RT5665_DMIC_CTRL_2                      0x006f
+/* Format - ADC/DAC */
+#define RT5665_I2S1_SDP                         0x0070
+#define RT5665_I2S2_SDP                         0x0071
+#define RT5665_I2S3_SDP                         0x0072
+#define RT5665_ADDA_CLK_1                       0x0073
+#define RT5665_ADDA_CLK_2                       0x0074
+#define RT5665_I2S1_F_DIV_CTRL_1                0x0075
+#define RT5665_I2S1_F_DIV_CTRL_2                0x0076
+/* Format - TDM Control */
+#define RT5665_TDM_CTRL_1                       0x0078
+#define RT5665_TDM_CTRL_2                       0x0079
+#define RT5665_TDM_CTRL_3                       0x007a
+#define RT5665_TDM_CTRL_4                       0x007b
+#define RT5665_TDM_CTRL_5                       0x007c
+#define RT5665_TDM_CTRL_6                       0x007d
+#define RT5665_TDM_CTRL_7                       0x007e
+#define RT5665_TDM_CTRL_8                       0x007f
+/* Function - Analog */
+#define RT5665_GLB_CLK                          0x0080
+#define RT5665_PLL_CTRL_1                       0x0081
+#define RT5665_PLL_CTRL_2                       0x0082
+#define RT5665_ASRC_1                           0x0083
+#define RT5665_ASRC_2                           0x0084
+#define RT5665_ASRC_3                           0x0085
+#define RT5665_ASRC_4                           0x0086
+#define RT5665_ASRC_5                           0x0087
+#define RT5665_ASRC_6                           0x0088
+#define RT5665_ASRC_7                           0x0089
+#define RT5665_ASRC_8                           0x008a
+#define RT5665_ASRC_9                           0x008b
+#define RT5665_ASRC_10                          0x008c
+#define RT5665_DEPOP_1                          0x008e
+#define RT5665_DEPOP_2                          0x008f
+#define RT5665_HP_CHARGE_PUMP_1                 0x0091
+#define RT5665_HP_CHARGE_PUMP_2                 0x0092
+#define RT5665_MICBIAS_1                        0x0093
+#define RT5665_MICBIAS_2                        0x0094
+#define RT5665_ASRC_12                          0x0098
+#define RT5665_ASRC_13                          0x0099
+#define RT5665_ASRC_14                          0x009a
+#define RT5665_RC_CLK_CTRL                      0x009f
+#define RT5665_I2S_M_CLK_CTRL_1                 0x00a0
+#define RT5665_I2S2_F_DIV_CTRL_1                0x00a1
+#define RT5665_I2S2_F_DIV_CTRL_2                0x00a2
+#define RT5665_I2S3_F_DIV_CTRL_1                0x00a3
+#define RT5665_I2S3_F_DIV_CTRL_2                0x00a4
+/* Function - Digital */
+#define RT5665_EQ_CTRL_1                        0x00ae
+#define RT5665_EQ_CTRL_2                        0x00af
+#define RT5665_IRQ_CTRL_1                       0x00b6
+#define RT5665_IRQ_CTRL_2                       0x00b7
+#define RT5665_IRQ_CTRL_3                       0x00b8
+#define RT5665_IRQ_CTRL_4                       0x00b9
+#define RT5665_IRQ_CTRL_5                       0x00ba
+#define RT5665_IRQ_CTRL_6                       0x00bb
+#define RT5665_INT_ST_1                         0x00be
+#define RT5665_GPIO_CTRL_1                      0x00c0
+#define RT5665_GPIO_CTRL_2                      0x00c1
+#define RT5665_GPIO_CTRL_3                      0x00c2
+#define RT5665_GPIO_CTRL_4                      0x00c3
+#define RT5665_GPIO_STA                         0x00c4
+#define RT5665_HP_AMP_DET_CTRL_1                0x00d0
+#define RT5665_HP_AMP_DET_CTRL_2                0x00d1
+#define RT5665_MID_HP_AMP_DET                   0x00d3
+#define RT5665_LOW_HP_AMP_DET                   0x00d4
+#define RT5665_SV_ZCD_1                         0x00d9
+#define RT5665_SV_ZCD_2                         0x00da
+#define RT5665_IL_CMD_1                         0x00db
+#define RT5665_IL_CMD_2                         0x00dc
+#define RT5665_IL_CMD_3                         0x00dd
+#define RT5665_IL_CMD_4                         0x00de
+#define RT5665_4BTN_IL_CMD_1                    0x00df
+#define RT5665_4BTN_IL_CMD_2                    0x00e0
+#define RT5665_4BTN_IL_CMD_3                    0x00e1
+#define RT5665_PSV_IL_CMD_1                     0x00e2
+
+#define RT5665_ADC_STO1_HP_CTRL_1               0x00ea
+#define RT5665_ADC_STO1_HP_CTRL_2               0x00eb
+#define RT5665_ADC_MONO_HP_CTRL_1               0x00ec
+#define RT5665_ADC_MONO_HP_CTRL_2               0x00ed
+#define RT5665_ADC_STO2_HP_CTRL_1               0x00ee
+#define RT5665_ADC_STO2_HP_CTRL_2               0x00ef
+#define RT5665_AJD1_CTRL                        0x00f0
+#define RT5665_JD1_THD                          0x00f1
+#define RT5665_JD2_THD                          0x00f2
+#define RT5665_JD_CTRL_1                        0x00f6
+#define RT5665_JD_CTRL_2                        0x00f7
+#define RT5665_JD_CTRL_3                        0x00f8
+/* General Control */
+#define RT5665_DIG_MISC                         0x00fa
+#define RT5665_DUMMY_2                          0x00fb
+#define RT5665_DUMMY_3                          0x00fc
+
+#define RT5665_DAC_ADC_DIG_VOL1                 0x0100
+#define RT5665_DAC_ADC_DIG_VOL2                 0x0101
+#define RT5665_BIAS_CUR_CTRL_1                  0x010a
+#define RT5665_BIAS_CUR_CTRL_2                  0x010b
+#define RT5665_BIAS_CUR_CTRL_3                  0x010c
+#define RT5665_BIAS_CUR_CTRL_4                  0x010d
+#define RT5665_BIAS_CUR_CTRL_5                  0x010e
+#define RT5665_BIAS_CUR_CTRL_6                  0x010f
+#define RT5665_BIAS_CUR_CTRL_7                  0x0110
+#define RT5665_BIAS_CUR_CTRL_8                  0x0111
+#define RT5665_BIAS_CUR_CTRL_9                  0x0112
+#define RT5665_BIAS_CUR_CTRL_10                 0x0113
+#define RT5665_VREF_REC_OP_FB_CAP_CTRL          0x0117
+#define RT5665_CHARGE_PUMP_1                    0x0125
+#define RT5665_DIG_IN_CTRL_1                    0x0132
+#define RT5665_DIG_IN_CTRL_2                    0x0133
+#define RT5665_PAD_DRIVING_CTRL                 0x0137
+#define RT5665_SOFT_RAMP_DEPOP                  0x0138
+#define RT5665_PLL                              0x0139
+#define RT5665_CHOP_DAC                         0x013a
+#define RT5665_CHOP_ADC                         0x013b
+#define RT5665_CALIB_ADC_CTRL                   0x013c
+#define RT5665_VOL_TEST                         0x013f
+#define RT5665_TEST_MODE_CTRL_1                 0x0145
+#define RT5665_TEST_MODE_CTRL_2                 0x0146
+#define RT5665_TEST_MODE_CTRL_3                 0x0147
+#define RT5665_TEST_MODE_CTRL_4                 0x0148
+#define RT5665_BASSBACK_CTRL                    0x0150
+#define RT5665_STO_NG2_CTRL_1                   0x0160
+#define RT5665_STO_NG2_CTRL_2                   0x0161
+#define RT5665_STO_NG2_CTRL_3                   0x0162
+#define RT5665_STO_NG2_CTRL_4                   0x0163
+#define RT5665_STO_NG2_CTRL_5                   0x0164
+#define RT5665_STO_NG2_CTRL_6                   0x0165
+#define RT5665_STO_NG2_CTRL_7                   0x0166
+#define RT5665_STO_NG2_CTRL_8                   0x0167
+#define RT5665_MONO_NG2_CTRL_1                  0x0170
+#define RT5665_MONO_NG2_CTRL_2                  0x0171
+#define RT5665_MONO_NG2_CTRL_3                  0x0172
+#define RT5665_MONO_NG2_CTRL_4                  0x0173
+#define RT5665_MONO_NG2_CTRL_5                  0x0174
+#define RT5665_MONO_NG2_CTRL_6                  0x0175
+#define RT5665_STO1_DAC_SIL_DET                 0x0190
+#define RT5665_MONOL_DAC_SIL_DET                0x0191
+#define RT5665_MONOR_DAC_SIL_DET                0x0192
+#define RT5665_STO2_DAC_SIL_DET                 0x0193
+#define RT5665_SIL_PSV_CTRL1                    0x0194
+#define RT5665_SIL_PSV_CTRL2                    0x0195
+#define RT5665_SIL_PSV_CTRL3                    0x0196
+#define RT5665_SIL_PSV_CTRL4                    0x0197
+#define RT5665_SIL_PSV_CTRL5                    0x0198
+#define RT5665_SIL_PSV_CTRL6                    0x0199
+#define RT5665_MONO_AMP_CALIB_CTRL_1            0x01a0
+#define RT5665_MONO_AMP_CALIB_CTRL_2            0x01a1
+#define RT5665_MONO_AMP_CALIB_CTRL_3            0x01a2
+#define RT5665_MONO_AMP_CALIB_CTRL_4            0x01a3
+#define RT5665_MONO_AMP_CALIB_CTRL_5            0x01a4
+#define RT5665_MONO_AMP_CALIB_CTRL_6            0x01a5
+#define RT5665_MONO_AMP_CALIB_CTRL_7            0x01a6
+#define RT5665_MONO_AMP_CALIB_STA1              0x01a7
+#define RT5665_MONO_AMP_CALIB_STA2              0x01a8
+#define RT5665_MONO_AMP_CALIB_STA3              0x01a9
+#define RT5665_MONO_AMP_CALIB_STA4              0x01aa
+#define RT5665_MONO_AMP_CALIB_STA6              0x01ab
+#define RT5665_HP_IMP_SENS_CTRL_01              0x01b5
+#define RT5665_HP_IMP_SENS_CTRL_02              0x01b6
+#define RT5665_HP_IMP_SENS_CTRL_03              0x01b7
+#define RT5665_HP_IMP_SENS_CTRL_04              0x01b8
+#define RT5665_HP_IMP_SENS_CTRL_05              0x01b9
+#define RT5665_HP_IMP_SENS_CTRL_06              0x01ba
+#define RT5665_HP_IMP_SENS_CTRL_07              0x01bb
+#define RT5665_HP_IMP_SENS_CTRL_08              0x01bc
+#define RT5665_HP_IMP_SENS_CTRL_09              0x01bd
+#define RT5665_HP_IMP_SENS_CTRL_10              0x01be
+#define RT5665_HP_IMP_SENS_CTRL_11              0x01bf
+#define RT5665_HP_IMP_SENS_CTRL_12              0x01c0
+#define RT5665_HP_IMP_SENS_CTRL_13              0x01c1
+#define RT5665_HP_IMP_SENS_CTRL_14              0x01c2
+#define RT5665_HP_IMP_SENS_CTRL_15              0x01c3
+#define RT5665_HP_IMP_SENS_CTRL_16              0x01c4
+#define RT5665_HP_IMP_SENS_CTRL_17              0x01c5
+#define RT5665_HP_IMP_SENS_CTRL_18              0x01c6
+#define RT5665_HP_IMP_SENS_CTRL_19              0x01c7
+#define RT5665_HP_IMP_SENS_CTRL_20              0x01c8
+#define RT5665_HP_IMP_SENS_CTRL_21              0x01c9
+#define RT5665_HP_IMP_SENS_CTRL_22              0x01ca
+#define RT5665_HP_IMP_SENS_CTRL_23              0x01cb
+#define RT5665_HP_IMP_SENS_CTRL_24              0x01cc
+#define RT5665_HP_IMP_SENS_CTRL_25              0x01cd
+#define RT5665_HP_IMP_SENS_CTRL_26              0x01ce
+#define RT5665_HP_IMP_SENS_CTRL_27              0x01cf
+#define RT5665_HP_IMP_SENS_CTRL_28              0x01d0
+#define RT5665_HP_IMP_SENS_CTRL_29              0x01d1
+#define RT5665_HP_IMP_SENS_CTRL_30              0x01d2
+#define RT5665_HP_IMP_SENS_CTRL_31              0x01d3
+#define RT5665_HP_IMP_SENS_CTRL_32              0x01d4
+#define RT5665_HP_IMP_SENS_CTRL_33              0x01d5
+#define RT5665_HP_IMP_SENS_CTRL_34              0x01d6
+#define RT5665_HP_LOGIC_CTRL_1                  0x01da
+#define RT5665_HP_LOGIC_CTRL_2                  0x01db
+#define RT5665_HP_LOGIC_CTRL_3                  0x01dc
+#define RT5665_HP_CALIB_CTRL_1                  0x01de
+#define RT5665_HP_CALIB_CTRL_2                  0x01df
+#define RT5665_HP_CALIB_CTRL_3                  0x01e0
+#define RT5665_HP_CALIB_CTRL_4                  0x01e1
+#define RT5665_HP_CALIB_CTRL_5                  0x01e2
+#define RT5665_HP_CALIB_CTRL_6                  0x01e3
+#define RT5665_HP_CALIB_CTRL_7                  0x01e4
+#define RT5665_HP_CALIB_CTRL_9                  0x01e6
+#define RT5665_HP_CALIB_CTRL_10                 0x01e7
+#define RT5665_HP_CALIB_CTRL_11                 0x01e8
+#define RT5665_HP_CALIB_STA_1                   0x01ea
+#define RT5665_HP_CALIB_STA_2                   0x01eb
+#define RT5665_HP_CALIB_STA_3                   0x01ec
+#define RT5665_HP_CALIB_STA_4                   0x01ed
+#define RT5665_HP_CALIB_STA_5                   0x01ee
+#define RT5665_HP_CALIB_STA_6                   0x01ef
+#define RT5665_HP_CALIB_STA_7                   0x01f0
+#define RT5665_HP_CALIB_STA_8                   0x01f1
+#define RT5665_HP_CALIB_STA_9                   0x01f2
+#define RT5665_HP_CALIB_STA_10                  0x01f3
+#define RT5665_HP_CALIB_STA_11                  0x01f4
+#define RT5665_PGM_TAB_CTRL1                    0x0200
+#define RT5665_PGM_TAB_CTRL2                    0x0201
+#define RT5665_PGM_TAB_CTRL3                    0x0202
+#define RT5665_PGM_TAB_CTRL4                    0x0203
+#define RT5665_PGM_TAB_CTRL5                    0x0204
+#define RT5665_PGM_TAB_CTRL6                    0x0205
+#define RT5665_PGM_TAB_CTRL7                    0x0206
+#define RT5665_PGM_TAB_CTRL8                    0x0207
+#define RT5665_PGM_TAB_CTRL9                    0x0208
+#define RT5665_SAR_IL_CMD_1                     0x0210
+#define RT5665_SAR_IL_CMD_2                     0x0211
+#define RT5665_SAR_IL_CMD_3                     0x0212
+#define RT5665_SAR_IL_CMD_4                     0x0213
+#define RT5665_SAR_IL_CMD_5                     0x0214
+#define RT5665_SAR_IL_CMD_6                     0x0215
+#define RT5665_SAR_IL_CMD_7                     0x0216
+#define RT5665_SAR_IL_CMD_8                     0x0217
+#define RT5665_SAR_IL_CMD_9                     0x0218
+#define RT5665_SAR_IL_CMD_10                    0x0219
+#define RT5665_SAR_IL_CMD_11                    0x021a
+#define RT5665_SAR_IL_CMD_12                    0x021b
+#define RT5665_DRC1_CTRL_0                      0x02ff
+#define RT5665_DRC1_CTRL_1                      0x0300
+#define RT5665_DRC1_CTRL_2                      0x0301
+#define RT5665_DRC1_CTRL_3                      0x0302
+#define RT5665_DRC1_CTRL_4                      0x0303
+#define RT5665_DRC1_CTRL_5                      0x0304
+#define RT5665_DRC1_CTRL_6                      0x0305
+#define RT5665_DRC1_HARD_LMT_CTRL_1             0x0306
+#define RT5665_DRC1_HARD_LMT_CTRL_2             0x0307
+#define RT5665_DRC1_PRIV_1                      0x0310
+#define RT5665_DRC1_PRIV_2                      0x0311
+#define RT5665_DRC1_PRIV_3                      0x0312
+#define RT5665_DRC1_PRIV_4                      0x0313
+#define RT5665_DRC1_PRIV_5                      0x0314
+#define RT5665_DRC1_PRIV_6                      0x0315
+#define RT5665_DRC1_PRIV_7                      0x0316
+#define RT5665_DRC1_PRIV_8                      0x0317
+#define RT5665_ALC_PGA_CTRL_1                   0x0330
+#define RT5665_ALC_PGA_CTRL_2                   0x0331
+#define RT5665_ALC_PGA_CTRL_3                   0x0332
+#define RT5665_ALC_PGA_CTRL_4                   0x0333
+#define RT5665_ALC_PGA_CTRL_5                   0x0334
+#define RT5665_ALC_PGA_CTRL_6                   0x0335
+#define RT5665_ALC_PGA_CTRL_7                   0x0336
+#define RT5665_ALC_PGA_CTRL_8                   0x0337
+#define RT5665_ALC_PGA_STA_1                    0x0338
+#define RT5665_ALC_PGA_STA_2                    0x0339
+#define RT5665_ALC_PGA_STA_3                    0x033a
+#define RT5665_EQ_AUTO_RCV_CTRL1                0x03c0
+#define RT5665_EQ_AUTO_RCV_CTRL2                0x03c1
+#define RT5665_EQ_AUTO_RCV_CTRL3                0x03c2
+#define RT5665_EQ_AUTO_RCV_CTRL4                0x03c3
+#define RT5665_EQ_AUTO_RCV_CTRL5                0x03c4
+#define RT5665_EQ_AUTO_RCV_CTRL6                0x03c5
+#define RT5665_EQ_AUTO_RCV_CTRL7                0x03c6
+#define RT5665_EQ_AUTO_RCV_CTRL8                0x03c7
+#define RT5665_EQ_AUTO_RCV_CTRL9                0x03c8
+#define RT5665_EQ_AUTO_RCV_CTRL10               0x03c9
+#define RT5665_EQ_AUTO_RCV_CTRL11               0x03ca
+#define RT5665_EQ_AUTO_RCV_CTRL12               0x03cb
+#define RT5665_EQ_AUTO_RCV_CTRL13               0x03cc
+#define RT5665_ADC_L_EQ_LPF1_A1                 0x03d0
+#define RT5665_R_EQ_LPF1_A1                     0x03d1
+#define RT5665_L_EQ_LPF1_H0                     0x03d2
+#define RT5665_R_EQ_LPF1_H0                     0x03d3
+#define RT5665_L_EQ_BPF1_A1                     0x03d4
+#define RT5665_R_EQ_BPF1_A1                     0x03d5
+#define RT5665_L_EQ_BPF1_A2                     0x03d6
+#define RT5665_R_EQ_BPF1_A2                     0x03d7
+#define RT5665_L_EQ_BPF1_H0                     0x03d8
+#define RT5665_R_EQ_BPF1_H0                     0x03d9
+#define RT5665_L_EQ_BPF2_A1                     0x03da
+#define RT5665_R_EQ_BPF2_A1                     0x03db
+#define RT5665_L_EQ_BPF2_A2                     0x03dc
+#define RT5665_R_EQ_BPF2_A2                     0x03dd
+#define RT5665_L_EQ_BPF2_H0                     0x03de
+#define RT5665_R_EQ_BPF2_H0                     0x03df
+#define RT5665_L_EQ_BPF3_A1                     0x03e0
+#define RT5665_R_EQ_BPF3_A1                     0x03e1
+#define RT5665_L_EQ_BPF3_A2                     0x03e2
+#define RT5665_R_EQ_BPF3_A2                     0x03e3
+#define RT5665_L_EQ_BPF3_H0                     0x03e4
+#define RT5665_R_EQ_BPF3_H0                     0x03e5
+#define RT5665_L_EQ_BPF4_A1                     0x03e6
+#define RT5665_R_EQ_BPF4_A1                     0x03e7
+#define RT5665_L_EQ_BPF4_A2                     0x03e8
+#define RT5665_R_EQ_BPF4_A2                     0x03e9
+#define RT5665_L_EQ_BPF4_H0                     0x03ea
+#define RT5665_R_EQ_BPF4_H0                     0x03eb
+#define RT5665_L_EQ_HPF1_A1                     0x03ec
+#define RT5665_R_EQ_HPF1_A1                     0x03ed
+#define RT5665_L_EQ_HPF1_H0                     0x03ee
+#define RT5665_R_EQ_HPF1_H0                     0x03ef
+#define RT5665_L_EQ_PRE_VOL                     0x03f0
+#define RT5665_R_EQ_PRE_VOL                     0x03f1
+#define RT5665_L_EQ_POST_VOL                    0x03f2
+#define RT5665_R_EQ_POST_VOL                    0x03f3
+#define RT5665_SCAN_MODE_CTRL                   0x07f0
+#define RT5665_I2C_MODE                         0x07fa
+
+
+
+/* global definition */
+#define RT5665_L_MUTE                           (0x1 << 15)
+#define RT5665_L_MUTE_SFT                       15
+#define RT5665_VOL_L_MUTE                       (0x1 << 14)
+#define RT5665_VOL_L_SFT                        14
+#define RT5665_R_MUTE                           (0x1 << 7)
+#define RT5665_R_MUTE_SFT                       7
+#define RT5665_VOL_R_MUTE                       (0x1 << 6)
+#define RT5665_VOL_R_SFT                        6
+#define RT5665_L_VOL_MASK                       (0x3f << 8)
+#define RT5665_L_VOL_SFT                        8
+#define RT5665_R_VOL_MASK                       (0x3f)
+#define RT5665_R_VOL_SFT                        0
+
+/*Headphone Amp L/R Analog Gain and Digital NG2 Gain Control (0x0005 0x0006)*/
+#define RT5665_G_HP                             (0xf << 8)
+#define RT5665_G_HP_SFT                         8
+#define RT5665_G_STO_DA_DMIX                    (0xf)
+#define RT5665_G_STO_DA_SFT                     0
+
+/* CBJ Control (0x000b) */
+#define RT5665_BST_CBJ_MASK                     (0xf << 8)
+#define RT5665_BST_CBJ_SFT                      8
+
+/* IN1/IN2 Control (0x000c) */
+#define RT5665_IN1_DF_MASK                      (0x1 << 15)
+#define RT5665_IN1_DF                           15
+#define RT5665_BST1_MASK                        (0x7f << 8)
+#define RT5665_BST1_SFT                         8
+#define RT5665_IN2_DF_MASK                      (0x1 << 7)
+#define RT5665_IN2_DF                           7
+#define RT5665_BST2_MASK                        (0x7f)
+#define RT5665_BST2_SFT                         0
+
+/* IN3/IN4 Control (0x000d) */
+#define RT5665_IN3_DF_MASK                      (0x1 << 15)
+#define RT5665_IN3_DF                           15
+#define RT5665_BST3_MASK                        (0x7f << 8)
+#define RT5665_BST3_SFT                         8
+#define RT5665_IN4_DF_MASK                      (0x1 << 7)
+#define RT5665_IN4_DF                           7
+#define RT5665_BST4_MASK                        (0x7f)
+#define RT5665_BST4_SFT                         0
+
+/* INL and INR Volume Control (0x000f) */
+#define RT5665_INL_VOL_MASK                     (0x1f << 8)
+#define RT5665_INL_VOL_SFT                      8
+#define RT5665_INR_VOL_MASK                     (0x1f)
+#define RT5665_INR_VOL_SFT                      0
+
+/* Embeeded Jack and Type Detection Control 1 (0x0010) */
+#define RT5665_EMB_JD_EN                        (0x1 << 15)
+#define RT5665_EMB_JD_EN_SFT                    15
+#define RT5665_JD_MODE                          (0x1 << 13)
+#define RT5665_JD_MODE_SFT                      13
+#define RT5665_POLA_EXT_JD_MASK                 (0x1 << 11)
+#define RT5665_POLA_EXT_JD_LOW                  (0x1 << 11)
+#define RT5665_POLA_EXT_JD_HIGH                 (0x0 << 11)
+#define RT5665_EXT_JD_DIG                       (0x1 << 9)
+#define RT5665_POL_FAST_OFF_MASK                (0x1 << 8)
+#define RT5665_POL_FAST_OFF_HIGH                (0x1 << 8)
+#define RT5665_POL_FAST_OFF_LOW                 (0x0 << 8)
+#define RT5665_VREF_POW_MASK                    (0x1 << 6)
+#define RT5665_VREF_POW_FSM                     (0x0 << 6)
+#define RT5665_VREF_POW_REG                     (0x1 << 6)
+#define RT5665_MB1_PATH_MASK                    (0x1 << 5)
+#define RT5665_CTRL_MB1_REG                     (0x1 << 5)
+#define RT5665_CTRL_MB1_FSM                     (0x0 << 5)
+#define RT5665_MB2_PATH_MASK                    (0x1 << 4)
+#define RT5665_CTRL_MB2_REG                     (0x1 << 4)
+#define RT5665_CTRL_MB2_FSM                     (0x0 << 4)
+#define RT5665_TRIG_JD_MASK                     (0x1 << 3)
+#define RT5665_TRIG_JD_HIGH                     (0x1 << 3)
+#define RT5665_TRIG_JD_LOW                      (0x0 << 3)
+
+/* Embeeded Jack and Type Detection Control 2 (0x0011) */
+#define RT5665_EXT_JD_SRC                       (0x7 << 4)
+#define RT5665_EXT_JD_SRC_SFT                   4
+#define RT5665_EXT_JD_SRC_GPIO_JD1              (0x0 << 4)
+#define RT5665_EXT_JD_SRC_GPIO_JD2              (0x1 << 4)
+#define RT5665_EXT_JD_SRC_JD1_1                 (0x2 << 4)
+#define RT5665_EXT_JD_SRC_JD1_2                 (0x3 << 4)
+#define RT5665_EXT_JD_SRC_JD2                   (0x4 << 4)
+#define RT5665_EXT_JD_SRC_JD3                   (0x5 << 4)
+#define RT5665_EXT_JD_SRC_MANUAL                (0x6 << 4)
+
+/* Combo Jack and Type Detection Control 4 (0x0013) */
+#define RT5665_SEL_SHT_MID_TON_MASK             (0x3 << 12)
+#define RT5665_SEL_SHT_MID_TON_2                (0x0 << 12)
+#define RT5665_SEL_SHT_MID_TON_3                (0x1 << 12)
+#define RT5665_CBJ_JD_TEST_MASK                 (0x1 << 6)
+#define RT5665_CBJ_JD_TEST_NORM                 (0x0 << 6)
+#define RT5665_CBJ_JD_TEST_MODE                 (0x1 << 6)
+
+/* Slience Detection Control (0x0015) */
+#define RT5665_SIL_DET_MASK                     (0x1 << 15)
+#define RT5665_SIL_DET_DIS                      (0x0 << 15)
+#define RT5665_SIL_DET_EN                       (0x1 << 15)
+
+/* DAC2 Control (0x0017) */
+#define RT5665_M_DAC2_L_VOL                     (0x1 << 13)
+#define RT5665_M_DAC2_L_VOL_SFT                 13
+#define RT5665_M_DAC2_R_VOL                     (0x1 << 12)
+#define RT5665_M_DAC2_R_VOL_SFT                 12
+#define RT5665_DAC_L2_SEL_MASK                  (0x7 << 4)
+#define RT5665_DAC_L2_SEL_SFT                   4
+#define RT5665_DAC_R2_SEL_MASK                  (0x7 << 0)
+#define RT5665_DAC_R2_SEL_SFT                   0
+
+/* Sidetone Control (0x0018) */
+#define RT5665_ST_SEL_MASK                      (0x7 << 9)
+#define RT5665_ST_SEL_SFT                       9
+#define RT5665_ST_EN                            (0x1 << 6)
+#define RT5665_ST_EN_SFT                        6
+
+/* DAC1 Digital Volume (0x0019) */
+#define RT5665_DAC_L1_VOL_MASK                  (0xff << 8)
+#define RT5665_DAC_L1_VOL_SFT                   8
+#define RT5665_DAC_R1_VOL_MASK                  (0xff)
+#define RT5665_DAC_R1_VOL_SFT                   0
+
+/* DAC2 Digital Volume (0x001a) */
+#define RT5665_DAC_L2_VOL_MASK                  (0xff << 8)
+#define RT5665_DAC_L2_VOL_SFT                   8
+#define RT5665_DAC_R2_VOL_MASK                  (0xff)
+#define RT5665_DAC_R2_VOL_SFT                   0
+
+/* DAC3 Control (0x001b) */
+#define RT5665_M_DAC3_L_VOL                     (0x1 << 13)
+#define RT5665_M_DAC3_L_VOL_SFT                 13
+#define RT5665_M_DAC3_R_VOL                     (0x1 << 12)
+#define RT5665_M_DAC3_R_VOL_SFT                 12
+#define RT5665_DAC_L3_SEL_MASK                  (0x7 << 4)
+#define RT5665_DAC_L3_SEL_SFT                   4
+#define RT5665_DAC_R3_SEL_MASK                  (0x7 << 0)
+#define RT5665_DAC_R3_SEL_SFT                   0
+
+/* ADC Digital Volume Control (0x001c) */
+#define RT5665_ADC_L_VOL_MASK                   (0x7f << 8)
+#define RT5665_ADC_L_VOL_SFT                    8
+#define RT5665_ADC_R_VOL_MASK                   (0x7f)
+#define RT5665_ADC_R_VOL_SFT                    0
+
+/* Mono ADC Digital Volume Control (0x001d) */
+#define RT5665_MONO_ADC_L_VOL_MASK              (0x7f << 8)
+#define RT5665_MONO_ADC_L_VOL_SFT               8
+#define RT5665_MONO_ADC_R_VOL_MASK              (0x7f)
+#define RT5665_MONO_ADC_R_VOL_SFT               0
+
+/* Stereo1 ADC Boost Gain Control (0x001f) */
+#define RT5665_STO1_ADC_L_BST_MASK              (0x3 << 14)
+#define RT5665_STO1_ADC_L_BST_SFT               14
+#define RT5665_STO1_ADC_R_BST_MASK              (0x3 << 12)
+#define RT5665_STO1_ADC_R_BST_SFT               12
+
+/* Mono ADC Boost Gain Control (0x0020) */
+#define RT5665_MONO_ADC_L_BST_MASK              (0x3 << 14)
+#define RT5665_MONO_ADC_L_BST_SFT               14
+#define RT5665_MONO_ADC_R_BST_MASK              (0x3 << 12)
+#define RT5665_MONO_ADC_R_BST_SFT               12
+
+/* Stereo1 ADC Boost Gain Control (0x001f) */
+#define RT5665_STO2_ADC_L_BST_MASK              (0x3 << 14)
+#define RT5665_STO2_ADC_L_BST_SFT               14
+#define RT5665_STO2_ADC_R_BST_MASK              (0x3 << 12)
+#define RT5665_STO2_ADC_R_BST_SFT               12
+
+/* Stereo1 ADC Mixer Control (0x0026) */
+#define RT5665_M_STO1_ADC_L1                    (0x1 << 15)
+#define RT5665_M_STO1_ADC_L1_SFT                15
+#define RT5665_M_STO1_ADC_L2                    (0x1 << 14)
+#define RT5665_M_STO1_ADC_L2_SFT                14
+#define RT5665_STO1_ADC1L_SRC_MASK              (0x1 << 13)
+#define RT5665_STO1_ADC1L_SRC_SFT               13
+#define RT5665_STO1_ADC1_SRC_ADC                (0x1 << 13)
+#define RT5665_STO1_ADC1_SRC_DACMIX             (0x0 << 13)
+#define RT5665_STO1_ADC2L_SRC_MASK              (0x1 << 12)
+#define RT5665_STO1_ADC2L_SRC_SFT               12
+#define RT5665_STO1_ADCL_SRC_MASK               (0x3 << 10)
+#define RT5665_STO1_ADCL_SRC_SFT                10
+#define RT5665_STO1_DD_L_SRC_MASK               (0x1 << 9)
+#define RT5665_STO1_DD_L_SRC_SFT                9
+#define RT5665_STO1_DMIC_SRC_MASK               (0x1 << 8)
+#define RT5665_STO1_DMIC_SRC_SFT                8
+#define RT5665_STO1_DMIC_SRC_DMIC2              (0x1 << 8)
+#define RT5665_STO1_DMIC_SRC_DMIC1              (0x0 << 8)
+#define RT5665_M_STO1_ADC_R1                    (0x1 << 7)
+#define RT5665_M_STO1_ADC_R1_SFT                7
+#define RT5665_M_STO1_ADC_R2                    (0x1 << 6)
+#define RT5665_M_STO1_ADC_R2_SFT                6
+#define RT5665_STO1_ADC1R_SRC_MASK              (0x1 << 5)
+#define RT5665_STO1_ADC1R_SRC_SFT               5
+#define RT5665_STO1_ADC2R_SRC_MASK              (0x1 << 4)
+#define RT5665_STO1_ADC2R_SRC_SFT               4
+#define RT5665_STO1_ADCR_SRC_MASK               (0x3 << 2)
+#define RT5665_STO1_ADCR_SRC_SFT                2
+#define RT5665_STO1_DD_R_SRC_MASK               (0x3)
+#define RT5665_STO1_DD_R_SRC_SFT                0
+
+
+/* Mono1 ADC Mixer control (0x0027) */
+#define RT5665_M_MONO_ADC_L1                    (0x1 << 15)
+#define RT5665_M_MONO_ADC_L1_SFT                15
+#define RT5665_M_MONO_ADC_L2                    (0x1 << 14)
+#define RT5665_M_MONO_ADC_L2_SFT                14
+#define RT5665_MONO_ADC_L1_SRC_MASK             (0x1 << 13)
+#define RT5665_MONO_ADC_L1_SRC_SFT              13
+#define RT5665_MONO_ADC_L2_SRC_MASK             (0x1 << 12)
+#define RT5665_MONO_ADC_L2_SRC_SFT              12
+#define RT5665_MONO_ADC_L_SRC_MASK              (0x3 << 10)
+#define RT5665_MONO_ADC_L_SRC_SFT               10
+#define RT5665_MONO_DD_L_SRC_MASK               (0x1 << 9)
+#define RT5665_MONO_DD_L_SRC_SFT                9
+#define RT5665_MONO_DMIC_L_SRC_MASK             (0x1 << 8)
+#define RT5665_MONO_DMIC_L_SRC_SFT              8
+#define RT5665_M_MONO_ADC_R1                    (0x1 << 7)
+#define RT5665_M_MONO_ADC_R1_SFT                7
+#define RT5665_M_MONO_ADC_R2                    (0x1 << 6)
+#define RT5665_M_MONO_ADC_R2_SFT                6
+#define RT5665_MONO_ADC_R1_SRC_MASK             (0x1 << 5)
+#define RT5665_MONO_ADC_R1_SRC_SFT              5
+#define RT5665_MONO_ADC_R2_SRC_MASK             (0x1 << 4)
+#define RT5665_MONO_ADC_R2_SRC_SFT              4
+#define RT5665_MONO_ADC_R_SRC_MASK              (0x3 << 2)
+#define RT5665_MONO_ADC_R_SRC_SFT               2
+#define RT5665_MONO_DD_R_SRC_MASK               (0x1 << 1)
+#define RT5665_MONO_DD_R_SRC_SFT                1
+#define RT5665_MONO_DMIC_R_SRC_MASK             0x1
+#define RT5665_MONO_DMIC_R_SRC_SFT              0
+
+/* Stereo2 ADC Mixer Control (0x0028) */
+#define RT5665_M_STO2_ADC_L1                    (0x1 << 15)
+#define RT5665_M_STO2_ADC_L1_UN                 (0x0 << 15)
+#define RT5665_M_STO2_ADC_L1_SFT                15
+#define RT5665_M_STO2_ADC_L2                    (0x1 << 14)
+#define RT5665_M_STO2_ADC_L2_SFT                14
+#define RT5665_STO2_ADC1L_SRC_MASK              (0x1 << 13)
+#define RT5665_STO2_ADC1L_SRC_SFT               13
+#define RT5665_STO2_ADC1_SRC_ADC                (0x1 << 13)
+#define RT5665_STO2_ADC1_SRC_DACMIX             (0x0 << 13)
+#define RT5665_STO2_ADC2L_SRC_MASK              (0x1 << 12)
+#define RT5665_STO2_ADC2L_SRC_SFT               12
+#define RT5665_STO2_ADCL_SRC_MASK               (0x3 << 10)
+#define RT5665_STO2_ADCL_SRC_SFT                10
+#define RT5665_STO2_DD_L_SRC_MASK               (0x1 << 9)
+#define RT5665_STO2_DD_L_SRC_SFT                9
+#define RT5665_STO2_DMIC_SRC_MASK               (0x1 << 8)
+#define RT5665_STO2_DMIC_SRC_SFT                8
+#define RT5665_STO2_DMIC_SRC_DMIC2              (0x1 << 8)
+#define RT5665_STO2_DMIC_SRC_DMIC1              (0x0 << 8)
+#define RT5665_M_STO2_ADC_R1                    (0x1 << 7)
+#define RT5665_M_STO2_ADC_R1_UN                 (0x0 << 7)
+#define RT5665_M_STO2_ADC_R1_SFT                7
+#define RT5665_M_STO2_ADC_R2                    (0x1 << 6)
+#define RT5665_M_STO2_ADC_R2_SFT                6
+#define RT5665_STO2_ADC1R_SRC_MASK              (0x1 << 5)
+#define RT5665_STO2_ADC1R_SRC_SFT               5
+#define RT5665_STO2_ADC2R_SRC_MASK              (0x1 << 4)
+#define RT5665_STO2_ADC2R_SRC_SFT               4
+#define RT5665_STO2_ADCR_SRC_MASK               (0x3 << 2)
+#define RT5665_STO2_ADCR_SRC_SFT                2
+#define RT5665_STO2_DD_R_SRC_MASK               (0x1 << 1)
+#define RT5665_STO2_DD_R_SRC_SFT                1
+
+/* ADC Mixer to DAC Mixer Control (0x0029) */
+#define RT5665_M_ADCMIX_L                       (0x1 << 15)
+#define RT5665_M_ADCMIX_L_SFT                   15
+#define RT5665_M_DAC1_L                         (0x1 << 14)
+#define RT5665_M_DAC1_L_SFT                     14
+#define RT5665_DAC1_R_SEL_MASK                  (0x3 << 10)
+#define RT5665_DAC1_R_SEL_SFT                   10
+#define RT5665_DAC1_L_SEL_MASK                  (0x3 << 8)
+#define RT5665_DAC1_L_SEL_SFT                   8
+#define RT5665_M_ADCMIX_R                       (0x1 << 7)
+#define RT5665_M_ADCMIX_R_SFT                   7
+#define RT5665_M_DAC1_R                         (0x1 << 6)
+#define RT5665_M_DAC1_R_SFT                     6
+
+/* Stereo1 DAC Mixer Control (0x002a) */
+#define RT5665_M_DAC_L1_STO_L                   (0x1 << 15)
+#define RT5665_M_DAC_L1_STO_L_SFT               15
+#define RT5665_G_DAC_L1_STO_L_MASK              (0x1 << 14)
+#define RT5665_G_DAC_L1_STO_L_SFT               14
+#define RT5665_M_DAC_R1_STO_L                   (0x1 << 13)
+#define RT5665_M_DAC_R1_STO_L_SFT               13
+#define RT5665_G_DAC_R1_STO_L_MASK              (0x1 << 12)
+#define RT5665_G_DAC_R1_STO_L_SFT               12
+#define RT5665_M_DAC_L2_STO_L                   (0x1 << 11)
+#define RT5665_M_DAC_L2_STO_L_SFT               11
+#define RT5665_G_DAC_L2_STO_L_MASK              (0x1 << 10)
+#define RT5665_G_DAC_L2_STO_L_SFT               10
+#define RT5665_M_DAC_R2_STO_L                   (0x1 << 9)
+#define RT5665_M_DAC_R2_STO_L_SFT               9
+#define RT5665_G_DAC_R2_STO_L_MASK              (0x1 << 8)
+#define RT5665_G_DAC_R2_STO_L_SFT               8
+#define RT5665_M_DAC_L1_STO_R                   (0x1 << 7)
+#define RT5665_M_DAC_L1_STO_R_SFT               7
+#define RT5665_G_DAC_L1_STO_R_MASK              (0x1 << 6)
+#define RT5665_G_DAC_L1_STO_R_SFT               6
+#define RT5665_M_DAC_R1_STO_R                   (0x1 << 5)
+#define RT5665_M_DAC_R1_STO_R_SFT               5
+#define RT5665_G_DAC_R1_STO_R_MASK              (0x1 << 4)
+#define RT5665_G_DAC_R1_STO_R_SFT               4
+#define RT5665_M_DAC_L2_STO_R                   (0x1 << 3)
+#define RT5665_M_DAC_L2_STO_R_SFT               3
+#define RT5665_G_DAC_L2_STO_R_MASK              (0x1 << 2)
+#define RT5665_G_DAC_L2_STO_R_SFT               2
+#define RT5665_M_DAC_R2_STO_R                   (0x1 << 1)
+#define RT5665_M_DAC_R2_STO_R_SFT               1
+#define RT5665_G_DAC_R2_STO_R_MASK              (0x1)
+#define RT5665_G_DAC_R2_STO_R_SFT               0
+
+/* Mono DAC Mixer Control (0x002b) */
+#define RT5665_M_DAC_L1_MONO_L                  (0x1 << 15)
+#define RT5665_M_DAC_L1_MONO_L_SFT              15
+#define RT5665_G_DAC_L1_MONO_L_MASK             (0x1 << 14)
+#define RT5665_G_DAC_L1_MONO_L_SFT              14
+#define RT5665_M_DAC_R1_MONO_L                  (0x1 << 13)
+#define RT5665_M_DAC_R1_MONO_L_SFT              13
+#define RT5665_G_DAC_R1_MONO_L_MASK             (0x1 << 12)
+#define RT5665_G_DAC_R1_MONO_L_SFT              12
+#define RT5665_M_DAC_L2_MONO_L                  (0x1 << 11)
+#define RT5665_M_DAC_L2_MONO_L_SFT              11
+#define RT5665_G_DAC_L2_MONO_L_MASK             (0x1 << 10)
+#define RT5665_G_DAC_L2_MONO_L_SFT              10
+#define RT5665_M_DAC_R2_MONO_L                  (0x1 << 9)
+#define RT5665_M_DAC_R2_MONO_L_SFT              9
+#define RT5665_G_DAC_R2_MONO_L_MASK             (0x1 << 8)
+#define RT5665_G_DAC_R2_MONO_L_SFT              8
+#define RT5665_M_DAC_L1_MONO_R                  (0x1 << 7)
+#define RT5665_M_DAC_L1_MONO_R_SFT              7
+#define RT5665_G_DAC_L1_MONO_R_MASK             (0x1 << 6)
+#define RT5665_G_DAC_L1_MONO_R_SFT              6
+#define RT5665_M_DAC_R1_MONO_R                  (0x1 << 5)
+#define RT5665_M_DAC_R1_MONO_R_SFT              5
+#define RT5665_G_DAC_R1_MONO_R_MASK             (0x1 << 4)
+#define RT5665_G_DAC_R1_MONO_R_SFT              4
+#define RT5665_M_DAC_L2_MONO_R                  (0x1 << 3)
+#define RT5665_M_DAC_L2_MONO_R_SFT              3
+#define RT5665_G_DAC_L2_MONO_R_MASK             (0x1 << 2)
+#define RT5665_G_DAC_L2_MONO_R_SFT              2
+#define RT5665_M_DAC_R2_MONO_R                  (0x1 << 1)
+#define RT5665_M_DAC_R2_MONO_R_SFT              1
+#define RT5665_G_DAC_R2_MONO_R_MASK             (0x1)
+#define RT5665_G_DAC_R2_MONO_R_SFT              0
+
+/* Stereo2 DAC Mixer Control (0x002c) */
+#define RT5665_M_DAC_L1_STO2_L                  (0x1 << 15)
+#define RT5665_M_DAC_L1_STO2_L_SFT              15
+#define RT5665_G_DAC_L1_STO2_L_MASK             (0x1 << 14)
+#define RT5665_G_DAC_L1_STO2_L_SFT              14
+#define RT5665_M_DAC_L2_STO2_L                  (0x1 << 13)
+#define RT5665_M_DAC_L2_STO2_L_SFT              13
+#define RT5665_G_DAC_L2_STO2_L_MASK             (0x1 << 12)
+#define RT5665_G_DAC_L2_STO2_L_SFT              12
+#define RT5665_M_DAC_L3_STO2_L                  (0x1 << 11)
+#define RT5665_M_DAC_L3_STO2_L_SFT              11
+#define RT5665_G_DAC_L3_STO2_L_MASK             (0x1 << 10)
+#define RT5665_G_DAC_L3_STO2_L_SFT              10
+#define RT5665_M_ST_DAC_L1                      (0x1 << 9)
+#define RT5665_M_ST_DAC_L1_SFT                  9
+#define RT5665_M_ST_DAC_R1                      (0x1 << 8)
+#define RT5665_M_ST_DAC_R1_SFT                  8
+#define RT5665_M_DAC_R1_STO2_R                  (0x1 << 7)
+#define RT5665_M_DAC_R1_STO2_R_SFT              7
+#define RT5665_G_DAC_R1_STO2_R_MASK             (0x1 << 6)
+#define RT5665_G_DAC_R1_STO2_R_SFT              6
+#define RT5665_M_DAC_R2_STO2_R                  (0x1 << 5)
+#define RT5665_M_DAC_R2_STO2_R_SFT              5
+#define RT5665_G_DAC_R2_STO2_R_MASK             (0x1 << 4)
+#define RT5665_G_DAC_R2_STO2_R_SFT              4
+#define RT5665_M_DAC_R3_STO2_R                  (0x1 << 3)
+#define RT5665_M_DAC_R3_STO2_R_SFT              3
+#define RT5665_G_DAC_R3_STO2_R_MASK             (0x1 << 2)
+#define RT5665_G_DAC_R3_STO2_R_SFT              2
+
+/* Analog DAC1 Input Source Control (0x002d) */
+#define RT5665_DAC_MIX_L_MASK                   (0x3 << 12)
+#define RT5665_DAC_MIX_L_SFT                    12
+#define RT5665_DAC_MIX_R_MASK                   (0x3 << 8)
+#define RT5665_DAC_MIX_R_SFT                    8
+#define RT5665_DAC_L1_SRC_MASK                  (0x3 << 4)
+#define RT5665_A_DACL1_SFT                      4
+#define RT5665_DAC_R1_SRC_MASK                  (0x3)
+#define RT5665_A_DACR1_SFT                      0
+
+/* Analog DAC Input Source Control (0x002e) */
+#define RT5665_A_DACL2_SEL                      (0x1 << 4)
+#define RT5665_A_DACL2_SFT                      4
+#define RT5665_A_DACR2_SEL                      (0x1 << 0)
+#define RT5665_A_DACR2_SFT                      0
+
+/* Digital Interface Data Control (0x002f) */
+#define RT5665_IF2_1_ADC_IN_MASK                (0x7 << 12)
+#define RT5665_IF2_1_ADC_IN_SFT                 12
+#define RT5665_IF2_1_DAC_SEL_MASK               (0x3 << 10)
+#define RT5665_IF2_1_DAC_SEL_SFT                10
+#define RT5665_IF2_1_ADC_SEL_MASK               (0x3 << 8)
+#define RT5665_IF2_1_ADC_SEL_SFT                8
+#define RT5665_IF2_2_ADC_IN_MASK                (0x7 << 4)
+#define RT5665_IF2_2_ADC_IN_SFT                 4
+#define RT5665_IF2_2_DAC_SEL_MASK               (0x3 << 2)
+#define RT5665_IF2_2_DAC_SEL_SFT                2
+#define RT5665_IF2_2_ADC_SEL_MASK               (0x3 << 0)
+#define RT5665_IF2_2_ADC_SEL_SFT                0
+
+/* Digital Interface Data Control (0x0030) */
+#define RT5665_IF3_ADC_IN_MASK                  (0x7 << 4)
+#define RT5665_IF3_ADC_IN_SFT                   4
+#define RT5665_IF3_DAC_SEL_MASK                 (0x3 << 2)
+#define RT5665_IF3_DAC_SEL_SFT                  2
+#define RT5665_IF3_ADC_SEL_MASK                 (0x3 << 0)
+#define RT5665_IF3_ADC_SEL_SFT                  0
+
+/* PDM Output Control (0x0031) */
+#define RT5665_M_PDM1_L                         (0x1 << 14)
+#define RT5665_M_PDM1_L_SFT                     14
+#define RT5665_M_PDM1_R                         (0x1 << 12)
+#define RT5665_M_PDM1_R_SFT                     12
+#define RT5665_PDM1_L_MASK                      (0x3 << 10)
+#define RT5665_PDM1_L_SFT                       10
+#define RT5665_PDM1_R_MASK                      (0x3 << 8)
+#define RT5665_PDM1_R_SFT                       8
+#define RT5665_PDM1_BUSY                        (0x1 << 6)
+#define RT5665_PDM_PATTERN                      (0x1 << 5)
+#define RT5665_PDM_GAIN                         (0x1 << 4)
+#define RT5665_LRCK_PDM_PI2C                    (0x1 << 3)
+#define RT5665_PDM_DIV_MASK                     (0x3)
+
+/*S/PDIF Output Control (0x0036) */
+#define RT5665_SPDIF_SEL_MASK                   (0x3 << 0)
+#define RT5665_SPDIF_SEL_SFT                    0
+
+/* REC Left Mixer Control 2 (0x003c) */
+#define RT5665_M_CBJ_RM1_L                      (0x1 << 7)
+#define RT5665_M_CBJ_RM1_L_SFT                  7
+#define RT5665_M_BST1_RM1_L                     (0x1 << 5)
+#define RT5665_M_BST1_RM1_L_SFT                 5
+#define RT5665_M_BST2_RM1_L                     (0x1 << 4)
+#define RT5665_M_BST2_RM1_L_SFT                 4
+#define RT5665_M_BST3_RM1_L                     (0x1 << 3)
+#define RT5665_M_BST3_RM1_L_SFT                 3
+#define RT5665_M_BST4_RM1_L                     (0x1 << 2)
+#define RT5665_M_BST4_RM1_L_SFT                 2
+#define RT5665_M_INL_RM1_L                      (0x1 << 1)
+#define RT5665_M_INL_RM1_L_SFT                  1
+#define RT5665_M_INR_RM1_L                      (0x1)
+#define RT5665_M_INR_RM1_L_SFT                  0
+
+/* REC Right Mixer Control 2 (0x003e) */
+#define RT5665_M_AEC_REF_RM1_R                  (0x1 << 7)
+#define RT5665_M_AEC_REF_RM1_R_SFT              7
+#define RT5665_M_BST1_RM1_R                     (0x1 << 5)
+#define RT5665_M_BST1_RM1_R_SFT                 5
+#define RT5665_M_BST2_RM1_R                     (0x1 << 4)
+#define RT5665_M_BST2_RM1_R_SFT                 4
+#define RT5665_M_BST3_RM1_R                     (0x1 << 3)
+#define RT5665_M_BST3_RM1_R_SFT                 3
+#define RT5665_M_BST4_RM1_R                     (0x1 << 2)
+#define RT5665_M_BST4_RM1_R_SFT                 2
+#define RT5665_M_INR_RM1_R                      (0x1 << 1)
+#define RT5665_M_INR_RM1_R_SFT                  1
+#define RT5665_M_MONOVOL_RM1_R                  (0x1)
+#define RT5665_M_MONOVOL_RM1_R_SFT              0
+
+/* REC Mixer 2 Left Control 2 (0x0041) */
+#define RT5665_M_CBJ_RM2_L                      (0x1 << 7)
+#define RT5665_M_CBJ_RM2_L_SFT                  7
+#define RT5665_M_BST1_RM2_L                     (0x1 << 5)
+#define RT5665_M_BST1_RM2_L_SFT                 5
+#define RT5665_M_BST2_RM2_L                     (0x1 << 4)
+#define RT5665_M_BST2_RM2_L_SFT                 4
+#define RT5665_M_BST3_RM2_L                     (0x1 << 3)
+#define RT5665_M_BST3_RM2_L_SFT                 3
+#define RT5665_M_BST4_RM2_L                     (0x1 << 2)
+#define RT5665_M_BST4_RM2_L_SFT                 2
+#define RT5665_M_INL_RM2_L                      (0x1 << 1)
+#define RT5665_M_INL_RM2_L_SFT                  1
+#define RT5665_M_INR_RM2_L                      (0x1)
+#define RT5665_M_INR_RM2_L_SFT                  0
+
+/* REC Mixer 2 Right Control 2 (0x0043) */
+#define RT5665_M_MONOVOL_RM2_R                  (0x1 << 7)
+#define RT5665_M_MONOVOL_RM2_R_SFT              7
+#define RT5665_M_BST1_RM2_R                     (0x1 << 5)
+#define RT5665_M_BST1_RM2_R_SFT                 5
+#define RT5665_M_BST2_RM2_R                     (0x1 << 4)
+#define RT5665_M_BST2_RM2_R_SFT                 4
+#define RT5665_M_BST3_RM2_R                     (0x1 << 3)
+#define RT5665_M_BST3_RM2_R_SFT                 3
+#define RT5665_M_BST4_RM2_R                     (0x1 << 2)
+#define RT5665_M_BST4_RM2_R_SFT                 2
+#define RT5665_M_INL_RM2_R                      (0x1 << 1)
+#define RT5665_M_INL_RM2_R_SFT                  1
+#define RT5665_M_INR_RM2_R                      (0x1)
+#define RT5665_M_INR_RM2_R_SFT                  0
+
+/* SPK Left Mixer Control (0x0046) */
+#define RT5665_M_BST3_SM_L                      (0x1 << 4)
+#define RT5665_M_BST3_SM_L_SFT                  4
+#define RT5665_M_IN_R_SM_L                      (0x1 << 3)
+#define RT5665_M_IN_R_SM_L_SFT                  3
+#define RT5665_M_IN_L_SM_L                      (0x1 << 2)
+#define RT5665_M_IN_L_SM_L_SFT                  2
+#define RT5665_M_BST1_SM_L                      (0x1 << 1)
+#define RT5665_M_BST1_SM_L_SFT                  1
+#define RT5665_M_DAC_L2_SM_L                    (0x1)
+#define RT5665_M_DAC_L2_SM_L_SFT                0
+
+/* SPK Right Mixer Control (0x0047) */
+#define RT5665_M_BST3_SM_R                      (0x1 << 4)
+#define RT5665_M_BST3_SM_R_SFT                  4
+#define RT5665_M_IN_R_SM_R                      (0x1 << 3)
+#define RT5665_M_IN_R_SM_R_SFT                  3
+#define RT5665_M_IN_L_SM_R                      (0x1 << 2)
+#define RT5665_M_IN_L_SM_R_SFT                  2
+#define RT5665_M_BST4_SM_R                      (0x1 << 1)
+#define RT5665_M_BST4_SM_R_SFT                  1
+#define RT5665_M_DAC_R2_SM_R                    (0x1)
+#define RT5665_M_DAC_R2_SM_R_SFT                0
+
+/* SPO Amp Input and Gain Control (0x0048) */
+#define RT5665_M_DAC_L2_SPKOMIX                 (0x1 << 13)
+#define RT5665_M_DAC_L2_SPKOMIX_SFT             13
+#define RT5665_M_SPKVOLL_SPKOMIX                (0x1 << 12)
+#define RT5665_M_SPKVOLL_SPKOMIX_SFT            12
+#define RT5665_M_DAC_R2_SPKOMIX                 (0x1 << 9)
+#define RT5665_M_DAC_R2_SPKOMIX_SFT             9
+#define RT5665_M_SPKVOLR_SPKOMIX                (0x1 << 8)
+#define RT5665_M_SPKVOLR_SPKOMIX_SFT            8
+
+/* MONOMIX Input and Gain Control (0x004b) */
+#define RT5665_G_MONOVOL_MA                     (0x1 << 10)
+#define RT5665_G_MONOVOL_MA_SFT                 10
+#define RT5665_M_MONOVOL_MA                     (0x1 << 9)
+#define RT5665_M_MONOVOL_MA_SFT                 9
+#define RT5665_M_DAC_L2_MA                      (0x1 << 8)
+#define RT5665_M_DAC_L2_MA_SFT                  8
+#define RT5665_M_BST3_MM                        (0x1 << 4)
+#define RT5665_M_BST3_MM_SFT                    4
+#define RT5665_M_BST2_MM                        (0x1 << 3)
+#define RT5665_M_BST2_MM_SFT                    3
+#define RT5665_M_BST1_MM                        (0x1 << 2)
+#define RT5665_M_BST1_MM_SFT                    2
+#define RT5665_M_RECMIC2L_MM                    (0x1 << 1)
+#define RT5665_M_RECMIC2L_MM_SFT                1
+#define RT5665_M_DAC_L2_MM                      (0x1)
+#define RT5665_M_DAC_L2_MM_SFT                  0
+
+/* Output Left Mixer Control 1 (0x004d) */
+#define RT5665_G_BST3_OM_L_MASK                 (0x7 << 12)
+#define RT5665_G_BST3_OM_L_SFT                  12
+#define RT5665_G_BST2_OM_L_MASK                 (0x7 << 9)
+#define RT5665_G_BST2_OM_L_SFT                  9
+#define RT5665_G_BST1_OM_L_MASK                 (0x7 << 6)
+#define RT5665_G_BST1_OM_L_SFT                  6
+#define RT5665_G_IN_L_OM_L_MASK                 (0x7 << 3)
+#define RT5665_G_IN_L_OM_L_SFT                  3
+#define RT5665_G_DAC_L2_OM_L_MASK               (0x7 << 0)
+#define RT5665_G_DAC_L2_OM_L_SFT                0
+
+/* Output Left Mixer Input Control (0x004e) */
+#define RT5665_M_BST3_OM_L                      (0x1 << 4)
+#define RT5665_M_BST3_OM_L_SFT                  4
+#define RT5665_M_BST2_OM_L                      (0x1 << 3)
+#define RT5665_M_BST2_OM_L_SFT                  3
+#define RT5665_M_BST1_OM_L                      (0x1 << 2)
+#define RT5665_M_BST1_OM_L_SFT                  2
+#define RT5665_M_IN_L_OM_L                      (0x1 << 1)
+#define RT5665_M_IN_L_OM_L_SFT                  1
+#define RT5665_M_DAC_L2_OM_L                    (0x1)
+#define RT5665_M_DAC_L2_OM_L_SFT                0
+
+/* Output Right Mixer Input Control (0x0050) */
+#define RT5665_M_BST4_OM_R                      (0x1 << 4)
+#define RT5665_M_BST4_OM_R_SFT                  4
+#define RT5665_M_BST3_OM_R                      (0x1 << 3)
+#define RT5665_M_BST3_OM_R_SFT                  3
+#define RT5665_M_BST2_OM_R                      (0x1 << 2)
+#define RT5665_M_BST2_OM_R_SFT                  2
+#define RT5665_M_IN_R_OM_R                      (0x1 << 1)
+#define RT5665_M_IN_R_OM_R_SFT                  1
+#define RT5665_M_DAC_R2_OM_R                    (0x1)
+#define RT5665_M_DAC_R2_OM_R_SFT                0
+
+/* LOUT Mixer Control (0x0052) */
+#define RT5665_M_DAC_L2_LM                      (0x1 << 15)
+#define RT5665_M_DAC_L2_LM_SFT                  15
+#define RT5665_M_DAC_R2_LM                      (0x1 << 14)
+#define RT5665_M_DAC_R2_LM_SFT                  14
+#define RT5665_M_OV_L_LM                        (0x1 << 13)
+#define RT5665_M_OV_L_LM_SFT                    13
+#define RT5665_M_OV_R_LM                        (0x1 << 12)
+#define RT5665_M_OV_R_LM_SFT                    12
+#define RT5665_LOUT_BST_SFT                     11
+#define RT5665_LOUT_DF                          (0x1 << 11)
+#define RT5665_LOUT_DF_SFT                      11
+
+/* Power Management for Digital 1 (0x0061) */
+#define RT5665_PWR_I2S1_1                       (0x1 << 15)
+#define RT5665_PWR_I2S1_1_BIT                   15
+#define RT5665_PWR_I2S1_2                       (0x1 << 14)
+#define RT5665_PWR_I2S1_2_BIT                   14
+#define RT5665_PWR_I2S2_1                       (0x1 << 13)
+#define RT5665_PWR_I2S2_1_BIT                   13
+#define RT5665_PWR_I2S2_2                       (0x1 << 12)
+#define RT5665_PWR_I2S2_2_BIT                   12
+#define RT5665_PWR_DAC_L1                       (0x1 << 11)
+#define RT5665_PWR_DAC_L1_BIT                   11
+#define RT5665_PWR_DAC_R1                       (0x1 << 10)
+#define RT5665_PWR_DAC_R1_BIT                   10
+#define RT5665_PWR_I2S3                         (0x1 << 9)
+#define RT5665_PWR_I2S3_BIT                     9
+#define RT5665_PWR_LDO                          (0x1 << 8)
+#define RT5665_PWR_LDO_BIT                      8
+#define RT5665_PWR_DAC_L2                       (0x1 << 7)
+#define RT5665_PWR_DAC_L2_BIT                   7
+#define RT5665_PWR_DAC_R2                       (0x1 << 6)
+#define RT5665_PWR_DAC_R2_BIT                   6
+#define RT5665_PWR_ADC_L1                       (0x1 << 4)
+#define RT5665_PWR_ADC_L1_BIT                   4
+#define RT5665_PWR_ADC_R1                       (0x1 << 3)
+#define RT5665_PWR_ADC_R1_BIT                   3
+#define RT5665_PWR_ADC_L2                       (0x1 << 2)
+#define RT5665_PWR_ADC_L2_BIT                   2
+#define RT5665_PWR_ADC_R2                       (0x1 << 1)
+#define RT5665_PWR_ADC_R2_BIT                   1
+
+/* Power Management for Digital 2 (0x0062) */
+#define RT5665_PWR_ADC_S1F                      (0x1 << 15)
+#define RT5665_PWR_ADC_S1F_BIT                  15
+#define RT5665_PWR_ADC_S2F                      (0x1 << 14)
+#define RT5665_PWR_ADC_S2F_BIT                  14
+#define RT5665_PWR_ADC_MF_L                     (0x1 << 13)
+#define RT5665_PWR_ADC_MF_L_BIT                 13
+#define RT5665_PWR_ADC_MF_R                     (0x1 << 12)
+#define RT5665_PWR_ADC_MF_R_BIT                 12
+#define RT5665_PWR_DAC_S2F                      (0x1 << 11)
+#define RT5665_PWR_DAC_S2F_BIT                  11
+#define RT5665_PWR_DAC_S1F                      (0x1 << 10)
+#define RT5665_PWR_DAC_S1F_BIT                  10
+#define RT5665_PWR_DAC_MF_L                     (0x1 << 9)
+#define RT5665_PWR_DAC_MF_L_BIT                 9
+#define RT5665_PWR_DAC_MF_R                     (0x1 << 8)
+#define RT5665_PWR_DAC_MF_R_BIT                 8
+#define RT5665_PWR_PDM1                         (0x1 << 7)
+#define RT5665_PWR_PDM1_BIT                     7
+
+/* Power Management for Analog 1 (0x0063) */
+#define RT5665_PWR_VREF1                        (0x1 << 15)
+#define RT5665_PWR_VREF1_BIT                    15
+#define RT5665_PWR_FV1                          (0x1 << 14)
+#define RT5665_PWR_FV1_BIT                      14
+#define RT5665_PWR_VREF2                        (0x1 << 13)
+#define RT5665_PWR_VREF2_BIT                    13
+#define RT5665_PWR_FV2                          (0x1 << 12)
+#define RT5665_PWR_FV2_BIT                      12
+#define RT5665_PWR_VREF3                        (0x1 << 11)
+#define RT5665_PWR_VREF3_BIT                    11
+#define RT5665_PWR_FV3                          (0x1 << 10)
+#define RT5665_PWR_FV3_BIT                      10
+#define RT5665_PWR_MB                           (0x1 << 9)
+#define RT5665_PWR_MB_BIT                       9
+#define RT5665_PWR_LM                           (0x1 << 8)
+#define RT5665_PWR_LM_BIT                       8
+#define RT5665_PWR_BG                           (0x1 << 7)
+#define RT5665_PWR_BG_BIT                       7
+#define RT5665_PWR_MA                           (0x1 << 6)
+#define RT5665_PWR_MA_BIT                       6
+#define RT5665_PWR_HA_L                         (0x1 << 5)
+#define RT5665_PWR_HA_L_BIT                     5
+#define RT5665_PWR_HA_R                         (0x1 << 4)
+#define RT5665_PWR_HA_R_BIT                     4
+#define RT5665_HP_DRIVER_MASK                   (0x3 << 2)
+#define RT5665_HP_DRIVER_1X                     (0x0 << 2)
+#define RT5665_HP_DRIVER_3X                     (0x1 << 2)
+#define RT5665_HP_DRIVER_5X                     (0x2 << 2)
+#define RT5665_LDO1_DVO_MASK                    (0x3)
+#define RT5665_LDO1_DVO_09                      (0x0)
+#define RT5665_LDO1_DVO_10                      (0x1)
+#define RT5665_LDO1_DVO_12                      (0x2)
+#define RT5665_LDO1_DVO_14                      (0x3)
+
+/* Power Management for Analog 2 (0x0064) */
+#define RT5665_PWR_BST1                         (0x1 << 15)
+#define RT5665_PWR_BST1_BIT                     15
+#define RT5665_PWR_BST2                         (0x1 << 14)
+#define RT5665_PWR_BST2_BIT                     14
+#define RT5665_PWR_BST3                         (0x1 << 13)
+#define RT5665_PWR_BST3_BIT                     13
+#define RT5665_PWR_BST4                         (0x1 << 12)
+#define RT5665_PWR_BST4_BIT                     12
+#define RT5665_PWR_MB1                          (0x1 << 11)
+#define RT5665_PWR_MB1_PWR_DOWN                 (0x0 << 11)
+#define RT5665_PWR_MB1_BIT                      11
+#define RT5665_PWR_MB2                          (0x1 << 10)
+#define RT5665_PWR_MB2_PWR_DOWN                 (0x0 << 10)
+#define RT5665_PWR_MB2_BIT                      10
+#define RT5665_PWR_MB3                          (0x1 << 9)
+#define RT5665_PWR_MB3_BIT                      9
+#define RT5665_PWR_BST1_P                       (0x1 << 7)
+#define RT5665_PWR_BST1_P_BIT                   7
+#define RT5665_PWR_BST2_P                       (0x1 << 6)
+#define RT5665_PWR_BST2_P_BIT                   6
+#define RT5665_PWR_BST3_P                       (0x1 << 5)
+#define RT5665_PWR_BST3_P_BIT                   5
+#define RT5665_PWR_BST4_P                       (0x1 << 4)
+#define RT5665_PWR_BST4_P_BIT                   4
+#define RT5665_PWR_JD1                          (0x1 << 3)
+#define RT5665_PWR_JD1_BIT                      3
+#define RT5665_PWR_JD2                          (0x1 << 2)
+#define RT5665_PWR_JD2_BIT                      2
+#define RT5665_PWR_RM1_L                        (0x1 << 1)
+#define RT5665_PWR_RM1_L_BIT                    1
+#define RT5665_PWR_RM1_R                        (0x1)
+#define RT5665_PWR_RM1_R_BIT                    0
+
+/* Power Management for Analog 3 (0x0065) */
+#define RT5665_PWR_CBJ                          (0x1 << 9)
+#define RT5665_PWR_CBJ_BIT                      9
+#define RT5665_PWR_BST_L                        (0x1 << 8)
+#define RT5665_PWR_BST_L_BIT                    8
+#define RT5665_PWR_BST_R                        (0x1 << 7)
+#define RT5665_PWR_BST_R_BIT                    7
+#define RT5665_PWR_PLL                          (0x1 << 6)
+#define RT5665_PWR_PLL_BIT                      6
+#define RT5665_PWR_LDO2                         (0x1 << 2)
+#define RT5665_PWR_LDO2_BIT                     2
+#define RT5665_PWR_SVD                          (0x1 << 1)
+#define RT5665_PWR_SVD_BIT                      1
+
+/* Power Management for Mixer (0x0066) */
+#define RT5665_PWR_RM2_L                        (0x1 << 15)
+#define RT5665_PWR_RM2_L_BIT                    15
+#define RT5665_PWR_RM2_R                        (0x1 << 14)
+#define RT5665_PWR_RM2_R_BIT                    14
+#define RT5665_PWR_OM_L                         (0x1 << 13)
+#define RT5665_PWR_OM_L_BIT                     13
+#define RT5665_PWR_OM_R                         (0x1 << 12)
+#define RT5665_PWR_OM_R_BIT                     12
+#define RT5665_PWR_MM                           (0x1 << 11)
+#define RT5665_PWR_MM_BIT                       11
+#define RT5665_PWR_AEC_REF                      (0x1 << 6)
+#define RT5665_PWR_AEC_REF_BIT                  6
+#define RT5665_PWR_STO1_DAC_L                   (0x1 << 5)
+#define RT5665_PWR_STO1_DAC_L_BIT               5
+#define RT5665_PWR_STO1_DAC_R                   (0x1 << 4)
+#define RT5665_PWR_STO1_DAC_R_BIT               4
+#define RT5665_PWR_MONO_DAC_L                   (0x1 << 3)
+#define RT5665_PWR_MONO_DAC_L_BIT               3
+#define RT5665_PWR_MONO_DAC_R                   (0x1 << 2)
+#define RT5665_PWR_MONO_DAC_R_BIT               2
+#define RT5665_PWR_STO2_DAC_L                   (0x1 << 1)
+#define RT5665_PWR_STO2_DAC_L_BIT               1
+#define RT5665_PWR_STO2_DAC_R                   (0x1)
+#define RT5665_PWR_STO2_DAC_R_BIT               0
+
+/* Power Management for Volume (0x0067) */
+#define RT5665_PWR_OV_L                         (0x1 << 13)
+#define RT5665_PWR_OV_L_BIT                     13
+#define RT5665_PWR_OV_R                         (0x1 << 12)
+#define RT5665_PWR_OV_R_BIT                     12
+#define RT5665_PWR_IN_L                         (0x1 << 9)
+#define RT5665_PWR_IN_L_BIT                     9
+#define RT5665_PWR_IN_R                         (0x1 << 8)
+#define RT5665_PWR_IN_R_BIT                     8
+#define RT5665_PWR_MV                           (0x1 << 7)
+#define RT5665_PWR_MV_BIT                       7
+#define RT5665_PWR_MIC_DET                      (0x1 << 5)
+#define RT5665_PWR_MIC_DET_BIT                  5
+
+/* (0x006b) */
+#define RT5665_SYS_CLK_DET                      15
+#define RT5665_HP_CLK_DET                       14
+#define RT5665_MONO_CLK_DET                     13
+#define RT5665_LOUT_CLK_DET                     12
+#define RT5665_POW_CLK_DET                      0
+
+/* Digital Microphone Control 1 (0x006e) */
+#define RT5665_DMIC_1_EN_MASK                   (0x1 << 15)
+#define RT5665_DMIC_1_EN_SFT                    15
+#define RT5665_DMIC_1_DIS                       (0x0 << 15)
+#define RT5665_DMIC_1_EN                        (0x1 << 15)
+#define RT5665_DMIC_2_EN_MASK                   (0x1 << 14)
+#define RT5665_DMIC_2_EN_SFT                    14
+#define RT5665_DMIC_2_DIS                       (0x0 << 14)
+#define RT5665_DMIC_2_EN                        (0x1 << 14)
+#define RT5665_DMIC_2_DP_MASK                   (0x1 << 9)
+#define RT5665_DMIC_2_DP_SFT                    9
+#define RT5665_DMIC_2_DP_GPIO5                  (0x0 << 9)
+#define RT5665_DMIC_2_DP_IN2P                   (0x1 << 9)
+#define RT5665_DMIC_CLK_MASK                    (0x7 << 5)
+#define RT5665_DMIC_CLK_SFT                     5
+#define RT5665_DMIC_1_DP_MASK                   (0x1 << 1)
+#define RT5665_DMIC_1_DP_SFT                    1
+#define RT5665_DMIC_1_DP_GPIO4                  (0x0 << 1)
+#define RT5665_DMIC_1_DP_IN2N                   (0x1 << 1)
+
+
+/* Digital Microphone Control 1 (0x006f) */
+#define RT5665_DMIC_2L_LH_MASK                  (0x1 << 3)
+#define RT5665_DMIC_2L_LH_SFT                   3
+#define RT5665_DMIC_2L_LH_RISING                (0x0 << 3)
+#define RT5665_DMIC_2L_LH_FALLING               (0x1 << 3)
+#define RT5665_DMIC_2R_LH_MASK                  (0x1 << 2)
+#define RT5665_DMIC_2R_LH_SFT                   2
+#define RT5665_DMIC_2R_LH_RISING                (0x0 << 2)
+#define RT5665_DMIC_2R_LH_FALLING               (0x1 << 2)
+#define RT5665_DMIC_1L_LH_MASK                  (0x1 << 1)
+#define RT5665_DMIC_1L_LH_SFT                   1
+#define RT5665_DMIC_1L_LH_RISING                (0x0 << 1)
+#define RT5665_DMIC_1L_LH_FALLING               (0x1 << 1)
+#define RT5665_DMIC_1R_LH_MASK                  (0x1 << 0)
+#define RT5665_DMIC_1R_LH_SFT                   0
+#define RT5665_DMIC_1R_LH_RISING                (0x0)
+#define RT5665_DMIC_1R_LH_FALLING               (0x1)
+
+/* I2S1/2/3 Audio Serial Data Port Control (0x0070 0x0071 0x0072) */
+#define RT5665_I2S_MS_MASK                      (0x1 << 15)
+#define RT5665_I2S_MS_SFT                       15
+#define RT5665_I2S_MS_M                         (0x0 << 15)
+#define RT5665_I2S_MS_S                         (0x1 << 15)
+#define RT5665_I2S_PIN_CFG_MASK                 (0x1 << 14)
+#define RT5665_I2S_PIN_CFG_SFT                  14
+#define RT5665_I2S_CLK_SEL_MASK                 (0x1 << 11)
+#define RT5665_I2S_CLK_SEL_SFT                  11
+#define RT5665_I2S_BP_MASK                      (0x1 << 8)
+#define RT5665_I2S_BP_SFT                       8
+#define RT5665_I2S_BP_NOR                       (0x0 << 8)
+#define RT5665_I2S_BP_INV                       (0x1 << 8)
+#define RT5665_I2S_DL_MASK                      (0x3 << 4)
+#define RT5665_I2S_DL_SFT                       4
+#define RT5665_I2S_DL_16                        (0x0 << 4)
+#define RT5665_I2S_DL_20                        (0x1 << 4)
+#define RT5665_I2S_DL_24                        (0x2 << 4)
+#define RT5665_I2S_DL_8                         (0x3 << 4)
+#define RT5665_I2S_DF_MASK                      (0x7)
+#define RT5665_I2S_DF_SFT                       0
+#define RT5665_I2S_DF_I2S                       (0x0)
+#define RT5665_I2S_DF_LEFT                      (0x1)
+#define RT5665_I2S_DF_PCM_A                     (0x2)
+#define RT5665_I2S_DF_PCM_B                     (0x3)
+#define RT5665_I2S_DF_PCM_A_N                   (0x6)
+#define RT5665_I2S_DF_PCM_B_N                   (0x7)
+
+/* ADC/DAC Clock Control 1 (0x0073) */
+#define RT5665_I2S_PD1_MASK                     (0x7 << 12)
+#define RT5665_I2S_PD1_SFT                      12
+#define RT5665_I2S_PD1_1                        (0x0 << 12)
+#define RT5665_I2S_PD1_2                        (0x1 << 12)
+#define RT5665_I2S_PD1_3                        (0x2 << 12)
+#define RT5665_I2S_PD1_4                        (0x3 << 12)
+#define RT5665_I2S_PD1_6                        (0x4 << 12)
+#define RT5665_I2S_PD1_8                        (0x5 << 12)
+#define RT5665_I2S_PD1_12                       (0x6 << 12)
+#define RT5665_I2S_PD1_16                       (0x7 << 12)
+#define RT5665_I2S_M_PD2_MASK                   (0x7 << 8)
+#define RT5665_I2S_M_PD2_SFT                    8
+#define RT5665_I2S_M_PD2_1                      (0x0 << 8)
+#define RT5665_I2S_M_PD2_2                      (0x1 << 8)
+#define RT5665_I2S_M_PD2_3                      (0x2 << 8)
+#define RT5665_I2S_M_PD2_4                      (0x3 << 8)
+#define RT5665_I2S_M_PD2_6                      (0x4 << 8)
+#define RT5665_I2S_M_PD2_8                      (0x5 << 8)
+#define RT5665_I2S_M_PD2_12                     (0x6 << 8)
+#define RT5665_I2S_M_PD2_16                     (0x7 << 8)
+#define RT5665_I2S_CLK_SRC_MASK                 (0x3 << 4)
+#define RT5665_I2S_CLK_SRC_SFT                  4
+#define RT5665_I2S_CLK_SRC_MCLK                 (0x0 << 4)
+#define RT5665_I2S_CLK_SRC_PLL1                 (0x1 << 4)
+#define RT5665_I2S_CLK_SRC_RCCLK                (0x2 << 4)
+#define RT5665_DAC_OSR_MASK                     (0x3 << 2)
+#define RT5665_DAC_OSR_SFT                      2
+#define RT5665_DAC_OSR_128                      (0x0 << 2)
+#define RT5665_DAC_OSR_64                       (0x1 << 2)
+#define RT5665_DAC_OSR_32                       (0x2 << 2)
+#define RT5665_ADC_OSR_MASK                     (0x3)
+#define RT5665_ADC_OSR_SFT                      0
+#define RT5665_ADC_OSR_128                      (0x0)
+#define RT5665_ADC_OSR_64                       (0x1)
+#define RT5665_ADC_OSR_32                       (0x2)
+
+/* ADC/DAC Clock Control 2 (0x0074) */
+#define RT5665_I2S_BCLK_MS2_MASK                (0x1 << 15)
+#define RT5665_I2S_BCLK_MS2_SFT                 15
+#define RT5665_I2S_BCLK_MS2_32                  (0x0 << 15)
+#define RT5665_I2S_BCLK_MS2_64                  (0x1 << 15)
+#define RT5665_I2S_PD2_MASK                     (0x7 << 12)
+#define RT5665_I2S_PD2_SFT                      12
+#define RT5665_I2S_PD2_1                        (0x0 << 12)
+#define RT5665_I2S_PD2_2                        (0x1 << 12)
+#define RT5665_I2S_PD2_3                        (0x2 << 12)
+#define RT5665_I2S_PD2_4                        (0x3 << 12)
+#define RT5665_I2S_PD2_6                        (0x4 << 12)
+#define RT5665_I2S_PD2_8                        (0x5 << 12)
+#define RT5665_I2S_PD2_12                       (0x6 << 12)
+#define RT5665_I2S_PD2_16                       (0x7 << 12)
+#define RT5665_I2S_BCLK_MS3_MASK                (0x1 << 11)
+#define RT5665_I2S_BCLK_MS3_SFT                 11
+#define RT5665_I2S_BCLK_MS3_32                  (0x0 << 11)
+#define RT5665_I2S_BCLK_MS3_64                  (0x1 << 11)
+#define RT5665_I2S_PD3_MASK                     (0x7 << 8)
+#define RT5665_I2S_PD3_SFT                      8
+#define RT5665_I2S_PD3_1                        (0x0 << 8)
+#define RT5665_I2S_PD3_2                        (0x1 << 8)
+#define RT5665_I2S_PD3_3                        (0x2 << 8)
+#define RT5665_I2S_PD3_4                        (0x3 << 8)
+#define RT5665_I2S_PD3_6                        (0x4 << 8)
+#define RT5665_I2S_PD3_8                        (0x5 << 8)
+#define RT5665_I2S_PD3_12                       (0x6 << 8)
+#define RT5665_I2S_PD3_16                       (0x7 << 8)
+#define RT5665_I2S_PD4_MASK                     (0x7 << 4)
+#define RT5665_I2S_PD4_SFT                      4
+#define RT5665_I2S_PD4_1                        (0x0 << 4)
+#define RT5665_I2S_PD4_2                        (0x1 << 4)
+#define RT5665_I2S_PD4_3                        (0x2 << 4)
+#define RT5665_I2S_PD4_4                        (0x3 << 4)
+#define RT5665_I2S_PD4_6                        (0x4 << 4)
+#define RT5665_I2S_PD4_8                        (0x5 << 4)
+#define RT5665_I2S_PD4_12                       (0x6 << 4)
+#define RT5665_I2S_PD4_16                       (0x7 << 4)
+
+/* TDM control 1 (0x0078) */
+#define RT5665_I2S1_MODE_MASK                   (0x1 << 15)
+#define RT5665_I2S1_MODE_I2S                    (0x0 << 15)
+#define RT5665_I2S1_MODE_TDM                    (0x1 << 15)
+#define RT5665_TDM_IN_CH_MASK                   (0x3 << 10)
+#define RT5665_TDM_IN_CH_2                      (0x0 << 10)
+#define RT5665_TDM_IN_CH_4                      (0x1 << 10)
+#define RT5665_TDM_IN_CH_6                      (0x2 << 10)
+#define RT5665_TDM_IN_CH_8                      (0x3 << 10)
+#define RT5665_TDM_OUT_CH_MASK                  (0x3 << 8)
+#define RT5665_TDM_OUT_CH_2                     (0x0 << 8)
+#define RT5665_TDM_OUT_CH_4                     (0x1 << 8)
+#define RT5665_TDM_OUT_CH_6                     (0x2 << 8)
+#define RT5665_TDM_OUT_CH_8                     (0x3 << 8)
+#define RT5665_TDM_IN_LEN_MASK                  (0x3 << 6)
+#define RT5665_TDM_IN_LEN_16                    (0x0 << 6)
+#define RT5665_TDM_IN_LEN_20                    (0x1 << 6)
+#define RT5665_TDM_IN_LEN_24                    (0x2 << 6)
+#define RT5665_TDM_IN_LEN_32                    (0x3 << 6)
+#define RT5665_TDM_OUT_LEN_MASK                 (0x3 << 4)
+#define RT5665_TDM_OUT_LEN_16                   (0x0 << 4)
+#define RT5665_TDM_OUT_LEN_20                   (0x1 << 4)
+#define RT5665_TDM_OUT_LEN_24                   (0x2 << 4)
+#define RT5665_TDM_OUT_LEN_32                   (0x3 << 4)
+
+
+/* TDM control 2 (0x0079) */
+#define RT5665_I2S1_1_DS_ADC_SLOT01_SFT         14
+#define RT5665_I2S1_1_DS_ADC_SLOT23_SFT         12
+#define RT5665_I2S1_1_DS_ADC_SLOT45_SFT         10
+#define RT5665_I2S1_1_DS_ADC_SLOT67_SFT         8
+#define RT5665_I2S1_2_DS_ADC_SLOT01_SFT         6
+#define RT5665_I2S1_2_DS_ADC_SLOT23_SFT         4
+#define RT5665_I2S1_2_DS_ADC_SLOT45_SFT         2
+#define RT5665_I2S1_2_DS_ADC_SLOT67_SFT         0
+
+/* TDM control 3/4 (0x007a) (0x007b) */
+#define RT5665_IF1_ADC1_SEL_SFT                 10
+#define RT5665_IF1_ADC2_SEL_SFT                 9
+#define RT5665_IF1_ADC3_SEL_SFT                 8
+#define RT5665_IF1_ADC4_SEL_SFT                 7
+#define RT5665_TDM_ADC_SEL_SFT                  0
+#define RT5665_TDM_ADC_CTRL_MASK                (0x1f << 0)
+#define RT5665_TDM_ADC_DATA_06                  (0x6 << 0)
+
+/* Global Clock Control (0x0080) */
+#define RT5665_SCLK_SRC_MASK                    (0x3 << 14)
+#define RT5665_SCLK_SRC_SFT                     14
+#define RT5665_SCLK_SRC_MCLK                    (0x0 << 14)
+#define RT5665_SCLK_SRC_PLL1                    (0x1 << 14)
+#define RT5665_SCLK_SRC_RCCLK                   (0x2 << 14)
+#define RT5665_PLL1_SRC_MASK                    (0x7 << 8)
+#define RT5665_PLL1_SRC_SFT                     8
+#define RT5665_PLL1_SRC_MCLK                    (0x0 << 8)
+#define RT5665_PLL1_SRC_BCLK1                   (0x1 << 8)
+#define RT5665_PLL1_SRC_BCLK2                   (0x2 << 8)
+#define RT5665_PLL1_SRC_BCLK3                   (0x3 << 8)
+#define RT5665_PLL1_PD_MASK                     (0x7 << 4)
+#define RT5665_PLL1_PD_SFT                      4
+
+
+#define RT5665_PLL_INP_MAX                      40000000
+#define RT5665_PLL_INP_MIN                      256000
+/* PLL M/N/K Code Control 1 (0x0081) */
+#define RT5665_PLL_N_MAX                        0x001ff
+#define RT5665_PLL_N_MASK                       (RT5665_PLL_N_MAX << 7)
+#define RT5665_PLL_N_SFT                        7
+#define RT5665_PLL_K_MAX                        0x001f
+#define RT5665_PLL_K_MASK                       (RT5665_PLL_K_MAX)
+#define RT5665_PLL_K_SFT                        0
+
+/* PLL M/N/K Code Control 2 (0x0082) */
+#define RT5665_PLL_M_MAX                        0x00f
+#define RT5665_PLL_M_MASK                       (RT5665_PLL_M_MAX << 12)
+#define RT5665_PLL_M_SFT                        12
+#define RT5665_PLL_M_BP                         (0x1 << 11)
+#define RT5665_PLL_M_BP_SFT                     11
+#define RT5665_PLL_K_BP                         (0x1 << 10)
+#define RT5665_PLL_K_BP_SFT                     10
+
+/* PLL tracking mode 1 (0x0083) */
+#define RT5665_I2S3_ASRC_MASK                   (0x1 << 15)
+#define RT5665_I2S3_ASRC_SFT                    15
+#define RT5665_I2S2_ASRC_MASK                   (0x1 << 14)
+#define RT5665_I2S2_ASRC_SFT                    14
+#define RT5665_I2S1_ASRC_MASK                   (0x1 << 13)
+#define RT5665_I2S1_ASRC_SFT                    13
+#define RT5665_DAC_STO1_ASRC_MASK               (0x1 << 12)
+#define RT5665_DAC_STO1_ASRC_SFT                12
+#define RT5665_DAC_STO2_ASRC_MASK               (0x1 << 11)
+#define RT5665_DAC_STO2_ASRC_SFT                11
+#define RT5665_DAC_MONO_L_ASRC_MASK             (0x1 << 10)
+#define RT5665_DAC_MONO_L_ASRC_SFT              10
+#define RT5665_DAC_MONO_R_ASRC_MASK             (0x1 << 9)
+#define RT5665_DAC_MONO_R_ASRC_SFT              9
+#define RT5665_DMIC_STO1_ASRC_MASK              (0x1 << 8)
+#define RT5665_DMIC_STO1_ASRC_SFT               8
+#define RT5665_DMIC_STO2_ASRC_MASK              (0x1 << 7)
+#define RT5665_DMIC_STO2_ASRC_SFT               7
+#define RT5665_DMIC_MONO_L_ASRC_MASK            (0x1 << 6)
+#define RT5665_DMIC_MONO_L_ASRC_SFT             6
+#define RT5665_DMIC_MONO_R_ASRC_MASK            (0x1 << 5)
+#define RT5665_DMIC_MONO_R_ASRC_SFT             5
+#define RT5665_ADC_STO1_ASRC_MASK               (0x1 << 4)
+#define RT5665_ADC_STO1_ASRC_SFT                4
+#define RT5665_ADC_STO2_ASRC_MASK               (0x1 << 3)
+#define RT5665_ADC_STO2_ASRC_SFT                3
+#define RT5665_ADC_MONO_L_ASRC_MASK             (0x1 << 2)
+#define RT5665_ADC_MONO_L_ASRC_SFT              2
+#define RT5665_ADC_MONO_R_ASRC_MASK             (0x1 << 1)
+#define RT5665_ADC_MONO_R_ASRC_SFT              1
+
+/* PLL tracking mode 2 (0x0084)*/
+#define RT5665_DA_STO1_CLK_SEL_MASK             (0x7 << 12)
+#define RT5665_DA_STO1_CLK_SEL_SFT              12
+#define RT5665_DA_STO2_CLK_SEL_MASK             (0x7 << 8)
+#define RT5665_DA_STO2_CLK_SEL_SFT              8
+#define RT5665_DA_MONOL_CLK_SEL_MASK            (0x7 << 4)
+#define RT5665_DA_MONOL_CLK_SEL_SFT             4
+#define RT5665_DA_MONOR_CLK_SEL_MASK            (0x7)
+#define RT5665_DA_MONOR_CLK_SEL_SFT             0
+
+/* PLL tracking mode 3 (0x0085)*/
+#define RT5665_AD_STO1_CLK_SEL_MASK             (0x7 << 12)
+#define RT5665_AD_STO1_CLK_SEL_SFT              12
+#define RT5665_AD_STO2_CLK_SEL_MASK             (0x7 << 8)
+#define RT5665_AD_STO2_CLK_SEL_SFT              8
+#define RT5665_AD_MONOL_CLK_SEL_MASK            (0x7 << 4)
+#define RT5665_AD_MONOL_CLK_SEL_SFT             4
+#define RT5665_AD_MONOR_CLK_SEL_MASK            (0x7)
+#define RT5665_AD_MONOR_CLK_SEL_SFT             0
+
+/* ASRC Control 4 (0x0086) */
+#define RT5665_I2S1_RATE_MASK                   (0xf << 12)
+#define RT5665_I2S1_RATE_SFT                    12
+#define RT5665_I2S2_RATE_MASK                   (0xf << 8)
+#define RT5665_I2S2_RATE_SFT                    8
+#define RT5665_I2S3_RATE_MASK                   (0xf << 4)
+#define RT5665_I2S3_RATE_SFT                    4
+
+/* Depop Mode Control 1 (0x008e) */
+#define RT5665_PUMP_EN                          (0x1 << 3)
+
+/* Depop Mode Control 2 (0x8f) */
+#define RT5665_DEPOP_MASK                       (0x1 << 13)
+#define RT5665_DEPOP_SFT                        13
+#define RT5665_DEPOP_AUTO                       (0x0 << 13)
+#define RT5665_DEPOP_MAN                        (0x1 << 13)
+#define RT5665_RAMP_MASK                        (0x1 << 12)
+#define RT5665_RAMP_SFT                         12
+#define RT5665_RAMP_DIS                         (0x0 << 12)
+#define RT5665_RAMP_EN                          (0x1 << 12)
+#define RT5665_BPS_MASK                         (0x1 << 11)
+#define RT5665_BPS_SFT                          11
+#define RT5665_BPS_DIS                          (0x0 << 11)
+#define RT5665_BPS_EN                           (0x1 << 11)
+#define RT5665_FAST_UPDN_MASK                   (0x1 << 10)
+#define RT5665_FAST_UPDN_SFT                    10
+#define RT5665_FAST_UPDN_DIS                    (0x0 << 10)
+#define RT5665_FAST_UPDN_EN                     (0x1 << 10)
+#define RT5665_MRES_MASK                        (0x3 << 8)
+#define RT5665_MRES_SFT                         8
+#define RT5665_MRES_15MO                        (0x0 << 8)
+#define RT5665_MRES_25MO                        (0x1 << 8)
+#define RT5665_MRES_35MO                        (0x2 << 8)
+#define RT5665_MRES_45MO                        (0x3 << 8)
+#define RT5665_VLO_MASK                         (0x1 << 7)
+#define RT5665_VLO_SFT                          7
+#define RT5665_VLO_3V                           (0x0 << 7)
+#define RT5665_VLO_32V                          (0x1 << 7)
+#define RT5665_DIG_DP_MASK                      (0x1 << 6)
+#define RT5665_DIG_DP_SFT                       6
+#define RT5665_DIG_DP_DIS                       (0x0 << 6)
+#define RT5665_DIG_DP_EN                        (0x1 << 6)
+#define RT5665_DP_TH_MASK                       (0x3 << 4)
+#define RT5665_DP_TH_SFT                        4
+
+/* Depop Mode Control 3 (0x90) */
+#define RT5665_CP_SYS_MASK                      (0x7 << 12)
+#define RT5665_CP_SYS_SFT                       12
+#define RT5665_CP_FQ1_MASK                      (0x7 << 8)
+#define RT5665_CP_FQ1_SFT                       8
+#define RT5665_CP_FQ2_MASK                      (0x7 << 4)
+#define RT5665_CP_FQ2_SFT                       4
+#define RT5665_CP_FQ3_MASK                      (0x7)
+#define RT5665_CP_FQ3_SFT                       0
+#define RT5665_CP_FQ_1_5_KHZ                    0
+#define RT5665_CP_FQ_3_KHZ                      1
+#define RT5665_CP_FQ_6_KHZ                      2
+#define RT5665_CP_FQ_12_KHZ                     3
+#define RT5665_CP_FQ_24_KHZ                     4
+#define RT5665_CP_FQ_48_KHZ                     5
+#define RT5665_CP_FQ_96_KHZ                     6
+#define RT5665_CP_FQ_192_KHZ                    7
+
+/* HPOUT charge pump 1 (0x0091) */
+#define RT5665_OSW_L_MASK                       (0x1 << 11)
+#define RT5665_OSW_L_SFT                        11
+#define RT5665_OSW_L_DIS                        (0x0 << 11)
+#define RT5665_OSW_L_EN                         (0x1 << 11)
+#define RT5665_OSW_R_MASK                       (0x1 << 10)
+#define RT5665_OSW_R_SFT                        10
+#define RT5665_OSW_R_DIS                        (0x0 << 10)
+#define RT5665_OSW_R_EN                         (0x1 << 10)
+#define RT5665_PM_HP_MASK                       (0x3 << 8)
+#define RT5665_PM_HP_SFT                        8
+#define RT5665_PM_HP_LV                         (0x0 << 8)
+#define RT5665_PM_HP_MV                         (0x1 << 8)
+#define RT5665_PM_HP_HV                         (0x2 << 8)
+#define RT5665_IB_HP_MASK                       (0x3 << 6)
+#define RT5665_IB_HP_SFT                        6
+#define RT5665_IB_HP_125IL                      (0x0 << 6)
+#define RT5665_IB_HP_25IL                       (0x1 << 6)
+#define RT5665_IB_HP_5IL                        (0x2 << 6)
+#define RT5665_IB_HP_1IL                        (0x3 << 6)
+
+/* PV detection and SPK gain control (0x92) */
+#define RT5665_PVDD_DET_MASK                    (0x1 << 15)
+#define RT5665_PVDD_DET_SFT                     15
+#define RT5665_PVDD_DET_DIS                     (0x0 << 15)
+#define RT5665_PVDD_DET_EN                      (0x1 << 15)
+#define RT5665_SPK_AG_MASK                      (0x1 << 14)
+#define RT5665_SPK_AG_SFT                       14
+#define RT5665_SPK_AG_DIS                       (0x0 << 14)
+#define RT5665_SPK_AG_EN                        (0x1 << 14)
+
+/* Micbias Control1 (0x93) */
+#define RT5665_MIC1_BS_MASK                     (0x1 << 15)
+#define RT5665_MIC1_BS_SFT                      15
+#define RT5665_MIC1_BS_9AV                      (0x0 << 15)
+#define RT5665_MIC1_BS_75AV                     (0x1 << 15)
+#define RT5665_MIC2_BS_MASK                     (0x1 << 14)
+#define RT5665_MIC2_BS_SFT                      14
+#define RT5665_MIC2_BS_9AV                      (0x0 << 14)
+#define RT5665_MIC2_BS_75AV                     (0x1 << 14)
+#define RT5665_MIC1_CLK_MASK                    (0x1 << 13)
+#define RT5665_MIC1_CLK_SFT                     13
+#define RT5665_MIC1_CLK_DIS                     (0x0 << 13)
+#define RT5665_MIC1_CLK_EN                      (0x1 << 13)
+#define RT5665_MIC2_CLK_MASK                    (0x1 << 12)
+#define RT5665_MIC2_CLK_SFT                     12
+#define RT5665_MIC2_CLK_DIS                     (0x0 << 12)
+#define RT5665_MIC2_CLK_EN                      (0x1 << 12)
+#define RT5665_MIC1_OVCD_MASK                   (0x1 << 11)
+#define RT5665_MIC1_OVCD_SFT                    11
+#define RT5665_MIC1_OVCD_DIS                    (0x0 << 11)
+#define RT5665_MIC1_OVCD_EN                     (0x1 << 11)
+#define RT5665_MIC1_OVTH_MASK                   (0x3 << 9)
+#define RT5665_MIC1_OVTH_SFT                    9
+#define RT5665_MIC1_OVTH_600UA                  (0x0 << 9)
+#define RT5665_MIC1_OVTH_1500UA                 (0x1 << 9)
+#define RT5665_MIC1_OVTH_2000UA                 (0x2 << 9)
+#define RT5665_MIC2_OVCD_MASK                   (0x1 << 8)
+#define RT5665_MIC2_OVCD_SFT                    8
+#define RT5665_MIC2_OVCD_DIS                    (0x0 << 8)
+#define RT5665_MIC2_OVCD_EN                     (0x1 << 8)
+#define RT5665_MIC2_OVTH_MASK                   (0x3 << 6)
+#define RT5665_MIC2_OVTH_SFT                    6
+#define RT5665_MIC2_OVTH_600UA                  (0x0 << 6)
+#define RT5665_MIC2_OVTH_1500UA                 (0x1 << 6)
+#define RT5665_MIC2_OVTH_2000UA                 (0x2 << 6)
+#define RT5665_PWR_MB_MASK                      (0x1 << 5)
+#define RT5665_PWR_MB_SFT                       5
+#define RT5665_PWR_MB_PD                        (0x0 << 5)
+#define RT5665_PWR_MB_PU                        (0x1 << 5)
+
+/* Micbias Control2 (0x94) */
+#define RT5665_PWR_CLK25M_MASK                  (0x1 << 9)
+#define RT5665_PWR_CLK25M_SFT                   9
+#define RT5665_PWR_CLK25M_PD                    (0x0 << 9)
+#define RT5665_PWR_CLK25M_PU                    (0x1 << 9)
+#define RT5665_PWR_CLK1M_MASK                   (0x1 << 8)
+#define RT5665_PWR_CLK1M_SFT                    8
+#define RT5665_PWR_CLK1M_PD                     (0x0 << 8)
+#define RT5665_PWR_CLK1M_PU                     (0x1 << 8)
+
+
+/* EQ Control 1 (0x00b0) */
+#define RT5665_EQ_SRC_DAC                       (0x0 << 15)
+#define RT5665_EQ_SRC_ADC                       (0x1 << 15)
+#define RT5665_EQ_UPD                           (0x1 << 14)
+#define RT5665_EQ_UPD_BIT                       14
+#define RT5665_EQ_CD_MASK                       (0x1 << 13)
+#define RT5665_EQ_CD_SFT                        13
+#define RT5665_EQ_CD_DIS                        (0x0 << 13)
+#define RT5665_EQ_CD_EN                         (0x1 << 13)
+#define RT5665_EQ_DITH_MASK                     (0x3 << 8)
+#define RT5665_EQ_DITH_SFT                      8
+#define RT5665_EQ_DITH_NOR                      (0x0 << 8)
+#define RT5665_EQ_DITH_LSB                      (0x1 << 8)
+#define RT5665_EQ_DITH_LSB_1                    (0x2 << 8)
+#define RT5665_EQ_DITH_LSB_2                    (0x3 << 8)
+
+/* IRQ Control 1 (0x00b7) */
+#define RT5665_JD1_1_EN_MASK                    (0x1 << 15)
+#define RT5665_JD1_1_EN_SFT                     15
+#define RT5665_JD1_1_DIS                        (0x0 << 15)
+#define RT5665_JD1_1_EN                         (0x1 << 15)
+#define RT5665_JD1_2_EN_MASK                    (0x1 << 12)
+#define RT5665_JD1_2_EN_SFT                     12
+#define RT5665_JD1_2_DIS                        (0x0 << 12)
+#define RT5665_JD1_2_EN                         (0x1 << 12)
+
+/* IRQ Control 2 (0x00b8) */
+#define RT5665_IL_IRQ_MASK                      (0x1 << 6)
+#define RT5665_IL_IRQ_DIS                       (0x0 << 6)
+#define RT5665_IL_IRQ_EN                        (0x1 << 6)
+
+/* IRQ Control 5 (0x00ba) */
+#define RT5665_IRQ_JD_EN                        (0x1 << 3)
+#define RT5665_IRQ_JD_EN_SFT                    3
+
+/* GPIO Control 1 (0x00c0) */
+#define RT5665_GP1_PIN_MASK                     (0x1 << 15)
+#define RT5665_GP1_PIN_SFT                      15
+#define RT5665_GP1_PIN_GPIO1                    (0x0 << 15)
+#define RT5665_GP1_PIN_IRQ                      (0x1 << 15)
+#define RT5665_GP2_PIN_MASK                     (0x3 << 13)
+#define RT5665_GP2_PIN_SFT                      13
+#define RT5665_GP2_PIN_GPIO2                    (0x0 << 13)
+#define RT5665_GP2_PIN_BCLK2                    (0x1 << 13)
+#define RT5665_GP2_PIN_PDM_SCL                  (0x2 << 13)
+#define RT5665_GP3_PIN_MASK                     (0x3 << 11)
+#define RT5665_GP3_PIN_SFT                      11
+#define RT5665_GP3_PIN_GPIO3                    (0x0 << 11)
+#define RT5665_GP3_PIN_LRCK2                    (0x1 << 11)
+#define RT5665_GP3_PIN_PDM_SDA                  (0x2 << 11)
+#define RT5665_GP4_PIN_MASK                     (0x3 << 9)
+#define RT5665_GP4_PIN_SFT                      9
+#define RT5665_GP4_PIN_GPIO4                    (0x0 << 9)
+#define RT5665_GP4_PIN_DACDAT2_1                (0x1 << 9)
+#define RT5665_GP4_PIN_DMIC1_SDA                (0x2 << 9)
+#define RT5665_GP5_PIN_MASK                     (0x3 << 7)
+#define RT5665_GP5_PIN_SFT                      7
+#define RT5665_GP5_PIN_GPIO5                    (0x0 << 7)
+#define RT5665_GP5_PIN_ADCDAT2_1                (0x1 << 7)
+#define RT5665_GP5_PIN_DMIC2_SDA                (0x2 << 7)
+#define RT5665_GP6_PIN_MASK                     (0x3 << 5)
+#define RT5665_GP6_PIN_SFT                      5
+#define RT5665_GP6_PIN_GPIO6                    (0x0 << 5)
+#define RT5665_GP6_PIN_BCLK3                    (0x0 << 5)
+#define RT5665_GP6_PIN_PDM_SCL                  (0x1 << 5)
+#define RT5665_GP7_PIN_MASK                     (0x3 << 3)
+#define RT5665_GP7_PIN_SFT                      3
+#define RT5665_GP7_PIN_GPIO7                    (0x0 << 3)
+#define RT5665_GP7_PIN_LRCK3                    (0x1 << 3)
+#define RT5665_GP7_PIN_PDM_SDA                  (0x2 << 3)
+#define RT5665_GP8_PIN_MASK                     (0x3 << 1)
+#define RT5665_GP8_PIN_SFT                      1
+#define RT5665_GP8_PIN_GPIO8                    (0x0 << 1)
+#define RT5665_GP8_PIN_DACDAT3                  (0x1 << 1)
+#define RT5665_GP8_PIN_DMIC2_SCL                (0x2 << 1)
+#define RT5665_GP8_PIN_DACDAT2_2                (0x3 << 1)
+
+
+/* GPIO Control 2 (0x00c1)*/
+#define RT5665_GP9_PIN_MASK                     (0x3 << 14)
+#define RT5665_GP9_PIN_SFT                      14
+#define RT5665_GP9_PIN_GPIO9                    (0x0 << 14)
+#define RT5665_GP9_PIN_ADCDAT3                  (0x1 << 14)
+#define RT5665_GP9_PIN_DMIC1_SCL                (0x2 << 14)
+#define RT5665_GP9_PIN_ADCDAT2_2                (0x3 << 14)
+#define RT5665_GP10_PIN_MASK                    (0x3 << 12)
+#define RT5665_GP10_PIN_SFT                     12
+#define RT5665_GP10_PIN_GPIO10                  (0x0 << 12)
+#define RT5665_GP10_PIN_ADCDAT1_2               (0x1 << 12)
+#define RT5665_GP10_PIN_LPD                     (0x2 << 12)
+#define RT5665_GP1_PF_MASK                      (0x1 << 11)
+#define RT5665_GP1_PF_IN                        (0x0 << 11)
+#define RT5665_GP1_PF_OUT                       (0x1 << 11)
+#define RT5665_GP1_OUT_MASK                     (0x1 << 10)
+#define RT5665_GP1_OUT_H                        (0x0 << 10)
+#define RT5665_GP1_OUT_L                        (0x1 << 10)
+#define RT5665_GP2_PF_MASK                      (0x1 << 9)
+#define RT5665_GP2_PF_IN                        (0x0 << 9)
+#define RT5665_GP2_PF_OUT                       (0x1 << 9)
+#define RT5665_GP2_OUT_MASK                     (0x1 << 8)
+#define RT5665_GP2_OUT_H                        (0x0 << 8)
+#define RT5665_GP2_OUT_L                        (0x1 << 8)
+#define RT5665_GP3_PF_MASK                      (0x1 << 7)
+#define RT5665_GP3_PF_IN                        (0x0 << 7)
+#define RT5665_GP3_PF_OUT                       (0x1 << 7)
+#define RT5665_GP3_OUT_MASK                     (0x1 << 6)
+#define RT5665_GP3_OUT_H                        (0x0 << 6)
+#define RT5665_GP3_OUT_L                        (0x1 << 6)
+#define RT5665_GP4_PF_MASK                      (0x1 << 5)
+#define RT5665_GP4_PF_IN                        (0x0 << 5)
+#define RT5665_GP4_PF_OUT                       (0x1 << 5)
+#define RT5665_GP4_OUT_MASK                     (0x1 << 4)
+#define RT5665_GP4_OUT_H                        (0x0 << 4)
+#define RT5665_GP4_OUT_L                        (0x1 << 4)
+#define RT5665_GP5_PF_MASK                      (0x1 << 3)
+#define RT5665_GP5_PF_IN                        (0x0 << 3)
+#define RT5665_GP5_PF_OUT                       (0x1 << 3)
+#define RT5665_GP5_OUT_MASK                     (0x1 << 2)
+#define RT5665_GP5_OUT_H                        (0x0 << 2)
+#define RT5665_GP5_OUT_L                        (0x1 << 2)
+#define RT5665_GP6_PF_MASK                      (0x1 << 1)
+#define RT5665_GP6_PF_IN                        (0x0 << 1)
+#define RT5665_GP6_PF_OUT                       (0x1 << 1)
+#define RT5665_GP6_OUT_MASK                     (0x1)
+#define RT5665_GP6_OUT_H                        (0x0)
+#define RT5665_GP6_OUT_L                        (0x1)
+
+
+/* GPIO Control 3 (0x00c2) */
+#define RT5665_GP7_PF_MASK                      (0x1 << 15)
+#define RT5665_GP7_PF_IN                        (0x0 << 15)
+#define RT5665_GP7_PF_OUT                       (0x1 << 15)
+#define RT5665_GP7_OUT_MASK                     (0x1 << 14)
+#define RT5665_GP7_OUT_H                        (0x0 << 14)
+#define RT5665_GP7_OUT_L                        (0x1 << 14)
+#define RT5665_GP8_PF_MASK                      (0x1 << 13)
+#define RT5665_GP8_PF_IN                        (0x0 << 13)
+#define RT5665_GP8_PF_OUT                       (0x1 << 13)
+#define RT5665_GP8_OUT_MASK                     (0x1 << 12)
+#define RT5665_GP8_OUT_H                        (0x0 << 12)
+#define RT5665_GP8_OUT_L                        (0x1 << 12)
+#define RT5665_GP9_PF_MASK                      (0x1 << 11)
+#define RT5665_GP9_PF_IN                        (0x0 << 11)
+#define RT5665_GP9_PF_OUT                       (0x1 << 11)
+#define RT5665_GP9_OUT_MASK                     (0x1 << 10)
+#define RT5665_GP9_OUT_H                        (0x0 << 10)
+#define RT5665_GP9_OUT_L                        (0x1 << 10)
+#define RT5665_GP10_PF_MASK                     (0x1 << 9)
+#define RT5665_GP10_PF_IN                       (0x0 << 9)
+#define RT5665_GP10_PF_OUT                      (0x1 << 9)
+#define RT5665_GP10_OUT_MASK                    (0x1 << 8)
+#define RT5665_GP10_OUT_H                       (0x0 << 8)
+#define RT5665_GP10_OUT_L                       (0x1 << 8)
+#define RT5665_GP11_PF_MASK                     (0x1 << 7)
+#define RT5665_GP11_PF_IN                       (0x0 << 7)
+#define RT5665_GP11_PF_OUT                      (0x1 << 7)
+#define RT5665_GP11_OUT_MASK                    (0x1 << 6)
+#define RT5665_GP11_OUT_H                       (0x0 << 6)
+#define RT5665_GP11_OUT_L                       (0x1 << 6)
+
+/* Soft volume and zero cross control 1 (0x00d9) */
+#define RT5665_SV_MASK                          (0x1 << 15)
+#define RT5665_SV_SFT                           15
+#define RT5665_SV_DIS                           (0x0 << 15)
+#define RT5665_SV_EN                            (0x1 << 15)
+#define RT5665_OUT_SV_MASK                      (0x1 << 13)
+#define RT5665_OUT_SV_SFT                       13
+#define RT5665_OUT_SV_DIS                       (0x0 << 13)
+#define RT5665_OUT_SV_EN                        (0x1 << 13)
+#define RT5665_HP_SV_MASK                       (0x1 << 12)
+#define RT5665_HP_SV_SFT                        12
+#define RT5665_HP_SV_DIS                        (0x0 << 12)
+#define RT5665_HP_SV_EN                         (0x1 << 12)
+#define RT5665_ZCD_DIG_MASK                     (0x1 << 11)
+#define RT5665_ZCD_DIG_SFT                      11
+#define RT5665_ZCD_DIG_DIS                      (0x0 << 11)
+#define RT5665_ZCD_DIG_EN                       (0x1 << 11)
+#define RT5665_ZCD_MASK                         (0x1 << 10)
+#define RT5665_ZCD_SFT                          10
+#define RT5665_ZCD_PD                           (0x0 << 10)
+#define RT5665_ZCD_PU                           (0x1 << 10)
+#define RT5665_SV_DLY_MASK                      (0xf)
+#define RT5665_SV_DLY_SFT                       0
+
+/* Soft volume and zero cross control 2 (0x00da) */
+#define RT5665_ZCD_HP_MASK                      (0x1 << 15)
+#define RT5665_ZCD_HP_SFT                       15
+#define RT5665_ZCD_HP_DIS                       (0x0 << 15)
+#define RT5665_ZCD_HP_EN                        (0x1 << 15)
+
+/* 4 Button Inline Command Control 2 (0x00e0) */
+#define RT5665_4BTN_IL_MASK                     (0x1 << 15)
+#define RT5665_4BTN_IL_EN                       (0x1 << 15)
+#define RT5665_4BTN_IL_DIS                      (0x0 << 15)
+#define RT5665_4BTN_IL_RST_MASK                 (0x1 << 14)
+#define RT5665_4BTN_IL_NOR                      (0x1 << 14)
+#define RT5665_4BTN_IL_RST                      (0x0 << 14)
+
+/* Analog JD Control 1 (0x00f0) */
+#define RT5665_JD1_MODE_MASK                    (0x3 << 0)
+#define RT5665_JD1_MODE_0                       (0x0 << 0)
+#define RT5665_JD1_MODE_1                       (0x1 << 0)
+#define RT5665_JD1_MODE_2                       (0x2 << 0)
+
+/* Jack Detect Control 3 (0x00f8) */
+#define RT5665_JD_TRI_HPO_SEL_MASK              (0x7)
+#define RT5665_JD_TRI_HPO_SEL_SFT               (0)
+#define RT5665_JD_HPO_GPIO_JD1                  (0x0)
+#define RT5665_JD_HPO_JD1_1                     (0x1)
+#define RT5665_JD_HPO_JD1_2                     (0x2)
+#define RT5665_JD_HPO_JD2                       (0x3)
+#define RT5665_JD_HPO_GPIO_JD2                  (0x4)
+#define RT5665_JD_HPO_JD3                       (0x5)
+#define RT5665_JD_HPO_JD_D                      (0x6)
+
+/* Digital Misc Control (0x00fa) */
+#define RT5665_AM_MASK                          (0x1 << 7)
+#define RT5665_AM_EN                            (0x1 << 7)
+#define RT5665_AM_DIS                           (0x1 << 7)
+#define RT5665_DIG_GATE_CTRL                    0x1
+#define RT5665_DIG_GATE_CTRL_SFT                (0)
+
+/* Chopper and Clock control for ADC (0x011c)*/
+#define RT5665_M_RF_DIG_MASK                    (0x1 << 12)
+#define RT5665_M_RF_DIG_SFT                     12
+#define RT5665_M_RI_DIG                         (0x1 << 11)
+
+/* Chopper and Clock control for DAC (0x013a)*/
+#define RT5665_CKXEN_DAC1_MASK                  (0x1 << 13)
+#define RT5665_CKXEN_DAC1_SFT                   13
+#define RT5665_CKGEN_DAC1_MASK                  (0x1 << 12)
+#define RT5665_CKGEN_DAC1_SFT                   12
+#define RT5665_CKXEN_DAC2_MASK                  (0x1 << 5)
+#define RT5665_CKXEN_DAC2_SFT                   5
+#define RT5665_CKGEN_DAC2_MASK                  (0x1 << 4)
+#define RT5665_CKGEN_DAC2_SFT                   4
+
+/* Chopper and Clock control for ADC (0x013b)*/
+#define RT5665_CKXEN_ADC1_MASK                  (0x1 << 13)
+#define RT5665_CKXEN_ADC1_SFT                   13
+#define RT5665_CKGEN_ADC1_MASK                  (0x1 << 12)
+#define RT5665_CKGEN_ADC1_SFT                   12
+#define RT5665_CKXEN_ADC2_MASK                  (0x1 << 5)
+#define RT5665_CKXEN_ADC2_SFT                   5
+#define RT5665_CKGEN_ADC2_MASK                  (0x1 << 4)
+#define RT5665_CKGEN_ADC2_SFT                   4
+
+/* Volume test (0x013f)*/
+#define RT5665_SEL_CLK_VOL_MASK                 (0x1 << 15)
+#define RT5665_SEL_CLK_VOL_EN                   (0x1 << 15)
+#define RT5665_SEL_CLK_VOL_DIS                  (0x0 << 15)
+
+/* Test Mode Control 1 (0x0145) */
+#define RT5665_AD2DA_LB_MASK                    (0x1 << 9)
+#define RT5665_AD2DA_LB_SFT                     9
+
+/* Stereo Noise Gate Control 1 (0x0160) */
+#define RT5665_NG2_EN_MASK                      (0x1 << 15)
+#define RT5665_NG2_EN                           (0x1 << 15)
+#define RT5665_NG2_DIS                          (0x0 << 15)
+
+/* Stereo1 DAC Silence Detection Control (0x0190) */
+#define RT5665_DEB_STO_DAC_MASK                 (0x7 << 4)
+#define RT5665_DEB_80_MS                        (0x0 << 4)
+
+/* SAR ADC Inline Command Control 1 (0x0210) */
+#define RT5665_SAR_BUTT_DET_MASK                (0x1 << 15)
+#define RT5665_SAR_BUTT_DET_EN                  (0x1 << 15)
+#define RT5665_SAR_BUTT_DET_DIS                 (0x0 << 15)
+#define RT5665_SAR_BUTDET_MODE_MASK             (0x1 << 14)
+#define RT5665_SAR_BUTDET_POW_SAV               (0x1 << 14)
+#define RT5665_SAR_BUTDET_POW_NORM              (0x0 << 14)
+#define RT5665_SAR_BUTDET_RST_MASK              (0x1 << 13)
+#define RT5665_SAR_BUTDET_RST_NORMAL            (0x1 << 13)
+#define RT5665_SAR_BUTDET_RST                   (0x0 << 13)
+#define RT5665_SAR_POW_MASK                     (0x1 << 12)
+#define RT5665_SAR_POW_EN                       (0x1 << 12)
+#define RT5665_SAR_POW_DIS                      (0x0 << 12)
+#define RT5665_SAR_RST_MASK                     (0x1 << 11)
+#define RT5665_SAR_RST_NORMAL                   (0x1 << 11)
+#define RT5665_SAR_RST                          (0x0 << 11)
+#define RT5665_SAR_BYPASS_MASK                  (0x1 << 10)
+#define RT5665_SAR_BYPASS_EN                    (0x1 << 10)
+#define RT5665_SAR_BYPASS_DIS                   (0x0 << 10)
+#define RT5665_SAR_SEL_MB1_MASK                 (0x1 << 9)
+#define RT5665_SAR_SEL_MB1_SEL                  (0x1 << 9)
+#define RT5665_SAR_SEL_MB1_NOSEL                (0x0 << 9)
+#define RT5665_SAR_SEL_MB2_MASK                 (0x1 << 8)
+#define RT5665_SAR_SEL_MB2_SEL                  (0x1 << 8)
+#define RT5665_SAR_SEL_MB2_NOSEL                (0x0 << 8)
+#define RT5665_SAR_SEL_MODE_MASK                (0x1 << 7)
+#define RT5665_SAR_SEL_MODE_CMP                 (0x1 << 7)
+#define RT5665_SAR_SEL_MODE_ADC                 (0x0 << 7)
+#define RT5665_SAR_SEL_MB1_MB2_MASK             (0x1 << 5)
+#define RT5665_SAR_SEL_MB1_MB2_AUTO             (0x1 << 5)
+#define RT5665_SAR_SEL_MB1_MB2_MANU             (0x0 << 5)
+#define RT5665_SAR_SEL_SIGNAL_MASK              (0x1 << 4)
+#define RT5665_SAR_SEL_SIGNAL_AUTO              (0x1 << 4)
+#define RT5665_SAR_SEL_SIGNAL_MANU              (0x0 << 4)
+
+/* System Clock Source */
+enum {
+        RT5665_SCLK_S_MCLK,
+        RT5665_SCLK_S_PLL1,
+        RT5665_SCLK_S_RCCLK,
+};
+
+/* PLL1 Source */
+enum {
+        RT5665_PLL1_S_MCLK,
+        RT5665_PLL1_S_BCLK1,
+        RT5665_PLL1_S_BCLK2,
+        RT5665_PLL1_S_BCLK3,
+        RT5665_PLL1_S_BCLK4,
+};
+
+enum {
+        RT5665_AIF1_1,
+        RT5665_AIF1_2,
+        RT5665_AIF2_1,
+        RT5665_AIF2_2,
+        RT5665_AIF3,
+        RT5665_AIFS
+};
+
+enum {
+        CODEC_5665,
+        CODEC_5666,
+        CODEC_5668,
+};
+
+/* filter mask */
+enum {
+        RT5665_DA_STEREO1_FILTER = 0x1,
+        RT5665_DA_STEREO2_FILTER = (0x1 << 1),
+        RT5665_DA_MONO_L_FILTER = (0x1 << 2),
+        RT5665_DA_MONO_R_FILTER = (0x1 << 3),
+        RT5665_AD_STEREO1_FILTER = (0x1 << 4),
+        RT5665_AD_STEREO2_FILTER = (0x1 << 5),
+        RT5665_AD_MONO_L_FILTER = (0x1 << 6),
+        RT5665_AD_MONO_R_FILTER = (0x1 << 7),
+};
+
+enum {
+        RT5665_CLK_SEL_SYS,
+        RT5665_CLK_SEL_I2S1_ASRC,
+        RT5665_CLK_SEL_I2S2_ASRC,
+        RT5665_CLK_SEL_I2S3_ASRC,
+        RT5665_CLK_SEL_SYS2,
+        RT5665_CLK_SEL_SYS3,
+        RT5665_CLK_SEL_SYS4,
+};
+
+int rt5665_sel_asrc_clk_src(struct snd_soc_codec *codec,
+                unsigned int filter_mask, unsigned int clk_src);
+int rt5665_set_jack_detect(struct snd_soc_codec *codec,
+        struct snd_soc_jack *hs_jack);
+
+#endif /* __RT5665_H__ */
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index 49caf1393aeb..97bafac3bc15 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -2618,7 +2618,7 @@ static int rt5670_set_bias_level(struct snd_soc_codec *codec,
                                 RT5670_OSW_L_DIS | RT5670_OSW_R_DIS);
                         snd_soc_update_bits(codec, RT5670_DIG_MISC, 0x1, 0x1);
                         snd_soc_update_bits(codec, RT5670_PWR_ANLG1,
-                                RT5670_LDO_SEL_MASK, 0x3);
+                                RT5670_LDO_SEL_MASK, 0x5);
                 }
                 break;
         case SND_SOC_BIAS_STANDBY:
@@ -2626,7 +2626,7 @@ static int rt5670_set_bias_level(struct snd_soc_codec *codec,
                                 RT5670_PWR_VREF1 | RT5670_PWR_VREF2 |
                                 RT5670_PWR_FV1 | RT5670_PWR_FV2, 0);
                 snd_soc_update_bits(codec, RT5670_PWR_ANLG1,
-                                RT5670_LDO_SEL_MASK, 0x1);
+                                RT5670_LDO_SEL_MASK, 0x3);
                 break;
         case SND_SOC_BIAS_OFF:
                 if (rt5670->pdata.jd_mode)
@@ -2813,6 +2813,7 @@ MODULE_DEVICE_TABLE(i2c, rt5670_i2c_id);
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id rt5670_acpi_match[] = {
         { "10EC5670", 0},
+        { "10EC5672", 0},
         { },
 };
 MODULE_DEVICE_TABLE(acpi, rt5670_acpi_match);
@@ -2826,6 +2827,13 @@ static const struct dmi_system_id dmi_platform_intel_braswell[] = {
                         DMI_MATCH(DMI_BOARD_NAME, "Braswell CRB"),
                 },
         },
+        {
+                .ident = "Dell Wyse 3040",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Wyse 3040"),
+                },
+        },
         {}
 };
 
@@ -2889,6 +2897,9 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
         if (ret != 0)
                 dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret);
 
+        regmap_update_bits(rt5670->regmap, RT5670_DIG_MISC,
+                                 RT5670_MCLK_DET, RT5670_MCLK_DET);
+
         if (rt5670->pdata.in2_diff)
                 regmap_update_bits(rt5670->regmap, RT5670_IN2,
                                         RT5670_IN_DF2, RT5670_IN_DF2);
@@ -2903,7 +2914,6 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
                                    RT5670_GP1_PIN_MASK, RT5670_GP1_PIN_IRQ);
                 regmap_update_bits(rt5670->regmap, RT5670_GPIO_CTRL2,
                                    RT5670_GP1_PF_MASK, RT5670_GP1_PF_OUT);
-                regmap_update_bits(rt5670->regmap, RT5670_DIG_MISC, 0x8, 0x8);
         }
 
         if (rt5670->pdata.jd_mode) {
diff --git a/sound/soc/codecs/rt5670.h b/sound/soc/codecs/rt5670.h
index 3f1b0f1df809..5ba485cae4e6 100644
--- a/sound/soc/codecs/rt5670.h
+++ b/sound/soc/codecs/rt5670.h
@@ -1914,6 +1914,7 @@ enum {
 #define RT5670_IF1_ADC1_IN2_SFT                 11
 #define RT5670_IF1_ADC2_IN1_SEL                 (0x1 << 10)
 #define RT5670_IF1_ADC2_IN1_SFT                 10
+#define RT5670_MCLK_DET                         (0x1 << 3)
 
 /* General Control2 (0xfb) */
 #define RT5670_RXDC_SRC_MASK                    (0x1 << 7)
diff --git a/sound/soc/codecs/rt5677-spi.c b/sound/soc/codecs/rt5677-spi.c
index 91879ea95415..ebd0f7c5ad3b 100644
--- a/sound/soc/codecs/rt5677-spi.c
+++ b/sound/soc/codecs/rt5677-spi.c
@@ -20,7 +20,6 @@
 #include <linux/slab.h>
 #include <linux/gpio.h>
 #include <linux/sched.h>
-#include <linux/kthread.h>
 #include <linux/uaccess.h>
 #include <linux/miscdevice.h>
 #include <linux/regulator/consumer.h>
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index 27f30d352867..9de7fe8af255 100644
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/device.h>
+#include <linux/regmap.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/ac97_codec.h>
@@ -26,31 +27,56 @@
 #include <sound/soc.h>
 #include <sound/tlv.h>
 
-#include "stac9766.h"
-
 #define STAC9766_VENDOR_ID 0x83847666
 #define STAC9766_VENDOR_ID_MASK 0xffffffff
 
-/*
- * STAC9766 register cache
- */
-static const u16 stac9766_reg[] = {
-        0x6A90, 0x8000, 0x8000, 0x8000, /* 6 */
-        0x0000, 0x0000, 0x8008, 0x8008, /* e */
-        0x8808, 0x8808, 0x8808, 0x8808, /* 16 */
-        0x8808, 0x0000, 0x8000, 0x0000, /* 1e */
-        0x0000, 0x0000, 0x0000, 0x000f, /* 26 */
-        0x0a05, 0x0400, 0xbb80, 0x0000, /* 2e */
-        0x0000, 0xbb80, 0x0000, 0x0000, /* 36 */
-        0x0000, 0x2000, 0x0000, 0x0100, /* 3e */
-        0x0000, 0x0000, 0x0080, 0x0000, /* 46 */
-        0x0000, 0x0000, 0x0003, 0xffff, /* 4e */
-        0x0000, 0x0000, 0x0000, 0x0000, /* 56 */
-        0x4000, 0x0000, 0x0000, 0x0000, /* 5e */
-        0x1201, 0xFFFF, 0xFFFF, 0x0000, /* 66 */
-        0x0000, 0x0000, 0x0000, 0x0000, /* 6e */
-        0x0000, 0x0000, 0x0000, 0x0006, /* 76 */
-        0x0000, 0x0000, 0x0000, 0x0000, /* 7e */
+#define AC97_STAC_DA_CONTROL 0x6A
+#define AC97_STAC_ANALOG_SPECIAL 0x6E
+#define AC97_STAC_STEREO_MIC 0x78
+
+static const struct reg_default stac9766_reg_defaults[] = {
+        { 0x02, 0x8000 },
+        { 0x04, 0x8000 },
+        { 0x06, 0x8000 },
+        { 0x0a, 0x0000 },
+        { 0x0c, 0x8008 },
+        { 0x0e, 0x8008 },
+        { 0x10, 0x8808 },
+        { 0x12, 0x8808 },
+        { 0x14, 0x8808 },
+        { 0x16, 0x8808 },
+        { 0x18, 0x8808 },
+        { 0x1a, 0x0000 },
+        { 0x1c, 0x8000 },
+        { 0x20, 0x0000 },
+        { 0x22, 0x0000 },
+        { 0x28, 0x0a05 },
+        { 0x2c, 0xbb80 },
+        { 0x32, 0xbb80 },
+        { 0x3a, 0x2000 },
+        { 0x3e, 0x0100 },
+        { 0x4c, 0x0300 },
+        { 0x4e, 0xffff },
+        { 0x50, 0x0000 },
+        { 0x52, 0x0000 },
+        { 0x54, 0x0000 },
+        { 0x6a, 0x0000 },
+        { 0x6e, 0x1000 },
+        { 0x72, 0x0000 },
+        { 0x78, 0x0000 },
+};
+
+static const struct regmap_config stac9766_regmap_config = {
+        .reg_bits = 16,
+        .reg_stride = 2,
+        .val_bits = 16,
+        .max_register = 0x78,
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = regmap_ac97_default_volatile,
+
+        .reg_defaults = stac9766_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(stac9766_reg_defaults),
 };
 
 static const char *stac9766_record_mux[] = {"Mic", "CD", "Video", "AUX",
@@ -139,71 +165,22 @@ static const struct snd_kcontrol_new stac9766_snd_ac97_controls[] = {
         SOC_ENUM("Pop Bypass Mux", stac9766_popbypass_enum),
 };
 
-static int stac9766_ac97_write(struct snd_soc_codec *codec, unsigned int reg,
-                               unsigned int val)
-{
-        struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
-        u16 *cache = codec->reg_cache;
-
-        if (reg > AC97_STAC_PAGE0) {
-                stac9766_ac97_write(codec, AC97_INT_PAGING, 0);
-                soc_ac97_ops->write(ac97, reg, val);
-                stac9766_ac97_write(codec, AC97_INT_PAGING, 1);
-                return 0;
-        }
-        if (reg / 2 >= ARRAY_SIZE(stac9766_reg))
-                return -EIO;
-
-        soc_ac97_ops->write(ac97, reg, val);
-        cache[reg / 2] = val;
-        return 0;
-}
-
-static unsigned int stac9766_ac97_read(struct snd_soc_codec *codec,
-                                       unsigned int reg)
-{
-        struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
-        u16 val = 0, *cache = codec->reg_cache;
-
-        if (reg > AC97_STAC_PAGE0) {
-                stac9766_ac97_write(codec, AC97_INT_PAGING, 0);
-                val = soc_ac97_ops->read(ac97, reg - AC97_STAC_PAGE0);
-                stac9766_ac97_write(codec, AC97_INT_PAGING, 1);
-                return val;
-        }
-        if (reg / 2 >= ARRAY_SIZE(stac9766_reg))
-                return -EIO;
-
-        if (reg == AC97_RESET || reg == AC97_GPIO_STATUS ||
-                reg == AC97_INT_PAGING || reg == AC97_VENDOR_ID1 ||
-                reg == AC97_VENDOR_ID2) {
-
-                val = soc_ac97_ops->read(ac97, reg);
-                return val;
-        }
-        return cache[reg / 2];
-}
-
 static int ac97_analog_prepare(struct snd_pcm_substream *substream,
                                struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
         struct snd_pcm_runtime *runtime = substream->runtime;
-        unsigned short reg, vra;
-
-        vra = stac9766_ac97_read(codec, AC97_EXTENDED_STATUS);
+        unsigned short reg;
 
-        vra |= 0x1; /* enable variable rate audio */
-        vra &= ~0x4; /* disable SPDIF output */
-
-        stac9766_ac97_write(codec, AC97_EXTENDED_STATUS, vra);
+        /* enable variable rate audio, disable SPDIF output */
+        snd_soc_update_bits(codec, AC97_EXTENDED_STATUS, 0x5, 0x1);
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                 reg = AC97_PCM_FRONT_DAC_RATE;
         else
                 reg = AC97_PCM_LR_ADC_RATE;
 
-        return stac9766_ac97_write(codec, reg, runtime->rate);
+        return snd_soc_write(codec, reg, runtime->rate);
 }
 
 static int ac97_digital_prepare(struct snd_pcm_substream *substream,
@@ -211,18 +188,16 @@ static int ac97_digital_prepare(struct snd_pcm_substream *substream,
 {
         struct snd_soc_codec *codec = dai->codec;
         struct snd_pcm_runtime *runtime = substream->runtime;
-        unsigned short reg, vra;
-
-        stac9766_ac97_write(codec, AC97_SPDIF, 0x2002);
+        unsigned short reg;
 
-        vra = stac9766_ac97_read(codec, AC97_EXTENDED_STATUS);
-        vra |= 0x5; /* Enable VRA and SPDIF out */
+        snd_soc_write(codec, AC97_SPDIF, 0x2002);
 
-        stac9766_ac97_write(codec, AC97_EXTENDED_STATUS, vra);
+        /* Enable VRA and SPDIF out */
+        snd_soc_update_bits(codec, AC97_EXTENDED_STATUS, 0x5, 0x5);
 
         reg = AC97_PCM_FRONT_DAC_RATE;
 
-        return stac9766_ac97_write(codec, reg, runtime->rate);
+        return snd_soc_write(codec, reg, runtime->rate);
 }
 
 static int stac9766_set_bias_level(struct snd_soc_codec *codec,
@@ -232,11 +207,11 @@ static int stac9766_set_bias_level(struct snd_soc_codec *codec,
         case SND_SOC_BIAS_ON: /* full On */
         case SND_SOC_BIAS_PREPARE: /* partial On */
         case SND_SOC_BIAS_STANDBY: /* Off, with power */
-                stac9766_ac97_write(codec, AC97_POWERDOWN, 0x0000);
+                snd_soc_write(codec, AC97_POWERDOWN, 0x0000);
                 break;
         case SND_SOC_BIAS_OFF: /* Off, without power */
                 /* disable everything including AC link */
-                stac9766_ac97_write(codec, AC97_POWERDOWN, 0xffff);
+                snd_soc_write(codec, AC97_POWERDOWN, 0xffff);
                 break;
         }
         return 0;
@@ -300,21 +275,34 @@ static struct snd_soc_dai_driver stac9766_dai[] = {
 static int stac9766_codec_probe(struct snd_soc_codec *codec)
 {
         struct snd_ac97 *ac97;
+        struct regmap *regmap;
+        int ret;
 
         ac97 = snd_soc_new_ac97_codec(codec, STAC9766_VENDOR_ID,
                         STAC9766_VENDOR_ID_MASK);
         if (IS_ERR(ac97))
                 return PTR_ERR(ac97);
 
+        regmap = regmap_init_ac97(ac97, &stac9766_regmap_config);
+        if (IS_ERR(regmap)) {
+                ret = PTR_ERR(regmap);
+                goto err_free_ac97;
+        }
+
+        snd_soc_codec_init_regmap(codec, regmap);
         snd_soc_codec_set_drvdata(codec, ac97);
 
         return 0;
+err_free_ac97:
+        snd_soc_free_ac97_codec(ac97);
+        return ret;
 }
 
 static int stac9766_codec_remove(struct snd_soc_codec *codec)
 {
         struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
 
+        snd_soc_codec_exit_regmap(codec);
         snd_soc_free_ac97_codec(ac97);
         return 0;
 }
@@ -324,17 +312,11 @@ static struct snd_soc_codec_driver soc_codec_dev_stac9766 = {
                 .controls               = stac9766_snd_ac97_controls,
                 .num_controls           = ARRAY_SIZE(stac9766_snd_ac97_controls),
         },
-        .write = stac9766_ac97_write,
-        .read = stac9766_ac97_read,
         .set_bias_level = stac9766_set_bias_level,
         .suspend_bias_off = true,
         .probe = stac9766_codec_probe,
         .remove = stac9766_codec_remove,
         .resume = stac9766_codec_resume,
-        .reg_cache_size = ARRAY_SIZE(stac9766_reg),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_step = 2,
-        .reg_cache_default = stac9766_reg,
 };
 
 static int stac9766_probe(struct platform_device *pdev)
diff --git a/sound/soc/codecs/stac9766.h b/sound/soc/codecs/stac9766.h
deleted file mode 100644
index c726f907e2c0..000000000000
--- a/sound/soc/codecs/stac9766.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * stac9766.h  --  STAC9766 Soc Audio driver
- */
-
-#ifndef _STAC9766_H
-#define _STAC9766_H
-
-#define AC97_STAC_PAGE0 0x1000
-#define AC97_STAC_DA_CONTROL (AC97_STAC_PAGE0 | 0x6A)
-#define AC97_STAC_ANALOG_SPECIAL (AC97_STAC_PAGE0 | 0x6E)
-#define AC97_STAC_STEREO_MIC 0x78
-
-/* STAC9766 DAI ID's */
-#define STAC9766_DAI_AC97_ANALOG                0
-#define STAC9766_DAI_AC97_DIGITAL               1
-
-#endif
diff --git a/sound/soc/codecs/sti-sas.c b/sound/soc/codecs/sti-sas.c
index d6e00c77edcd..62c618765224 100644
--- a/sound/soc/codecs/sti-sas.c
+++ b/sound/soc/codecs/sti-sas.c
@@ -14,28 +14,8 @@
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 
-/* chipID supported */
-#define CHIPID_STIH416 0
-#define CHIPID_STIH407 1
-
 /* DAC definitions */
 
-/* stih416 DAC registers */
-/* sysconf 2517: Audio-DAC-Control */
-#define STIH416_AUDIO_DAC_CTRL 0x00000814
-/* sysconf 2519: Audio-Gue-Control */
-#define STIH416_AUDIO_GLUE_CTRL 0x0000081C
-
-#define STIH416_DAC_NOT_STANDBY 0x3
-#define STIH416_DAC_SOFTMUTE    0x4
-#define STIH416_DAC_ANA_NOT_PWR 0x5
-#define STIH416_DAC_NOT_PNDBG   0x6
-
-#define STIH416_DAC_NOT_STANDBY_MASK    BIT(STIH416_DAC_NOT_STANDBY)
-#define STIH416_DAC_SOFTMUTE_MASK       BIT(STIH416_DAC_SOFTMUTE)
-#define STIH416_DAC_ANA_NOT_PWR_MASK    BIT(STIH416_DAC_ANA_NOT_PWR)
-#define STIH416_DAC_NOT_PNDBG_MASK      BIT(STIH416_DAC_NOT_PNDBG)
-
 /* stih407 DAC registers */
 /* sysconf 5041: Audio-Gue-Control */
 #define STIH407_AUDIO_GLUE_CTRL 0x000000A4
@@ -63,14 +43,9 @@ enum {
         STI_SAS_DAI_ANALOG_OUT,
 };
 
-static const struct reg_default stih416_sas_reg_defaults[] = {
-        { STIH407_AUDIO_GLUE_CTRL, 0x00000040 },
-        { STIH407_AUDIO_DAC_CTRL, 0x000000000 },
-};
-
 static const struct reg_default stih407_sas_reg_defaults[] = {
-        { STIH416_AUDIO_DAC_CTRL, 0x000000000 },
-        { STIH416_AUDIO_GLUE_CTRL, 0x00000040 },
+        { STIH407_AUDIO_DAC_CTRL, 0x000000000 },
+        { STIH407_AUDIO_GLUE_CTRL, 0x00000040 },
 };
 
 struct sti_dac_audio {
@@ -89,7 +64,6 @@ struct sti_spdif_audio {
 
 /* device data structure */
 struct sti_sas_dev_data {
-        const int chipid; /* IC version */
         const struct regmap_config *regmap;
         const struct snd_soc_dai_ops *dac_ops;  /* DAC function callbacks */
         const struct snd_soc_dapm_widget *dapm_widgets; /* dapms declaration */
@@ -150,51 +124,27 @@ static int  sti_sas_init_sas_registers(struct snd_soc_codec *codec,
                 ret = snd_soc_update_bits(codec, STIH407_AUDIO_GLUE_CTRL,
                                           SPDIF_BIPHASE_IDLE_MASK, 0);
         if (ret < 0) {
-                dev_err(codec->dev, "Failed to update SPDIF registers");
+                dev_err(codec->dev, "Failed to update SPDIF registers\n");
                 return ret;
         }
 
         /* Init DAC configuration */
-        switch (data->dev_data->chipid) {
-        case CHIPID_STIH407:
-                /* init configuration */
-                ret =  snd_soc_update_bits(codec, STIH407_AUDIO_DAC_CTRL,
-                                           STIH407_DAC_STANDBY_MASK,
-                                           STIH407_DAC_STANDBY_MASK);
-
-                if (!ret)
-                        ret = snd_soc_update_bits(codec, STIH407_AUDIO_DAC_CTRL,
-                                                  STIH407_DAC_STANDBY_ANA_MASK,
-                                                  STIH407_DAC_STANDBY_ANA_MASK);
-                if (!ret)
-                        ret = snd_soc_update_bits(codec, STIH407_AUDIO_DAC_CTRL,
-                                                  STIH407_DAC_SOFTMUTE_MASK,
-                                                  STIH407_DAC_SOFTMUTE_MASK);
-                break;
-        case CHIPID_STIH416:
-                ret =  snd_soc_update_bits(codec, STIH416_AUDIO_DAC_CTRL,
-                                           STIH416_DAC_NOT_STANDBY_MASK, 0);
-                if (!ret)
-                        ret =  snd_soc_update_bits(codec,
-                                                   STIH416_AUDIO_DAC_CTRL,
-                                                   STIH416_DAC_ANA_NOT_PWR, 0);
-                if (!ret)
-                        ret =  snd_soc_update_bits(codec,
-                                                   STIH416_AUDIO_DAC_CTRL,
-                                                   STIH416_DAC_NOT_PNDBG_MASK,
-                                                   0);
-                if (!ret)
-                        ret =  snd_soc_update_bits(codec,
-                                                   STIH416_AUDIO_DAC_CTRL,
-                                                   STIH416_DAC_SOFTMUTE_MASK,
-                                                   STIH416_DAC_SOFTMUTE_MASK);
-                break;
-        default:
-                return -EINVAL;
-        }
+        /* init configuration */
+        ret =  snd_soc_update_bits(codec, STIH407_AUDIO_DAC_CTRL,
+                                   STIH407_DAC_STANDBY_MASK,
+                                   STIH407_DAC_STANDBY_MASK);
+
+        if (!ret)
+                ret = snd_soc_update_bits(codec, STIH407_AUDIO_DAC_CTRL,
+                                          STIH407_DAC_STANDBY_ANA_MASK,
+                                          STIH407_DAC_STANDBY_ANA_MASK);
+        if (!ret)
+                ret = snd_soc_update_bits(codec, STIH407_AUDIO_DAC_CTRL,
+                                          STIH407_DAC_SOFTMUTE_MASK,
+                                          STIH407_DAC_SOFTMUTE_MASK);
 
         if (ret < 0) {
-                dev_err(codec->dev, "Failed to update DAC registers");
+                dev_err(codec->dev, "Failed to update DAC registers\n");
                 return ret;
         }
 
@@ -217,37 +167,6 @@ static int sti_sas_dac_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
         return 0;
 }
 
-static int stih416_dac_probe(struct snd_soc_dai *dai)
-{
-        struct snd_soc_codec *codec = dai->codec;
-        struct sti_sas_data *drvdata = dev_get_drvdata(codec->dev);
-        struct sti_dac_audio *dac = &drvdata->dac;
-
-        /* Get reset control */
-        dac->rst = devm_reset_control_get(codec->dev, "dac_rst");
-        if (IS_ERR(dac->rst)) {
-                dev_err(dai->codec->dev,
-                        "%s: ERROR: DAC reset control not defined !\n",
-                        __func__);
-                dac->rst = NULL;
-                return -EFAULT;
-        }
-        /* Put the DAC into reset */
-        reset_control_assert(dac->rst);
-
-        return 0;
-}
-
-static const struct snd_soc_dapm_widget stih416_sas_dapm_widgets[] = {
-        SND_SOC_DAPM_PGA("DAC bandgap", STIH416_AUDIO_DAC_CTRL,
-                         STIH416_DAC_NOT_PNDBG_MASK, 0, NULL, 0),
-        SND_SOC_DAPM_OUT_DRV("DAC standby ana", STIH416_AUDIO_DAC_CTRL,
-                             STIH416_DAC_ANA_NOT_PWR, 0, NULL, 0),
-        SND_SOC_DAPM_DAC("DAC standby",  "dac_p", STIH416_AUDIO_DAC_CTRL,
-                         STIH416_DAC_NOT_STANDBY, 0),
-        SND_SOC_DAPM_OUTPUT("DAC Output"),
-};
-
 static const struct snd_soc_dapm_widget stih407_sas_dapm_widgets[] = {
         SND_SOC_DAPM_OUT_DRV("DAC standby ana", STIH407_AUDIO_DAC_CTRL,
                              STIH407_DAC_STANDBY_ANA, 1, NULL, 0),
@@ -256,30 +175,11 @@ static const struct snd_soc_dapm_widget stih407_sas_dapm_widgets[] = {
         SND_SOC_DAPM_OUTPUT("DAC Output"),
 };
 
-static const struct snd_soc_dapm_route stih416_sas_route[] = {
-        {"DAC Output", NULL, "DAC bandgap"},
-        {"DAC Output", NULL, "DAC standby ana"},
-        {"DAC standby ana", NULL, "DAC standby"},
-};
-
 static const struct snd_soc_dapm_route stih407_sas_route[] = {
         {"DAC Output", NULL, "DAC standby ana"},
         {"DAC standby ana", NULL, "DAC standby"},
 };
 
-static int stih416_sas_dac_mute(struct snd_soc_dai *dai, int mute, int stream)
-{
-        struct snd_soc_codec *codec = dai->codec;
-
-        if (mute) {
-                return snd_soc_update_bits(codec, STIH416_AUDIO_DAC_CTRL,
-                                            STIH416_DAC_SOFTMUTE_MASK,
-                                            STIH416_DAC_SOFTMUTE_MASK);
-        } else {
-                return snd_soc_update_bits(codec, STIH416_AUDIO_DAC_CTRL,
-                                            STIH416_DAC_SOFTMUTE_MASK, 0);
-        }
-}
 
 static int stih407_sas_dac_mute(struct snd_soc_dai *dai, int mute, int stream)
 {
@@ -392,13 +292,13 @@ static int sti_sas_prepare(struct snd_pcm_substream *substream,
         switch (dai->id) {
         case STI_SAS_DAI_SPDIF_OUT:
                 if ((drvdata->spdif.mclk / runtime->rate) != 128) {
-                        dev_err(codec->dev, "unexpected mclk-fs ratio");
+                        dev_err(codec->dev, "unexpected mclk-fs ratio\n");
                         return -EINVAL;
                 }
                 break;
         case STI_SAS_DAI_ANALOG_OUT:
                 if ((drvdata->dac.mclk / runtime->rate) != 256) {
-                        dev_err(codec->dev, "unexpected mclk-fs ratio");
+                        dev_err(codec->dev, "unexpected mclk-fs ratio\n");
                         return -EINVAL;
                 }
                 break;
@@ -407,13 +307,6 @@ static int sti_sas_prepare(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static const struct snd_soc_dai_ops stih416_dac_ops = {
-        .set_fmt = sti_sas_dac_set_fmt,
-        .mute_stream = stih416_sas_dac_mute,
-        .prepare = sti_sas_prepare,
-        .set_sysclk = sti_sas_set_sysclk,
-};
-
 static const struct snd_soc_dai_ops stih407_dac_ops = {
         .set_fmt = sti_sas_dac_set_fmt,
         .mute_stream = stih407_sas_dac_mute,
@@ -434,31 +327,7 @@ static const struct regmap_config stih407_sas_regmap = {
         .reg_write = sti_sas_write_reg,
 };
 
-static const struct regmap_config stih416_sas_regmap = {
-        .reg_bits = 32,
-        .val_bits = 32,
-
-        .max_register = STIH416_AUDIO_DAC_CTRL,
-        .reg_defaults = stih416_sas_reg_defaults,
-        .num_reg_defaults = ARRAY_SIZE(stih416_sas_reg_defaults),
-        .volatile_reg = sti_sas_volatile_register,
-        .cache_type = REGCACHE_RBTREE,
-        .reg_read = sti_sas_read_reg,
-        .reg_write = sti_sas_write_reg,
-};
-
-static const struct sti_sas_dev_data stih416_data = {
-        .chipid = CHIPID_STIH416,
-        .regmap = &stih416_sas_regmap,
-        .dac_ops = &stih416_dac_ops,
-        .dapm_widgets = stih416_sas_dapm_widgets,
-        .num_dapm_widgets = ARRAY_SIZE(stih416_sas_dapm_widgets),
-        .dapm_routes =  stih416_sas_route,
-        .num_dapm_routes = ARRAY_SIZE(stih416_sas_route),
-};
-
 static const struct sti_sas_dev_data stih407_data = {
-        .chipid = CHIPID_STIH407,
         .regmap = &stih407_sas_regmap,
         .dac_ops = &stih407_dac_ops,
         .dapm_widgets = stih407_sas_dapm_widgets,
@@ -533,10 +402,6 @@ static struct snd_soc_codec_driver sti_sas_driver = {
 
 static const struct of_device_id sti_sas_dev_match[] = {
         {
-                .compatible = "st,stih416-sas-codec",
-                .data = &stih416_data,
-        },
-        {
                 .compatible = "st,stih407-sas-codec",
                 .data = &stih407_data,
         },
@@ -558,7 +423,7 @@ static int sti_sas_driver_probe(struct platform_device *pdev)
         /* Populate data structure depending on compatibility */
         of_id = of_match_node(sti_sas_dev_match, pnode);
         if (!of_id->data) {
-                dev_err(&pdev->dev, "data associated to device is missing");
+                dev_err(&pdev->dev, "data associated to device is missing\n");
                 return -EINVAL;
         }
 
@@ -584,10 +449,6 @@ static int sti_sas_driver_probe(struct platform_device *pdev)
         }
         drvdata->spdif.regmap = drvdata->dac.regmap;
 
-        /* Set DAC dai probe */
-        if (drvdata->dev_data->chipid == CHIPID_STIH416)
-                sti_sas_dai[STI_SAS_DAI_ANALOG_OUT].probe = stih416_dac_probe;
-
         sti_sas_dai[STI_SAS_DAI_ANALOG_OUT].ops = drvdata->dev_data->dac_ops;
 
         /* Set dapms*/
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index be1a64bfd320..f8a90ba8cd71 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -1253,6 +1253,8 @@ static const struct of_device_id tlv320aic31xx_of_match[] = {
         { .compatible = "ti,tlv320aic3110" },
         { .compatible = "ti,tlv320aic3120" },
         { .compatible = "ti,tlv320aic3111" },
+        { .compatible = "ti,tlv320dac3100" },
+        { .compatible = "ti,tlv320dac3101" },
         {},
 };
 MODULE_DEVICE_TABLE(of, tlv320aic31xx_of_match);
@@ -1379,6 +1381,7 @@ static const struct i2c_device_id aic31xx_i2c_id[] = {
         { "tlv320aic3120", AIC3120 },
         { "tlv320aic3111", AIC3111 },
         { "tlv320dac3100", DAC3100 },
+        { "tlv320dac3101", DAC3101 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, aic31xx_i2c_id);
diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h
index 5acd5b69fb83..730fb2058869 100644
--- a/sound/soc/codecs/tlv320aic31xx.h
+++ b/sound/soc/codecs/tlv320aic31xx.h
@@ -32,6 +32,7 @@ enum aic31xx_type {
         AIC3120 = AIC31XX_MINIDSP_BIT,
         AIC3111 = (AIC31XX_STEREO_CLASS_D_BIT | AIC31XX_MINIDSP_BIT),
         DAC3100 = DAC31XX_BIT,
+        DAC3101 = DAC31XX_BIT | AIC31XX_STEREO_CLASS_D_BIT,
 };
 
 struct aic31xx_pdata {
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 5a8d96ec058c..8877b74b0510 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -157,7 +157,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
         unsigned int mask = (1 << fls(max)) - 1;
         unsigned int invert = mc->invert;
         unsigned short val;
-        struct snd_soc_dapm_update update;
+        struct snd_soc_dapm_update update = { 0 };
         int connect, change;
 
         val = (ucontrol->value.integer.value[0] & mask);
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index 533e3bb444e4..2918fdb95e58 100644
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -698,25 +698,10 @@ static int uda1380_probe(struct snd_soc_codec *codec)
         codec->hw_write = (hw_write_t)i2c_master_send;
         codec->control_data = uda1380->control_data;
 
-        if (!pdata)
-                return -EINVAL;
-
-        if (gpio_is_valid(pdata->gpio_reset)) {
-                ret = gpio_request_one(pdata->gpio_reset, GPIOF_OUT_INIT_LOW,
-                                       "uda1380 reset");
-                if (ret)
-                        goto err_out;
-        }
-
-        if (gpio_is_valid(pdata->gpio_power)) {
-                ret = gpio_request_one(pdata->gpio_power, GPIOF_OUT_INIT_LOW,
-                                   "uda1380 power");
-                if (ret)
-                        goto err_free_gpio;
-        } else {
+        if (!gpio_is_valid(pdata->gpio_power)) {
                 ret = uda1380_reset(codec);
                 if (ret)
-                        goto err_free_gpio;
+                        return ret;
         }
 
         INIT_WORK(&uda1380->work, uda1380_flush_work);
@@ -733,28 +718,10 @@ static int uda1380_probe(struct snd_soc_codec *codec)
         }
 
         return 0;
-
-err_free_gpio:
-        if (gpio_is_valid(pdata->gpio_reset))
-                gpio_free(pdata->gpio_reset);
-err_out:
-        return ret;
-}
-
-/* power down chip */
-static int uda1380_remove(struct snd_soc_codec *codec)
-{
-        struct uda1380_platform_data *pdata =codec->dev->platform_data;
-
-        gpio_free(pdata->gpio_reset);
-        gpio_free(pdata->gpio_power);
-
-        return 0;
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_uda1380 = {
         .probe =        uda1380_probe,
-        .remove =       uda1380_remove,
         .read =         uda1380_read_reg_cache,
         .write =        uda1380_write,
         .set_bias_level = uda1380_set_bias_level,
@@ -775,18 +742,35 @@ static struct snd_soc_codec_driver soc_codec_dev_uda1380 = {
         },
 };
 
-#if IS_ENABLED(CONFIG_I2C)
 static int uda1380_i2c_probe(struct i2c_client *i2c,
                              const struct i2c_device_id *id)
 {
+        struct uda1380_platform_data *pdata = i2c->dev.platform_data;
         struct uda1380_priv *uda1380;
         int ret;
 
+        if (!pdata)
+                return -EINVAL;
+
         uda1380 = devm_kzalloc(&i2c->dev, sizeof(struct uda1380_priv),
                                GFP_KERNEL);
         if (uda1380 == NULL)
                 return -ENOMEM;
 
+        if (gpio_is_valid(pdata->gpio_reset)) {
+                ret = devm_gpio_request_one(&i2c->dev, pdata->gpio_reset,
+                        GPIOF_OUT_INIT_LOW, "uda1380 reset");
+                if (ret)
+                        return ret;
+        }
+
+        if (gpio_is_valid(pdata->gpio_power)) {
+                ret = devm_gpio_request_one(&i2c->dev, pdata->gpio_power,
+                        GPIOF_OUT_INIT_LOW, "uda1380 power");
+                if (ret)
+                        return ret;
+        }
+
         i2c_set_clientdata(i2c, uda1380);
         uda1380->control_data = i2c;
 
@@ -815,27 +799,8 @@ static struct i2c_driver uda1380_i2c_driver = {
         .remove =   uda1380_i2c_remove,
         .id_table = uda1380_i2c_id,
 };
-#endif
 
-static int __init uda1380_modinit(void)
-{
-        int ret = 0;
-#if IS_ENABLED(CONFIG_I2C)
-        ret = i2c_add_driver(&uda1380_i2c_driver);
-        if (ret != 0)
-                pr_err("Failed to register UDA1380 I2C driver: %d\n", ret);
-#endif
-        return ret;
-}
-module_init(uda1380_modinit);
-
-static void __exit uda1380_exit(void)
-{
-#if IS_ENABLED(CONFIG_I2C)
-        i2c_del_driver(&uda1380_i2c_driver);
-#endif
-}
-module_exit(uda1380_exit);
+module_i2c_driver(uda1380_i2c_driver);
 
 MODULE_AUTHOR("Giorgio Padrin");
 MODULE_DESCRIPTION("Audio support for codec Philips UDA1380");
diff --git a/sound/soc/codecs/uda1380.h b/sound/soc/codecs/uda1380.h
index 942e3927c72b..69a326ac3c1a 100644
--- a/sound/soc/codecs/uda1380.h
+++ b/sound/soc/codecs/uda1380.h
@@ -72,8 +72,4 @@
 #define R22_SKIP_DCFIL  0x0002
 #define R23_AGC_EN      0x0001
 
-#define UDA1380_DAI_DUPLEX      0 /* playback and capture on single DAI */
-#define UDA1380_DAI_PLAYBACK    1 /* playback DAI */
-#define UDA1380_DAI_CAPTURE     2 /* capture DAI */
-
 #endif /* _UDA1380_H */
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index 606bf88abfc4..d83dab57a1d1 100644
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -999,7 +999,7 @@ static DECLARE_TLV_DB_SCALE(in_tlv, -6300, 100, 0);
 static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0);
 static DECLARE_TLV_DB_SCALE(out_tlv, -6400, 100, 0);
 
-static const char *wm2200_mixer_texts[] = {
+static const char * const wm2200_mixer_texts[] = {
         "None",
         "Tone Generator",
         "AEC Loopback",
@@ -1033,7 +1033,7 @@ static const char *wm2200_mixer_texts[] = {
         "DSP2.6",
 };
 
-static int wm2200_mixer_values[] = {
+static unsigned int wm2200_mixer_values[] = {
         0x00,
         0x04,   /* Tone */
         0x08,   /* AEC */
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 93876c6d48ee..e7ab37d0dd32 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -607,6 +607,9 @@ static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w,
                 break;
         case SND_SOC_DAPM_PRE_PMD:
                 break;
+        case SND_SOC_DAPM_PRE_PMU:
+        case SND_SOC_DAPM_POST_PMD:
+                return arizona_clk_ev(w, kcontrol, event);
         default:
                 return 0;
         }
@@ -1077,9 +1080,11 @@ static const struct snd_kcontrol_new wm5102_aec_loopback_mux =
 static const struct snd_soc_dapm_widget wm5102_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT,
                     0, wm5102_sysclk_ev,
-                    SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
+                    SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD |
+                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("ASYNCCLK", ARIZONA_ASYNC_CLOCK_1,
-                    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, NULL, 0),
+                    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, arizona_clk_ev,
+                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,
                     ARIZONA_OPCLK_ENA_SHIFT, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", ARIZONA_OUTPUT_ASYNC_CLOCK,
@@ -1903,7 +1908,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = {
 static int wm5102_open(struct snd_compr_stream *stream)
 {
         struct snd_soc_pcm_runtime *rtd = stream->private_data;
-        struct wm5102_priv *priv = snd_soc_codec_get_drvdata(rtd->codec);
+        struct wm5102_priv *priv = snd_soc_platform_get_drvdata(rtd->platform);
 
         return wm_adsp_compr_open(&priv->core.adsp[0], stream);
 }
@@ -1926,18 +1931,10 @@ static irqreturn_t wm5102_adsp2_irq(int irq, void *data)
 static int wm5102_codec_probe(struct snd_soc_codec *codec)
 {
         struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
+        struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
         struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec);
-        struct arizona *arizona = priv->core.arizona;
         int ret;
 
-        ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,
-                                  "ADSP2 Compressed IRQ", wm5102_adsp2_irq,
-                                  priv);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to request DSP IRQ: %d\n", ret);
-                return ret;
-        }
-
         ret = wm_adsp2_codec_probe(&priv->core.adsp[0], codec);
         if (ret)
                 return ret;
@@ -1949,8 +1946,9 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec)
 
         arizona_init_spk(codec);
         arizona_init_gpio(codec);
+        arizona_init_notifiers(codec);
 
-        snd_soc_dapm_disable_pin(dapm, "HAPTICS");
+        snd_soc_component_disable_pin(component, "HAPTICS");
 
         priv->core.arizona->dapm = dapm;
 
@@ -1965,16 +1963,11 @@ err_adsp2_codec_probe:
 static int wm5102_codec_remove(struct snd_soc_codec *codec)
 {
         struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec);
-        struct arizona *arizona = priv->core.arizona;
 
         wm_adsp2_codec_remove(&priv->core.adsp[0], codec);
 
         priv->core.arizona->dapm = NULL;
 
-        arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);
-
-        arizona_free_spk(codec);
-
         return 0;
 }
 
@@ -2092,25 +2085,47 @@ static int wm5102_probe(struct platform_device *pdev)
         pm_runtime_enable(&pdev->dev);
         pm_runtime_idle(&pdev->dev);
 
+        ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,
+                                  "ADSP2 Compressed IRQ", wm5102_adsp2_irq,
+                                  wm5102);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "Failed to request DSP IRQ: %d\n", ret);
+                return ret;
+        }
+
+        ret = arizona_init_spk_irqs(arizona);
+        if (ret < 0)
+                goto err_dsp_irq;
+
         ret = snd_soc_register_platform(&pdev->dev, &wm5102_compr_platform);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Failed to register platform: %d\n", ret);
-                return ret;
+                goto err_spk_irqs;
         }
 
         ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm5102,
                                       wm5102_dai, ARRAY_SIZE(wm5102_dai));
         if (ret < 0) {
                 dev_err(&pdev->dev, "Failed to register codec: %d\n", ret);
-                snd_soc_unregister_platform(&pdev->dev);
+                goto err_platform;
         }
 
         return ret;
+
+err_platform:
+        snd_soc_unregister_platform(&pdev->dev);
+err_spk_irqs:
+        arizona_free_spk_irqs(arizona);
+err_dsp_irq:
+        arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5102);
+
+        return ret;
 }
 
 static int wm5102_remove(struct platform_device *pdev)
 {
         struct wm5102_priv *wm5102 = platform_get_drvdata(pdev);
+        struct arizona *arizona = wm5102->core.arizona;
 
         snd_soc_unregister_platform(&pdev->dev);
         snd_soc_unregister_codec(&pdev->dev);
@@ -2118,6 +2133,10 @@ static int wm5102_remove(struct platform_device *pdev)
 
         wm_adsp2_remove(&wm5102->core.adsp[0]);
 
+        arizona_free_spk_irqs(arizona);
+
+        arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5102);
+
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 06bae3b23fce..585fc706c1b0 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -183,7 +183,9 @@ static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w,
                                 regmap_write_async(regmap, patch[i].reg,
                                                    patch[i].def);
                 break;
-
+        case SND_SOC_DAPM_PRE_PMU:
+        case SND_SOC_DAPM_POST_PMD:
+                return arizona_clk_ev(w, kcontrol, event);
         default:
                 break;
         }
@@ -1073,9 +1075,11 @@ static const struct snd_kcontrol_new wm5110_output_anc_src[] = {
 
 static const struct snd_soc_dapm_widget wm5110_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT,
-                    0, wm5110_sysclk_ev, SND_SOC_DAPM_POST_PMU),
+                    0, wm5110_sysclk_ev, SND_SOC_DAPM_POST_PMU |
+                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("ASYNCCLK", ARIZONA_ASYNC_CLOCK_1,
-                    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, NULL, 0),
+                    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, arizona_clk_ev,
+                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,
                     ARIZONA_OPCLK_ENA_SHIFT, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", ARIZONA_OUTPUT_ASYNC_CLOCK,
@@ -2220,7 +2224,7 @@ static struct snd_soc_dai_driver wm5110_dai[] = {
 static int wm5110_open(struct snd_compr_stream *stream)
 {
         struct snd_soc_pcm_runtime *rtd = stream->private_data;
-        struct wm5110_priv *priv = snd_soc_codec_get_drvdata(rtd->codec);
+        struct wm5110_priv *priv = snd_soc_platform_get_drvdata(rtd->platform);
         struct arizona *arizona = priv->core.arizona;
         int n_adsp;
 
@@ -2269,8 +2273,8 @@ static irqreturn_t wm5110_adsp2_irq(int irq, void *data)
 static int wm5110_codec_probe(struct snd_soc_codec *codec)
 {
         struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
+        struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
         struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec);
-        struct arizona *arizona = priv->core.arizona;
         int i, ret;
 
         priv->core.arizona->dapm = dapm;
@@ -2280,14 +2284,6 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
         arizona_init_mono(codec);
         arizona_init_notifiers(codec);
 
-        ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,
-                                  "ADSP2 Compressed IRQ", wm5110_adsp2_irq,
-                                  priv);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to request DSP IRQ: %d\n", ret);
-                return ret;
-        }
-
         for (i = 0; i < WM5110_NUM_ADSP; ++i) {
                 ret = wm_adsp2_codec_probe(&priv->core.adsp[i], codec);
                 if (ret)
@@ -2300,7 +2296,7 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
         if (ret)
                 goto err_adsp2_codec_probe;
 
-        snd_soc_dapm_disable_pin(dapm, "HAPTICS");
+        snd_soc_component_disable_pin(component, "HAPTICS");
 
         return 0;
 
@@ -2308,15 +2304,12 @@ err_adsp2_codec_probe:
         for (--i; i >= 0; --i)
                 wm_adsp2_codec_remove(&priv->core.adsp[i], codec);
 
-        arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);
-
         return ret;
 }
 
 static int wm5110_codec_remove(struct snd_soc_codec *codec)
 {
         struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec);
-        struct arizona *arizona = priv->core.arizona;
         int i;
 
         for (i = 0; i < WM5110_NUM_ADSP; ++i)
@@ -2324,10 +2317,6 @@ static int wm5110_codec_remove(struct snd_soc_codec *codec)
 
         priv->core.arizona->dapm = NULL;
 
-        arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);
-
-        arizona_free_spk(codec);
-
         return 0;
 }
 
@@ -2449,25 +2438,47 @@ static int wm5110_probe(struct platform_device *pdev)
         pm_runtime_enable(&pdev->dev);
         pm_runtime_idle(&pdev->dev);
 
+        ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,
+                                  "ADSP2 Compressed IRQ", wm5110_adsp2_irq,
+                                  wm5110);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "Failed to request DSP IRQ: %d\n", ret);
+                return ret;
+        }
+
+        ret = arizona_init_spk_irqs(arizona);
+        if (ret < 0)
+                goto err_dsp_irq;
+
         ret = snd_soc_register_platform(&pdev->dev, &wm5110_compr_platform);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Failed to register platform: %d\n", ret);
-                return ret;
+                goto err_spk_irqs;
         }
 
         ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm5110,
                                       wm5110_dai, ARRAY_SIZE(wm5110_dai));
         if (ret < 0) {
                 dev_err(&pdev->dev, "Failed to register codec: %d\n", ret);
-                snd_soc_unregister_platform(&pdev->dev);
+                goto err_platform;
         }
 
         return ret;
+
+err_platform:
+        snd_soc_unregister_platform(&pdev->dev);
+err_spk_irqs:
+        arizona_free_spk_irqs(arizona);
+err_dsp_irq:
+        arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5110);
+
+        return ret;
 }
 
 static int wm5110_remove(struct platform_device *pdev)
 {
         struct wm5110_priv *wm5110 = platform_get_drvdata(pdev);
+        struct arizona *arizona = wm5110->core.arizona;
         int i;
 
         snd_soc_unregister_platform(&pdev->dev);
@@ -2477,6 +2488,10 @@ static int wm5110_remove(struct platform_device *pdev)
         for (i = 0; i < WM5110_NUM_ADSP; i++)
                 wm_adsp2_remove(&wm5110->core.adsp[i]);
 
+        arizona_free_spk_irqs(arizona);
+
+        arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5110);
+
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index deb2e075428e..6d0a2723bfde 100644
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -446,7 +446,6 @@ static const struct regmap_config wm8523_regmap = {
         .volatile_reg = wm8523_volatile_register,
 };
 
-#if IS_ENABLED(CONFIG_I2C)
 static int wm8523_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
@@ -543,29 +542,8 @@ static struct i2c_driver wm8523_i2c_driver = {
         .remove =   wm8523_i2c_remove,
         .id_table = wm8523_i2c_id,
 };
-#endif
 
-static int __init wm8523_modinit(void)
-{
-        int ret;
-#if IS_ENABLED(CONFIG_I2C)
-        ret = i2c_add_driver(&wm8523_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register WM8523 I2C driver: %d\n",
-                       ret);
-        }
-#endif
-        return 0;
-}
-module_init(wm8523_modinit);
-
-static void __exit wm8523_exit(void)
-{
-#if IS_ENABLED(CONFIG_I2C)
-        i2c_del_driver(&wm8523_i2c_driver);
-#endif
-}
-module_exit(wm8523_exit);
+module_i2c_driver(wm8523_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8523 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index faa7287a5253..910801dddd64 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -1,5 +1,5 @@
 /*
- * wm8580.c  --  WM8580 ALSA Soc Audio driver
+ * wm8580.c  --  WM8580 and WM8581 ALSA Soc Audio driver
  *
  * Copyright 2008-12 Wolfson Microelectronics PLC.
  *
@@ -12,6 +12,9 @@
  *  The WM8580 is a multichannel codec with S/PDIF support, featuring six
  *  DAC channels and two ADC channels.
  *
+ *  The WM8581 is a multichannel codec with S/PDIF support, featuring eight
+ *  DAC channels and two ADC channels.
+ *
  *  Currently only the primary audio interface is supported - S/PDIF and
  *  the secondary audio interfaces are not.
  */
@@ -65,6 +68,8 @@
 #define WM8580_DIGITAL_ATTENUATION_DACR2     0x17
 #define WM8580_DIGITAL_ATTENUATION_DACL3     0x18
 #define WM8580_DIGITAL_ATTENUATION_DACR3     0x19
+#define WM8581_DIGITAL_ATTENUATION_DACL4     0x1A
+#define WM8581_DIGITAL_ATTENUATION_DACR4     0x1B
 #define WM8580_MASTER_DIGITAL_ATTENUATION    0x1C
 #define WM8580_ADC_CONTROL1                  0x1D
 #define WM8580_SPDTXCHAN0                    0x1E
@@ -236,12 +241,17 @@ static const char *wm8580_supply_names[WM8580_NUM_SUPPLIES] = {
         "PVDD",
 };
 
+struct wm8580_driver_data {
+        int num_dacs;
+};
+
 /* codec private data */
 struct wm8580_priv {
         struct regmap *regmap;
         struct regulator_bulk_data supplies[WM8580_NUM_SUPPLIES];
         struct pll_state a;
         struct pll_state b;
+        const struct wm8580_driver_data *drvdata;
         int sysclk[2];
 };
 
@@ -306,6 +316,19 @@ SOC_DOUBLE("Capture Switch", WM8580_ADC_CONTROL1, 0, 1, 1, 1),
 SOC_SINGLE("Capture High-Pass Filter Switch", WM8580_ADC_CONTROL1, 4, 1, 0),
 };
 
+static const struct snd_kcontrol_new wm8581_snd_controls[] = {
+SOC_DOUBLE_R_EXT_TLV("DAC4 Playback Volume",
+                     WM8581_DIGITAL_ATTENUATION_DACL4,
+                     WM8581_DIGITAL_ATTENUATION_DACR4,
+                     0, 0xff, 0, snd_soc_get_volsw, wm8580_out_vu, dac_tlv),
+
+SOC_SINGLE("DAC4 Deemphasis Switch", WM8580_DAC_CONTROL3, 3, 1, 0),
+
+SOC_DOUBLE("DAC4 Invert Switch", WM8580_DAC_CONTROL4,  8, 7, 1, 0),
+
+SOC_SINGLE("DAC4 Switch", WM8580_DAC_CONTROL5, 3, 1, 1),
+};
+
 static const struct snd_soc_dapm_widget wm8580_dapm_widgets[] = {
 SND_SOC_DAPM_DAC("DAC1", "Playback", WM8580_PWRDN1, 2, 1),
 SND_SOC_DAPM_DAC("DAC2", "Playback", WM8580_PWRDN1, 3, 1),
@@ -324,6 +347,13 @@ SND_SOC_DAPM_INPUT("AINL"),
 SND_SOC_DAPM_INPUT("AINR"),
 };
 
+static const struct snd_soc_dapm_widget wm8581_dapm_widgets[] = {
+SND_SOC_DAPM_DAC("DAC4", "Playback", WM8580_PWRDN1, 5, 1),
+
+SND_SOC_DAPM_OUTPUT("VOUT4L"),
+SND_SOC_DAPM_OUTPUT("VOUT4R"),
+};
+
 static const struct snd_soc_dapm_route wm8580_dapm_routes[] = {
         { "VOUT1L", NULL, "DAC1" },
         { "VOUT1R", NULL, "DAC1" },
@@ -338,6 +368,11 @@ static const struct snd_soc_dapm_route wm8580_dapm_routes[] = {
         { "ADC", NULL, "AINR" },
 };
 
+static const struct snd_soc_dapm_route wm8581_dapm_routes[] = {
+        { "VOUT4L", NULL, "DAC4" },
+        { "VOUT4R", NULL, "DAC4" },
+};
+
 /* PLL divisors */
 struct _pll_div {
         u32 prescale:1;
@@ -815,10 +850,21 @@ static int wm8580_set_bias_level(struct snd_soc_codec *codec,
         return 0;
 }
 
+static int wm8580_playback_startup(struct snd_pcm_substream *substream,
+                           struct snd_soc_dai *dai)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec);
+
+        return snd_pcm_hw_constraint_minmax(substream->runtime,
+                SNDRV_PCM_HW_PARAM_CHANNELS, 1, wm8580->drvdata->num_dacs * 2);
+}
+
 #define WM8580_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
                         SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
 static const struct snd_soc_dai_ops wm8580_dai_ops_playback = {
+        .startup        = wm8580_playback_startup,
         .set_sysclk     = wm8580_set_sysclk,
         .hw_params      = wm8580_paif_hw_params,
         .set_fmt        = wm8580_set_paif_dai_fmt,
@@ -842,7 +888,6 @@ static struct snd_soc_dai_driver wm8580_dai[] = {
                 .playback = {
                         .stream_name = "Playback",
                         .channels_min = 1,
-                        .channels_max = 6,
                         .rates = SNDRV_PCM_RATE_8000_192000,
                         .formats = WM8580_FORMATS,
                 },
@@ -865,8 +910,22 @@ static struct snd_soc_dai_driver wm8580_dai[] = {
 static int wm8580_probe(struct snd_soc_codec *codec)
 {
         struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
         int ret = 0;
 
+        switch (wm8580->drvdata->num_dacs) {
+        case 4:
+                snd_soc_add_codec_controls(codec, wm8581_snd_controls,
+                                        ARRAY_SIZE(wm8581_snd_controls));
+                snd_soc_dapm_new_controls(dapm, wm8581_dapm_widgets,
+                                        ARRAY_SIZE(wm8581_dapm_widgets));
+                snd_soc_dapm_add_routes(dapm, wm8581_dapm_routes,
+                                        ARRAY_SIZE(wm8581_dapm_routes));
+                break;
+        default:
+                break;
+        }
+
         ret = regulator_bulk_enable(ARRAY_SIZE(wm8580->supplies),
                                     wm8580->supplies);
         if (ret != 0) {
@@ -914,12 +973,6 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm8580 = {
         },
 };
 
-static const struct of_device_id wm8580_of_match[] = {
-        { .compatible = "wlf,wm8580" },
-        { },
-};
-MODULE_DEVICE_TABLE(of, wm8580_of_match);
-
 static const struct regmap_config wm8580_regmap = {
         .reg_bits = 7,
         .val_bits = 9,
@@ -932,10 +985,25 @@ static const struct regmap_config wm8580_regmap = {
         .volatile_reg = wm8580_volatile,
 };
 
-#if IS_ENABLED(CONFIG_I2C)
+static const struct wm8580_driver_data wm8580_data = {
+        .num_dacs = 3,
+};
+
+static const struct wm8580_driver_data wm8581_data = {
+        .num_dacs = 4,
+};
+
+static const struct of_device_id wm8580_of_match[] = {
+        { .compatible = "wlf,wm8580", .data = &wm8580_data },
+        { .compatible = "wlf,wm8581", .data = &wm8581_data },
+        { },
+};
+MODULE_DEVICE_TABLE(of, wm8580_of_match);
+
 static int wm8580_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
+        const struct of_device_id *of_id;
         struct wm8580_priv *wm8580;
         int ret, i;
 
@@ -960,6 +1028,15 @@ static int wm8580_i2c_probe(struct i2c_client *i2c,
 
         i2c_set_clientdata(i2c, wm8580);
 
+        of_id = of_match_device(wm8580_of_match, &i2c->dev);
+        if (of_id)
+                wm8580->drvdata = of_id->data;
+
+        if (!wm8580->drvdata) {
+                dev_err(&i2c->dev, "failed to find driver data\n");
+                return -EINVAL;
+        }
+
         ret =  snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm8580, wm8580_dai, ARRAY_SIZE(wm8580_dai));
 
@@ -973,7 +1050,8 @@ static int wm8580_i2c_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id wm8580_i2c_id[] = {
-        { "wm8580", 0 },
+        { "wm8580", (kernel_ulong_t)&wm8580_data },
+        { "wm8581", (kernel_ulong_t)&wm8581_data },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, wm8580_i2c_id);
@@ -987,31 +1065,10 @@ static struct i2c_driver wm8580_i2c_driver = {
         .remove =   wm8580_i2c_remove,
         .id_table = wm8580_i2c_id,
 };
-#endif
 
-static int __init wm8580_modinit(void)
-{
-        int ret = 0;
-
-#if IS_ENABLED(CONFIG_I2C)
-        ret = i2c_add_driver(&wm8580_i2c_driver);
-        if (ret != 0) {
-                pr_err("Failed to register WM8580 I2C driver: %d\n", ret);
-        }
-#endif
-
-        return ret;
-}
-module_init(wm8580_modinit);
-
-static void __exit wm8580_exit(void)
-{
-#if IS_ENABLED(CONFIG_I2C)
-        i2c_del_driver(&wm8580_i2c_driver);
-#endif
-}
-module_exit(wm8580_exit);
+module_i2c_driver(wm8580_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC WM8580 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
+MODULE_AUTHOR("Matt Flax <flatmax@flatmax.org>");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/wm8753.h b/sound/soc/codecs/wm8753.h
index 94edac144bcb..8b39e3677ac8 100644
--- a/sound/soc/codecs/wm8753.h
+++ b/sound/soc/codecs/wm8753.h
@@ -112,7 +112,4 @@
 #define WM8753_VXCLK_DIV_8      (3 << 6)
 #define WM8753_VXCLK_DIV_16     (4 << 6)
 
-#define WM8753_DAI_HIFI         0
-#define WM8753_DAI_VOICE                1
-
 #endif
diff --git a/sound/soc/codecs/wm8978.h b/sound/soc/codecs/wm8978.h
index 6ae43495b7cf..0dcf6868dff6 100644
--- a/sound/soc/codecs/wm8978.h
+++ b/sound/soc/codecs/wm8978.h
@@ -78,8 +78,8 @@ enum wm8978_clk_id {
 };
 
 enum wm8978_sysclk_src {
+        WM8978_MCLK = 0,
         WM8978_PLL,
-        WM8978_MCLK
 };
 
 #endif  /* __WM8978_H__ */
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 2f2821b3382f..ee0c8639c743 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -108,6 +108,9 @@ static int wm8997_sysclk_ev(struct snd_soc_dapm_widget *w,
                 break;
         case SND_SOC_DAPM_PRE_PMD:
                 break;
+        case SND_SOC_DAPM_PRE_PMU:
+        case SND_SOC_DAPM_POST_PMD:
+                return arizona_clk_ev(w, kcontrol, event);
         default:
                 return 0;
         }
@@ -408,9 +411,11 @@ static const struct snd_kcontrol_new wm8997_aec_loopback_mux =
 static const struct snd_soc_dapm_widget wm8997_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT,
                     0, wm8997_sysclk_ev,
-                    SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
+                    SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD |
+                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("ASYNCCLK", ARIZONA_ASYNC_CLOCK_1,
-                    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, NULL, 0),
+                    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, arizona_clk_ev,
+                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,
                     ARIZONA_OPCLK_ENA_SHIFT, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", ARIZONA_OUTPUT_ASYNC_CLOCK,
@@ -1055,11 +1060,13 @@ static struct snd_soc_dai_driver wm8997_dai[] = {
 static int wm8997_codec_probe(struct snd_soc_codec *codec)
 {
         struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
+        struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
         struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);
 
         arizona_init_spk(codec);
+        arizona_init_notifiers(codec);
 
-        snd_soc_dapm_disable_pin(dapm, "HAPTICS");
+        snd_soc_component_disable_pin(component, "HAPTICS");
 
         priv->core.arizona->dapm = dapm;
 
@@ -1072,8 +1079,6 @@ static int wm8997_codec_remove(struct snd_soc_codec *codec)
 
         priv->core.arizona->dapm = NULL;
 
-        arizona_free_spk(codec);
-
         return 0;
 }
 
@@ -1119,7 +1124,7 @@ static int wm8997_probe(struct platform_device *pdev)
 {
         struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
         struct wm8997_priv *wm8997;
-        int i;
+        int i, ret;
 
         wm8997 = devm_kzalloc(&pdev->dev, sizeof(struct wm8997_priv),
                               GFP_KERNEL);
@@ -1159,15 +1164,33 @@ static int wm8997_probe(struct platform_device *pdev)
         pm_runtime_enable(&pdev->dev);
         pm_runtime_idle(&pdev->dev);
 
-        return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8997,
-                                      wm8997_dai, ARRAY_SIZE(wm8997_dai));
+        ret = arizona_init_spk_irqs(arizona);
+        if (ret < 0)
+                return ret;
+
+        ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8997,
+                                     wm8997_dai, ARRAY_SIZE(wm8997_dai));
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Failed to register codec: %d\n", ret);
+                goto err_spk_irqs;
+        }
+
+err_spk_irqs:
+        arizona_free_spk_irqs(arizona);
+
+        return ret;
 }
 
 static int wm8997_remove(struct platform_device *pdev)
 {
+        struct wm8997_priv *wm8997 = platform_get_drvdata(pdev);
+        struct arizona *arizona = wm8997->core.arizona;
+
         snd_soc_unregister_codec(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
 
+        arizona_free_spk_irqs(arizona);
+
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c
index bcc2e1060a6c..3694f5958d86 100644
--- a/sound/soc/codecs/wm8998.c
+++ b/sound/soc/codecs/wm8998.c
@@ -541,9 +541,11 @@ static const struct snd_kcontrol_new wm8998_aec_loopback_mux[] = {
 
 static const struct snd_soc_dapm_widget wm8998_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1,
-                    ARIZONA_SYSCLK_ENA_SHIFT, 0, NULL, 0),
+                    ARIZONA_SYSCLK_ENA_SHIFT, 0, arizona_clk_ev,
+                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("ASYNCCLK", ARIZONA_ASYNC_CLOCK_1,
-                    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, NULL, 0),
+                    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, arizona_clk_ev,
+                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,
                     ARIZONA_OPCLK_ENA_SHIFT, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", ARIZONA_OUTPUT_ASYNC_CLOCK,
@@ -1318,13 +1320,15 @@ static int wm8998_codec_probe(struct snd_soc_codec *codec)
 {
         struct wm8998_priv *priv = snd_soc_codec_get_drvdata(codec);
         struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
+        struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
 
         priv->core.arizona->dapm = dapm;
 
         arizona_init_spk(codec);
         arizona_init_gpio(codec);
+        arizona_init_notifiers(codec);
 
-        snd_soc_dapm_disable_pin(dapm, "HAPTICS");
+        snd_soc_component_disable_pin(component, "HAPTICS");
 
         return 0;
 }
@@ -1335,8 +1339,6 @@ static int wm8998_codec_remove(struct snd_soc_codec *codec)
 
         priv->core.arizona->dapm = NULL;
 
-        arizona_free_spk(codec);
-
         return 0;
 }
 
@@ -1385,7 +1387,7 @@ static int wm8998_probe(struct platform_device *pdev)
 {
         struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
         struct wm8998_priv *wm8998;
-        int i;
+        int i, ret;
 
         wm8998 = devm_kzalloc(&pdev->dev, sizeof(struct wm8998_priv),
                               GFP_KERNEL);
@@ -1417,15 +1419,35 @@ static int wm8998_probe(struct platform_device *pdev)
         pm_runtime_enable(&pdev->dev);
         pm_runtime_idle(&pdev->dev);
 
-        return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8998,
-                                      wm8998_dai, ARRAY_SIZE(wm8998_dai));
+        ret = arizona_init_spk_irqs(arizona);
+        if (ret < 0)
+                return ret;
+
+        ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8998,
+                                     wm8998_dai, ARRAY_SIZE(wm8998_dai));
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Failed to register codec: %d\n", ret);
+                goto err_spk_irqs;
+        }
+
+        return ret;
+
+err_spk_irqs:
+        arizona_free_spk_irqs(arizona);
+
+        return ret;
 }
 
 static int wm8998_remove(struct platform_device *pdev)
 {
+        struct wm8998_priv *wm8998 = platform_get_drvdata(pdev);
+        struct arizona *arizona = wm8998->core.arizona;
+
         snd_soc_unregister_codec(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
 
+        arizona_free_spk_irqs(arizona);
+
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 856867ec2813..6febef337dd2 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -1304,7 +1304,6 @@ static const struct regmap_config wm9081_regmap = {
         .cache_type = REGCACHE_RBTREE,
 };
 
-#if IS_ENABLED(CONFIG_I2C)
 static int wm9081_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
@@ -1384,7 +1383,6 @@ static struct i2c_driver wm9081_i2c_driver = {
         .remove =   wm9081_i2c_remove,
         .id_table = wm9081_i2c_id,
 };
-#endif
 
 module_i2c_driver(wm9081_i2c_driver);
 
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c
index dcdd055db57b..f6d5c0f2aea5 100644
--- a/sound/soc/codecs/wm9705.c
+++ b/sound/soc/codecs/wm9705.c
@@ -14,37 +14,58 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
+#include <linux/regmap.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/ac97_codec.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include "wm9705.h"
-
 #define WM9705_VENDOR_ID 0x574d4c05
 #define WM9705_VENDOR_ID_MASK 0xffffffff
 
-/*
- * WM9705 register cache
- */
-static const u16 wm9705_reg[] = {
-        0x6150, 0x8000, 0x8000, 0x8000, /* 0x0  */
-        0x0000, 0x8000, 0x8008, 0x8008, /* 0x8  */
-        0x8808, 0x8808, 0x8808, 0x8808, /* 0x10 */
-        0x8808, 0x0000, 0x8000, 0x0000, /* 0x18 */
-        0x0000, 0x0000, 0x0000, 0x000f, /* 0x20 */
-        0x0605, 0x0000, 0xbb80, 0x0000, /* 0x28 */
-        0x0000, 0xbb80, 0x0000, 0x0000, /* 0x30 */
-        0x0000, 0x2000, 0x0000, 0x0000, /* 0x38 */
-        0x0000, 0x0000, 0x0000, 0x0000, /* 0x40 */
-        0x0000, 0x0000, 0x0000, 0x0000, /* 0x48 */
-        0x0000, 0x0000, 0x0000, 0x0000, /* 0x50 */
-        0x0000, 0x0000, 0x0000, 0x0000, /* 0x58 */
-        0x0000, 0x0000, 0x0000, 0x0000, /* 0x60 */
-        0x0000, 0x0000, 0x0000, 0x0000, /* 0x68 */
-        0x0000, 0x0808, 0x0000, 0x0006, /* 0x70 */
-        0x0000, 0x0000, 0x574d, 0x4c05, /* 0x78 */
+static const struct reg_default wm9705_reg_defaults[] = {
+        { 0x02, 0x8000 },
+        { 0x04, 0x8000 },
+        { 0x06, 0x8000 },
+        { 0x0a, 0x8000 },
+        { 0x0c, 0x8008 },
+        { 0x0e, 0x8008 },
+        { 0x10, 0x8808 },
+        { 0x12, 0x8808 },
+        { 0x14, 0x8808 },
+        { 0x16, 0x8808 },
+        { 0x18, 0x8808 },
+        { 0x1a, 0x0000 },
+        { 0x1c, 0x8000 },
+        { 0x20, 0x0000 },
+        { 0x22, 0x0000 },
+        { 0x26, 0x000f },
+        { 0x28, 0x0605 },
+        { 0x2a, 0x0000 },
+        { 0x2c, 0xbb80 },
+        { 0x32, 0xbb80 },
+        { 0x34, 0x2000 },
+        { 0x5a, 0x0000 },
+        { 0x5c, 0x0000 },
+        { 0x72, 0x0808 },
+        { 0x74, 0x0000 },
+        { 0x76, 0x0006 },
+        { 0x78, 0x0000 },
+        { 0x7a, 0x0000 },
+};
+
+static const struct regmap_config wm9705_regmap_config = {
+        .reg_bits = 16,
+        .reg_stride = 2,
+        .val_bits = 16,
+        .max_register = 0x7e,
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = regmap_ac97_default_volatile,
+
+        .reg_defaults = wm9705_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm9705_reg_defaults),
 };
 
 static const struct snd_kcontrol_new wm9705_snd_ac97_controls[] = {
@@ -203,57 +224,20 @@ static const struct snd_soc_dapm_route wm9705_audio_map[] = {
         {"Right ADC", NULL, "ADC PGA"},
 };
 
-/* We use a register cache to enhance read performance. */
-static unsigned int ac97_read(struct snd_soc_codec *codec, unsigned int reg)
-{
-        struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
-        u16 *cache = codec->reg_cache;
-
-        switch (reg) {
-        case AC97_RESET:
-        case AC97_VENDOR_ID1:
-        case AC97_VENDOR_ID2:
-                return soc_ac97_ops->read(ac97, reg);
-        default:
-                reg = reg >> 1;
-
-                if (reg >= (ARRAY_SIZE(wm9705_reg)))
-                        return -EIO;
-
-                return cache[reg];
-        }
-}
-
-static int ac97_write(struct snd_soc_codec *codec, unsigned int reg,
-        unsigned int val)
-{
-        struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
-        u16 *cache = codec->reg_cache;
-
-        soc_ac97_ops->write(ac97, reg, val);
-        reg = reg >> 1;
-        if (reg < (ARRAY_SIZE(wm9705_reg)))
-                cache[reg] = val;
-
-        return 0;
-}
-
 static int ac97_prepare(struct snd_pcm_substream *substream,
                         struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
         int reg;
-        u16 vra;
 
-        vra = ac97_read(codec, AC97_EXTENDED_STATUS);
-        ac97_write(codec, AC97_EXTENDED_STATUS, vra | 0x1);
+        snd_soc_update_bits(codec, AC97_EXTENDED_STATUS, 0x1, 0x1);
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                 reg = AC97_PCM_FRONT_DAC_RATE;
         else
                 reg = AC97_PCM_LR_ADC_RATE;
 
-        return ac97_write(codec, reg, substream->runtime->rate);
+        return snd_soc_write(codec, reg, substream->runtime->rate);
 }
 
 #define WM9705_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | \
@@ -299,9 +283,9 @@ static struct snd_soc_dai_driver wm9705_dai[] = {
 #ifdef CONFIG_PM
 static int wm9705_soc_suspend(struct snd_soc_codec *codec)
 {
-        struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
-
-        soc_ac97_ops->write(ac97, AC97_POWERDOWN, 0xffff);
+        regcache_cache_bypass(codec->component.regmap, true);
+        snd_soc_write(codec, AC97_POWERDOWN, 0xffff);
+        regcache_cache_bypass(codec->component.regmap, false);
 
         return 0;
 }
@@ -309,17 +293,14 @@ static int wm9705_soc_suspend(struct snd_soc_codec *codec)
 static int wm9705_soc_resume(struct snd_soc_codec *codec)
 {
         struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
-        int i, ret;
-        u16 *cache = codec->reg_cache;
+        int ret;
 
         ret = snd_ac97_reset(ac97, true, WM9705_VENDOR_ID,
                 WM9705_VENDOR_ID_MASK);
         if (ret < 0)
                 return ret;
 
-        for (i = 2; i < ARRAY_SIZE(wm9705_reg) << 1; i += 2) {
-                soc_ac97_ops->write(ac97, i, cache[i>>1]);
-        }
+        regcache_sync(codec->component.regmap);
 
         return 0;
 }
@@ -331,6 +312,8 @@ static int wm9705_soc_resume(struct snd_soc_codec *codec)
 static int wm9705_soc_probe(struct snd_soc_codec *codec)
 {
         struct snd_ac97 *ac97;
+        struct regmap *regmap;
+        int ret;
 
         ac97 = snd_soc_new_ac97_codec(codec, WM9705_VENDOR_ID,
                 WM9705_VENDOR_ID_MASK);
@@ -339,15 +322,26 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec)
                 return PTR_ERR(ac97);
         }
 
+        regmap = regmap_init_ac97(ac97, &wm9705_regmap_config);
+        if (IS_ERR(regmap)) {
+                ret = PTR_ERR(regmap);
+                goto err_free_ac97_codec;
+        }
+
         snd_soc_codec_set_drvdata(codec, ac97);
+        snd_soc_codec_init_regmap(codec, regmap);
 
         return 0;
+err_free_ac97_codec:
+        snd_soc_free_ac97_codec(ac97);
+        return ret;
 }
 
 static int wm9705_soc_remove(struct snd_soc_codec *codec)
 {
         struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
 
+        snd_soc_codec_exit_regmap(codec);
         snd_soc_free_ac97_codec(ac97);
         return 0;
 }
@@ -357,12 +351,6 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm9705 = {
         .remove =       wm9705_soc_remove,
         .suspend =      wm9705_soc_suspend,
         .resume =       wm9705_soc_resume,
-        .read = ac97_read,
-        .write = ac97_write,
-        .reg_cache_size = ARRAY_SIZE(wm9705_reg),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_step = 2,
-        .reg_cache_default = wm9705_reg,
 
         .component_driver = {
                 .controls               = wm9705_snd_ac97_controls,
diff --git a/sound/soc/codecs/wm9705.h b/sound/soc/codecs/wm9705.h
deleted file mode 100644
index 23ea9ce47359..000000000000
--- a/sound/soc/codecs/wm9705.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * wm9705.h  --  WM9705 Soc Audio driver
- */
-
-#ifndef _WM9705_H
-#define _WM9705_H
-
-#define WM9705_DAI_AC97_HIFI    0
-#define WM9705_DAI_AC97_AUX     1
-
-#endif
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 557709eac698..1a3e1797994a 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -15,13 +15,13 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
+#include <linux/regmap.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/ac97_codec.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
 #include <sound/tlv.h>
-#include "wm9712.h"
 
 #define WM9712_VENDOR_ID 0x574d4c12
 #define WM9712_VENDOR_ID_MASK 0xffffffff
@@ -32,31 +32,66 @@ struct wm9712_priv {
         struct mutex lock;
 };
 
-static unsigned int ac97_read(struct snd_soc_codec *codec,
-        unsigned int reg);
-static int ac97_write(struct snd_soc_codec *codec,
-        unsigned int reg, unsigned int val);
+static const struct reg_default wm9712_reg_defaults[] = {
+        { 0x02, 0x8000 },
+        { 0x04, 0x8000 },
+        { 0x06, 0x8000 },
+        { 0x08, 0x0f0f },
+        { 0x0a, 0xaaa0 },
+        { 0x0c, 0xc008 },
+        { 0x0e, 0x6808 },
+        { 0x10, 0xe808 },
+        { 0x12, 0xaaa0 },
+        { 0x14, 0xad00 },
+        { 0x16, 0x8000 },
+        { 0x18, 0xe808 },
+        { 0x1a, 0x3000 },
+        { 0x1c, 0x8000 },
+        { 0x20, 0x0000 },
+        { 0x22, 0x0000 },
+        { 0x26, 0x000f },
+        { 0x28, 0x0605 },
+        { 0x2a, 0x0410 },
+        { 0x2c, 0xbb80 },
+        { 0x2e, 0xbb80 },
+        { 0x32, 0xbb80 },
+        { 0x34, 0x2000 },
+        { 0x4c, 0xf83e },
+        { 0x4e, 0xffff },
+        { 0x50, 0x0000 },
+        { 0x52, 0x0000 },
+        { 0x56, 0xf83e },
+        { 0x58, 0x0008 },
+        { 0x5c, 0x0000 },
+        { 0x60, 0xb032 },
+        { 0x62, 0x3e00 },
+        { 0x64, 0x0000 },
+        { 0x76, 0x0006 },
+        { 0x78, 0x0001 },
+        { 0x7a, 0x0000 },
+};
 
-/*
- * WM9712 register cache
- */
-static const u16 wm9712_reg[] = {
-        0x6174, 0x8000, 0x8000, 0x8000, /*  6 */
-        0x0f0f, 0xaaa0, 0xc008, 0x6808, /*  e */
-        0xe808, 0xaaa0, 0xad00, 0x8000, /* 16 */
-        0xe808, 0x3000, 0x8000, 0x0000, /* 1e */
-        0x0000, 0x0000, 0x0000, 0x000f, /* 26 */
-        0x0405, 0x0410, 0xbb80, 0xbb80, /* 2e */
-        0x0000, 0xbb80, 0x0000, 0x0000, /* 36 */
-        0x0000, 0x2000, 0x0000, 0x0000, /* 3e */
-        0x0000, 0x0000, 0x0000, 0x0000, /* 46 */
-        0x0000, 0x0000, 0xf83e, 0xffff, /* 4e */
-        0x0000, 0x0000, 0x0000, 0xf83e, /* 56 */
-        0x0008, 0x0000, 0x0000, 0x0000, /* 5e */
-        0xb032, 0x3e00, 0x0000, 0x0000, /* 66 */
-        0x0000, 0x0000, 0x0000, 0x0000, /* 6e */
-        0x0000, 0x0000, 0x0000, 0x0006, /* 76 */
-        0x0001, 0x0000, 0x574d, 0x4c12, /* 7e */
+static bool wm9712_volatile_reg(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case AC97_REC_GAIN:
+                return true;
+        default:
+                return regmap_ac97_default_volatile(dev, reg);
+        }
+}
+
+static const struct regmap_config wm9712_regmap_config = {
+        .reg_bits = 16,
+        .reg_stride = 2,
+        .val_bits = 16,
+        .max_register = 0x7e,
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = wm9712_volatile_reg,
+
+        .reg_defaults = wm9712_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(wm9712_reg_defaults),
 };
 
 #define HPL_MIXER       0x0
@@ -187,7 +222,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol,
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         unsigned int mixer, mask, shift, old;
-        struct snd_soc_dapm_update update;
+        struct snd_soc_dapm_update update = { 0 };
         bool change;
 
         mixer = mc->shift >> 8;
@@ -485,75 +520,36 @@ static const struct snd_soc_dapm_route wm9712_audio_map[] = {
         {"ROUT2", NULL, "Speaker PGA"},
 };
 
-static unsigned int ac97_read(struct snd_soc_codec *codec,
-        unsigned int reg)
-{
-        struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec);
-        u16 *cache = codec->reg_cache;
-
-        if (reg == AC97_RESET || reg == AC97_GPIO_STATUS ||
-                reg == AC97_VENDOR_ID1 || reg == AC97_VENDOR_ID2 ||
-                reg == AC97_REC_GAIN)
-                return soc_ac97_ops->read(wm9712->ac97, reg);
-        else {
-                reg = reg >> 1;
-
-                if (reg >= (ARRAY_SIZE(wm9712_reg)))
-                        return -EIO;
-
-                return cache[reg];
-        }
-}
-
-static int ac97_write(struct snd_soc_codec *codec, unsigned int reg,
-        unsigned int val)
-{
-        struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec);
-        u16 *cache = codec->reg_cache;
-
-        soc_ac97_ops->write(wm9712->ac97, reg, val);
-        reg = reg >> 1;
-        if (reg < (ARRAY_SIZE(wm9712_reg)))
-                cache[reg] = val;
-
-        return 0;
-}
-
 static int ac97_prepare(struct snd_pcm_substream *substream,
                         struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
         int reg;
-        u16 vra;
         struct snd_pcm_runtime *runtime = substream->runtime;
 
-        vra = ac97_read(codec, AC97_EXTENDED_STATUS);
-        ac97_write(codec, AC97_EXTENDED_STATUS, vra | 0x1);
+        snd_soc_update_bits(codec, AC97_EXTENDED_STATUS, 0x1, 0x1);
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                 reg = AC97_PCM_FRONT_DAC_RATE;
         else
                 reg = AC97_PCM_LR_ADC_RATE;
 
-        return ac97_write(codec, reg, runtime->rate);
+        return snd_soc_write(codec, reg, runtime->rate);
 }
 
 static int ac97_aux_prepare(struct snd_pcm_substream *substream,
                             struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
-        u16 vra, xsle;
         struct snd_pcm_runtime *runtime = substream->runtime;
 
-        vra = ac97_read(codec, AC97_EXTENDED_STATUS);
-        ac97_write(codec, AC97_EXTENDED_STATUS, vra | 0x1);
-        xsle = ac97_read(codec, AC97_PCI_SID);
-        ac97_write(codec, AC97_PCI_SID, xsle | 0x8000);
+        snd_soc_update_bits(codec, AC97_EXTENDED_STATUS, 0x1, 0x1);
+        snd_soc_update_bits(codec, AC97_PCI_SID, 0x8000, 0x8000);
 
         if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
                 return -ENODEV;
 
-        return ac97_write(codec, AC97_PCM_SURR_DAC_RATE, runtime->rate);
+        return snd_soc_write(codec, AC97_PCM_SURR_DAC_RATE, runtime->rate);
 }
 
 #define WM9712_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
@@ -605,12 +601,12 @@ static int wm9712_set_bias_level(struct snd_soc_codec *codec,
         case SND_SOC_BIAS_PREPARE:
                 break;
         case SND_SOC_BIAS_STANDBY:
-                ac97_write(codec, AC97_POWERDOWN, 0x0000);
+                snd_soc_write(codec, AC97_POWERDOWN, 0x0000);
                 break;
         case SND_SOC_BIAS_OFF:
                 /* disable everything including AC link */
-                ac97_write(codec, AC97_EXTENDED_MSTATUS, 0xffff);
-                ac97_write(codec, AC97_POWERDOWN, 0xffff);
+                snd_soc_write(codec, AC97_EXTENDED_MSTATUS, 0xffff);
+                snd_soc_write(codec, AC97_POWERDOWN, 0xffff);
                 break;
         }
         return 0;
@@ -619,8 +615,7 @@ static int wm9712_set_bias_level(struct snd_soc_codec *codec,
 static int wm9712_soc_resume(struct snd_soc_codec *codec)
 {
         struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec);
-        int i, ret;
-        u16 *cache = codec->reg_cache;
+        int ret;
 
         ret = snd_ac97_reset(wm9712->ac97, true, WM9712_VENDOR_ID,
                 WM9712_VENDOR_ID_MASK);
@@ -629,15 +624,8 @@ static int wm9712_soc_resume(struct snd_soc_codec *codec)
 
         snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-        if (ret == 0) {
-                /* Sync reg_cache with the hardware after cold reset */
-                for (i = 2; i < ARRAY_SIZE(wm9712_reg) << 1; i += 2) {
-                        if (i == AC97_INT_PAGING || i == AC97_POWERDOWN ||
-                            (i > 0x58 && i != 0x5c))
-                                continue;
-                        soc_ac97_ops->write(wm9712->ac97, i, cache[i>>1]);
-                }
-        }
+        if (ret == 0)
+                regcache_sync(codec->component.regmap);
 
         return ret;
 }
@@ -645,6 +633,7 @@ static int wm9712_soc_resume(struct snd_soc_codec *codec)
 static int wm9712_soc_probe(struct snd_soc_codec *codec)
 {
         struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec);
+        struct regmap *regmap;
         int ret;
 
         wm9712->ac97 = snd_soc_new_ac97_codec(codec, WM9712_VENDOR_ID,
@@ -655,16 +644,28 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec)
                 return ret;
         }
 
+        regmap = regmap_init_ac97(wm9712->ac97, &wm9712_regmap_config);
+        if (IS_ERR(regmap)) {
+                ret = PTR_ERR(regmap);
+                goto err_free_ac97_codec;
+        }
+
+        snd_soc_codec_init_regmap(codec, regmap);
+
         /* set alc mux to none */
-        ac97_write(codec, AC97_VIDEO, ac97_read(codec, AC97_VIDEO) | 0x3000);
+        snd_soc_update_bits(codec, AC97_VIDEO, 0x3000, 0x3000);
 
         return 0;
+err_free_ac97_codec:
+        snd_soc_free_ac97_codec(wm9712->ac97);
+        return ret;
 }
 
 static int wm9712_soc_remove(struct snd_soc_codec *codec)
 {
         struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec);
 
+        snd_soc_codec_exit_regmap(codec);
         snd_soc_free_ac97_codec(wm9712->ac97);
         return 0;
 }
@@ -673,14 +674,8 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm9712 = {
         .probe =        wm9712_soc_probe,
         .remove =       wm9712_soc_remove,
         .resume =       wm9712_soc_resume,
-        .read = ac97_read,
-        .write = ac97_write,
         .set_bias_level = wm9712_set_bias_level,
         .suspend_bias_off = true,
-        .reg_cache_size = ARRAY_SIZE(wm9712_reg),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_step = 2,
-        .reg_cache_default = wm9712_reg,
 
         .component_driver = {
                 .controls               = wm9712_snd_ac97_controls,
diff --git a/sound/soc/codecs/wm9712.h b/sound/soc/codecs/wm9712.h
deleted file mode 100644
index fb69c3aa4ed0..000000000000
--- a/sound/soc/codecs/wm9712.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * wm9712.h  --  WM9712 Soc Audio driver
- */
-
-#ifndef _WM9712_H
-#define _WM9712_H
-
-#define WM9712_DAI_AC97_HIFI    0
-#define WM9712_DAI_AC97_AUX             1
-
-#endif
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index e4301ddb1b84..7e4822185feb 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -231,7 +231,7 @@ static int wm9713_hp_mixer_put(struct snd_kcontrol *kcontrol,
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         unsigned int mixer, mask, shift, old;
-        struct snd_soc_dapm_update update;
+        struct snd_soc_dapm_update update = { 0 };
         bool change;
 
         mixer = mc->shift >> 8;
diff --git a/sound/soc/codecs/wm9713.h b/sound/soc/codecs/wm9713.h
index 53df11b1f727..7ecffc563016 100644
--- a/sound/soc/codecs/wm9713.h
+++ b/sound/soc/codecs/wm9713.h
@@ -41,8 +41,4 @@
 #define WM9713_PCMBCLK_DIV_8    (3 << 9)
 #define WM9713_PCMBCLK_DIV_16   (4 << 9)
 
-#define WM9713_DAI_AC97_HIFI    0
-#define WM9713_DAI_AC97_AUX             1
-#define WM9713_DAI_PCM_VOICE    2
-
 #endif
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index b943dde8dbe5..593b7d1aed46 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -162,6 +162,16 @@
 
 #define ADSP_MAX_STD_CTRL_SIZE               512
 
+#define WM_ADSP_ACKED_CTL_TIMEOUT_MS         100
+#define WM_ADSP_ACKED_CTL_N_QUICKPOLLS       10
+#define WM_ADSP_ACKED_CTL_MIN_VALUE          0
+#define WM_ADSP_ACKED_CTL_MAX_VALUE          0xFFFFFF
+
+/*
+ * Event control messages
+ */
+#define WM_ADSP_FW_EVENT_SHUTDOWN            0x000001
+
 struct wm_adsp_buf {
         struct list_head list;
         void *buf;
@@ -177,7 +187,7 @@ static struct wm_adsp_buf *wm_adsp_buf_alloc(const void *src, size_t len,
 
         buf->buf = vmalloc(len);
         if (!buf->buf) {
-                vfree(buf);
+                kfree(buf);
                 return NULL;
         }
         memcpy(buf->buf, src, len);
@@ -441,11 +451,29 @@ struct wm_coeff_ctl {
         unsigned int offset;
         size_t len;
         unsigned int set:1;
-        struct snd_kcontrol *kcontrol;
         struct soc_bytes_ext bytes_ext;
         unsigned int flags;
+        unsigned int type;
 };
 
+static const char *wm_adsp_mem_region_name(unsigned int type)
+{
+        switch (type) {
+        case WMFW_ADSP1_PM:
+                return "PM";
+        case WMFW_ADSP1_DM:
+                return "DM";
+        case WMFW_ADSP2_XM:
+                return "XM";
+        case WMFW_ADSP2_YM:
+                return "YM";
+        case WMFW_ADSP1_ZM:
+                return "ZM";
+        default:
+                return NULL;
+        }
+}
+
 #ifdef CONFIG_DEBUG_FS
 static void wm_adsp_debugfs_save_wmfwname(struct wm_adsp *dsp, const char *s)
 {
@@ -727,6 +755,24 @@ static inline struct wm_coeff_ctl *bytes_ext_to_ctl(struct soc_bytes_ext *ext)
         return container_of(ext, struct wm_coeff_ctl, bytes_ext);
 }
 
+static int wm_coeff_base_reg(struct wm_coeff_ctl *ctl, unsigned int *reg)
+{
+        const struct wm_adsp_alg_region *alg_region = &ctl->alg_region;
+        struct wm_adsp *dsp = ctl->dsp;
+        const struct wm_adsp_region *mem;
+
+        mem = wm_adsp_find_region(dsp, alg_region->type);
+        if (!mem) {
+                adsp_err(dsp, "No base for region %x\n",
+                         alg_region->type);
+                return -EINVAL;
+        }
+
+        *reg = wm_adsp_region_to_reg(mem, ctl->alg_region.base + ctl->offset);
+
+        return 0;
+}
+
 static int wm_coeff_info(struct snd_kcontrol *kctl,
                          struct snd_ctl_elem_info *uinfo)
 {
@@ -734,30 +780,94 @@ static int wm_coeff_info(struct snd_kcontrol *kctl,
                 (struct soc_bytes_ext *)kctl->private_value;
         struct wm_coeff_ctl *ctl = bytes_ext_to_ctl(bytes_ext);
 
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
-        uinfo->count = ctl->len;
+        switch (ctl->type) {
+        case WMFW_CTL_TYPE_ACKED:
+                uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+                uinfo->value.integer.min = WM_ADSP_ACKED_CTL_MIN_VALUE;
+                uinfo->value.integer.max = WM_ADSP_ACKED_CTL_MAX_VALUE;
+                uinfo->value.integer.step = 1;
+                uinfo->count = 1;
+                break;
+        default:
+                uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
+                uinfo->count = ctl->len;
+                break;
+        }
+
         return 0;
 }
 
+static int wm_coeff_write_acked_control(struct wm_coeff_ctl *ctl,
+                                        unsigned int event_id)
+{
+        struct wm_adsp *dsp = ctl->dsp;
+        u32 val = cpu_to_be32(event_id);
+        unsigned int reg;
+        int i, ret;
+
+        ret = wm_coeff_base_reg(ctl, &reg);
+        if (ret)
+                return ret;
+
+        adsp_dbg(dsp, "Sending 0x%x to acked control alg 0x%x %s:0x%x\n",
+                 event_id, ctl->alg_region.alg,
+                 wm_adsp_mem_region_name(ctl->alg_region.type), ctl->offset);
+
+        ret = regmap_raw_write(dsp->regmap, reg, &val, sizeof(val));
+        if (ret) {
+                adsp_err(dsp, "Failed to write %x: %d\n", reg, ret);
+                return ret;
+        }
+
+        /*
+         * Poll for ack, we initially poll at ~1ms intervals for firmwares
+         * that respond quickly, then go to ~10ms polls. A firmware is unlikely
+         * to ack instantly so we do the first 1ms delay before reading the
+         * control to avoid a pointless bus transaction
+         */
+        for (i = 0; i < WM_ADSP_ACKED_CTL_TIMEOUT_MS;) {
+                switch (i) {
+                case 0 ... WM_ADSP_ACKED_CTL_N_QUICKPOLLS - 1:
+                        usleep_range(1000, 2000);
+                        i++;
+                        break;
+                default:
+                        usleep_range(10000, 20000);
+                        i += 10;
+                        break;
+                }
+
+                ret = regmap_raw_read(dsp->regmap, reg, &val, sizeof(val));
+                if (ret) {
+                        adsp_err(dsp, "Failed to read %x: %d\n", reg, ret);
+                        return ret;
+                }
+
+                if (val == 0) {
+                        adsp_dbg(dsp, "Acked control ACKED at poll %u\n", i);
+                        return 0;
+                }
+        }
+
+        adsp_warn(dsp, "Acked control @0x%x alg:0x%x %s:0x%x timed out\n",
+                  reg, ctl->alg_region.alg,
+                  wm_adsp_mem_region_name(ctl->alg_region.type),
+                  ctl->offset);
+
+        return -ETIMEDOUT;
+}
+
 static int wm_coeff_write_control(struct wm_coeff_ctl *ctl,
                                   const void *buf, size_t len)
 {
-        struct wm_adsp_alg_region *alg_region = &ctl->alg_region;
-        const struct wm_adsp_region *mem;
         struct wm_adsp *dsp = ctl->dsp;
         void *scratch;
         int ret;
         unsigned int reg;
 
-        mem = wm_adsp_find_region(dsp, alg_region->type);
-        if (!mem) {
-                adsp_err(dsp, "No base for region %x\n",
-                         alg_region->type);
-                return -EINVAL;
-        }
-
-        reg = ctl->alg_region.base + ctl->offset;
-        reg = wm_adsp_region_to_reg(mem, reg);
+        ret = wm_coeff_base_reg(ctl, &reg);
+        if (ret)
+                return ret;
 
         scratch = kmemdup(buf, len, GFP_KERNEL | GFP_DMA);
         if (!scratch)
@@ -823,25 +933,41 @@ static int wm_coeff_tlv_put(struct snd_kcontrol *kctl,
         return ret;
 }
 
+static int wm_coeff_put_acked(struct snd_kcontrol *kctl,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+        struct soc_bytes_ext *bytes_ext =
+                (struct soc_bytes_ext *)kctl->private_value;
+        struct wm_coeff_ctl *ctl = bytes_ext_to_ctl(bytes_ext);
+        unsigned int val = ucontrol->value.integer.value[0];
+        int ret;
+
+        if (val == 0)
+                return 0;       /* 0 means no event */
+
+        mutex_lock(&ctl->dsp->pwr_lock);
+
+        if (ctl->enabled)
+                ret = wm_coeff_write_acked_control(ctl, val);
+        else
+                ret = -EPERM;
+
+        mutex_unlock(&ctl->dsp->pwr_lock);
+
+        return ret;
+}
+
 static int wm_coeff_read_control(struct wm_coeff_ctl *ctl,
                                  void *buf, size_t len)
 {
-        struct wm_adsp_alg_region *alg_region = &ctl->alg_region;
-        const struct wm_adsp_region *mem;
         struct wm_adsp *dsp = ctl->dsp;
         void *scratch;
         int ret;
         unsigned int reg;
 
-        mem = wm_adsp_find_region(dsp, alg_region->type);
-        if (!mem) {
-                adsp_err(dsp, "No base for region %x\n",
-                         alg_region->type);
-                return -EINVAL;
-        }
-
-        reg = ctl->alg_region.base + ctl->offset;
-        reg = wm_adsp_region_to_reg(mem, reg);
+        ret = wm_coeff_base_reg(ctl, &reg);
+        if (ret)
+                return ret;
 
         scratch = kmalloc(len, GFP_KERNEL | GFP_DMA);
         if (!scratch)
@@ -918,6 +1044,21 @@ static int wm_coeff_tlv_get(struct snd_kcontrol *kctl,
         return ret;
 }
 
+static int wm_coeff_get_acked(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+        /*
+         * Although it's not useful to read an acked control, we must satisfy
+         * user-side assumptions that all controls are readable and that a
+         * write of the same value should be filtered out (it's valid to send
+         * the same event number again to the firmware). We therefore return 0,
+         * meaning "no event" so valid event numbers will always be a change
+         */
+        ucontrol->value.integer.value[0] = 0;
+
+        return 0;
+}
+
 struct wmfw_ctl_work {
         struct wm_adsp *dsp;
         struct wm_coeff_ctl *ctl;
@@ -967,30 +1108,35 @@ static int wmfw_add_ctl(struct wm_adsp *dsp, struct wm_coeff_ctl *ctl)
         kcontrol = kzalloc(sizeof(*kcontrol), GFP_KERNEL);
         if (!kcontrol)
                 return -ENOMEM;
-        kcontrol->iface = SNDRV_CTL_ELEM_IFACE_MIXER;
 
         kcontrol->name = ctl->name;
         kcontrol->info = wm_coeff_info;
-        kcontrol->get = wm_coeff_get;
-        kcontrol->put = wm_coeff_put;
         kcontrol->iface = SNDRV_CTL_ELEM_IFACE_MIXER;
         kcontrol->tlv.c = snd_soc_bytes_tlv_callback;
         kcontrol->private_value = (unsigned long)&ctl->bytes_ext;
+        kcontrol->access = wmfw_convert_flags(ctl->flags, ctl->len);
 
-        ctl->bytes_ext.max = ctl->len;
-        ctl->bytes_ext.get = wm_coeff_tlv_get;
-        ctl->bytes_ext.put = wm_coeff_tlv_put;
+        switch (ctl->type) {
+        case WMFW_CTL_TYPE_ACKED:
+                kcontrol->get = wm_coeff_get_acked;
+                kcontrol->put = wm_coeff_put_acked;
+                break;
+        default:
+                kcontrol->get = wm_coeff_get;
+                kcontrol->put = wm_coeff_put;
 
-        kcontrol->access = wmfw_convert_flags(ctl->flags, ctl->len);
+                ctl->bytes_ext.max = ctl->len;
+                ctl->bytes_ext.get = wm_coeff_tlv_get;
+                ctl->bytes_ext.put = wm_coeff_tlv_put;
+                break;
+        }
 
-        ret = snd_soc_add_card_controls(dsp->card, kcontrol, 1);
+        ret = snd_soc_add_codec_controls(dsp->codec, kcontrol, 1);
         if (ret < 0)
                 goto err_kcontrol;
 
         kfree(kcontrol);
 
-        ctl->kcontrol = snd_soc_card_get_kcontrol(dsp->card, ctl->name);
-
         return 0;
 
 err_kcontrol:
@@ -1035,6 +1181,27 @@ static int wm_coeff_sync_controls(struct wm_adsp *dsp)
         return 0;
 }
 
+static void wm_adsp_signal_event_controls(struct wm_adsp *dsp,
+                                          unsigned int event)
+{
+        struct wm_coeff_ctl *ctl;
+        int ret;
+
+        list_for_each_entry(ctl, &dsp->ctl_list, list) {
+                if (ctl->type != WMFW_CTL_TYPE_HOSTEVENT)
+                        continue;
+
+                if (!ctl->enabled)
+                        continue;
+
+                ret = wm_coeff_write_acked_control(ctl, event);
+                if (ret)
+                        adsp_warn(dsp,
+                                  "Failed to send 0x%x event to alg 0x%x (%d)\n",
+                                  event, ctl->alg_region.alg, ret);
+        }
+}
+
 static void wm_adsp_ctl_work(struct work_struct *work)
 {
         struct wmfw_ctl_work *ctl_work = container_of(work,
@@ -1056,34 +1223,16 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
                                   const struct wm_adsp_alg_region *alg_region,
                                   unsigned int offset, unsigned int len,
                                   const char *subname, unsigned int subname_len,
-                                  unsigned int flags)
+                                  unsigned int flags, unsigned int type)
 {
         struct wm_coeff_ctl *ctl;
         struct wmfw_ctl_work *ctl_work;
         char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
-        char *region_name;
+        const char *region_name;
         int ret;
 
-        if (flags & WMFW_CTL_FLAG_SYS)
-                return 0;
-
-        switch (alg_region->type) {
-        case WMFW_ADSP1_PM:
-                region_name = "PM";
-                break;
-        case WMFW_ADSP1_DM:
-                region_name = "DM";
-                break;
-        case WMFW_ADSP2_XM:
-                region_name = "XM";
-                break;
-        case WMFW_ADSP2_YM:
-                region_name = "YM";
-                break;
-        case WMFW_ADSP1_ZM:
-                region_name = "ZM";
-                break;
-        default:
+        region_name = wm_adsp_mem_region_name(alg_region->type);
+        if (!region_name) {
                 adsp_err(dsp, "Unknown region type: %d\n", alg_region->type);
                 return -EINVAL;
         }
@@ -1139,6 +1288,7 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
         ctl->dsp = dsp;
 
         ctl->flags = flags;
+        ctl->type = type;
         ctl->offset = offset;
         ctl->len = len;
         ctl->cache = kzalloc(ctl->len, GFP_KERNEL);
@@ -1149,6 +1299,9 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
 
         list_add(&ctl->list, &dsp->ctl_list);
 
+        if (flags & WMFW_CTL_FLAG_SYS)
+                return 0;
+
         ctl_work = kzalloc(sizeof(*ctl_work), GFP_KERNEL);
         if (!ctl_work) {
                 ret = -ENOMEM;
@@ -1308,6 +1461,21 @@ static inline void wm_coeff_parse_coeff(struct wm_adsp *dsp, const u8 **data,
         adsp_dbg(dsp, "\tALSA control len: %#x\n", blk->len);
 }
 
+static int wm_adsp_check_coeff_flags(struct wm_adsp *dsp,
+                                const struct wm_coeff_parsed_coeff *coeff_blk,
+                                unsigned int f_required,
+                                unsigned int f_illegal)
+{
+        if ((coeff_blk->flags & f_illegal) ||
+            ((coeff_blk->flags & f_required) != f_required)) {
+                adsp_err(dsp, "Illegal flags 0x%x for control type 0x%x\n",
+                         coeff_blk->flags, coeff_blk->ctl_type);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 static int wm_adsp_parse_coeff(struct wm_adsp *dsp,
                                const struct wmfw_region *region)
 {
@@ -1324,6 +1492,28 @@ static int wm_adsp_parse_coeff(struct wm_adsp *dsp,
                 switch (coeff_blk.ctl_type) {
                 case SNDRV_CTL_ELEM_TYPE_BYTES:
                         break;
+                case WMFW_CTL_TYPE_ACKED:
+                        if (coeff_blk.flags & WMFW_CTL_FLAG_SYS)
+                                continue;       /* ignore */
+
+                        ret = wm_adsp_check_coeff_flags(dsp, &coeff_blk,
+                                                WMFW_CTL_FLAG_VOLATILE |
+                                                WMFW_CTL_FLAG_WRITEABLE |
+                                                WMFW_CTL_FLAG_READABLE,
+                                                0);
+                        if (ret)
+                                return -EINVAL;
+                        break;
+                case WMFW_CTL_TYPE_HOSTEVENT:
+                        ret = wm_adsp_check_coeff_flags(dsp, &coeff_blk,
+                                                WMFW_CTL_FLAG_SYS |
+                                                WMFW_CTL_FLAG_VOLATILE |
+                                                WMFW_CTL_FLAG_WRITEABLE |
+                                                WMFW_CTL_FLAG_READABLE,
+                                                0);
+                        if (ret)
+                                return -EINVAL;
+                        break;
                 default:
                         adsp_err(dsp, "Unknown control type: %d\n",
                                  coeff_blk.ctl_type);
@@ -1338,7 +1528,8 @@ static int wm_adsp_parse_coeff(struct wm_adsp *dsp,
                                              coeff_blk.len,
                                              coeff_blk.name,
                                              coeff_blk.name_len,
-                                             coeff_blk.flags);
+                                             coeff_blk.flags,
+                                             coeff_blk.ctl_type);
                 if (ret < 0)
                         adsp_err(dsp, "Failed to create control: %.*s, %d\n",
                                  coeff_blk.name_len, coeff_blk.name, ret);
@@ -1491,23 +1682,11 @@ static int wm_adsp_load(struct wm_adsp *dsp)
                         reg = offset;
                         break;
                 case WMFW_ADSP1_PM:
-                        region_name = "PM";
-                        reg = wm_adsp_region_to_reg(mem, offset);
-                        break;
                 case WMFW_ADSP1_DM:
-                        region_name = "DM";
-                        reg = wm_adsp_region_to_reg(mem, offset);
-                        break;
                 case WMFW_ADSP2_XM:
-                        region_name = "XM";
-                        reg = wm_adsp_region_to_reg(mem, offset);
-                        break;
                 case WMFW_ADSP2_YM:
-                        region_name = "YM";
-                        reg = wm_adsp_region_to_reg(mem, offset);
-                        break;
                 case WMFW_ADSP1_ZM:
-                        region_name = "ZM";
+                        region_name = wm_adsp_mem_region_name(type);
                         reg = wm_adsp_region_to_reg(mem, offset);
                         break;
                 default:
@@ -1750,7 +1929,8 @@ static int wm_adsp1_setup_algs(struct wm_adsp *dsp)
                                 len -= be32_to_cpu(adsp1_alg[i].dm);
                                 len *= 4;
                                 wm_adsp_create_control(dsp, alg_region, 0,
-                                                       len, NULL, 0, 0);
+                                                     len, NULL, 0, 0,
+                                                     SNDRV_CTL_ELEM_TYPE_BYTES);
                         } else {
                                 adsp_warn(dsp, "Missing length info for region DM with ID %x\n",
                                           be32_to_cpu(adsp1_alg[i].alg.id));
@@ -1770,7 +1950,8 @@ static int wm_adsp1_setup_algs(struct wm_adsp *dsp)
                                 len -= be32_to_cpu(adsp1_alg[i].zm);
                                 len *= 4;
                                 wm_adsp_create_control(dsp, alg_region, 0,
-                                                       len, NULL, 0, 0);
+                                                     len, NULL, 0, 0,
+                                                     SNDRV_CTL_ELEM_TYPE_BYTES);
                         } else {
                                 adsp_warn(dsp, "Missing length info for region ZM with ID %x\n",
                                           be32_to_cpu(adsp1_alg[i].alg.id));
@@ -1861,7 +2042,8 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
                                 len -= be32_to_cpu(adsp2_alg[i].xm);
                                 len *= 4;
                                 wm_adsp_create_control(dsp, alg_region, 0,
-                                                       len, NULL, 0, 0);
+                                                     len, NULL, 0, 0,
+                                                     SNDRV_CTL_ELEM_TYPE_BYTES);
                         } else {
                                 adsp_warn(dsp, "Missing length info for region XM with ID %x\n",
                                           be32_to_cpu(adsp2_alg[i].alg.id));
@@ -1881,7 +2063,8 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
                                 len -= be32_to_cpu(adsp2_alg[i].ym);
                                 len *= 4;
                                 wm_adsp_create_control(dsp, alg_region, 0,
-                                                       len, NULL, 0, 0);
+                                                     len, NULL, 0, 0,
+                                                     SNDRV_CTL_ELEM_TYPE_BYTES);
                         } else {
                                 adsp_warn(dsp, "Missing length info for region YM with ID %x\n",
                                           be32_to_cpu(adsp2_alg[i].alg.id));
@@ -1901,7 +2084,8 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
                                 len -= be32_to_cpu(adsp2_alg[i].zm);
                                 len *= 4;
                                 wm_adsp_create_control(dsp, alg_region, 0,
-                                                       len, NULL, 0, 0);
+                                                     len, NULL, 0, 0,
+                                                     SNDRV_CTL_ELEM_TYPE_BYTES);
                         } else {
                                 adsp_warn(dsp, "Missing length info for region ZM with ID %x\n",
                                           be32_to_cpu(adsp2_alg[i].alg.id));
@@ -2114,7 +2298,7 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,
         int ret;
         unsigned int val;
 
-        dsp->card = codec->component.card;
+        dsp->codec = codec;
 
         mutex_lock(&dsp->pwr_lock);
 
@@ -2325,8 +2509,6 @@ int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,
         struct wm_adsp *dsp = &dsps[w->shift];
         struct wm_coeff_ctl *ctl;
 
-        dsp->card = codec->component.card;
-
         switch (event) {
         case SND_SOC_DAPM_PRE_PMU:
                 wm_adsp2_set_dspclk(dsp, freq);
@@ -2393,14 +2575,22 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
 
                 mutex_lock(&dsp->pwr_lock);
 
-                if (wm_adsp_fw[dsp->fw].num_caps != 0)
+                if (wm_adsp_fw[dsp->fw].num_caps != 0) {
                         ret = wm_adsp_buffer_init(dsp);
+                        if (ret < 0) {
+                                mutex_unlock(&dsp->pwr_lock);
+                                goto err;
+                        }
+                }
 
                 mutex_unlock(&dsp->pwr_lock);
 
                 break;
 
         case SND_SOC_DAPM_PRE_PMD:
+                /* Tell the firmware to cleanup */
+                wm_adsp_signal_event_controls(dsp, WM_ADSP_FW_EVENT_SHUTDOWN);
+
                 /* Log firmware state, it can be useful for analysis */
                 wm_adsp2_show_fw_status(dsp);
 
@@ -2441,6 +2631,8 @@ EXPORT_SYMBOL_GPL(wm_adsp2_event);
 
 int wm_adsp2_codec_probe(struct wm_adsp *dsp, struct snd_soc_codec *codec)
 {
+        dsp->codec = codec;
+
         wm_adsp2_init_debugfs(dsp, codec);
 
         return snd_soc_add_codec_controls(codec,
diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
index 362dd7ce60d8..411d062c13f2 100644
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -44,7 +44,7 @@ struct wm_adsp {
         int type;
         struct device *dev;
         struct regmap *regmap;
-        struct snd_soc_card *card;
+        struct snd_soc_codec *codec;
 
         int base;
         int sysclk_reg;
@@ -110,18 +110,17 @@ int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,
 int wm_adsp2_event(struct snd_soc_dapm_widget *w,
                    struct snd_kcontrol *kcontrol, int event);
 
-extern int wm_adsp_compr_open(struct wm_adsp *dsp,
-                              struct snd_compr_stream *stream);
-extern int wm_adsp_compr_free(struct snd_compr_stream *stream);
-extern int wm_adsp_compr_set_params(struct snd_compr_stream *stream,
-                                    struct snd_compr_params *params);
-extern int wm_adsp_compr_get_caps(struct snd_compr_stream *stream,
-                                  struct snd_compr_caps *caps);
-extern int wm_adsp_compr_trigger(struct snd_compr_stream *stream, int cmd);
-extern int wm_adsp_compr_handle_irq(struct wm_adsp *dsp);
-extern int wm_adsp_compr_pointer(struct snd_compr_stream *stream,
-                                 struct snd_compr_tstamp *tstamp);
-extern int wm_adsp_compr_copy(struct snd_compr_stream *stream,
-                              char __user *buf, size_t count);
+int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream);
+int wm_adsp_compr_free(struct snd_compr_stream *stream);
+int wm_adsp_compr_set_params(struct snd_compr_stream *stream,
+                             struct snd_compr_params *params);
+int wm_adsp_compr_get_caps(struct snd_compr_stream *stream,
+                           struct snd_compr_caps *caps);
+int wm_adsp_compr_trigger(struct snd_compr_stream *stream, int cmd);
+int wm_adsp_compr_handle_irq(struct wm_adsp *dsp);
+int wm_adsp_compr_pointer(struct snd_compr_stream *stream,
+                          struct snd_compr_tstamp *tstamp);
+int wm_adsp_compr_copy(struct snd_compr_stream *stream,
+                       char __user *buf, size_t count);
 
 #endif
diff --git a/sound/soc/codecs/wmfw.h b/sound/soc/codecs/wmfw.h
index 7613d60d62ea..ec78b9da020f 100644
--- a/sound/soc/codecs/wmfw.h
+++ b/sound/soc/codecs/wmfw.h
@@ -26,6 +26,10 @@
 #define WMFW_CTL_FLAG_WRITEABLE   0x0002
 #define WMFW_CTL_FLAG_READABLE    0x0001
 
+/* Non-ALSA coefficient types start at 0x1000 */
+#define WMFW_CTL_TYPE_ACKED       0x1000 /* acked control */
+#define WMFW_CTL_TYPE_HOSTEVENT   0x1001 /* event control */
+
 struct wmfw_header {
         char magic[4];
         __le32 len;
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 19bdcac71775..37f9b6201918 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -40,6 +40,7 @@ config SND_SOC_FSL_SPDIF
         select REGMAP_MMIO
         select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
         select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && (MXC_TZIC || MXC_AVIC)
+        select BITREVERSE
         help
           Say Y if you want to add Sony/Philips Digital Interface (SPDIF)
           support for the Freescale CPUs.
diff --git a/sound/soc/fsl/efika-audio-fabric.c b/sound/soc/fsl/efika-audio-fabric.c
index b2acd3293ea8..f200d1cfc4bd 100644
--- a/sound/soc/fsl/efika-audio-fabric.c
+++ b/sound/soc/fsl/efika-audio-fabric.c
@@ -27,7 +27,6 @@
 
 #include "mpc5200_dma.h"
 #include "mpc5200_psc_ac97.h"
-#include "../codecs/stac9766.h"
 
 #define DRV_NAME "efika-audio-fabric"
 
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index dffd549a0e2a..9998aea23597 100644
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -183,7 +183,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static struct snd_soc_ops fsl_asoc_card_ops = {
+static const struct snd_soc_ops fsl_asoc_card_ops = {
         .hw_params = fsl_asoc_card_hw_params,
 };
 
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
index 201a70d1027a..1b60958e2080 100644
--- a/sound/soc/fsl/imx-wm8962.c
+++ b/sound/soc/fsl/imx-wm8962.c
@@ -61,7 +61,7 @@ static int imx_hifi_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static struct snd_soc_ops imx_hifi_ops = {
+static const struct snd_soc_ops imx_hifi_ops = {
         .hw_params = imx_hifi_hw_params,
 };
 
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 1cb39309f5d5..cf026252cd4a 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -1,5 +1,5 @@
 /*
- * simple-card-core.c
+ * simple-card-utils.c
  *
  * Copyright (c) 2016 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
  *
@@ -195,9 +195,6 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_init_dai);
 
 int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link)
 {
-        if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name)
-                return -EINVAL;
-
         /* Assumes platform == cpu */
         if (!dai_link->platform_of_node)
                 dai_link->platform_of_node = dai_link->cpu_of_node;
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index f608f8d23f3d..a385ff6bfa4b 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -174,7 +174,7 @@ err:
         return ret;
 }
 
-static struct snd_soc_ops asoc_simple_card_ops = {
+static const struct snd_soc_ops asoc_simple_card_ops = {
         .startup = asoc_simple_card_startup,
         .shutdown = asoc_simple_card_shutdown,
         .hw_params = asoc_simple_card_hw_params,
diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c
index b9973a56bcb0..bb86ee042490 100644
--- a/sound/soc/generic/simple-scu-card.c
+++ b/sound/soc/generic/simple-scu-card.c
@@ -22,7 +22,7 @@
 #include <sound/soc-dai.h>
 #include <sound/simple_card_utils.h>
 
-struct asoc_simple_card_priv {
+struct simple_card_data {
         struct snd_soc_card snd_card;
         struct snd_soc_codec_conf codec_conf;
         struct asoc_simple_dai *dai_props;
@@ -42,7 +42,7 @@ struct asoc_simple_card_priv {
 static int asoc_simple_card_startup(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct asoc_simple_card_priv *priv =    snd_soc_card_get_drvdata(rtd->card);
+        struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
         struct asoc_simple_dai *dai_props =
                 simple_priv_to_props(priv, rtd->num);
 
@@ -52,21 +52,21 @@ static int asoc_simple_card_startup(struct snd_pcm_substream *substream)
 static void asoc_simple_card_shutdown(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct asoc_simple_card_priv *priv =    snd_soc_card_get_drvdata(rtd->card);
+        struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
         struct asoc_simple_dai *dai_props =
                 simple_priv_to_props(priv, rtd->num);
 
         clk_disable_unprepare(dai_props->clk);
 }
 
-static struct snd_soc_ops asoc_simple_card_ops = {
+static const struct snd_soc_ops asoc_simple_card_ops = {
         .startup = asoc_simple_card_startup,
         .shutdown = asoc_simple_card_shutdown,
 };
 
 static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct asoc_simple_card_priv *priv = snd_soc_card_get_drvdata(rtd->card);
+        struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
         struct snd_soc_dai *dai;
         struct snd_soc_dai_link *dai_link;
         struct asoc_simple_dai *dai_props;
@@ -84,7 +84,7 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
 static int asoc_simple_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
                                         struct snd_pcm_hw_params *params)
 {
-        struct asoc_simple_card_priv *priv = snd_soc_card_get_drvdata(rtd->card);
+        struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
         struct snd_interval *rate = hw_param_interval(params,
                                                       SNDRV_PCM_HW_PARAM_RATE);
         struct snd_interval *channels = hw_param_interval(params,
@@ -101,8 +101,8 @@ static int asoc_simple_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
         return 0;
 }
 
-static int asoc_simple_card_parse_links(struct device_node *np,
-                                        struct asoc_simple_card_priv *priv,
+static int asoc_simple_card_dai_link_of(struct device_node *np,
+                                        struct simple_card_data *priv,
                                         unsigned int daifmt,
                                         int idx, bool is_fe)
 {
@@ -195,22 +195,35 @@ static int asoc_simple_card_parse_links(struct device_node *np,
         return 0;
 }
 
-static int asoc_simple_card_dai_link_of(struct device_node *node,
-                                 struct asoc_simple_card_priv *priv)
+static int asoc_simple_card_parse_of(struct device_node *node,
+                                     struct simple_card_data *priv)
+
 {
         struct device *dev = simple_priv_to_dev(priv);
         struct device_node *np;
         unsigned int daifmt = 0;
-        int ret, i;
         bool is_fe;
+        int ret, i;
+
+        if (!node)
+                return -EINVAL;
+
+        ret = snd_soc_of_parse_audio_routing(&priv->snd_card, PREFIX "routing");
+        if (ret < 0)
+                return ret;
+
+        /* sampling rate convert */
+        of_property_read_u32(node, PREFIX "convert-rate", &priv->convert_rate);
+
+        /* channels transfer */
+        of_property_read_u32(node, PREFIX "convert-channels", &priv->convert_channels);
 
         /* find 1st codec */
         np = of_get_child_by_name(node, PREFIX "codec");
         if (!np)
                 return -ENODEV;
 
-        ret = asoc_simple_card_parse_daifmt(dev, node, np,
-                                            PREFIX, &daifmt);
+        ret = asoc_simple_card_parse_daifmt(dev, node, np, PREFIX, &daifmt);
         if (ret < 0)
                 return ret;
 
@@ -220,58 +233,12 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
                 if (strcmp(np->name, PREFIX "cpu") == 0)
                         is_fe = true;
 
-                ret = asoc_simple_card_parse_links(np, priv, daifmt, i, is_fe);
+                ret = asoc_simple_card_dai_link_of(np, priv, daifmt, i, is_fe);
                 if (ret < 0)
                         return ret;
                 i++;
         }
 
-        return 0;
-}
-
-static int asoc_simple_card_parse_of(struct device_node *node,
-                              struct asoc_simple_card_priv *priv,
-                              struct device *dev)
-{
-        struct asoc_simple_dai *props;
-        struct snd_soc_dai_link *links;
-        int ret;
-        int num;
-
-        if (!node)
-                return -EINVAL;
-
-        num = of_get_child_count(node);
-        props = devm_kzalloc(dev, sizeof(*props) * num, GFP_KERNEL);
-        links = devm_kzalloc(dev, sizeof(*links) * num, GFP_KERNEL);
-        if (!props || !links)
-                return -ENOMEM;
-
-        priv->dai_props = props;
-        priv->dai_link  = links;
-
-        /* Init snd_soc_card */
-        priv->snd_card.owner                    = THIS_MODULE;
-        priv->snd_card.dev                      = dev;
-        priv->snd_card.dai_link                 = priv->dai_link;
-        priv->snd_card.num_links                = num;
-        priv->snd_card.codec_conf               = &priv->codec_conf;
-        priv->snd_card.num_configs              = 1;
-
-        ret = snd_soc_of_parse_audio_routing(&priv->snd_card, PREFIX "routing");
-        if (ret < 0)
-                return ret;
-
-        /* sampling rate convert */
-        of_property_read_u32(node, PREFIX "convert-rate", &priv->convert_rate);
-
-        /* channels transfer */
-        of_property_read_u32(node, PREFIX "convert-channels", &priv->convert_channels);
-
-        ret = asoc_simple_card_dai_link_of(node, priv);
-        if (ret < 0)
-                return ret;
-
         ret = asoc_simple_card_parse_card_name(&priv->snd_card, PREFIX);
         if (ret < 0)
                 return ret;
@@ -286,17 +253,37 @@ static int asoc_simple_card_parse_of(struct device_node *node,
 
 static int asoc_simple_card_probe(struct platform_device *pdev)
 {
-        struct asoc_simple_card_priv *priv;
-        struct device_node *np = pdev->dev.of_node;
+        struct simple_card_data *priv;
+        struct snd_soc_dai_link *dai_link;
+        struct asoc_simple_dai *dai_props;
         struct device *dev = &pdev->dev;
-        int ret;
+        struct device_node *np = pdev->dev.of_node;
+        int num, ret;
 
         /* Allocate the private data */
         priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
 
-        ret = asoc_simple_card_parse_of(np, priv, dev);
+        num = of_get_child_count(np);
+
+        dai_props = devm_kzalloc(dev, sizeof(*dai_props) * num, GFP_KERNEL);
+        dai_link  = devm_kzalloc(dev, sizeof(*dai_link)  * num, GFP_KERNEL);
+        if (!dai_props || !dai_link)
+                return -ENOMEM;
+
+        priv->dai_props                         = dai_props;
+        priv->dai_link                          = dai_link;
+
+        /* Init snd_soc_card */
+        priv->snd_card.owner                    = THIS_MODULE;
+        priv->snd_card.dev                      = dev;
+        priv->snd_card.dai_link                 = priv->dai_link;
+        priv->snd_card.num_links                = num;
+        priv->snd_card.codec_conf               = &priv->codec_conf;
+        priv->snd_card.num_configs              = 1;
+
+        ret = asoc_simple_card_parse_of(np, priv);
         if (ret < 0) {
                 if (ret != -EPROBE_DEFER)
                         dev_err(dev, "parse error %d\n", ret);
diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c
index 0838478c4c3f..c7b3cbf92faf 100644
--- a/sound/soc/intel/atom/sst-atom-controls.c
+++ b/sound/soc/intel/atom/sst-atom-controls.c
@@ -937,7 +937,7 @@ int send_ssp_cmd(struct snd_soc_dai *dai, const char *id, bool enable)
         struct sst_data *drv = snd_soc_dai_get_drvdata(dai);
         int ssp_id;
 
-        dev_info(dai->dev, "Enter: enable=%d port_name=%s\n", enable, id);
+        dev_dbg(dai->dev, "Enter: enable=%d port_name=%s\n", enable, id);
 
         if (strcmp(id, "ssp0-port") == 0)
                 ssp_id = SSP_MODEM;
diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
index 25c6d87c818e..f5a8050351b5 100644
--- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
@@ -771,6 +771,9 @@ static int sst_soc_prepare(struct device *dev)
         struct sst_data *drv = dev_get_drvdata(dev);
         struct snd_soc_pcm_runtime *rtd;
 
+        if (!drv->soc_card)
+                return 0;
+
         /* suspend all pcms first */
         snd_soc_suspend(drv->soc_card->dev);
         snd_soc_poweroff(drv->soc_card->dev);
@@ -793,6 +796,9 @@ static void sst_soc_complete(struct device *dev)
         struct sst_data *drv = dev_get_drvdata(dev);
         struct snd_soc_pcm_runtime *rtd;
 
+        if (!drv->soc_card)
+                return;
+
         /* restart SSPs */
         list_for_each_entry(rtd, &drv->soc_card->rtd_list, list) {
                 struct snd_soc_dai *dai = rtd->cpu_dai;
diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c
index 9b6e27385dc9..f9ba71315e33 100644
--- a/sound/soc/intel/atom/sst/sst.c
+++ b/sound/soc/intel/atom/sst/sst.c
@@ -27,6 +27,7 @@
 #include <linux/pm_qos.h>
 #include <linux/async.h>
 #include <linux/acpi.h>
+#include <linux/sysfs.h>
 #include <sound/core.h>
 #include <sound/soc.h>
 #include <asm/platform_sst_audio.h>
@@ -242,6 +243,32 @@ int sst_alloc_drv_context(struct intel_sst_drv **ctx,
 }
 EXPORT_SYMBOL_GPL(sst_alloc_drv_context);
 
+static ssize_t firmware_version_show(struct device *dev,
+                            struct device_attribute *attr, char *buf)
+{
+        struct intel_sst_drv *ctx = dev_get_drvdata(dev);
+
+        if (ctx->fw_version.type == 0 && ctx->fw_version.major == 0 &&
+            ctx->fw_version.minor == 0 && ctx->fw_version.build == 0)
+                return sprintf(buf, "FW not yet loaded\n");
+        else
+                return sprintf(buf, "v%02x.%02x.%02x.%02x\n",
+                               ctx->fw_version.type, ctx->fw_version.major,
+                               ctx->fw_version.minor, ctx->fw_version.build);
+
+}
+
+DEVICE_ATTR_RO(firmware_version);
+
+static const struct attribute *sst_fw_version_attrs[] = {
+        &dev_attr_firmware_version.attr,
+        NULL,
+};
+
+static const struct attribute_group sst_fw_version_attr_group = {
+        .attrs = (struct attribute **)sst_fw_version_attrs,
+};
+
 int sst_context_init(struct intel_sst_drv *ctx)
 {
         int ret = 0, i;
@@ -315,8 +342,19 @@ int sst_context_init(struct intel_sst_drv *ctx)
                 dev_err(ctx->dev, "Firmware download failed:%d\n", ret);
                 goto do_free_mem;
         }
+
+        ret = sysfs_create_group(&ctx->dev->kobj,
+                                 &sst_fw_version_attr_group);
+        if (ret) {
+                dev_err(ctx->dev,
+                        "Unable to create sysfs\n");
+                goto err_sysfs;
+        }
+
         sst_register(ctx->dev);
         return 0;
+err_sysfs:
+        sysfs_remove_group(&ctx->dev->kobj, &sst_fw_version_attr_group);
 
 do_free_mem:
         destroy_workqueue(ctx->post_msg_wq);
@@ -330,6 +368,7 @@ void sst_context_cleanup(struct intel_sst_drv *ctx)
         pm_runtime_disable(ctx->dev);
         sst_unregister(ctx->dev);
         sst_set_fw_state_locked(ctx, SST_SHUTDOWN);
+        sysfs_remove_group(&ctx->dev->kobj, &sst_fw_version_attr_group);
         flush_scheduled_work();
         destroy_workqueue(ctx->post_msg_wq);
         pm_qos_remove_request(ctx->qos);
diff --git a/sound/soc/intel/atom/sst/sst.h b/sound/soc/intel/atom/sst/sst.h
index 3f493862e98d..5c9a51cc77aa 100644
--- a/sound/soc/intel/atom/sst/sst.h
+++ b/sound/soc/intel/atom/sst/sst.h
@@ -436,6 +436,7 @@ struct intel_sst_drv {
          */
         char firmware_name[FW_NAME_SIZE];
 
+        struct snd_sst_fw_version fw_version;
         struct sst_fw_save      *fw_save;
 };
 
diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c
index 0a88537ca58a..f4d92bbc5373 100644
--- a/sound/soc/intel/atom/sst/sst_acpi.c
+++ b/sound/soc/intel/atom/sst/sst_acpi.c
@@ -452,6 +452,8 @@ static struct sst_acpi_mach sst_acpi_bytcr[] = {
 static struct sst_acpi_mach sst_acpi_chv[] = {
         {"10EC5670", "cht-bsw-rt5672", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
                                                 &chv_platform_data },
+        {"10EC5672", "cht-bsw-rt5672", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
+                                                &chv_platform_data },
         {"10EC5645", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
                                                 &chv_platform_data },
         {"10EC5650", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL,
diff --git a/sound/soc/intel/atom/sst/sst_ipc.c b/sound/soc/intel/atom/sst/sst_ipc.c
index bfc889950bb2..374bb61c596d 100644
--- a/sound/soc/intel/atom/sst/sst_ipc.c
+++ b/sound/soc/intel/atom/sst/sst_ipc.c
@@ -236,6 +236,17 @@ static void process_fw_init(struct intel_sst_drv *sst_drv_ctx,
                 retval = init->result;
                 goto ret;
         }
+        dev_info(sst_drv_ctx->dev, "FW Version %02x.%02x.%02x.%02x\n",
+                        init->fw_version.type, init->fw_version.major,
+                        init->fw_version.minor, init->fw_version.build);
+        dev_dbg(sst_drv_ctx->dev, "Build date %s Time %s\n",
+                        init->build_info.date, init->build_info.time);
+
+        /* Save FW version */
+        sst_drv_ctx->fw_version.type = init->fw_version.type;
+        sst_drv_ctx->fw_version.major = init->fw_version.major;
+        sst_drv_ctx->fw_version.minor = init->fw_version.minor;
+        sst_drv_ctx->fw_version.build = init->fw_version.build;
 
 ret:
         sst_wake_up_block(sst_drv_ctx, retval, FW_DWNL_ID, 0 , NULL, 0);
diff --git a/sound/soc/intel/atom/sst/sst_stream.c b/sound/soc/intel/atom/sst/sst_stream.c
index 4ccc80e5e8cc..51bdeeecb7c8 100644
--- a/sound/soc/intel/atom/sst/sst_stream.c
+++ b/sound/soc/intel/atom/sst/sst_stream.c
@@ -104,7 +104,7 @@ int sst_alloc_stream_mrfld(struct intel_sst_drv *sst_drv_ctx, void *params)
         sst_init_stream(&sst_drv_ctx->streams[str_id], alloc_param.codec_type,
                         str_id, alloc_param.operation, 0);
 
-        dev_info(sst_drv_ctx->dev, "Alloc for str %d pipe %#x\n",
+        dev_dbg(sst_drv_ctx->dev, "Alloc for str %d pipe %#x\n",
                         str_id, pipe_id);
         ret = sst_prepare_and_post_msg(sst_drv_ctx, task_id, IPC_CMD,
                         IPC_IA_ALLOC_STREAM_MRFLD, pipe_id, sizeof(alloc_param),
@@ -415,7 +415,7 @@ int sst_free_stream(struct intel_sst_drv *sst_drv_ctx, int str_id)
                 str_info->status = STREAM_UN_INIT;
                 mutex_unlock(&str_info->lock);
 
-                dev_info(sst_drv_ctx->dev, "Free for str %d pipe %#x\n",
+                dev_dbg(sst_drv_ctx->dev, "Free for str %d pipe %#x\n",
                                 str_id, str_info->pipe_id);
                 retval = sst_prepare_and_post_msg(sst_drv_ctx, str_info->task_id, IPC_CMD,
                                 IPC_IA_FREE_STREAM_MRFLD, str_info->pipe_id, 0,
diff --git a/sound/soc/intel/baytrail/sst-baytrail-ipc.c b/sound/soc/intel/baytrail/sst-baytrail-ipc.c
index 7ab14ce65a73..260447da32b8 100644
--- a/sound/soc/intel/baytrail/sst-baytrail-ipc.c
+++ b/sound/soc/intel/baytrail/sst-baytrail-ipc.c
@@ -23,7 +23,6 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
-#include <linux/kthread.h>
 #include <linux/firmware.h>
 #include <linux/io.h>
 #include <asm/div64.h>
@@ -338,7 +337,7 @@ static irqreturn_t sst_byt_irq_thread(int irq, void *context)
         spin_unlock_irqrestore(&sst->spinlock, flags);
 
         /* continue to send any remaining messages... */
-        kthread_queue_work(&ipc->kworker, &ipc->kwork);
+        schedule_work(&ipc->kwork);
 
         return IRQ_HANDLED;
 }
diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c
index 547e6705bf6d..53c6b4cbb1e1 100644
--- a/sound/soc/intel/boards/bdw-rt5677.c
+++ b/sound/soc/intel/boards/bdw-rt5677.c
@@ -156,7 +156,7 @@ static int bdw_rt5677_hw_params(struct snd_pcm_substream *substream,
         return ret;
 }
 
-static struct snd_soc_ops bdw_rt5677_ops = {
+static const struct snd_soc_ops bdw_rt5677_ops = {
         .hw_params = bdw_rt5677_hw_params,
 };
 
diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c
index 7486a0022fde..4d7e9decfa92 100644
--- a/sound/soc/intel/boards/broadwell.c
+++ b/sound/soc/intel/boards/broadwell.c
@@ -126,7 +126,7 @@ static int broadwell_rt286_hw_params(struct snd_pcm_substream *substream,
         return ret;
 }
 
-static struct snd_soc_ops broadwell_rt286_ops = {
+static const struct snd_soc_ops broadwell_rt286_ops = {
         .hw_params = broadwell_rt286_hw_params,
 };
 
@@ -220,10 +220,12 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
 };
 
 static int broadwell_suspend(struct snd_soc_card *card){
-        struct snd_soc_codec *codec;
+        struct snd_soc_component *component;
+
+        list_for_each_entry(component, &card->component_dev_list, card_list) {
+                if (!strcmp(component->name, "i2c-INT343A:00")) {
+                        struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 
-        list_for_each_entry(codec, &card->codec_dev_list, card_list) {
-                if (!strcmp(codec->component.name, "i2c-INT343A:00")) {
                         dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n");
                         rt286_mic_detect(codec, NULL);
                         break;
@@ -233,10 +235,12 @@ static int broadwell_suspend(struct snd_soc_card *card){
 }
 
 static int broadwell_resume(struct snd_soc_card *card){
-        struct snd_soc_codec *codec;
+        struct snd_soc_component *component;
+
+        list_for_each_entry(component, &card->component_dev_list, card_list) {
+                if (!strcmp(component->name, "i2c-INT343A:00")) {
+                        struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 
-        list_for_each_entry(codec, &card->codec_dev_list, card_list) {
-                if (!strcmp(codec->component.name, "i2c-INT343A:00")) {
                         dev_dbg(codec->dev, "enabling jack detect for resume.\n");
                         rt286_mic_detect(codec, &broadwell_headset);
                         break;
diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
index 865a21e557cc..1b4330cd2739 100644
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@ -30,6 +30,7 @@
 #define BXT_DIALOG_CODEC_DAI    "da7219-hifi"
 #define BXT_MAXIM_CODEC_DAI     "HiFi"
 #define DUAL_CHANNEL            2
+#define QUAD_CHANNEL            4
 
 static struct snd_soc_jack broxton_headset;
 
@@ -182,6 +183,16 @@ static struct snd_pcm_hw_constraint_list constraints_channels = {
         .mask = 0,
 };
 
+static unsigned int channels_quad[] = {
+        QUAD_CHANNEL,
+};
+
+static struct snd_pcm_hw_constraint_list constraints_channels_quad = {
+        .count = ARRAY_SIZE(channels_quad),
+        .list = channels_quad,
+        .mask = 0,
+};
+
 static int bxt_fe_startup(struct snd_pcm_substream *substream)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
@@ -248,7 +259,7 @@ static int broxton_da7219_hw_free(struct snd_pcm_substream *substream)
         return ret;
 }
 
-static struct snd_soc_ops broxton_da7219_ops = {
+static const struct snd_soc_ops broxton_da7219_ops = {
         .hw_params = broxton_da7219_hw_params,
         .hw_free = broxton_da7219_hw_free,
 };
@@ -258,7 +269,10 @@ static int broxton_dmic_fixup(struct snd_soc_pcm_runtime *rtd,
 {
         struct snd_interval *channels = hw_param_interval(params,
                                                 SNDRV_PCM_HW_PARAM_CHANNELS);
-        channels->min = channels->max = DUAL_CHANNEL;
+        if (params_channels(params) == 2)
+                channels->min = channels->max = 2;
+        else
+                channels->min = channels->max = 4;
 
         return 0;
 }
@@ -267,9 +281,9 @@ static int broxton_dmic_startup(struct snd_pcm_substream *substream)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
 
-        runtime->hw.channels_max = DUAL_CHANNEL;
+        runtime->hw.channels_min = runtime->hw.channels_max = QUAD_CHANNEL;
         snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
-                        &constraints_channels);
+                        &constraints_channels_quad);
 
         return snd_pcm_hw_constraint_list(substream->runtime, 0,
                         SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
@@ -295,7 +309,7 @@ static int broxton_refcap_startup(struct snd_pcm_substream *substream)
                         &constraints_16000);
 };
 
-static struct snd_soc_ops broxton_refcap_ops = {
+static const struct snd_soc_ops broxton_refcap_ops = {
         .startup = broxton_refcap_startup,
 };
 
@@ -348,7 +362,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
                 .dynamic = 1,
                 .ops = &broxton_refcap_ops,
         },
-        [BXT_DPCM_AUDIO_DMIC_CP]
+        [BXT_DPCM_AUDIO_DMIC_CP] =
         {
                 .name = "Bxt Audio DMIC cap",
                 .stream_name = "dmiccap",
diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c
index d610bdca1608..1309405b3808 100644
--- a/sound/soc/intel/boards/bxt_rt298.c
+++ b/sound/soc/intel/boards/bxt_rt298.c
@@ -181,7 +181,7 @@ static int broxton_rt298_hw_params(struct snd_pcm_substream *substream,
         return ret;
 }
 
-static struct snd_soc_ops broxton_rt298_ops = {
+static const struct snd_soc_ops broxton_rt298_ops = {
         .hw_params = broxton_rt298_hw_params,
 };
 
@@ -230,7 +230,7 @@ static int broxton_dmic_startup(struct snd_pcm_substream *substream)
                                 SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
 }
 
-static struct snd_soc_ops broxton_dmic_ops = {
+static const struct snd_soc_ops broxton_dmic_ops = {
         .startup = broxton_dmic_startup,
 };
 
diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index bff77a1f27fc..507a86a5eafe 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -57,9 +57,7 @@ struct byt_rt5640_private {
         struct clk *mclk;
 };
 
-static unsigned long byt_rt5640_quirk = BYT_RT5640_DMIC1_MAP |
-                                        BYT_RT5640_DMIC_EN |
-                                        BYT_RT5640_MCLK_EN;
+static unsigned long byt_rt5640_quirk = BYT_RT5640_MCLK_EN;
 
 static void log_quirks(struct device *dev)
 {
@@ -597,11 +595,11 @@ static int byt_rt5640_aif1_startup(struct snd_pcm_substream *substream)
                         SNDRV_PCM_HW_PARAM_RATE, 48000);
 }
 
-static struct snd_soc_ops byt_rt5640_aif1_ops = {
+static const struct snd_soc_ops byt_rt5640_aif1_ops = {
         .startup = byt_rt5640_aif1_startup,
 };
 
-static struct snd_soc_ops byt_rt5640_be_ssp2_ops = {
+static const struct snd_soc_ops byt_rt5640_be_ssp2_ops = {
         .hw_params = byt_rt5640_aif1_hw_params,
 };
 
@@ -689,6 +687,10 @@ static bool is_valleyview(void)
         return true;
 }
 
+struct acpi_chan_package {   /* ACPICA seems to require 64 bit integers */
+        u64 aif_value;       /* 1: AIF1, 2: AIF2 */
+        u64 mclock_value;    /* usually 25MHz (0x17d7940), ignored */
+};
 
 static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
 {
@@ -698,6 +700,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
         int i;
         int dai_index;
         struct byt_rt5640_private *priv;
+        bool is_bytcr = false;
 
         priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_ATOMIC);
         if (!priv)
@@ -734,10 +737,61 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
                 struct sst_platform_info *p_info = mach->pdata;
                 const struct sst_res_info *res_info = p_info->res_info;
 
-                /* TODO: use CHAN package info from BIOS to detect AIF1/AIF2 */
-                if (res_info->acpi_ipc_irq_index == 0) {
+                if (res_info->acpi_ipc_irq_index == 0)
+                        is_bytcr = true;
+        }
+
+        if (is_bytcr) {
+                /*
+                 * Baytrail CR platforms may have CHAN package in BIOS, try
+                 * to find relevant routing quirk based as done on Windows
+                 * platforms. We have to read the information directly from the
+                 * BIOS, at this stage the card is not created and the links
+                 * with the codec driver/pdata are non-existent
+                 */
+
+                struct acpi_chan_package chan_package;
+
+                /* format specified: 2 64-bit integers */
+                struct acpi_buffer format = {sizeof("NN"), "NN"};
+                struct acpi_buffer state = {0, NULL};
+                struct sst_acpi_package_context pkg_ctx;
+                bool pkg_found = false;
+
+                state.length = sizeof(chan_package);
+                state.pointer = &chan_package;
+
+                pkg_ctx.name = "CHAN";
+                pkg_ctx.length = 2;
+                pkg_ctx.format = &format;
+                pkg_ctx.state = &state;
+                pkg_ctx.data_valid = false;
+
+                pkg_found = sst_acpi_find_package_from_hid(mach->id, &pkg_ctx);
+                if (pkg_found) {
+                        if (chan_package.aif_value == 1) {
+                                dev_info(&pdev->dev, "BIOS Routing: AIF1 connected\n");
+                                byt_rt5640_quirk |= BYT_RT5640_SSP0_AIF1;
+                        } else  if (chan_package.aif_value == 2) {
+                                dev_info(&pdev->dev, "BIOS Routing: AIF2 connected\n");
+                                byt_rt5640_quirk |= BYT_RT5640_SSP0_AIF2;
+                        } else {
+                                dev_info(&pdev->dev, "BIOS Routing isn't valid, ignored\n");
+                                pkg_found = false;
+                        }
+                }
+
+                if (!pkg_found) {
+                        /* no BIOS indications, assume SSP0-AIF2 connection */
                         byt_rt5640_quirk |= BYT_RT5640_SSP0_AIF2;
                 }
+
+                /* change defaults for Baytrail-CR capture */
+                byt_rt5640_quirk |= BYT_RT5640_IN1_MAP;
+                byt_rt5640_quirk |= BYT_RT5640_DIFF_MIC;
+        } else {
+                byt_rt5640_quirk |= (BYT_RT5640_DMIC1_MAP |
+                                BYT_RT5640_DMIC_EN);
         }
 
         /* check quirks before creating card */
diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index 35f591eab3c9..2d24dc04b597 100644
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -219,11 +219,11 @@ static int byt_rt5651_aif1_startup(struct snd_pcm_substream *substream)
                         &constraints_48000);
 }
 
-static struct snd_soc_ops byt_rt5651_aif1_ops = {
+static const struct snd_soc_ops byt_rt5651_aif1_ops = {
         .startup = byt_rt5651_aif1_startup,
 };
 
-static struct snd_soc_ops byt_rt5651_be_ssp2_ops = {
+static const struct snd_soc_ops byt_rt5651_be_ssp2_ops = {
         .hw_params = byt_rt5651_aif1_hw_params,
 };
 
diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
index cdcced9f32b6..742bc0d4e681 100644
--- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c
+++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
@@ -204,11 +204,11 @@ static int cht_max98090_headset_init(struct snd_soc_component *component)
         return ts3a227e_enable_jack_detect(component, &ctx->jack);
 }
 
-static struct snd_soc_ops cht_aif1_ops = {
+static const struct snd_soc_ops cht_aif1_ops = {
         .startup = cht_aif1_startup,
 };
 
-static struct snd_soc_ops cht_be_ssp2_ops = {
+static const struct snd_soc_ops cht_be_ssp2_ops = {
         .hw_params = cht_aif1_hw_params,
 };
 
diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c
index 56056ed7fcfd..f504a0e18f91 100644
--- a/sound/soc/intel/boards/cht_bsw_rt5645.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5645.c
@@ -44,6 +44,7 @@ struct cht_acpi_card {
 struct cht_mc_private {
         struct snd_soc_jack jack;
         struct cht_acpi_card *acpi_card;
+        char codec_name[16];
 };
 
 static inline struct snd_soc_dai *cht_get_codec_dai(struct snd_soc_card *card)
@@ -250,11 +251,11 @@ static int cht_aif1_startup(struct snd_pcm_substream *substream)
                         SNDRV_PCM_HW_PARAM_RATE, 48000);
 }
 
-static struct snd_soc_ops cht_aif1_ops = {
+static const struct snd_soc_ops cht_aif1_ops = {
         .startup = cht_aif1_startup,
 };
 
-static struct snd_soc_ops cht_be_ssp2_ops = {
+static const struct snd_soc_ops cht_be_ssp2_ops = {
         .hw_params = cht_aif1_hw_params,
 };
 
@@ -354,7 +355,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
         int i;
         struct cht_mc_private *drv;
         struct snd_soc_card *card = snd_soc_cards[0].soc_card;
-        char codec_name[16];
         struct sst_acpi_mach *mach;
         const char *i2c_name = NULL;
         int dai_index = 0;
@@ -374,12 +374,12 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
         }
         card->dev = &pdev->dev;
         mach = card->dev->platform_data;
-        sprintf(codec_name, "i2c-%s:00", drv->acpi_card->codec_id);
+        sprintf(drv->codec_name, "i2c-%s:00", drv->acpi_card->codec_id);
 
         /* set correct codec name */
         for (i = 0; i < ARRAY_SIZE(cht_dailink); i++)
                 if (!strcmp(card->dai_link[i].codec_name, "i2c-10EC5645:00")) {
-                        card->dai_link[i].codec_name = kstrdup(codec_name, GFP_KERNEL);
+                        card->dai_link[i].codec_name = drv->codec_name;
                         dai_index = i;
                 }
 
diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
index df9d254baa18..e4d46d4360d7 100644
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -25,12 +25,14 @@
 #include <sound/jack.h>
 #include "../../codecs/rt5670.h"
 #include "../atom/sst-atom-controls.h"
+#include "../common/sst-acpi.h"
 
 /* The platform clock #3 outputs 19.2Mhz clock to codec as I2S MCLK */
 #define CHT_PLAT_CLK_3_HZ       19200000
 #define CHT_CODEC_DAI   "rt5670-aif1"
 
 static struct snd_soc_jack cht_bsw_headset;
+static char cht_bsw_codec_name[16];
 
 /* Headset jack detection DAPM pins */
 static struct snd_soc_jack_pin cht_bsw_headset_pins[] = {
@@ -225,11 +227,11 @@ static int cht_aif1_startup(struct snd_pcm_substream *substream)
                         SNDRV_PCM_HW_PARAM_RATE, 48000);
 }
 
-static struct snd_soc_ops cht_aif1_ops = {
+static const struct snd_soc_ops cht_aif1_ops = {
         .startup = cht_aif1_startup,
 };
 
-static struct snd_soc_ops cht_be_ssp2_ops = {
+static const struct snd_soc_ops cht_be_ssp2_ops = {
         .hw_params = cht_aif1_hw_params,
 };
 
@@ -292,10 +294,12 @@ static struct snd_soc_dai_link cht_dailink[] = {
 
 static int cht_suspend_pre(struct snd_soc_card *card)
 {
-        struct snd_soc_codec *codec;
+        struct snd_soc_component *component;
+
+        list_for_each_entry(component, &card->component_dev_list, card_list) {
+                if (!strcmp(component->name, "i2c-10EC5670:00")) {
+                        struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 
-        list_for_each_entry(codec, &card->codec_dev_list, card_list) {
-                if (!strcmp(codec->component.name, "i2c-10EC5670:00")) {
                         dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n");
                         rt5670_jack_suspend(codec);
                         break;
@@ -306,10 +310,12 @@ static int cht_suspend_pre(struct snd_soc_card *card)
 
 static int cht_resume_post(struct snd_soc_card *card)
 {
-        struct snd_soc_codec *codec;
+        struct snd_soc_component *component;
+
+        list_for_each_entry(component, &card->component_dev_list, card_list) {
+                if (!strcmp(component->name, "i2c-10EC5670:00")) {
+                        struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
 
-        list_for_each_entry(codec, &card->codec_dev_list, card_list) {
-                if (!strcmp(codec->component.name, "i2c-10EC5670:00")) {
                         dev_dbg(codec->dev, "enabling jack detect for resume.\n");
                         rt5670_jack_resume(codec);
                         break;
@@ -335,9 +341,33 @@ static struct snd_soc_card snd_soc_card_cht = {
         .resume_post = cht_resume_post,
 };
 
+#define RT5672_I2C_DEFAULT      "i2c-10EC5670:00"
+
 static int snd_cht_mc_probe(struct platform_device *pdev)
 {
         int ret_val = 0;
+        struct sst_acpi_mach *mach = pdev->dev.platform_data;
+        const char *i2c_name;
+        int i;
+
+        strcpy(cht_bsw_codec_name, RT5672_I2C_DEFAULT);
+
+        /* fixup codec name based on HID */
+        if (mach) {
+                i2c_name = sst_acpi_find_name_from_hid(mach->id);
+                if (i2c_name) {
+                        snprintf(cht_bsw_codec_name, sizeof(cht_bsw_codec_name),
+                                 "i2c-%s", i2c_name);
+                        for (i = 0; i < ARRAY_SIZE(cht_dailink); i++) {
+                                if (!strcmp(cht_dailink[i].codec_name,
+                                            RT5672_I2C_DEFAULT)) {
+                                        cht_dailink[i].codec_name =
+                                                cht_bsw_codec_name;
+                                        break;
+                                }
+                        }
+                }
+        }
 
         /* register the soc card */
         snd_soc_card_cht.dev = &pdev->dev;
diff --git a/sound/soc/intel/boards/haswell.c b/sound/soc/intel/boards/haswell.c
index 863f1d5e2a2c..5e1ea0371c90 100644
--- a/sound/soc/intel/boards/haswell.c
+++ b/sound/soc/intel/boards/haswell.c
@@ -81,7 +81,7 @@ static int haswell_rt5640_hw_params(struct snd_pcm_substream *substream,
         return ret;
 }
 
-static struct snd_soc_ops haswell_rt5640_ops = {
+static const struct snd_soc_ops haswell_rt5640_ops = {
         .hw_params = haswell_rt5640_hw_params,
 };
 
diff --git a/sound/soc/intel/boards/mfld_machine.c b/sound/soc/intel/boards/mfld_machine.c
index 34f46c72a0e2..4e08885f37aa 100644
--- a/sound/soc/intel/boards/mfld_machine.c
+++ b/sound/soc/intel/boards/mfld_machine.c
@@ -81,9 +81,9 @@ static struct snd_soc_jack_zone mfld_zones[] = {
 };
 
 /* sound card controls */
-static const char *headset_switch_text[] = {"Earpiece", "Headset"};
+static const char * const headset_switch_text[] = {"Earpiece", "Headset"};
 
-static const char *lo_text[] = {"Vibra", "Headset", "IHF", "None"};
+static const char * const lo_text[] = {"Vibra", "Headset", "IHF", "None"};
 
 static const struct soc_enum headset_enum =
         SOC_ENUM_SINGLE_EXT(2, headset_switch_text);
diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
index 25db5be7fdfa..fddd1cd12f13 100644
--- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c
+++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
@@ -332,7 +332,7 @@ static int skylake_nau8825_hw_params(struct snd_pcm_substream *substream,
         return ret;
 }
 
-static struct snd_soc_ops skylake_nau8825_ops = {
+static const struct snd_soc_ops skylake_nau8825_ops = {
         .hw_params = skylake_nau8825_hw_params,
 };
 
@@ -382,7 +382,7 @@ static int skylake_dmic_startup(struct snd_pcm_substream *substream)
                         SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
 }
 
-static struct snd_soc_ops skylake_dmic_ops = {
+static const struct snd_soc_ops skylake_dmic_ops = {
         .startup = skylake_dmic_startup,
 };
 
@@ -416,7 +416,7 @@ static int skylake_refcap_startup(struct snd_pcm_substream *substream)
                                 &constraints_16000);
 }
 
-static struct snd_soc_ops skylaye_refcap_ops = {
+static const struct snd_soc_ops skylaye_refcap_ops = {
         .startup = skylake_refcap_startup,
 };
 
diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
index 69c5d5da4e86..8ab865ee0cad 100644
--- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
+++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
@@ -394,7 +394,7 @@ static int skylake_nau8825_hw_params(struct snd_pcm_substream *substream,
         return ret;
 }
 
-static struct snd_soc_ops skylake_nau8825_ops = {
+static const struct snd_soc_ops skylake_nau8825_ops = {
         .hw_params = skylake_nau8825_hw_params,
 };
 
@@ -430,7 +430,7 @@ static int skylake_dmic_startup(struct snd_pcm_substream *substream)
                         SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
 }
 
-static struct snd_soc_ops skylake_dmic_ops = {
+static const struct snd_soc_ops skylake_dmic_ops = {
         .startup = skylake_dmic_startup,
 };
 
@@ -464,7 +464,7 @@ static int skylake_refcap_startup(struct snd_pcm_substream *substream)
                         &constraints_16000);
 }
 
-static struct snd_soc_ops skylaye_refcap_ops = {
+static const struct snd_soc_ops skylaye_refcap_ops = {
         .startup = skylake_refcap_startup,
 };
 
diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c
index 88c61e8cb87f..dc5c3611a6ff 100644
--- a/sound/soc/intel/boards/skl_rt286.c
+++ b/sound/soc/intel/boards/skl_rt286.c
@@ -250,7 +250,7 @@ static int skylake_rt286_hw_params(struct snd_pcm_substream *substream,
         return ret;
 }
 
-static struct snd_soc_ops skylake_rt286_ops = {
+static const struct snd_soc_ops skylake_rt286_ops = {
         .hw_params = skylake_rt286_hw_params,
 };
 
@@ -289,7 +289,7 @@ static int skylake_dmic_startup(struct snd_pcm_substream *substream)
                         SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
 }
 
-static struct snd_soc_ops skylake_dmic_ops = {
+static const struct snd_soc_ops skylake_dmic_ops = {
         .startup = skylake_dmic_startup,
 };
 
diff --git a/sound/soc/intel/common/sst-acpi.h b/sound/soc/intel/common/sst-acpi.h
index 012742299dd5..214e000667ae 100644
--- a/sound/soc/intel/common/sst-acpi.h
+++ b/sound/soc/intel/common/sst-acpi.h
@@ -15,14 +15,29 @@
 #include <linux/stddef.h>
 #include <linux/acpi.h>
 
-/* translation fron HID to I2C name, needed for DAI codec_name */
+struct sst_acpi_package_context {
+        char *name;           /* package name */
+        int length;           /* number of elements */
+        struct acpi_buffer *format;
+        struct acpi_buffer *state;
+        bool data_valid;
+};
+
 #if IS_ENABLED(CONFIG_ACPI)
+/* translation fron HID to I2C name, needed for DAI codec_name */
 const char *sst_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN]);
+bool sst_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],
+                                    struct sst_acpi_package_context *ctx);
 #else
 static inline const char *sst_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN])
 {
         return NULL;
 }
+static inline bool sst_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],
+                                           struct sst_acpi_package_context *ctx)
+{
+        return false;
+}
 #endif
 
 /* acpi match */
diff --git a/sound/soc/intel/common/sst-ipc.c b/sound/soc/intel/common/sst-ipc.c
index 6c672ac79cce..62f3a8e0ec87 100644
--- a/sound/soc/intel/common/sst-ipc.c
+++ b/sound/soc/intel/common/sst-ipc.c
@@ -26,7 +26,6 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
-#include <linux/kthread.h>
 #include <sound/asound.h>
 
 #include "sst-dsp.h"
@@ -109,10 +108,9 @@ static int ipc_tx_message(struct sst_generic_ipc *ipc, u64 header,
                 ipc->ops.tx_data_copy(msg, tx_data, tx_bytes);
 
         list_add_tail(&msg->list, &ipc->tx_list);
+        schedule_work(&ipc->kwork);
         spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
 
-        kthread_queue_work(&ipc->kworker, &ipc->kwork);
-
         if (wait)
                 return tx_wait_done(ipc, msg, rx_data);
         else
@@ -156,42 +154,56 @@ free_mem:
         return -ENOMEM;
 }
 
-static void ipc_tx_msgs(struct kthread_work *work)
+static void ipc_tx_msgs(struct work_struct *work)
 {
         struct sst_generic_ipc *ipc =
                 container_of(work, struct sst_generic_ipc, kwork);
         struct ipc_message *msg;
-        unsigned long flags;
 
-        spin_lock_irqsave(&ipc->dsp->spinlock, flags);
+        spin_lock_irq(&ipc->dsp->spinlock);
 
-        if (list_empty(&ipc->tx_list) || ipc->pending) {
-                spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
-                return;
-        }
-
-        /* if the DSP is busy, we will TX messages after IRQ.
-         * also postpone if we are in the middle of procesing completion irq*/
-        if (ipc->ops.is_dsp_busy && ipc->ops.is_dsp_busy(ipc->dsp)) {
-                dev_dbg(ipc->dev, "ipc_tx_msgs dsp busy\n");
-                spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
-                return;
-        }
+        while (!list_empty(&ipc->tx_list) && !ipc->pending) {
+                /* if the DSP is busy, we will TX messages after IRQ.
+                 * also postpone if we are in the middle of processing
+                 * completion irq
+                 */
+                if (ipc->ops.is_dsp_busy && ipc->ops.is_dsp_busy(ipc->dsp)) {
+                        dev_dbg(ipc->dev, "ipc_tx_msgs dsp busy\n");
+                        break;
+                }
 
-        msg = list_first_entry(&ipc->tx_list, struct ipc_message, list);
-        list_move(&msg->list, &ipc->rx_list);
+                msg = list_first_entry(&ipc->tx_list, struct ipc_message, list);
+                list_move(&msg->list, &ipc->rx_list);
 
-        if (ipc->ops.tx_msg != NULL)
-                ipc->ops.tx_msg(ipc, msg);
+                if (ipc->ops.tx_msg != NULL)
+                        ipc->ops.tx_msg(ipc, msg);
+        }
 
-        spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
+        spin_unlock_irq(&ipc->dsp->spinlock);
 }
 
 int sst_ipc_tx_message_wait(struct sst_generic_ipc *ipc, u64 header,
         void *tx_data, size_t tx_bytes, void *rx_data, size_t rx_bytes)
 {
-        return ipc_tx_message(ipc, header, tx_data, tx_bytes,
+        int ret;
+
+        /*
+         * DSP maybe in lower power active state, so
+         * check if the DSP supports DSP lp On method
+         * if so invoke that before sending IPC
+         */
+        if (ipc->ops.check_dsp_lp_on)
+                if (ipc->ops.check_dsp_lp_on(ipc->dsp, true))
+                        return -EIO;
+
+        ret = ipc_tx_message(ipc, header, tx_data, tx_bytes,
                 rx_data, rx_bytes, 1);
+
+        if (ipc->ops.check_dsp_lp_on)
+                if (ipc->ops.check_dsp_lp_on(ipc->dsp, false))
+                        return -EIO;
+
+        return ret;
 }
 EXPORT_SYMBOL_GPL(sst_ipc_tx_message_wait);
 
@@ -203,6 +215,14 @@ int sst_ipc_tx_message_nowait(struct sst_generic_ipc *ipc, u64 header,
 }
 EXPORT_SYMBOL_GPL(sst_ipc_tx_message_nowait);
 
+int sst_ipc_tx_message_nopm(struct sst_generic_ipc *ipc, u64 header,
+        void *tx_data, size_t tx_bytes, void *rx_data, size_t rx_bytes)
+{
+        return ipc_tx_message(ipc, header, tx_data, tx_bytes,
+                rx_data, rx_bytes, 1);
+}
+EXPORT_SYMBOL_GPL(sst_ipc_tx_message_nopm);
+
 struct ipc_message *sst_ipc_reply_find_msg(struct sst_generic_ipc *ipc,
         u64 header)
 {
@@ -280,19 +300,7 @@ int sst_ipc_init(struct sst_generic_ipc *ipc)
         if (ret < 0)
                 return -ENOMEM;
 
-        /* start the IPC message thread */
-        kthread_init_worker(&ipc->kworker);
-        ipc->tx_thread = kthread_run(kthread_worker_fn,
-                                        &ipc->kworker, "%s",
-                                        dev_name(ipc->dev));
-        if (IS_ERR(ipc->tx_thread)) {
-                dev_err(ipc->dev, "error: failed to create message TX task\n");
-                ret = PTR_ERR(ipc->tx_thread);
-                kfree(ipc->msg);
-                return ret;
-        }
-
-        kthread_init_work(&ipc->kwork, ipc_tx_msgs);
+        INIT_WORK(&ipc->kwork, ipc_tx_msgs);
         return 0;
 }
 EXPORT_SYMBOL_GPL(sst_ipc_init);
@@ -301,8 +309,7 @@ void sst_ipc_fini(struct sst_generic_ipc *ipc)
 {
         int i;
 
-        if (ipc->tx_thread)
-                kthread_stop(ipc->tx_thread);
+        cancel_work_sync(&ipc->kwork);
 
         if (ipc->msg) {
                 for (i = 0; i < IPC_EMPTY_LIST_SIZE; i++) {
diff --git a/sound/soc/intel/common/sst-ipc.h b/sound/soc/intel/common/sst-ipc.h
index ceb7e468a3fa..7ed42a640ad6 100644
--- a/sound/soc/intel/common/sst-ipc.h
+++ b/sound/soc/intel/common/sst-ipc.h
@@ -23,7 +23,6 @@
 #include <linux/list.h>
 #include <linux/workqueue.h>
 #include <linux/sched.h>
-#include <linux/kthread.h>
 
 #define IPC_MAX_MAILBOX_BYTES   256
 
@@ -52,6 +51,7 @@ struct sst_plat_ipc_ops {
         void (*tx_data_copy)(struct ipc_message *, char *, size_t);
         u64  (*reply_msg_match)(u64 header, u64 *mask);
         bool (*is_dsp_busy)(struct sst_dsp *dsp);
+        int (*check_dsp_lp_on)(struct sst_dsp *dsp, bool state);
 };
 
 /* SST generic IPC data */
@@ -65,8 +65,7 @@ struct sst_generic_ipc {
         struct list_head empty_list;
         wait_queue_head_t wait_txq;
         struct task_struct *tx_thread;
-        struct kthread_worker kworker;
-        struct kthread_work kwork;
+        struct work_struct kwork;
         bool pending;
         struct ipc_message *msg;
         int tx_data_max_size;
@@ -81,6 +80,9 @@ int sst_ipc_tx_message_wait(struct sst_generic_ipc *ipc, u64 header,
 int sst_ipc_tx_message_nowait(struct sst_generic_ipc *ipc, u64 header,
         void *tx_data, size_t tx_bytes);
 
+int sst_ipc_tx_message_nopm(struct sst_generic_ipc *ipc, u64 header,
+        void *tx_data, size_t tx_bytes, void *rx_data, size_t rx_bytes);
+
 struct ipc_message *sst_ipc_reply_find_msg(struct sst_generic_ipc *ipc,
         u64 header);
 
diff --git a/sound/soc/intel/common/sst-match-acpi.c b/sound/soc/intel/common/sst-match-acpi.c
index 789843307a49..1070f3ad23e5 100644
--- a/sound/soc/intel/common/sst-match-acpi.c
+++ b/sound/soc/intel/common/sst-match-acpi.c
@@ -77,5 +77,62 @@ struct sst_acpi_mach *sst_acpi_find_machine(struct sst_acpi_mach *machines)
 }
 EXPORT_SYMBOL_GPL(sst_acpi_find_machine);
 
+static acpi_status sst_acpi_find_package(acpi_handle handle, u32 level,
+                                        void *context, void **ret)
+{
+        struct acpi_device *adev;
+        acpi_status status = AE_OK;
+        struct sst_acpi_package_context *pkg_ctx = context;
+
+        pkg_ctx->data_valid = false;
+
+        if (acpi_bus_get_device(handle, &adev))
+                return AE_OK;
+
+        if (adev->status.present && adev->status.functional) {
+                struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+                union acpi_object  *myobj = NULL;
+
+                status = acpi_evaluate_object_typed(handle, pkg_ctx->name,
+                                                NULL, &buffer,
+                                                ACPI_TYPE_PACKAGE);
+                if (ACPI_FAILURE(status))
+                        return AE_OK;
+
+                myobj = buffer.pointer;
+                if (!myobj || myobj->package.count != pkg_ctx->length) {
+                        kfree(buffer.pointer);
+                        return AE_OK;
+                }
+
+                status = acpi_extract_package(myobj,
+                                        pkg_ctx->format, pkg_ctx->state);
+                if (ACPI_FAILURE(status)) {
+                        kfree(buffer.pointer);
+                        return AE_OK;
+                }
+
+                kfree(buffer.pointer);
+                pkg_ctx->data_valid = true;
+                return AE_CTRL_TERMINATE;
+        }
+
+        return AE_OK;
+}
+
+bool sst_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],
+                                struct sst_acpi_package_context *ctx)
+{
+        acpi_status status;
+
+        status = acpi_get_devices(hid, sst_acpi_find_package, ctx, NULL);
+
+        if (ACPI_FAILURE(status) || !ctx->data_valid)
+                return false;
+
+        return true;
+}
+EXPORT_SYMBOL_GPL(sst_acpi_find_package_from_hid);
+
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Intel Common ACPI Match module");
diff --git a/sound/soc/intel/haswell/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c
index e432a31fd9f2..a3459d1682a6 100644
--- a/sound/soc/intel/haswell/sst-haswell-ipc.c
+++ b/sound/soc/intel/haswell/sst-haswell-ipc.c
@@ -26,7 +26,6 @@
 #include <linux/delay.h>
 #include <linux/sched.h>
 #include <linux/platform_device.h>
-#include <linux/kthread.h>
 #include <linux/firmware.h>
 #include <linux/dma-mapping.h>
 #include <linux/debugfs.h>
@@ -818,7 +817,7 @@ static irqreturn_t hsw_irq_thread(int irq, void *context)
         spin_unlock_irqrestore(&sst->spinlock, flags);
 
         /* continue to send any remaining messages... */
-        kthread_queue_work(&ipc->kworker, &ipc->kwork);
+        schedule_work(&ipc->kwork);
 
         return IRQ_HANDLED;
 }
diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c
index 1d251d59bcb9..1f9f33d34000 100644
--- a/sound/soc/intel/skylake/bxt-sst.c
+++ b/sound/soc/intel/skylake/bxt-sst.c
@@ -43,6 +43,9 @@
 
 #define BXT_ADSP_FW_BIN_HDR_OFFSET 0x2000
 
+/* Delay before scheduling D0i3 entry */
+#define BXT_D0I3_DELAY 5000
+
 static unsigned int bxt_get_errorcode(struct sst_dsp *ctx)
 {
          return sst_dsp_shim_read(ctx, BXT_ADSP_ERROR_CODE);
@@ -288,6 +291,141 @@ sst_load_base_firmware_failed:
         return ret;
 }
 
+/*
+ * Decide the D0i3 state that can be targeted based on the usecase
+ * ref counts and DSP state
+ *
+ * Decision Matrix:  (X= dont care; state = target state)
+ *
+ * DSP state != SKL_DSP_RUNNING ; state = no d0i3
+ *
+ * DSP state == SKL_DSP_RUNNING , the following matrix applies
+ * non_d0i3 >0; streaming =X; non_streaming =X; state = no d0i3
+ * non_d0i3 =X; streaming =0; non_streaming =0; state = no d0i3
+ * non_d0i3 =0; streaming >0; non_streaming =X; state = streaming d0i3
+ * non_d0i3 =0; streaming =0; non_streaming =X; state = non-streaming d0i3
+ */
+static int bxt_d0i3_target_state(struct sst_dsp *ctx)
+{
+        struct skl_sst *skl = ctx->thread_context;
+        struct skl_d0i3_data *d0i3 = &skl->d0i3;
+
+        if (skl->cores.state[SKL_DSP_CORE0_ID] != SKL_DSP_RUNNING)
+                return SKL_DSP_D0I3_NONE;
+
+        if (d0i3->non_d0i3)
+                return SKL_DSP_D0I3_NONE;
+        else if (d0i3->streaming)
+                return SKL_DSP_D0I3_STREAMING;
+        else if (d0i3->non_streaming)
+                return SKL_DSP_D0I3_NON_STREAMING;
+        else
+                return SKL_DSP_D0I3_NONE;
+}
+
+static void bxt_set_dsp_D0i3(struct work_struct *work)
+{
+        int ret;
+        struct skl_ipc_d0ix_msg msg;
+        struct skl_sst *skl = container_of(work,
+                        struct skl_sst, d0i3.work.work);
+        struct sst_dsp *ctx = skl->dsp;
+        struct skl_d0i3_data *d0i3 = &skl->d0i3;
+        int target_state;
+
+        dev_dbg(ctx->dev, "In %s:\n", __func__);
+
+        /* D0i3 entry allowed only if core 0 alone is running */
+        if (skl_dsp_get_enabled_cores(ctx) !=  SKL_DSP_CORE0_MASK) {
+                dev_warn(ctx->dev,
+                                "D0i3 allowed when only core0 running:Exit\n");
+                return;
+        }
+
+        target_state = bxt_d0i3_target_state(ctx);
+        if (target_state == SKL_DSP_D0I3_NONE)
+                return;
+
+        msg.instance_id = 0;
+        msg.module_id = 0;
+        msg.wake = 1;
+        msg.streaming = 0;
+        if (target_state == SKL_DSP_D0I3_STREAMING)
+                msg.streaming = 1;
+
+        ret =  skl_ipc_set_d0ix(&skl->ipc, &msg);
+
+        if (ret < 0) {
+                dev_err(ctx->dev, "Failed to set DSP to D0i3 state\n");
+                return;
+        }
+
+        /* Set Vendor specific register D0I3C.I3 to enable D0i3*/
+        if (skl->update_d0i3c)
+                skl->update_d0i3c(skl->dev, true);
+
+        d0i3->state = target_state;
+        skl->cores.state[SKL_DSP_CORE0_ID] = SKL_DSP_RUNNING_D0I3;
+}
+
+static int bxt_schedule_dsp_D0i3(struct sst_dsp *ctx)
+{
+        struct skl_sst *skl = ctx->thread_context;
+        struct skl_d0i3_data *d0i3 = &skl->d0i3;
+
+        /* Schedule D0i3 only if the usecase ref counts are appropriate */
+        if (bxt_d0i3_target_state(ctx) != SKL_DSP_D0I3_NONE) {
+
+                dev_dbg(ctx->dev, "%s: Schedule D0i3\n", __func__);
+
+                schedule_delayed_work(&d0i3->work,
+                                msecs_to_jiffies(BXT_D0I3_DELAY));
+        }
+
+        return 0;
+}
+
+static int bxt_set_dsp_D0i0(struct sst_dsp *ctx)
+{
+        int ret;
+        struct skl_ipc_d0ix_msg msg;
+        struct skl_sst *skl = ctx->thread_context;
+
+        dev_dbg(ctx->dev, "In %s:\n", __func__);
+
+        /* First Cancel any pending attempt to put DSP to D0i3 */
+        cancel_delayed_work_sync(&skl->d0i3.work);
+
+        /* If DSP is currently in D0i3, bring it to D0i0 */
+        if (skl->cores.state[SKL_DSP_CORE0_ID] != SKL_DSP_RUNNING_D0I3)
+                return 0;
+
+        dev_dbg(ctx->dev, "Set DSP to D0i0\n");
+
+        msg.instance_id = 0;
+        msg.module_id = 0;
+        msg.streaming = 0;
+        msg.wake = 0;
+
+        if (skl->d0i3.state == SKL_DSP_D0I3_STREAMING)
+                msg.streaming = 1;
+
+        /* Clear Vendor specific register D0I3C.I3 to disable D0i3*/
+        if (skl->update_d0i3c)
+                skl->update_d0i3c(skl->dev, false);
+
+        ret =  skl_ipc_set_d0ix(&skl->ipc, &msg);
+        if (ret < 0) {
+                dev_err(ctx->dev, "Failed to set DSP to D0i0\n");
+                return ret;
+        }
+
+        skl->cores.state[SKL_DSP_CORE0_ID] = SKL_DSP_RUNNING;
+        skl->d0i3.state = SKL_DSP_D0I3_NONE;
+
+        return 0;
+}
+
 static int bxt_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id)
 {
         struct skl_sst *skl = ctx->thread_context;
@@ -414,6 +552,8 @@ static int bxt_set_dsp_D3(struct sst_dsp *ctx, unsigned int core_id)
 static struct skl_dsp_fw_ops bxt_fw_ops = {
         .set_state_D0 = bxt_set_dsp_D0,
         .set_state_D3 = bxt_set_dsp_D3,
+        .set_state_D0i3 = bxt_schedule_dsp_D0i3,
+        .set_state_D0i0 = bxt_set_dsp_D0i0,
         .load_fw = bxt_load_base_firmware,
         .get_fw_errcode = bxt_get_errorcode,
         .load_library = bxt_load_library,
@@ -470,10 +610,15 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,
         if (ret)
                 return ret;
 
+        /* set the D0i3 check */
+        skl->ipc.ops.check_dsp_lp_on = skl_ipc_check_D0i0;
+
         skl->cores.count = 2;
         skl->boot_complete = false;
         init_waitqueue_head(&skl->boot_wait);
         skl->is_first_boot = true;
+        INIT_DELAYED_WORK(&skl->d0i3.work, bxt_set_dsp_D0i3);
+        skl->d0i3.state = SKL_DSP_D0I3_NONE;
 
         if (dsp)
                 *dsp = skl;
diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
index 805b7f2173f3..e79cbcf6e462 100644
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
@@ -294,6 +294,33 @@ int skl_free_dsp(struct skl *skl)
         return 0;
 }
 
+/*
+ * In the case of "suspend_active" i.e, the Audio IP being active
+ * during system suspend, immediately excecute any pending D0i3 work
+ * before suspending. This is needed for the IP to work in low power
+ * mode during system suspend. In the case of normal suspend, cancel
+ * any pending D0i3 work.
+ */
+int skl_suspend_late_dsp(struct skl *skl)
+{
+        struct skl_sst *ctx = skl->skl_sst;
+        struct delayed_work *dwork;
+
+        if (!ctx)
+                return 0;
+
+        dwork = &ctx->d0i3.work;
+
+        if (dwork->work.func) {
+                if (skl->supend_active)
+                        flush_delayed_work(dwork);
+                else
+                        cancel_delayed_work_sync(dwork);
+        }
+
+        return 0;
+}
+
 int skl_suspend_dsp(struct skl *skl)
 {
         struct skl_sst *ctx = skl->skl_sst;
@@ -500,16 +527,14 @@ static void skl_setup_cpr_gateway_cfg(struct skl_sst *ctx,
 int skl_dsp_set_dma_control(struct skl_sst *ctx, struct skl_module_cfg *mconfig)
 {
         struct skl_dma_control *dma_ctrl;
-        struct skl_i2s_config_blob config_blob;
         struct skl_ipc_large_config_msg msg = {0};
         int err = 0;
 
 
         /*
-         * if blob size is same as capablity size, then no dma control
-         * present so return
+         * if blob size zero, then return
          */
-        if (mconfig->formats_config.caps_size == sizeof(config_blob))
+        if (mconfig->formats_config.caps_size == 0)
                 return 0;
 
         msg.large_param_id = DMA_CONTROL_ID;
@@ -523,7 +548,7 @@ int skl_dsp_set_dma_control(struct skl_sst *ctx, struct skl_module_cfg *mconfig)
         dma_ctrl->node_id = skl_get_node_id(ctx, mconfig);
 
         /* size in dwords */
-        dma_ctrl->config_length = sizeof(config_blob) / 4;
+        dma_ctrl->config_length = mconfig->formats_config.caps_size / 4;
 
         memcpy(dma_ctrl->config_data, mconfig->formats_config.caps,
                                 mconfig->formats_config.caps_size);
@@ -531,7 +556,6 @@ int skl_dsp_set_dma_control(struct skl_sst *ctx, struct skl_module_cfg *mconfig)
         err = skl_ipc_set_large_config(&ctx->ipc, &msg, (u32 *)dma_ctrl);
 
         kfree(dma_ctrl);
-
         return err;
 }
 
@@ -1042,7 +1066,8 @@ int skl_create_pipeline(struct skl_sst *ctx, struct skl_pipe *pipe)
         dev_dbg(ctx->dev, "%s: pipe_id = %d\n", __func__, pipe->ppl_id);
 
         ret = skl_ipc_create_pipeline(&ctx->ipc, pipe->memory_pages,
-                                pipe->pipe_priority, pipe->ppl_id);
+                                pipe->pipe_priority, pipe->ppl_id,
+                                pipe->lp_mode);
         if (ret < 0) {
                 dev_err(ctx->dev, "Failed to create pipeline\n");
                 return ret;
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index 58c728662600..84b5101e6ca6 100644
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -144,6 +144,8 @@ static int skl_pcm_open(struct snd_pcm_substream *substream,
         struct hdac_ext_stream *stream;
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct skl_dma_params *dma_params;
+        struct skl *skl = get_skl_ctx(dai->dev);
+        struct skl_module_cfg *mconfig;
 
         dev_dbg(dai->dev, "%s: %s\n", __func__, dai->name);
 
@@ -177,6 +179,9 @@ static int skl_pcm_open(struct snd_pcm_substream *substream,
         skl_set_suspend_active(substream, dai, true);
         snd_pcm_set_sync(substream);
 
+        mconfig = skl_tplg_fe_get_cpr_module(dai, substream->stream);
+        skl_tplg_d0i3_get(skl, mconfig->d0i3_caps);
+
         return 0;
 }
 
@@ -302,6 +307,7 @@ static void skl_pcm_close(struct snd_pcm_substream *substream,
         struct hdac_ext_bus *ebus = dev_get_drvdata(dai->dev);
         struct skl_dma_params *dma_params = NULL;
         struct skl *skl = ebus_to_skl(ebus);
+        struct skl_module_cfg *mconfig;
 
         dev_dbg(dai->dev, "%s: %s\n", __func__, dai->name);
 
@@ -325,6 +331,9 @@ static void skl_pcm_close(struct snd_pcm_substream *substream,
                 skl->skl_sst->miscbdcg_disabled = false;
         }
 
+        mconfig = skl_tplg_fe_get_cpr_module(dai, substream->stream);
+        skl_tplg_d0i3_put(skl, mconfig->d0i3_caps);
+
         kfree(dma_params);
 }
 
@@ -1031,10 +1040,24 @@ static snd_pcm_uframes_t skl_platform_pcm_pointer
                         (struct snd_pcm_substream *substream)
 {
         struct hdac_ext_stream *hstream = get_hdac_ext_stream(substream);
+        struct hdac_ext_bus *ebus = get_bus_ctx(substream);
         unsigned int pos;
 
-        /* use the position buffer as default */
-        pos = snd_hdac_stream_get_pos_posbuf(hdac_stream(hstream));
+        /*
+         * Use DPIB for Playback stream as the periodic DMA Position-in-
+         * Buffer Writes may be scheduled at the same time or later than
+         * the MSI and does not guarantee to reflect the Position of the
+         * last buffer that was transferred. Whereas DPIB register in
+         * HAD space reflects the actual data that is transferred.
+         * Use the position buffer for capture, as DPIB write gets
+         * completed earlier than the actual data written to the DDR.
+         */
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                pos = readl(ebus->bus.remap_addr + AZX_REG_VS_SDXDPIB_XBASE +
+                                (AZX_REG_VS_SDXDPIB_XINTERVAL *
+                                hdac_stream(hstream)->index));
+        else
+                pos = snd_hdac_stream_get_pos_posbuf(hdac_stream(hstream));
 
         if (pos >= hdac_stream(hstream)->bufsize)
                 pos = 0;
@@ -1197,6 +1220,7 @@ static int skl_platform_soc_probe(struct snd_soc_platform *platform)
                         return ret;
                 }
                 skl_populate_modules(skl);
+                skl->skl_sst->update_d0i3c = skl_update_d0i3c;
         }
         pm_runtime_mark_last_busy(platform->dev);
         pm_runtime_put_autosuspend(platform->dev);
diff --git a/sound/soc/intel/skylake/skl-sst-cldma.c b/sound/soc/intel/skylake/skl-sst-cldma.c
index efa2532114ba..c9f6d87381db 100644
--- a/sound/soc/intel/skylake/skl-sst-cldma.c
+++ b/sound/soc/intel/skylake/skl-sst-cldma.c
@@ -17,7 +17,6 @@
 
 #include <linux/device.h>
 #include <linux/mm.h>
-#include <linux/kthread.h>
 #include <linux/delay.h>
 #include "../common/sst-dsp.h"
 #include "../common/sst-dsp-priv.h"
diff --git a/sound/soc/intel/skylake/skl-sst-dsp.h b/sound/soc/intel/skylake/skl-sst-dsp.h
index b9e71d051fb1..7c272ba0f4b5 100644
--- a/sound/soc/intel/skylake/skl-sst-dsp.h
+++ b/sound/soc/intel/skylake/skl-sst-dsp.h
@@ -126,11 +126,21 @@ struct sst_dsp_device;
 #define SKL_ADSPCS_CPA_SHIFT            24
 #define SKL_ADSPCS_CPA_MASK(cm)         ((cm) << SKL_ADSPCS_CPA_SHIFT)
 
+/* DSP Core state */
 enum skl_dsp_states {
         SKL_DSP_RUNNING = 1,
+        /* Running in D0i3 state; can be in streaming or non-streaming D0i3 */
+        SKL_DSP_RUNNING_D0I3, /* Running in D0i3 state*/
         SKL_DSP_RESET,
 };
 
+/* D0i3 substates */
+enum skl_dsp_d0i3_states {
+        SKL_DSP_D0I3_NONE = -1, /* No D0i3 */
+        SKL_DSP_D0I3_NON_STREAMING = 0,
+        SKL_DSP_D0I3_STREAMING = 1,
+};
+
 struct skl_dsp_fw_ops {
         int (*load_fw)(struct sst_dsp  *ctx);
         /* FW module parser/loader */
@@ -139,6 +149,8 @@ struct skl_dsp_fw_ops {
         int (*parse_fw)(struct sst_dsp *ctx);
         int (*set_state_D0)(struct sst_dsp *ctx, unsigned int core_id);
         int (*set_state_D3)(struct sst_dsp *ctx, unsigned int core_id);
+        int (*set_state_D0i3)(struct sst_dsp *ctx);
+        int (*set_state_D0i0)(struct sst_dsp *ctx);
         unsigned int (*get_fw_errcode)(struct sst_dsp *ctx);
         int (*load_mod)(struct sst_dsp *ctx, u16 mod_id, u8 *mod_name);
         int (*unload_mod)(struct sst_dsp *ctx, u16 mod_id);
diff --git a/sound/soc/intel/skylake/skl-sst-ipc.c b/sound/soc/intel/skylake/skl-sst-ipc.c
index 797cf4053235..e1391dfbc9e9 100644
--- a/sound/soc/intel/skylake/skl-sst-ipc.c
+++ b/sound/soc/intel/skylake/skl-sst-ipc.c
@@ -81,6 +81,11 @@
 #define IPC_INSTANCE_ID(x)              (((x) & IPC_INSTANCE_ID_MASK) \
                                         << IPC_INSTANCE_ID_SHIFT)
 
+#define IPC_PPL_LP_MODE_SHIFT           0
+#define IPC_PPL_LP_MODE_MASK            0x1
+#define IPC_PPL_LP_MODE(x)              (((x) & IPC_PPL_LP_MODE_MASK) \
+                                        << IPC_PPL_LP_MODE_SHIFT)
+
 /* Set pipeline state message */
 #define IPC_PPL_STATE_SHIFT             0
 #define IPC_PPL_STATE_MASK              0x1F
@@ -172,6 +177,17 @@
                                         << IPC_INITIAL_BLOCK_SHIFT)
 #define IPC_INITIAL_BLOCK_CLEAR         ~(IPC_INITIAL_BLOCK_MASK \
                                           << IPC_INITIAL_BLOCK_SHIFT)
+/* Set D0ix IPC extension register */
+#define IPC_D0IX_WAKE_SHIFT             0
+#define IPC_D0IX_WAKE_MASK              0x1
+#define IPC_D0IX_WAKE(x)                (((x) & IPC_D0IX_WAKE_MASK) \
+                                        << IPC_D0IX_WAKE_SHIFT)
+
+#define IPC_D0IX_STREAMING_SHIFT        1
+#define IPC_D0IX_STREAMING_MASK         0x1
+#define IPC_D0IX_STREAMING(x)           (((x) & IPC_D0IX_STREAMING_MASK) \
+                                        << IPC_D0IX_STREAMING_SHIFT)
+
 
 enum skl_ipc_msg_target {
         IPC_FW_GEN_MSG = 0,
@@ -258,7 +274,8 @@ enum skl_ipc_module_msg {
         IPC_MOD_LARGE_CONFIG_SET = 4,
         IPC_MOD_BIND = 5,
         IPC_MOD_UNBIND = 6,
-        IPC_MOD_SET_DX = 7
+        IPC_MOD_SET_DX = 7,
+        IPC_MOD_SET_D0IX = 8
 };
 
 static void skl_ipc_tx_data_copy(struct ipc_message *msg, char *tx_data,
@@ -289,6 +306,23 @@ static void skl_ipc_tx_msg(struct sst_generic_ipc *ipc, struct ipc_message *msg)
                 header->primary | SKL_ADSP_REG_HIPCI_BUSY);
 }
 
+int skl_ipc_check_D0i0(struct sst_dsp *dsp, bool state)
+{
+        int ret;
+
+        /* check D0i3 support */
+        if (!dsp->fw_ops.set_state_D0i0)
+                return 0;
+
+        /* Attempt D0i0 or D0i3 based on state */
+        if (state)
+                ret = dsp->fw_ops.set_state_D0i0(dsp);
+        else
+                ret = dsp->fw_ops.set_state_D0i3(dsp);
+
+        return ret;
+}
+
 static struct ipc_message *skl_ipc_reply_get_msg(struct sst_generic_ipc *ipc,
                                 u64 ipc_header)
 {
@@ -464,7 +498,7 @@ irqreturn_t skl_dsp_irq_thread_handler(int irq, void *context)
         skl_ipc_int_enable(dsp);
 
         /* continue to send any remaining messages... */
-        kthread_queue_work(&ipc->kworker, &ipc->kwork);
+        schedule_work(&ipc->kwork);
 
         return IRQ_HANDLED;
 }
@@ -547,7 +581,7 @@ void skl_ipc_free(struct sst_generic_ipc *ipc)
 }
 
 int skl_ipc_create_pipeline(struct sst_generic_ipc *ipc,
-                u16 ppl_mem_size, u8 ppl_type, u8 instance_id)
+                u16 ppl_mem_size, u8 ppl_type, u8 instance_id, u8 lp_mode)
 {
         struct skl_ipc_header header = {0};
         u64 *ipc_header = (u64 *)(&header);
@@ -560,6 +594,8 @@ int skl_ipc_create_pipeline(struct sst_generic_ipc *ipc,
         header.primary |= IPC_PPL_TYPE(ppl_type);
         header.primary |= IPC_PPL_MEM_SIZE(ppl_mem_size);
 
+        header.extension = IPC_PPL_LP_MODE(lp_mode);
+
         dev_dbg(ipc->dev, "In %s header=%d\n", __func__, header.primary);
         ret = sst_ipc_tx_message_wait(ipc, *ipc_header, NULL, 0, NULL, 0);
         if (ret < 0) {
@@ -931,3 +967,32 @@ int skl_sst_ipc_load_library(struct sst_generic_ipc *ipc,
         return ret;
 }
 EXPORT_SYMBOL_GPL(skl_sst_ipc_load_library);
+
+int skl_ipc_set_d0ix(struct sst_generic_ipc *ipc, struct skl_ipc_d0ix_msg *msg)
+{
+        struct skl_ipc_header header = {0};
+        u64 *ipc_header = (u64 *)(&header);
+        int ret;
+
+        header.primary = IPC_MSG_TARGET(IPC_MOD_MSG);
+        header.primary |= IPC_MSG_DIR(IPC_MSG_REQUEST);
+        header.primary |= IPC_GLB_TYPE(IPC_MOD_SET_D0IX);
+        header.primary |= IPC_MOD_INSTANCE_ID(msg->instance_id);
+        header.primary |= IPC_MOD_ID(msg->module_id);
+
+        header.extension = IPC_D0IX_WAKE(msg->wake);
+        header.extension |= IPC_D0IX_STREAMING(msg->streaming);
+
+        dev_dbg(ipc->dev, "In %s primary=%x ext=%x\n", __func__,
+                        header.primary, header.extension);
+
+        /*
+         * Use the nopm IPC here as we dont want it checking for D0iX
+         */
+        ret = sst_ipc_tx_message_nopm(ipc, *ipc_header, NULL, 0, NULL, 0);
+        if (ret < 0)
+                dev_err(ipc->dev, "ipc: set d0ix failed, err %d\n", ret);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(skl_ipc_set_d0ix);
diff --git a/sound/soc/intel/skylake/skl-sst-ipc.h b/sound/soc/intel/skylake/skl-sst-ipc.h
index 0334ed4af031..cc40341233fa 100644
--- a/sound/soc/intel/skylake/skl-sst-ipc.h
+++ b/sound/soc/intel/skylake/skl-sst-ipc.h
@@ -16,7 +16,6 @@
 #ifndef __SKL_IPC_H
 #define __SKL_IPC_H
 
-#include <linux/kthread.h>
 #include <linux/irqreturn.h>
 #include "../common/sst-ipc.h"
 
@@ -53,6 +52,23 @@ struct skl_dsp_cores {
         int usage_count[SKL_DSP_CORES_MAX];
 };
 
+/**
+ * skl_d0i3_data: skl D0i3 counters data struct
+ *
+ * @streaming: Count of usecases that can attempt streaming D0i3
+ * @non_streaming: Count of usecases that can attempt non-streaming D0i3
+ * @non_d0i3: Count of usecases that cannot attempt D0i3
+ * @state: current state
+ * @work: D0i3 worker thread
+ */
+struct skl_d0i3_data {
+        int streaming;
+        int non_streaming;
+        int non_d0i3;
+        enum skl_dsp_d0i3_states state;
+        struct delayed_work work;
+};
+
 struct skl_sst {
         struct device *dev;
         struct sst_dsp *dsp;
@@ -83,6 +99,11 @@ struct skl_sst {
 
         /* tplg manifest */
         struct skl_dfw_manifest manifest;
+
+        /* Callback to update D0i3C register */
+        void (*update_d0i3c)(struct device *dev, bool enable);
+
+        struct skl_d0i3_data d0i3;
 };
 
 struct skl_ipc_init_instance_msg {
@@ -111,6 +132,13 @@ struct skl_ipc_large_config_msg {
         u32 param_data_size;
 };
 
+struct skl_ipc_d0ix_msg {
+        u32 module_id;
+        u32 instance_id;
+        u8 streaming;
+        u8 wake;
+};
+
 #define SKL_IPC_BOOT_MSECS              3000
 
 #define SKL_IPC_D3_MASK 0
@@ -119,7 +147,7 @@ struct skl_ipc_large_config_msg {
 irqreturn_t skl_dsp_irq_thread_handler(int irq, void *context);
 
 int skl_ipc_create_pipeline(struct sst_generic_ipc *sst_ipc,
-                u16 ppl_mem_size, u8 ppl_type, u8 instance_id);
+                u16 ppl_mem_size, u8 ppl_type, u8 instance_id, u8 lp_mode);
 
 int skl_ipc_delete_pipeline(struct sst_generic_ipc *sst_ipc, u8 instance_id);
 
@@ -155,6 +183,11 @@ int skl_ipc_get_large_config(struct sst_generic_ipc *ipc,
 int skl_sst_ipc_load_library(struct sst_generic_ipc *ipc,
                         u8 dma_id, u8 table_id);
 
+int skl_ipc_set_d0ix(struct sst_generic_ipc *ipc,
+                struct skl_ipc_d0ix_msg *msg);
+
+int skl_ipc_check_D0i0(struct sst_dsp *dsp, bool state);
+
 void skl_ipc_int_enable(struct sst_dsp *dsp);
 void skl_ipc_op_int_enable(struct sst_dsp *ctx);
 void skl_ipc_op_int_disable(struct sst_dsp *ctx);
diff --git a/sound/soc/intel/skylake/skl-sst-utils.c b/sound/soc/intel/skylake/skl-sst-utils.c
index 8dc03039b311..ea162fbf68e5 100644
--- a/sound/soc/intel/skylake/skl-sst-utils.c
+++ b/sound/soc/intel/skylake/skl-sst-utils.c
@@ -179,7 +179,7 @@ static inline int skl_getid_32(struct uuid_module *module, u64 *val,
                 index = ffz(mask_val);
                 pvt_id = index + word1_mask + word2_mask;
                 if (pvt_id <= (max_inst - 1)) {
-                        *val |= 1 << (index + word1_mask);
+                        *val |= 1ULL << (index + word1_mask);
                         return pvt_id;
                 }
         }
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index b5b1934d8550..bd313c907b20 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -36,6 +36,44 @@
 #define SKL_IN_DIR_BIT_MASK             BIT(0)
 #define SKL_PIN_COUNT_MASK              GENMASK(7, 4)
 
+void skl_tplg_d0i3_get(struct skl *skl, enum d0i3_capability caps)
+{
+        struct skl_d0i3_data *d0i3 =  &skl->skl_sst->d0i3;
+
+        switch (caps) {
+        case SKL_D0I3_NONE:
+                d0i3->non_d0i3++;
+                break;
+
+        case SKL_D0I3_STREAMING:
+                d0i3->streaming++;
+                break;
+
+        case SKL_D0I3_NON_STREAMING:
+                d0i3->non_streaming++;
+                break;
+        }
+}
+
+void skl_tplg_d0i3_put(struct skl *skl, enum d0i3_capability caps)
+{
+        struct skl_d0i3_data *d0i3 =  &skl->skl_sst->d0i3;
+
+        switch (caps) {
+        case SKL_D0I3_NONE:
+                d0i3->non_d0i3--;
+                break;
+
+        case SKL_D0I3_STREAMING:
+                d0i3->streaming--;
+                break;
+
+        case SKL_D0I3_NON_STREAMING:
+                d0i3->non_streaming--;
+                break;
+        }
+}
+
 /*
  * SKL DSP driver modelling uses only few DAPM widgets so for rest we will
  * ignore. This helpers checks if the SKL driver handles this widget type
@@ -1519,6 +1557,10 @@ static int skl_tplg_fill_pipe_tkn(struct device *dev,
                 pipe->memory_pages = tkn_val;
                 break;
 
+        case SKL_TKN_U32_PMODE:
+                pipe->lp_mode = tkn_val;
+                break;
+
         default:
                 dev_err(dev, "Token not handled %d\n", tkn);
                 return -EINVAL;
@@ -1826,6 +1868,10 @@ static int skl_tplg_get_token(struct device *dev,
                 mconfig->converter = tkn_elem->value;
                 break;
 
+        case SKL_TKL_U32_D0I3_CAPS:
+                mconfig->d0i3_caps = tkn_elem->value;
+                break;
+
         case SKL_TKN_U32_PIPE_ID:
                 ret = skl_tplg_add_pipe(dev,
                                 mconfig, skl, tkn_elem);
@@ -1841,6 +1887,7 @@ static int skl_tplg_get_token(struct device *dev,
         case SKL_TKN_U32_PIPE_CONN_TYPE:
         case SKL_TKN_U32_PIPE_PRIORITY:
         case SKL_TKN_U32_PIPE_MEM_PGS:
+        case SKL_TKN_U32_PMODE:
                 if (is_pipe_exists) {
                         ret = skl_tplg_fill_pipe_tkn(dev, mconfig->pipe,
                                         tkn_elem->token, tkn_elem->value);
diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index a519360f42a6..08d39280b07b 100644
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -113,23 +113,6 @@ struct skl_cpr_gtw_cfg {
         u32 config_data[1];
 } __packed;
 
-struct skl_i2s_config_blob {
-        u32 gateway_attrib;
-        u32 tdm_ts_group[8];
-        u32 ssc0;
-        u32 ssc1;
-        u32 sscto;
-        u32 sspsp;
-        u32 sstsa;
-        u32 ssrsa;
-        u32 ssc2;
-        u32 sspsp2;
-        u32 ssc3;
-        u32 ssioc;
-        u32 mdivc;
-        u32 mdivr;
-} __packed;
-
 struct skl_dma_control {
         u32 node_id;
         u32 config_length;
@@ -279,6 +262,7 @@ struct skl_pipe {
         u8 pipe_priority;
         u16 conn_type;
         u32 memory_pages;
+        u8 lp_mode;
         struct skl_pipe_params *p_params;
         enum skl_pipe_state state;
         struct list_head w_list;
@@ -293,6 +277,12 @@ enum skl_module_state {
         SKL_MODULE_UNLOADED = 4,
 };
 
+enum d0i3_capability {
+        SKL_D0I3_NONE = 0,
+        SKL_D0I3_STREAMING = 1,
+        SKL_D0I3_NON_STREAMING = 2,
+};
+
 struct skl_module_cfg {
         u8 guid[16];
         struct skl_module_inst_id id;
@@ -319,6 +309,7 @@ struct skl_module_cfg {
         u32 converter;
         u32 vbus_id;
         u32 mem_pages;
+        enum d0i3_capability d0i3_caps;
         struct skl_module_pin *m_in_pin;
         struct skl_module_pin *m_out_pin;
         enum skl_module_type m_type;
@@ -361,6 +352,9 @@ struct skl_module_cfg *skl_tplg_fe_get_cpr_module(
 int skl_tplg_update_pipe_params(struct device *dev,
                 struct skl_module_cfg *mconfig, struct skl_pipe_params *params);
 
+void skl_tplg_d0i3_get(struct skl *skl, enum d0i3_capability caps);
+void skl_tplg_d0i3_put(struct skl *skl, enum d0i3_capability caps);
+
 int skl_create_pipeline(struct skl_sst *ctx, struct skl_pipe *pipe);
 
 int skl_run_pipe(struct skl_sst *ctx, struct skl_pipe *pipe);
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 06fa5e85dd0e..da5db5098274 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -26,6 +26,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/platform_device.h>
 #include <linux/firmware.h>
+#include <linux/delay.h>
 #include <sound/pcm.h>
 #include "../common/sst-acpi.h"
 #include <sound/hda_register.h>
@@ -109,6 +110,52 @@ static int skl_init_chip(struct hdac_bus *bus, bool full_reset)
         return ret;
 }
 
+void skl_update_d0i3c(struct device *dev, bool enable)
+{
+        struct pci_dev *pci = to_pci_dev(dev);
+        struct hdac_ext_bus *ebus = pci_get_drvdata(pci);
+        struct hdac_bus *bus = ebus_to_hbus(ebus);
+        u8 reg;
+        int timeout = 50;
+
+        reg = snd_hdac_chip_readb(bus, VS_D0I3C);
+        /* Do not write to D0I3C until command in progress bit is cleared */
+        while ((reg & AZX_REG_VS_D0I3C_CIP) && --timeout) {
+                udelay(10);
+                reg = snd_hdac_chip_readb(bus, VS_D0I3C);
+        }
+
+        /* Highly unlikely. But if it happens, flag error explicitly */
+        if (!timeout) {
+                dev_err(bus->dev, "Before D0I3C update: D0I3C CIP timeout\n");
+                return;
+        }
+
+        if (enable)
+                reg = reg | AZX_REG_VS_D0I3C_I3;
+        else
+                reg = reg & (~AZX_REG_VS_D0I3C_I3);
+
+        snd_hdac_chip_writeb(bus, VS_D0I3C, reg);
+
+        timeout = 50;
+        /* Wait for cmd in progress to be cleared before exiting the function */
+        reg = snd_hdac_chip_readb(bus, VS_D0I3C);
+        while ((reg & AZX_REG_VS_D0I3C_CIP) && --timeout) {
+                udelay(10);
+                reg = snd_hdac_chip_readb(bus, VS_D0I3C);
+        }
+
+        /* Highly unlikely. But if it happens, flag error explicitly */
+        if (!timeout) {
+                dev_err(bus->dev, "After D0I3C update: D0I3C CIP timeout\n");
+                return;
+        }
+
+        dev_dbg(bus->dev, "D0I3C register = 0x%x\n",
+                        snd_hdac_chip_readb(bus, VS_D0I3C));
+}
+
 /* called from IRQ */
 static void skl_stream_update(struct hdac_bus *bus, struct hdac_stream *hstr)
 {
@@ -181,6 +228,15 @@ static int skl_acquire_irq(struct hdac_ext_bus *ebus, int do_disconnect)
         return 0;
 }
 
+static int skl_suspend_late(struct device *dev)
+{
+        struct pci_dev *pci = to_pci_dev(dev);
+        struct hdac_ext_bus *ebus = pci_get_drvdata(pci);
+        struct skl *skl = ebus_to_skl(ebus);
+
+        return skl_suspend_late_dsp(skl);
+}
+
 #ifdef CONFIG_PM
 static int _skl_suspend(struct hdac_ext_bus *ebus)
 {
@@ -243,7 +299,6 @@ static int skl_suspend(struct device *dev)
 
                 enable_irq_wake(bus->irq);
                 pci_save_state(pci);
-                pci_disable_device(pci);
         } else {
                 ret = _skl_suspend(ebus);
                 if (ret < 0)
@@ -286,7 +341,6 @@ static int skl_resume(struct device *dev)
          */
         if (skl->supend_active) {
                 pci_restore_state(pci);
-                ret = pci_enable_device(pci);
                 snd_hdac_ext_bus_link_power_up_all(ebus);
                 disable_irq_wake(bus->irq);
                 /*
@@ -345,6 +399,7 @@ static int skl_runtime_resume(struct device *dev)
 static const struct dev_pm_ops skl_pm = {
         SET_SYSTEM_SLEEP_PM_OPS(skl_suspend, skl_resume)
         SET_RUNTIME_PM_OPS(skl_runtime_suspend, skl_runtime_resume, NULL)
+        .suspend_late = skl_suspend_late,
 };
 
 /*
diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index 5d4fbb094c48..4986e3929dd3 100644
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -52,6 +52,9 @@
 #define AZX_PGCTL_LSRMD_MASK            (1 << 4)
 #define AZX_PCIREG_CGCTL                0x48
 #define AZX_CGCTL_MISCBDCGE_MASK        (1 << 6)
+/* D0I3C Register fields */
+#define AZX_REG_VS_D0I3C_CIP      0x1 /* Command in progress */
+#define AZX_REG_VS_D0I3C_I3       0x4 /* D0i3 enable */
 
 struct skl_dsp_resource {
         u32 max_mcps;
@@ -121,8 +124,11 @@ int skl_get_dmic_geo(struct skl *skl);
 int skl_nhlt_update_topology_bin(struct skl *skl);
 int skl_init_dsp(struct skl *skl);
 int skl_free_dsp(struct skl *skl);
+int skl_suspend_late_dsp(struct skl *skl);
 int skl_suspend_dsp(struct skl *skl);
 int skl_resume_dsp(struct skl *skl);
 void skl_cleanup_resources(struct skl *skl);
 const struct skl_dsp_ops *skl_get_dsp_ops(int pci_id);
+void skl_update_d0i3c(struct device *dev, bool enable);
+
 #endif /* __SOUND_SOC_SKL_H */
diff --git a/sound/soc/kirkwood/armada-370-db.c b/sound/soc/kirkwood/armada-370-db.c
index e0304d544f26..677a48d7b891 100644
--- a/sound/soc/kirkwood/armada-370-db.c
+++ b/sound/soc/kirkwood/armada-370-db.c
@@ -42,7 +42,7 @@ static int a370db_hw_params(struct snd_pcm_substream *substream,
         return snd_soc_dai_set_sysclk(codec_dai, 0, freq, SND_SOC_CLOCK_IN);
 }
 
-static struct snd_soc_ops a370db_ops = {
+static const struct snd_soc_ops a370db_ops = {
         .hw_params = a370db_hw_params,
 };
 
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 13631003cb7c..a002ab892772 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -735,6 +735,11 @@ static int mxs_saif_probe(struct platform_device *pdev)
         else
                 saif->id = ret;
 
+        if (saif->id >= ARRAY_SIZE(mxs_saif)) {
+                dev_err(&pdev->dev, "get wrong saif id\n");
+                return -EINVAL;
+        }
+
         /*
          * If there is no "fsl,saif-master" phandle, it's a saif
          * master.  Otherwise, it's a slave and its phandle points
@@ -749,11 +754,11 @@ static int mxs_saif_probe(struct platform_device *pdev)
                         return ret;
                 else
                         saif->master_id = ret;
-        }
 
-        if (saif->master_id >= ARRAY_SIZE(mxs_saif)) {
-                dev_err(&pdev->dev, "get wrong master id\n");
-                return -EINVAL;
+                if (saif->master_id >= ARRAY_SIZE(mxs_saif)) {
+                        dev_err(&pdev->dev, "get wrong master id\n");
+                        return -EINVAL;
+                }
         }
 
         mxs_saif[saif->id] = saif;
diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c
index 2b23ffbac6b1..a96276e77332 100644
--- a/sound/soc/mxs/mxs-sgtl5000.c
+++ b/sound/soc/mxs/mxs-sgtl5000.c
@@ -68,7 +68,7 @@ static int mxs_sgtl5000_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static struct snd_soc_ops mxs_sgtl5000_hifi_ops = {
+static const struct snd_soc_ops mxs_sgtl5000_hifi_ops = {
         .hw_params = mxs_sgtl5000_hw_params,
 };
 
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index dcbb7aa9830c..311774e9ca46 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -244,9 +244,9 @@ static const struct snd_soc_dapm_route corgi_audio_map[] = {
         {"MICIN", NULL, "Line Jack"},
 };
 
-static const char *jack_function[] = {"Headphone", "Mic", "Line", "Headset",
-        "Off"};
-static const char *spk_function[] = {"On", "Off"};
+static const char * const jack_function[] = {"Headphone", "Mic", "Line",
+        "Headset", "Off"};
+static const char * const spk_function[] = {"On", "Off"};
 static const struct soc_enum corgi_enum[] = {
         SOC_ENUM_SINGLE_EXT(5, jack_function),
         SOC_ENUM_SINGLE_EXT(2, spk_function),
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c
index 1de876529aa1..086c37a85630 100644
--- a/sound/soc/pxa/e740_wm9705.c
+++ b/sound/soc/pxa/e740_wm9705.c
@@ -22,7 +22,6 @@
 
 #include <asm/mach-types.h>
 
-#include "../codecs/wm9705.h"
 #include "pxa2xx-ac97.h"
 
 
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c
index b7eb7cd5df7d..7823278012a6 100644
--- a/sound/soc/pxa/e750_wm9705.c
+++ b/sound/soc/pxa/e750_wm9705.c
@@ -22,7 +22,6 @@
 
 #include <asm/mach-types.h>
 
-#include "../codecs/wm9705.h"
 #include "pxa2xx-ac97.h"
 
 static int e750_spk_amp_event(struct snd_soc_dapm_widget *w,
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c
index 41bf71466a7b..07b9c6e17df9 100644
--- a/sound/soc/pxa/e800_wm9712.c
+++ b/sound/soc/pxa/e800_wm9712.c
@@ -21,7 +21,6 @@
 #include <mach/audio.h>
 #include <mach/eseries-gpio.h>
 
-#include "../codecs/wm9712.h"
 #include "pxa2xx-ac97.h"
 
 static int e800_spk_amp_event(struct snd_soc_dapm_widget *w,
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c
index 64743a05aeae..966163d1c813 100644
--- a/sound/soc/pxa/em-x270.c
+++ b/sound/soc/pxa/em-x270.c
@@ -30,7 +30,6 @@
 #include <asm/mach-types.h>
 #include <mach/audio.h>
 
-#include "../codecs/wm9712.h"
 #include "pxa2xx-ac97.h"
 
 static struct snd_soc_dai_link em_x270_dai[] = {
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
index ecbf2873b7ff..85483049b916 100644
--- a/sound/soc/pxa/hx4700.c
+++ b/sound/soc/pxa/hx4700.c
@@ -27,8 +27,6 @@
 #include <asm/mach-types.h>
 #include "pxa2xx-i2s.h"
 
-#include "../codecs/ak4641.h"
-
 static struct snd_soc_jack hs_jack;
 
 /* Headphones jack detection DAPM pin */
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 62b8377a9d2b..2d4d4455fe87 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -376,7 +376,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"VINM", NULL, "Call Mic"},
 };
 
-static const char *input_select[] = {"Call Mic", "Headset Mic"};
+static const char * const input_select[] = {"Call Mic", "Headset Mic"};
 static const struct soc_enum magician_in_sel_enum =
         SOC_ENUM_SINGLE_EXT(2, input_select);
 
diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c
index d1661fa6ee08..0fe0abec8fc4 100644
--- a/sound/soc/pxa/mioa701_wm9713.c
+++ b/sound/soc/pxa/mioa701_wm9713.c
@@ -187,7 +187,7 @@ static int mioa701_wm9713_probe(struct platform_device *pdev)
         mioa701.dev = &pdev->dev;
         rc = devm_snd_soc_register_card(&pdev->dev, &mioa701);
         if (!rc)
-                dev_warn(&pdev->dev, "Be warned that incorrect mixers/muxes setup will"
+                dev_warn(&pdev->dev, "Be warned that incorrect mixers/muxes setup will "
                          "lead to overheating and possible destruction of your device."
                          " Do not use without a good knowledge of mio's board design!\n");
         return rc;
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
index bcc81e920a67..387492d46b6c 100644
--- a/sound/soc/pxa/palm27x.c
+++ b/sound/soc/pxa/palm27x.c
@@ -27,7 +27,6 @@
 #include <mach/audio.h>
 #include <linux/platform_data/asoc-palm27x.h>
 
-#include "../codecs/wm9712.h"
 #include "pxa2xx-ac97.h"
 
 static struct snd_soc_jack hs_jack;
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 4b3b714f5ee7..a879aba0691f 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -209,8 +209,8 @@ static const struct snd_soc_dapm_route poodle_audio_map[] = {
         {"MICIN", NULL, "Microphone"},
 };
 
-static const char *jack_function[] = {"Off", "Headphone"};
-static const char *spk_function[] = {"Off", "On"};
+static const char * const jack_function[] = {"Off", "Headphone"};
+static const char * const spk_function[] = {"Off", "On"};
 static const struct soc_enum poodle_enum[] = {
         SOC_ENUM_SINGLE_EXT(2, jack_function),
         SOC_ENUM_SINGLE_EXT(2, spk_function),
diff --git a/sound/soc/pxa/pxa-ssp.h b/sound/soc/pxa/pxa-ssp.h
index bc79da221c0d..abf6ec080258 100644
--- a/sound/soc/pxa/pxa-ssp.h
+++ b/sound/soc/pxa/pxa-ssp.h
@@ -9,12 +9,6 @@
 #ifndef _PXA_SSP_H
 #define _PXA_SSP_H
 
-/* pxa DAI SSP IDs */
-#define PXA_DAI_SSP1                    0
-#define PXA_DAI_SSP2                    1
-#define PXA_DAI_SSP3                    2
-#define PXA_DAI_SSP4                    3
-
 /* SSP clock sources */
 #define PXA_SSP_CLK_PLL 0
 #define PXA_SSP_CLK_EXT 1
diff --git a/sound/soc/pxa/pxa2xx-i2s.h b/sound/soc/pxa/pxa2xx-i2s.h
index 070f3c6059fe..7e218e2105a9 100644
--- a/sound/soc/pxa/pxa2xx-i2s.h
+++ b/sound/soc/pxa/pxa2xx-i2s.h
@@ -9,9 +9,6 @@
 #ifndef _PXA2XX_I2S_H
 #define _PXA2XX_I2S_H
 
-/* pxa2xx DAI ID's */
-#define PXA2XX_DAI_I2S                  0
-
 /* I2S clock */
 #define PXA2XX_I2S_SYSCLK               0
 
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index 0e02634c8b7f..07d77cddac60 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -241,9 +241,9 @@ static const struct snd_soc_dapm_route spitz_audio_map[] = {
         {"LINPUT1", NULL, "Line Jack"},
 };
 
-static const char *jack_function[] = {"Headphone", "Mic", "Line", "Headset",
-        "Off"};
-static const char *spk_function[] = {"On", "Off"};
+static const char * const jack_function[] = {"Headphone", "Mic", "Line",
+        "Headset", "Off"};
+static const char * const spk_function[] = {"On", "Off"};
 static const struct soc_enum spitz_enum[] = {
         SOC_ENUM_SINGLE_EXT(5, jack_function),
         SOC_ENUM_SINGLE_EXT(2, spk_function),
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index c508f024ecfb..2e312c62e3c7 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -31,7 +31,6 @@
 #include <mach/tosa.h>
 #include <mach/audio.h>
 
-#include "../codecs/wm9712.h"
 #include "pxa2xx-ac97.h"
 
 #define TOSA_HP        0
@@ -170,9 +169,9 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"Mic Bias", NULL, "Headset Jack"},
 };
 
-static const char *jack_function[] = {"Headphone", "Mic", "Line", "Headset",
-        "Off"};
-static const char *spk_function[] = {"On", "Off"};
+static const char * const jack_function[] = {"Headphone", "Mic", "Line",
+        "Headset", "Off"};
+static const char * const spk_function[] = {"On", "Off"};
 static const struct soc_enum tosa_enum[] = {
         SOC_ENUM_SINGLE_EXT(5, jack_function),
         SOC_ENUM_SINGLE_EXT(2, spk_function),
diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c
index 07f91e918b23..d084d7468299 100644
--- a/sound/soc/qcom/apq8016_sbc.c
+++ b/sound/soc/qcom/apq8016_sbc.c
@@ -123,20 +123,15 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card)
                         return ERR_PTR(-EINVAL);
                 }
 
-                link->codec_of_node = of_parse_phandle(codec, "sound-dai", 0);
-                if (!link->codec_of_node) {
-                        dev_err(card->dev, "error getting codec phandle\n");
-                        return ERR_PTR(-EINVAL);
-                }
-
                 ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name);
                 if (ret) {
                         dev_err(card->dev, "error getting cpu dai name\n");
                         return ERR_PTR(ret);
                 }
 
-                ret = snd_soc_of_get_dai_name(codec, &link->codec_dai_name);
-                if (ret) {
+                ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);
+
+                if (ret < 0) {
                         dev_err(card->dev, "error getting codec dai name\n");
                         return ERR_PTR(ret);
                 }
diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
index 07000f53db44..dd5bdd0da730 100644
--- a/sound/soc/qcom/lpass-platform.c
+++ b/sound/soc/qcom/lpass-platform.c
@@ -25,8 +25,7 @@
 #include "lpass.h"
 
 struct lpass_pcm_data {
-        int rdma_ch;
-        int wrdma_ch;
+        int dma_ch;
         int i2s_port;
 };
 
@@ -75,8 +74,12 @@ static int lpass_platform_pcmops_open(struct snd_pcm_substream *substream)
         data->i2s_port = cpu_dai->driver->id;
         runtime->private_data = data;
 
+        dma_ch = 0;
         if (v->alloc_dma_channel)
                 dma_ch = v->alloc_dma_channel(drvdata, dir);
+        else
+                dma_ch = 0;
+
         if (dma_ch < 0)
                 return dma_ch;
 
@@ -91,10 +94,7 @@ static int lpass_platform_pcmops_open(struct snd_pcm_substream *substream)
                         return ret;
         }
 
-        if (dir == SNDRV_PCM_STREAM_PLAYBACK)
-                data->rdma_ch = dma_ch;
-        else
-                data->wrdma_ch = dma_ch;
+        data->dma_ch = dma_ch;
 
         snd_soc_set_runtime_hwparams(substream, &lpass_platform_pcm_hardware);
 
@@ -121,20 +121,12 @@ static int lpass_platform_pcmops_close(struct snd_pcm_substream *substream)
                 snd_soc_platform_get_drvdata(soc_runtime->platform);
         struct lpass_variant *v = drvdata->variant;
         struct lpass_pcm_data *data;
-        int dma_ch, dir = substream->stream;
 
         data = runtime->private_data;
         v = drvdata->variant;
-
-        if (dir == SNDRV_PCM_STREAM_PLAYBACK)
-                dma_ch = data->rdma_ch;
-        else
-                dma_ch = data->wrdma_ch;
-
-        drvdata->substream[dma_ch] = NULL;
-
+        drvdata->substream[data->dma_ch] = NULL;
         if (v->free_dma_channel)
-                v->free_dma_channel(drvdata, dma_ch);
+                v->free_dma_channel(drvdata, data->dma_ch);
 
         return 0;
 }
@@ -155,10 +147,7 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream,
         int bitwidth;
         int ret, dma_port = pcm_data->i2s_port + v->dmactl_audif_start;
 
-        if (dir ==  SNDRV_PCM_STREAM_PLAYBACK)
-                ch = pcm_data->rdma_ch;
-        else
-                ch = pcm_data->wrdma_ch;
+        ch = pcm_data->dma_ch;
 
         bitwidth = snd_pcm_format_width(format);
         if (bitwidth < 0) {
@@ -245,11 +234,7 @@ static int lpass_platform_pcmops_hw_free(struct snd_pcm_substream *substream)
         unsigned int reg;
         int ret;
 
-        if (substream->stream ==  SNDRV_PCM_STREAM_PLAYBACK)
-                reg = LPAIF_RDMACTL_REG(v, pcm_data->rdma_ch);
-        else
-                reg = LPAIF_WRDMACTL_REG(v, pcm_data->wrdma_ch);
-
+        reg = LPAIF_DMACTL_REG(v, pcm_data->dma_ch, substream->stream);
         ret = regmap_write(drvdata->lpaif_map, reg, 0);
         if (ret)
                 dev_err(soc_runtime->dev, "%s() error writing to rdmactl reg: %d\n",
@@ -269,10 +254,7 @@ static int lpass_platform_pcmops_prepare(struct snd_pcm_substream *substream)
         struct lpass_variant *v = drvdata->variant;
         int ret, ch, dir = substream->stream;
 
-        if (dir ==  SNDRV_PCM_STREAM_PLAYBACK)
-                ch = pcm_data->rdma_ch;
-        else
-                ch = pcm_data->wrdma_ch;
+        ch = pcm_data->dma_ch;
 
         ret = regmap_write(drvdata->lpaif_map,
                         LPAIF_DMABASE_REG(v, ch, dir),
@@ -324,10 +306,7 @@ static int lpass_platform_pcmops_trigger(struct snd_pcm_substream *substream,
         struct lpass_variant *v = drvdata->variant;
         int ret, ch, dir = substream->stream;
 
-        if (dir == SNDRV_PCM_STREAM_PLAYBACK)
-                ch = pcm_data->rdma_ch;
-        else
-                ch = pcm_data->wrdma_ch;
+        ch = pcm_data->dma_ch;
 
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
@@ -402,10 +381,7 @@ static snd_pcm_uframes_t lpass_platform_pcmops_pointer(
         unsigned int base_addr, curr_addr;
         int ret, ch, dir = substream->stream;
 
-        if (dir == SNDRV_PCM_STREAM_PLAYBACK)
-                ch = pcm_data->rdma_ch;
-        else
-                ch = pcm_data->wrdma_ch;
+        ch = pcm_data->dma_ch;
 
         ret = regmap_read(drvdata->lpaif_map,
                         LPAIF_DMABASE_REG(v, ch, dir), &base_addr);
diff --git a/sound/soc/qcom/storm.c b/sound/soc/qcom/storm.c
index 2d833bffdba0..8fcac2ac3aa6 100644
--- a/sound/soc/qcom/storm.c
+++ b/sound/soc/qcom/storm.c
@@ -58,7 +58,7 @@ static int storm_ops_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static struct snd_soc_ops storm_soc_ops = {
+static const struct snd_soc_ops storm_soc_ops = {
         .hw_params      = storm_ops_hw_params,
 };
 
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c
index 9ed735a6cf49..3475c61a5fa0 100644
--- a/sound/soc/rockchip/rk3399_gru_sound.c
+++ b/sound/soc/rockchip/rk3399_gru_sound.c
@@ -38,7 +38,7 @@
 
 #define SOUND_FS        256
 
-unsigned int rt5514_dmic_delay;
+static unsigned int rt5514_dmic_delay;
 
 static struct snd_soc_jack rockchip_sound_jack;
 
@@ -228,15 +228,15 @@ static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd)
         return 0;
 }
 
-static struct snd_soc_ops rockchip_sound_max98357a_ops = {
+static const struct snd_soc_ops rockchip_sound_max98357a_ops = {
         .hw_params = rockchip_sound_max98357a_hw_params,
 };
 
-static struct snd_soc_ops rockchip_sound_rt5514_ops = {
+static const struct snd_soc_ops rockchip_sound_rt5514_ops = {
         .hw_params = rockchip_sound_rt5514_hw_params,
 };
 
-static struct snd_soc_ops rockchip_sound_da7219_ops = {
+static const struct snd_soc_ops rockchip_sound_da7219_ops = {
         .hw_params = rockchip_sound_da7219_hw_params,
 };
 
diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
index e70ffad07184..789d6f1e2b5f 100644
--- a/sound/soc/rockchip/rockchip_max98090.c
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@ -119,7 +119,7 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream,
         return ret;
 }
 
-static struct snd_soc_ops rk_aif1_ops = {
+static const struct snd_soc_ops rk_aif1_ops = {
         .hw_params = rk_aif1_hw_params,
 };
 
diff --git a/sound/soc/rockchip/rockchip_rt5645.c b/sound/soc/rockchip/rockchip_rt5645.c
index 440a8026346a..9e0c17805807 100644
--- a/sound/soc/rockchip/rockchip_rt5645.c
+++ b/sound/soc/rockchip/rockchip_rt5645.c
@@ -135,7 +135,7 @@ static int rk_init(struct snd_soc_pcm_runtime *runtime)
                                      &headset_jack);
 }
 
-static struct snd_soc_ops rk_aif1_ops = {
+static const struct snd_soc_ops rk_aif1_ops = {
         .hw_params = rk_aif1_hw_params,
 };
 
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index f6023b46c107..7c423151ef7d 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -1,6 +1,7 @@
 menuconfig SND_SOC_SAMSUNG
         tristate "ASoC support for Samsung"
-        depends on (PLAT_SAMSUNG || ARCH_EXYNOS)
+        depends on PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST
+        depends on COMMON_CLK
         select SND_SOC_GENERIC_DMAENGINE_PCM
         ---help---
           Say Y or M if you want to add support for codecs attached to
@@ -22,10 +23,6 @@ config SND_S3C2412_SOC_I2S
 config SND_SAMSUNG_PCM
         tristate "Samsung PCM interface support"
 
-config SND_SAMSUNG_AC97
-        tristate
-        select SND_SOC_AC97_BUS
-
 config SND_SAMSUNG_SPDIF
         tristate "Samsung SPDIF transmitter support"
         select SND_SOC_SPDIF
@@ -53,7 +50,7 @@ config SND_SOC_SAMSUNG_JIVE_WM8750
 
 config SND_SOC_SAMSUNG_SMDK_WM8580
         tristate "SoC I2S Audio support for WM8580 on SMDK"
-        depends on MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110
+        depends on MACH_SMDK6410 || COMPILE_TEST
         depends on I2C
         select SND_SOC_WM8580
         select SND_SAMSUNG_I2S
@@ -69,26 +66,6 @@ config SND_SOC_SAMSUNG_SMDK_WM8994
         help
                 Say Y if you want to add support for SoC audio on the SMDKs.
 
-config SND_SOC_SAMSUNG_SMDK2443_WM9710
-        tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
-        depends on MACH_SMDK2443
-        select AC97_BUS
-        select SND_SOC_AC97_CODEC
-        select SND_SAMSUNG_AC97
-        help
-          Say Y if you want to add support for SoC audio on smdk2443
-          with the WM9710.
-
-config SND_SOC_SAMSUNG_LN2440SBC_ALC650
-        tristate "SoC AC97 Audio support for LN2440SBC - ALC650"
-        depends on ARCH_S3C24XX
-        select AC97_BUS
-        select SND_SOC_AC97_CODEC
-        select SND_SAMSUNG_AC97
-        help
-          Say Y if you want to add support for SoC audio on ln2440sbc
-          with the ALC650.
-
 config SND_SOC_SAMSUNG_S3C24XX_UDA134X
         tristate "SoC I2S Audio support UDA134X wired to a S3C24XX"
         depends on ARCH_S3C24XX
@@ -131,17 +108,10 @@ config SND_SOC_SAMSUNG_RX1950_UDA1380
         help
           This driver provides audio support for HP iPAQ RX1950 PDA.
 
-config SND_SOC_SAMSUNG_SMDK_WM9713
-        tristate "SoC AC97 Audio support for SMDK with WM9713"
-        depends on MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDKV210 || MACH_SMDKC110
-        select SND_SOC_WM9713
-        select SND_SAMSUNG_AC97
-        help
-          Say Y if you want to add support for SoC audio on the SMDK.
-
 config SND_SOC_SMARTQ
         tristate "SoC I2S Audio support for SmartQ board"
-        depends on MACH_SMARTQ && I2C
+        depends on MACH_SMARTQ || COMPILE_TEST
+        depends on I2C
         select SND_SAMSUNG_I2S
         select SND_SOC_WM8750
 
@@ -151,15 +121,6 @@ config SND_SOC_SAMSUNG_SMDK_SPDIF
         help
           Say Y if you want to add support for SoC S/PDIF audio on the SMDK.
 
-config SND_SOC_SMDK_WM8580_PCM
-        tristate "SoC PCM Audio support for WM8580 on SMDK"
-        depends on MACH_SMDKV210 || MACH_SMDKC110
-        depends on I2C
-        select SND_SOC_WM8580
-        select SND_SAMSUNG_PCM
-        help
-          Say Y if you want to add support for SoC audio on the SMDK.
-
 config SND_SOC_SMDK_WM8994_PCM
         tristate "SoC PCM Audio support for WM8994 on SMDK"
         depends on I2C=y
@@ -229,4 +190,13 @@ config SND_SOC_ARNDALE_RT5631_ALC5631
         select SND_SAMSUNG_I2S
         select SND_SOC_RT5631
 
+config SND_SOC_SAMSUNG_TM2_WM5110
+        tristate "SoC I2S Audio support for WM5110 on TM2 board"
+        depends on SND_SOC_SAMSUNG && MFD_ARIZONA && I2C && SPI_MASTER
+        select SND_SOC_MAX98504
+        select SND_SOC_WM5110
+        select SND_SAMSUNG_I2S
+        help
+          Say Y if you want to add support for SoC audio on the TM2 board.
+
 endif #SND_SOC_SAMSUNG
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index 5d03f5ce6916..b5df5e2e3d94 100644
--- a/sound/soc/samsung/Makefile
+++ b/sound/soc/samsung/Makefile
@@ -3,7 +3,6 @@ snd-soc-s3c-dma-objs := dmaengine.o
 snd-soc-idma-objs := idma.o
 snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o
 snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o
-snd-soc-ac97-objs := ac97.o
 snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o
 snd-soc-samsung-spdif-objs := spdif.o
 snd-soc-pcm-objs := pcm.o
@@ -11,7 +10,6 @@ snd-soc-i2s-objs := i2s.o
 
 obj-$(CONFIG_SND_SOC_SAMSUNG) += snd-soc-s3c-dma.o
 obj-$(CONFIG_SND_S3C24XX_I2S) += snd-soc-s3c24xx-i2s.o
-obj-$(CONFIG_SND_SAMSUNG_AC97) += snd-soc-ac97.o
 obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o
 obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o
 obj-$(CONFIG_SND_SAMSUNG_SPDIF) += snd-soc-samsung-spdif.o
@@ -36,7 +34,6 @@ 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-smdk-spdif-objs := smdk_spdif.o
-snd-soc-smdk-wm8580pcm-objs := smdk_wm8580pcm.o
 snd-soc-smdk-wm8994pcm-objs := smdk_wm8994pcm.o
 snd-soc-speyside-objs := speyside.o
 snd-soc-tobermory-objs := tobermory.o
@@ -44,11 +41,10 @@ snd-soc-lowland-objs := lowland.o
 snd-soc-littlemill-objs := littlemill.o
 snd-soc-bells-objs := bells.o
 snd-soc-arndale-rt5631-objs := arndale_rt5631.o
+snd-soc-tm2-wm5110-objs := tm2_wm5110.o
 
 obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
-obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o
-obj-$(CONFIG_SND_SOC_SAMSUNG_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC) += snd-soc-s3c24xx-simtec.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o
@@ -58,10 +54,8 @@ 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
-obj-$(CONFIG_SND_SOC_SMDK_WM8580_PCM) += snd-soc-smdk-wm8580pcm.o
 obj-$(CONFIG_SND_SOC_SMDK_WM8994_PCM) += snd-soc-smdk-wm8994pcm.o
 obj-$(CONFIG_SND_SOC_SPEYSIDE) += snd-soc-speyside.o
 obj-$(CONFIG_SND_SOC_TOBERMORY) += snd-soc-tobermory.o
@@ -69,3 +63,4 @@ obj-$(CONFIG_SND_SOC_LOWLAND) += snd-soc-lowland.o
 obj-$(CONFIG_SND_SOC_LITTLEMILL) += snd-soc-littlemill.o
 obj-$(CONFIG_SND_SOC_BELLS) += snd-soc-bells.o
 obj-$(CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631) += snd-soc-arndale-rt5631.o
+obj-$(CONFIG_SND_SOC_SAMSUNG_TM2_WM5110) += snd-soc-tm2-wm5110.o
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
deleted file mode 100644
index cbc0023c2bc8..000000000000
--- a/sound/soc/samsung/ac97.c
+++ /dev/null
@@ -1,437 +0,0 @@
-/* sound/soc/samsung/ac97.c
- *
- * ALSA SoC Audio Layer - S3C AC97 Controller driver
- *      Evolved from s3c2443-ac97.c
- *
- * Copyright (c) 2010 Samsung Electronics Co. Ltd
- *      Author: Jaswinder Singh <jassisinghbrar@gmail.com>
- *      Credits: Graeme Gregory, Sean Choi
- *
- * 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/io.h>
-#include <linux/delay.h>
-#include <linux/clk.h>
-#include <linux/module.h>
-
-#include <sound/soc.h>
-
-#include "regs-ac97.h"
-#include <linux/platform_data/asoc-s3c.h>
-
-#include "dma.h"
-
-#define AC_CMD_ADDR(x) (x << 16)
-#define AC_CMD_DATA(x) (x & 0xffff)
-
-#define S3C_AC97_DAI_PCM 0
-#define S3C_AC97_DAI_MIC 1
-
-struct s3c_ac97_info {
-        struct clk         *ac97_clk;
-        void __iomem       *regs;
-        struct mutex       lock;
-        struct completion  done;
-};
-static struct s3c_ac97_info s3c_ac97;
-
-static struct snd_dmaengine_dai_dma_data s3c_ac97_pcm_out = {
-        .addr_width     = 4,
-};
-
-static struct snd_dmaengine_dai_dma_data s3c_ac97_pcm_in = {
-        .addr_width     = 4,
-};
-
-static struct snd_dmaengine_dai_dma_data s3c_ac97_mic_in = {
-        .addr_width     = 4,
-};
-
-static void s3c_ac97_activate(struct snd_ac97 *ac97)
-{
-        u32 ac_glbctrl, stat;
-
-        stat = readl(s3c_ac97.regs + S3C_AC97_GLBSTAT) & 0x7;
-        if (stat == S3C_AC97_GLBSTAT_MAINSTATE_ACTIVE)
-                return; /* Return if already active */
-
-        reinit_completion(&s3c_ac97.done);
-
-        ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        ac_glbctrl = S3C_AC97_GLBCTRL_ACLINKON;
-        writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        msleep(1);
-
-        ac_glbctrl |= S3C_AC97_GLBCTRL_TRANSFERDATAENABLE;
-        writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        msleep(1);
-
-        ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        ac_glbctrl |= S3C_AC97_GLBCTRL_CODECREADYIE;
-        writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
-
-        if (!wait_for_completion_timeout(&s3c_ac97.done, HZ))
-                pr_err("AC97: Unable to activate!\n");
-}
-
-static unsigned short s3c_ac97_read(struct snd_ac97 *ac97,
-        unsigned short reg)
-{
-        u32 ac_glbctrl, ac_codec_cmd;
-        u32 stat, addr, data;
-
-        mutex_lock(&s3c_ac97.lock);
-
-        s3c_ac97_activate(ac97);
-
-        reinit_completion(&s3c_ac97.done);
-
-        ac_codec_cmd = readl(s3c_ac97.regs + S3C_AC97_CODEC_CMD);
-        ac_codec_cmd = S3C_AC97_CODEC_CMD_READ | AC_CMD_ADDR(reg);
-        writel(ac_codec_cmd, s3c_ac97.regs + S3C_AC97_CODEC_CMD);
-
-        udelay(50);
-
-        ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        ac_glbctrl |= S3C_AC97_GLBCTRL_CODECREADYIE;
-        writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
-
-        if (!wait_for_completion_timeout(&s3c_ac97.done, HZ))
-                pr_err("AC97: Unable to read!\n");
-
-        stat = readl(s3c_ac97.regs + S3C_AC97_STAT);
-        addr = (stat >> 16) & 0x7f;
-        data = (stat & 0xffff);
-
-        if (addr != reg)
-                pr_err("ac97: req addr = %02x, rep addr = %02x\n",
-                        reg, addr);
-
-        mutex_unlock(&s3c_ac97.lock);
-
-        return (unsigned short)data;
-}
-
-static void s3c_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
-        unsigned short val)
-{
-        u32 ac_glbctrl, ac_codec_cmd;
-
-        mutex_lock(&s3c_ac97.lock);
-
-        s3c_ac97_activate(ac97);
-
-        reinit_completion(&s3c_ac97.done);
-
-        ac_codec_cmd = readl(s3c_ac97.regs + S3C_AC97_CODEC_CMD);
-        ac_codec_cmd = AC_CMD_ADDR(reg) | AC_CMD_DATA(val);
-        writel(ac_codec_cmd, s3c_ac97.regs + S3C_AC97_CODEC_CMD);
-
-        udelay(50);
-
-        ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        ac_glbctrl |= S3C_AC97_GLBCTRL_CODECREADYIE;
-        writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
-
-        if (!wait_for_completion_timeout(&s3c_ac97.done, HZ))
-                pr_err("AC97: Unable to write!\n");
-
-        ac_codec_cmd = readl(s3c_ac97.regs + S3C_AC97_CODEC_CMD);
-        ac_codec_cmd |= S3C_AC97_CODEC_CMD_READ;
-        writel(ac_codec_cmd, s3c_ac97.regs + S3C_AC97_CODEC_CMD);
-
-        mutex_unlock(&s3c_ac97.lock);
-}
-
-static void s3c_ac97_cold_reset(struct snd_ac97 *ac97)
-{
-        pr_debug("AC97: Cold reset\n");
-        writel(S3C_AC97_GLBCTRL_COLDRESET,
-                        s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        msleep(1);
-
-        writel(0, s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        msleep(1);
-}
-
-static void s3c_ac97_warm_reset(struct snd_ac97 *ac97)
-{
-        u32 stat;
-
-        stat = readl(s3c_ac97.regs + S3C_AC97_GLBSTAT) & 0x7;
-        if (stat == S3C_AC97_GLBSTAT_MAINSTATE_ACTIVE)
-                return; /* Return if already active */
-
-        pr_debug("AC97: Warm reset\n");
-
-        writel(S3C_AC97_GLBCTRL_WARMRESET, s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        msleep(1);
-
-        writel(0, s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        msleep(1);
-
-        s3c_ac97_activate(ac97);
-}
-
-static irqreturn_t s3c_ac97_irq(int irq, void *dev_id)
-{
-        u32 ac_glbctrl, ac_glbstat;
-
-        ac_glbstat = readl(s3c_ac97.regs + S3C_AC97_GLBSTAT);
-
-        if (ac_glbstat & S3C_AC97_GLBSTAT_CODECREADY) {
-
-                ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL);
-                ac_glbctrl &= ~S3C_AC97_GLBCTRL_CODECREADYIE;
-                writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
-
-                complete(&s3c_ac97.done);
-        }
-
-        ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        ac_glbctrl |= (1<<30); /* Clear interrupt */
-        writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
-
-        return IRQ_HANDLED;
-}
-
-static struct snd_ac97_bus_ops s3c_ac97_ops = {
-        .read       = s3c_ac97_read,
-        .write      = s3c_ac97_write,
-        .warm_reset = s3c_ac97_warm_reset,
-        .reset      = s3c_ac97_cold_reset,
-};
-
-static int s3c_ac97_trigger(struct snd_pcm_substream *substream, int cmd,
-                                struct snd_soc_dai *dai)
-{
-        u32 ac_glbctrl;
-
-        ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
-                ac_glbctrl &= ~S3C_AC97_GLBCTRL_PCMINTM_MASK;
-        else
-                ac_glbctrl &= ~S3C_AC97_GLBCTRL_PCMOUTTM_MASK;
-
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-        case SNDRV_PCM_TRIGGER_RESUME:
-        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
-                        ac_glbctrl |= S3C_AC97_GLBCTRL_PCMINTM_DMA;
-                else
-                        ac_glbctrl |= S3C_AC97_GLBCTRL_PCMOUTTM_DMA;
-                break;
-
-        case SNDRV_PCM_TRIGGER_STOP:
-        case SNDRV_PCM_TRIGGER_SUSPEND:
-        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                break;
-        }
-
-        writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
-
-        return 0;
-}
-
-static int s3c_ac97_mic_trigger(struct snd_pcm_substream *substream,
-                                    int cmd, struct snd_soc_dai *dai)
-{
-        u32 ac_glbctrl;
-
-        ac_glbctrl = readl(s3c_ac97.regs + S3C_AC97_GLBCTRL);
-        ac_glbctrl &= ~S3C_AC97_GLBCTRL_MICINTM_MASK;
-
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-        case SNDRV_PCM_TRIGGER_RESUME:
-        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                ac_glbctrl |= S3C_AC97_GLBCTRL_MICINTM_DMA;
-                break;
-
-        case SNDRV_PCM_TRIGGER_STOP:
-        case SNDRV_PCM_TRIGGER_SUSPEND:
-        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                break;
-        }
-
-        writel(ac_glbctrl, s3c_ac97.regs + S3C_AC97_GLBCTRL);
-
-        return 0;
-}
-
-static const struct snd_soc_dai_ops s3c_ac97_dai_ops = {
-        .trigger        = s3c_ac97_trigger,
-};
-
-static const struct snd_soc_dai_ops s3c_ac97_mic_dai_ops = {
-        .trigger        = s3c_ac97_mic_trigger,
-};
-
-static int s3c_ac97_dai_probe(struct snd_soc_dai *dai)
-{
-        snd_soc_dai_init_dma_data(dai, &s3c_ac97_pcm_out, &s3c_ac97_pcm_in);
-
-        return 0;
-}
-
-static int s3c_ac97_mic_dai_probe(struct snd_soc_dai *dai)
-{
-        snd_soc_dai_init_dma_data(dai, NULL, &s3c_ac97_mic_in);
-
-        return 0;
-}
-
-static struct snd_soc_dai_driver s3c_ac97_dai[] = {
-        [S3C_AC97_DAI_PCM] = {
-                .name = "samsung-ac97",
-                .bus_control = true,
-                .playback = {
-                        .stream_name = "AC97 Playback",
-                        .channels_min = 2,
-                        .channels_max = 2,
-                        .rates = SNDRV_PCM_RATE_8000_48000,
-                        .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-                .capture = {
-                        .stream_name = "AC97 Capture",
-                        .channels_min = 2,
-                        .channels_max = 2,
-                        .rates = SNDRV_PCM_RATE_8000_48000,
-                        .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-                .probe = s3c_ac97_dai_probe,
-                .ops = &s3c_ac97_dai_ops,
-        },
-        [S3C_AC97_DAI_MIC] = {
-                .name = "samsung-ac97-mic",
-                .bus_control = true,
-                .capture = {
-                        .stream_name = "AC97 Mic Capture",
-                        .channels_min = 1,
-                        .channels_max = 1,
-                        .rates = SNDRV_PCM_RATE_8000_48000,
-                        .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-                .probe = s3c_ac97_mic_dai_probe,
-                .ops = &s3c_ac97_mic_dai_ops,
-        },
-};
-
-static const struct snd_soc_component_driver s3c_ac97_component = {
-        .name           = "s3c-ac97",
-};
-
-static int s3c_ac97_probe(struct platform_device *pdev)
-{
-        struct resource *mem_res, *irq_res;
-        struct s3c_audio_pdata *ac97_pdata;
-        int ret;
-
-        ac97_pdata = pdev->dev.platform_data;
-        if (!ac97_pdata || !ac97_pdata->cfg_gpio) {
-                dev_err(&pdev->dev, "cfg_gpio callback not provided!\n");
-                return -EINVAL;
-        }
-
-        /* Check for availability of necessary resource */
-        irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        if (!irq_res) {
-                dev_err(&pdev->dev, "AC97 IRQ not provided!\n");
-                return -ENXIO;
-        }
-
-        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        s3c_ac97.regs = devm_ioremap_resource(&pdev->dev, mem_res);
-        if (IS_ERR(s3c_ac97.regs))
-                return PTR_ERR(s3c_ac97.regs);
-
-        s3c_ac97_pcm_out.filter_data = ac97_pdata->dma_playback;
-        s3c_ac97_pcm_out.addr = mem_res->start + S3C_AC97_PCM_DATA;
-        s3c_ac97_pcm_in.filter_data = ac97_pdata->dma_capture;
-        s3c_ac97_pcm_in.addr = mem_res->start + S3C_AC97_PCM_DATA;
-        s3c_ac97_mic_in.filter_data = ac97_pdata->dma_capture_mic;
-        s3c_ac97_mic_in.addr = mem_res->start + S3C_AC97_MIC_DATA;
-
-        init_completion(&s3c_ac97.done);
-        mutex_init(&s3c_ac97.lock);
-
-        s3c_ac97.ac97_clk = devm_clk_get(&pdev->dev, "ac97");
-        if (IS_ERR(s3c_ac97.ac97_clk)) {
-                dev_err(&pdev->dev, "ac97 failed to get ac97_clock\n");
-                ret = -ENODEV;
-                goto err2;
-        }
-        clk_prepare_enable(s3c_ac97.ac97_clk);
-
-        if (ac97_pdata->cfg_gpio(pdev)) {
-                dev_err(&pdev->dev, "Unable to configure gpio\n");
-                ret = -EINVAL;
-                goto err3;
-        }
-
-        ret = request_irq(irq_res->start, s3c_ac97_irq,
-                                        0, "AC97", NULL);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "ac97: interrupt request failed.\n");
-                goto err4;
-        }
-
-        ret = snd_soc_set_ac97_ops(&s3c_ac97_ops);
-        if (ret != 0) {
-                dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret);
-                goto err4;
-        }
-
-        ret = samsung_asoc_dma_platform_register(&pdev->dev,
-                                                 ac97_pdata->dma_filter,
-                                                 NULL, NULL);
-        if (ret) {
-                dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);
-                goto err5;
-        }
-
-        ret = devm_snd_soc_register_component(&pdev->dev, &s3c_ac97_component,
-                                         s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai));
-        if (ret)
-                goto err5;
-
-        return 0;
-err5:
-        free_irq(irq_res->start, NULL);
-err4:
-err3:
-        clk_disable_unprepare(s3c_ac97.ac97_clk);
-err2:
-        snd_soc_set_ac97_ops(NULL);
-        return ret;
-}
-
-static int s3c_ac97_remove(struct platform_device *pdev)
-{
-        struct resource *irq_res;
-
-        irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        if (irq_res)
-                free_irq(irq_res->start, NULL);
-
-        clk_disable_unprepare(s3c_ac97.ac97_clk);
-        snd_soc_set_ac97_ops(NULL);
-
-        return 0;
-}
-
-static struct platform_driver s3c_ac97_driver = {
-        .probe  = s3c_ac97_probe,
-        .remove = s3c_ac97_remove,
-        .driver = {
-                .name = "samsung-ac97",
-        },
-};
-
-module_platform_driver(s3c_ac97_driver);
-
-MODULE_AUTHOR("Jaswinder Singh, <jassisinghbrar@gmail.com>");
-MODULE_DESCRIPTION("AC97 driver for the Samsung SoC");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:samsung-ac97");
diff --git a/sound/soc/samsung/dmaengine.c b/sound/soc/samsung/dmaengine.c
index 9104c98deeb7..cda656e4afc6 100644
--- a/sound/soc/samsung/dmaengine.c
+++ b/sound/soc/samsung/dmaengine.c
@@ -37,12 +37,8 @@ int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter,
         pcm_conf->prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;
         pcm_conf->compat_filter_fn = filter;
 
-        if (dev->of_node) {
-                pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx;
-                pcm_conf->chan_names[SNDRV_PCM_STREAM_CAPTURE] = rx;
-        } else {
-                flags |= SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME;
-        }
+        pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx;
+        pcm_conf->chan_names[SNDRV_PCM_STREAM_CAPTURE] = rx;
 
         return devm_snd_dmaengine_pcm_register(dev, pcm_conf, flags);
 }
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 7825bff45ae3..e00974bc5616 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1029,12 +1029,13 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
 static int samsung_i2s_dai_remove(struct snd_soc_dai *dai)
 {
         struct i2s_dai *i2s = snd_soc_dai_get_drvdata(dai);
+        unsigned long flags;
 
         if (!is_secondary(i2s)) {
                 if (i2s->quirks & QUIRK_NEED_RSTCLR) {
-                        spin_lock(i2s->lock);
+                        spin_lock_irqsave(i2s->lock, flags);
                         writel(0, i2s->addr + I2SCON);
-                        spin_unlock(i2s->lock);
+                        spin_unlock_irqrestore(i2s->lock, flags);
                 }
         }
 
@@ -1304,8 +1305,6 @@ static int samsung_i2s_probe(struct platform_device *pdev)
         }
         pri_dai->dma_playback.addr = regs_base + I2STXD;
         pri_dai->dma_capture.addr = regs_base + I2SRXD;
-        pri_dai->dma_playback.chan_name = "tx";
-        pri_dai->dma_capture.chan_name = "rx";
         pri_dai->dma_playback.addr_width = 4;
         pri_dai->dma_capture.addr_width = 4;
         pri_dai->quirks = quirks;
@@ -1330,7 +1329,6 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                 sec_dai->lock = &pri_dai->spinlock;
                 sec_dai->variant_regs = pri_dai->variant_regs;
                 sec_dai->dma_playback.addr = regs_base + I2STXDS;
-                sec_dai->dma_playback.chan_name = "tx-sec";
 
                 if (!np) {
                         sec_dai->dma_playback.filter_data = i2s_pdata->dma_play_sec;
diff --git a/sound/soc/samsung/ln2440sbc_alc650.c b/sound/soc/samsung/ln2440sbc_alc650.c
deleted file mode 100644
index 9342fc270c2b..000000000000
--- a/sound/soc/samsung/ln2440sbc_alc650.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * SoC audio for ln2440sbc
- *
- * Copyright 2007 KonekTel, a.s.
- * Author: Ivan Kuten
- *         ivan.kuten@promwad.com
- *
- * Heavily based on smdk2443_wm9710.c
- * Copyright 2007 Wolfson Microelectronics PLC.
- * Author: Graeme Gregory
- *         graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.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 <sound/soc.h>
-
-static struct snd_soc_card ln2440sbc;
-
-static struct snd_soc_dai_link ln2440sbc_dai[] = {
-{
-        .name = "AC97",
-        .stream_name = "AC97 HiFi",
-        .cpu_dai_name = "samsung-ac97",
-        .codec_dai_name = "ac97-hifi",
-        .codec_name = "ac97-codec",
-        .platform_name = "samsung-ac97",
-},
-};
-
-static struct snd_soc_card ln2440sbc = {
-        .name = "LN2440SBC",
-        .owner = THIS_MODULE,
-        .dai_link = ln2440sbc_dai,
-        .num_links = ARRAY_SIZE(ln2440sbc_dai),
-};
-
-static struct platform_device *ln2440sbc_snd_ac97_device;
-
-static int __init ln2440sbc_init(void)
-{
-        int ret;
-
-        ln2440sbc_snd_ac97_device = platform_device_alloc("soc-audio", -1);
-        if (!ln2440sbc_snd_ac97_device)
-                return -ENOMEM;
-
-        platform_set_drvdata(ln2440sbc_snd_ac97_device, &ln2440sbc);
-        ret = platform_device_add(ln2440sbc_snd_ac97_device);
-
-        if (ret)
-                platform_device_put(ln2440sbc_snd_ac97_device);
-
-        return ret;
-}
-
-static void __exit ln2440sbc_exit(void)
-{
-        platform_device_unregister(ln2440sbc_snd_ac97_device);
-}
-
-module_init(ln2440sbc_init);
-module_exit(ln2440sbc_exit);
-
-/* Module information */
-MODULE_AUTHOR("Ivan Kuten");
-MODULE_DESCRIPTION("ALSA SoC ALC650 LN2440SBC");
-MODULE_LICENSE("GPL");
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index c484985812ed..d50a6377c23d 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -499,13 +499,6 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
 
         pcm_pdata = pdev->dev.platform_data;
 
-        /* Check for availability of necessary resource */
-        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!mem_res) {
-                dev_err(&pdev->dev, "Unable to get register resource\n");
-                return -ENXIO;
-        }
-
         if (pcm_pdata && pcm_pdata->cfg_gpio && pcm_pdata->cfg_gpio(pdev)) {
                 dev_err(&pdev->dev, "Unable to configure gpio\n");
                 return -EINVAL;
@@ -519,36 +512,26 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
         /* Default is 128fs */
         pcm->sclk_per_fs = 128;
 
+        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        pcm->regs = devm_ioremap_resource(&pdev->dev, mem_res);
+        if (IS_ERR(pcm->regs))
+                return PTR_ERR(pcm->regs);
+
         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);
-                goto err1;
+                dev_err(&pdev->dev, "failed to get audio-bus clock\n");
+                return PTR_ERR(pcm->cclk);
         }
         clk_prepare_enable(pcm->cclk);
 
         /* record our pcm structure for later use in the callbacks */
         dev_set_drvdata(&pdev->dev, pcm);
 
-        if (!request_mem_region(mem_res->start,
-                                resource_size(mem_res), "samsung-pcm")) {
-                dev_err(&pdev->dev, "Unable to request register region\n");
-                ret = -EBUSY;
-                goto err2;
-        }
-
-        pcm->regs = ioremap(mem_res->start, 0x100);
-        if (pcm->regs == NULL) {
-                dev_err(&pdev->dev, "cannot ioremap registers\n");
-                ret = -ENXIO;
-                goto err3;
-        }
-
         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;
-                goto err4;
+                dev_err(&pdev->dev, "failed to get pcm clock\n");
+                ret = PTR_ERR(pcm->pclk);
+                goto err_dis_cclk;
         }
         clk_prepare_enable(pcm->pclk);
 
@@ -569,7 +552,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
                                                  NULL, NULL);
         if (ret) {
                 dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);
-                goto err5;
+                goto err_dis_pclk;
         }
 
         pm_runtime_enable(&pdev->dev);
@@ -578,36 +561,25 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
                                          &s3c_pcm_dai[pdev->id], 1);
         if (ret != 0) {
                 dev_err(&pdev->dev, "failed to get register DAI: %d\n", ret);
-                goto err6;
+                goto err_dis_pm;
         }
 
         return 0;
-err6:
+
+err_dis_pm:
         pm_runtime_disable(&pdev->dev);
-err5:
+err_dis_pclk:
         clk_disable_unprepare(pcm->pclk);
-err4:
-        iounmap(pcm->regs);
-err3:
-        release_mem_region(mem_res->start, resource_size(mem_res));
-err2:
+err_dis_cclk:
         clk_disable_unprepare(pcm->cclk);
-err1:
         return ret;
 }
 
 static int s3c_pcm_dev_remove(struct platform_device *pdev)
 {
         struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id];
-        struct resource *mem_res;
 
         pm_runtime_disable(&pdev->dev);
-
-        iounmap(pcm->regs);
-
-        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(mem_res->start, resource_size(mem_res));
-
         clk_disable_unprepare(pcm->cclk);
         clk_disable_unprepare(pcm->pclk);
 
diff --git a/sound/soc/samsung/regs-ac97.h b/sound/soc/samsung/regs-ac97.h
deleted file mode 100644
index a71be45bbffc..000000000000
--- a/sound/soc/samsung/regs-ac97.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2006 Simtec Electronics <linux@simtec.co.uk>
- *              http://www.simtec.co.uk/products/SWLINUX/
- *
- * 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.
- *
- * S3C2440 AC97 Controller
-*/
-
-#ifndef __SAMSUNG_REGS_AC97_H__
-#define __SAMSUNG_REGS_AC97_H__
-
-#define S3C_AC97_GLBCTRL                                (0x00)
-
-#define S3C_AC97_GLBCTRL_CODECREADYIE                   (1<<22)
-#define S3C_AC97_GLBCTRL_PCMOUTURIE                     (1<<21)
-#define S3C_AC97_GLBCTRL_PCMINORIE                      (1<<20)
-#define S3C_AC97_GLBCTRL_MICINORIE                      (1<<19)
-#define S3C_AC97_GLBCTRL_PCMOUTTIE                      (1<<18)
-#define S3C_AC97_GLBCTRL_PCMINTIE                       (1<<17)
-#define S3C_AC97_GLBCTRL_MICINTIE                       (1<<16)
-#define S3C_AC97_GLBCTRL_PCMOUTTM_OFF                   (0<<12)
-#define S3C_AC97_GLBCTRL_PCMOUTTM_PIO                   (1<<12)
-#define S3C_AC97_GLBCTRL_PCMOUTTM_DMA                   (2<<12)
-#define S3C_AC97_GLBCTRL_PCMOUTTM_MASK                  (3<<12)
-#define S3C_AC97_GLBCTRL_PCMINTM_OFF                    (0<<10)
-#define S3C_AC97_GLBCTRL_PCMINTM_PIO                    (1<<10)
-#define S3C_AC97_GLBCTRL_PCMINTM_DMA                    (2<<10)
-#define S3C_AC97_GLBCTRL_PCMINTM_MASK                   (3<<10)
-#define S3C_AC97_GLBCTRL_MICINTM_OFF                    (0<<8)
-#define S3C_AC97_GLBCTRL_MICINTM_PIO                    (1<<8)
-#define S3C_AC97_GLBCTRL_MICINTM_DMA                    (2<<8)
-#define S3C_AC97_GLBCTRL_MICINTM_MASK                   (3<<8)
-#define S3C_AC97_GLBCTRL_TRANSFERDATAENABLE             (1<<3)
-#define S3C_AC97_GLBCTRL_ACLINKON                       (1<<2)
-#define S3C_AC97_GLBCTRL_WARMRESET                      (1<<1)
-#define S3C_AC97_GLBCTRL_COLDRESET                      (1<<0)
-
-#define S3C_AC97_GLBSTAT                                (0x04)
-
-#define S3C_AC97_GLBSTAT_CODECREADY                     (1<<22)
-#define S3C_AC97_GLBSTAT_PCMOUTUR                       (1<<21)
-#define S3C_AC97_GLBSTAT_PCMINORI                       (1<<20)
-#define S3C_AC97_GLBSTAT_MICINORI                       (1<<19)
-#define S3C_AC97_GLBSTAT_PCMOUTTI                       (1<<18)
-#define S3C_AC97_GLBSTAT_PCMINTI                        (1<<17)
-#define S3C_AC97_GLBSTAT_MICINTI                        (1<<16)
-#define S3C_AC97_GLBSTAT_MAINSTATE_IDLE                 (0<<0)
-#define S3C_AC97_GLBSTAT_MAINSTATE_INIT                 (1<<0)
-#define S3C_AC97_GLBSTAT_MAINSTATE_READY                (2<<0)
-#define S3C_AC97_GLBSTAT_MAINSTATE_ACTIVE               (3<<0)
-#define S3C_AC97_GLBSTAT_MAINSTATE_LP                   (4<<0)
-#define S3C_AC97_GLBSTAT_MAINSTATE_WARM                 (5<<0)
-
-#define S3C_AC97_CODEC_CMD                              (0x08)
-
-#define S3C_AC97_CODEC_CMD_READ                         (1<<23)
-
-#define S3C_AC97_STAT                                   (0x0c)
-#define S3C_AC97_PCM_ADDR                               (0x10)
-#define S3C_AC97_PCM_DATA                               (0x18)
-#define S3C_AC97_MIC_DATA                               (0x1C)
-
-#endif /* __SAMSUNG_REGS_AC97_H__ */
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index 0a4718207e6e..6d0b8897fa6c 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -35,12 +35,10 @@
 #include <linux/platform_data/asoc-s3c.h>
 
 static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_out = {
-        .chan_name      = "tx",
         .addr_width     = 4,
 };
 
 static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_in = {
-        .chan_name      = "rx",
         .addr_width     = 4,
 };
 
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 9052f6a7073e..07f5091b33e8 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -30,15 +30,11 @@
 #include "dma.h"
 #include "s3c24xx-i2s.h"
 
-#include <linux/platform_data/asoc-s3c.h>
-
 static struct snd_dmaengine_dai_dma_data s3c24xx_i2s_pcm_stereo_out = {
-        .chan_name      = "tx",
         .addr_width     = 2,
 };
 
 static struct snd_dmaengine_dai_dma_data s3c24xx_i2s_pcm_stereo_in = {
-        .chan_name      = "rx",
         .addr_width     = 2,
 };
 
@@ -58,8 +54,6 @@ static void s3c24xx_snd_txctrl(int on)
         u32 iiscon;
         u32 iismod;
 
-        pr_debug("Entered %s\n", __func__);
-
         iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON);
         iiscon  = readl(s3c24xx_i2s.regs + S3C2410_IISCON);
         iismod  = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
@@ -103,8 +97,6 @@ static void s3c24xx_snd_rxctrl(int on)
         u32 iiscon;
         u32 iismod;
 
-        pr_debug("Entered %s\n", __func__);
-
         iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON);
         iiscon  = readl(s3c24xx_i2s.regs + S3C2410_IISCON);
         iismod  = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
@@ -151,8 +143,6 @@ static int s3c24xx_snd_lrsync(void)
         u32 iiscon;
         int timeout = 50; /* 5ms */
 
-        pr_debug("Entered %s\n", __func__);
-
         while (1) {
                 iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON);
                 if (iiscon & S3C2410_IISCON_LRINDEX)
@@ -171,8 +161,6 @@ static int s3c24xx_snd_lrsync(void)
  */
 static inline int s3c24xx_snd_is_clkmaster(void)
 {
-        pr_debug("Entered %s\n", __func__);
-
         return (readl(s3c24xx_i2s.regs + S3C2410_IISMOD) & S3C2410_IISMOD_SLAVE) ? 0:1;
 }
 
@@ -184,8 +172,6 @@ static int s3c24xx_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
 {
         u32 iismod;
 
-        pr_debug("Entered %s\n", __func__);
-
         iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
         pr_debug("hw_params r: IISMOD: %x \n", iismod);
 
@@ -213,6 +199,7 @@ static int s3c24xx_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
 
         writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD);
         pr_debug("hw_params w: IISMOD: %x \n", iismod);
+
         return 0;
 }
 
@@ -223,8 +210,6 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream,
         struct snd_dmaengine_dai_dma_data *dma_data;
         u32 iismod;
 
-        pr_debug("Entered %s\n", __func__);
-
         dma_data = snd_soc_dai_get_dma_data(dai, substream);
 
         /* Working copies of register */
@@ -246,6 +231,7 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream,
 
         writel(iismod, s3c24xx_i2s.regs + S3C2410_IISMOD);
         pr_debug("hw_params w: IISMOD: %x\n", iismod);
+
         return 0;
 }
 
@@ -254,8 +240,6 @@ static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
 {
         int ret = 0;
 
-        pr_debug("Entered %s\n", __func__);
-
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_RESUME:
@@ -297,8 +281,6 @@ static int s3c24xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
 {
         u32 iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
 
-        pr_debug("Entered %s\n", __func__);
-
         iismod &= ~S3C2440_IISMOD_MPLL;
 
         switch (clk_id) {
@@ -323,8 +305,6 @@ static int s3c24xx_i2s_set_clkdiv(struct snd_soc_dai *cpu_dai,
 {
         u32 reg;
 
-        pr_debug("Entered %s\n", __func__);
-
         switch (div_id) {
         case S3C24XX_DIV_BCLK:
                 reg = readl(s3c24xx_i2s.regs + S3C2410_IISMOD) & ~S3C2410_IISMOD_FS_MASK;
@@ -358,8 +338,6 @@ EXPORT_SYMBOL_GPL(s3c24xx_i2s_get_clockrate);
 
 static int s3c24xx_i2s_probe(struct snd_soc_dai *dai)
 {
-        pr_debug("Entered %s\n", __func__);
-
         snd_soc_dai_init_dma_data(dai, &s3c24xx_i2s_pcm_stereo_out,
                                         &s3c24xx_i2s_pcm_stereo_in);
 
@@ -385,8 +363,6 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai)
 #ifdef CONFIG_PM
 static int s3c24xx_i2s_suspend(struct snd_soc_dai *cpu_dai)
 {
-        pr_debug("Entered %s\n", __func__);
-
         s3c24xx_i2s.iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON);
         s3c24xx_i2s.iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
         s3c24xx_i2s.iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON);
@@ -399,7 +375,6 @@ static int s3c24xx_i2s_suspend(struct snd_soc_dai *cpu_dai)
 
 static int s3c24xx_i2s_resume(struct snd_soc_dai *cpu_dai)
 {
-        pr_debug("Entered %s\n", __func__);
         clk_prepare_enable(s3c24xx_i2s.iis_clk);
 
         writel(s3c24xx_i2s.iiscon, s3c24xx_i2s.regs + S3C2410_IISCON);
@@ -414,7 +389,6 @@ static int s3c24xx_i2s_resume(struct snd_soc_dai *cpu_dai)
 #define s3c24xx_i2s_resume NULL
 #endif
 
-
 #define S3C24XX_I2S_RATES \
         (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \
         SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
@@ -451,41 +425,28 @@ static const struct snd_soc_component_driver s3c24xx_i2s_component = {
 
 static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
 {
-        int ret = 0;
         struct resource *res;
-        struct s3c_audio_pdata *pdata = dev_get_platdata(&pdev->dev);
-
-        if (!pdata) {
-                dev_err(&pdev->dev, "missing platform data");
-                return -ENXIO;
-        }
+        int ret;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(&pdev->dev, "Can't get IO resource.\n");
-                return -ENOENT;
-        }
         s3c24xx_i2s.regs = devm_ioremap_resource(&pdev->dev, res);
         if (IS_ERR(s3c24xx_i2s.regs))
                 return PTR_ERR(s3c24xx_i2s.regs);
 
         s3c24xx_i2s_pcm_stereo_out.addr = res->start + S3C2410_IISFIFO;
-        s3c24xx_i2s_pcm_stereo_out.filter_data = pdata->dma_playback;
         s3c24xx_i2s_pcm_stereo_in.addr = res->start + S3C2410_IISFIFO;
-        s3c24xx_i2s_pcm_stereo_in.filter_data = pdata->dma_capture;
 
-        ret = samsung_asoc_dma_platform_register(&pdev->dev,
-                                                 pdata->dma_filter,
+        ret = samsung_asoc_dma_platform_register(&pdev->dev, NULL,
                                                  NULL, NULL);
         if (ret) {
-                pr_err("failed to register the dma: %d\n", ret);
+                dev_err(&pdev->dev, "Failed to register the DMA: %d\n", ret);
                 return ret;
         }
 
         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");
+                dev_err(&pdev->dev, "Failed to register the DAI\n");
 
         return ret;
 }
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c
index 7853fbe6ccc9..81a78940967c 100644
--- a/sound/soc/samsung/s3c24xx_uda134x.c
+++ b/sound/soc/samsung/s3c24xx_uda134x.c
@@ -19,9 +19,15 @@
 #include <sound/s3c24xx_uda134x.h>
 
 #include "regs-iis.h"
-
 #include "s3c24xx-i2s.h"
 
+struct s3c24xx_uda134x {
+        struct clk *xtal;
+        struct clk *pclk;
+        struct mutex clk_lock;
+        int clk_users;
+};
+
 /* #define ENFORCE_RATES 1 */
 /*
   Unfortunately the S3C24XX in master mode has a limited capacity of
@@ -36,15 +42,6 @@
   possible an error will be returned.
 */
 
-static struct clk *xtal;
-static struct clk *pclk;
-/* this is need because we don't have a place where to keep the
- * pointers to the clocks in each substream. We get the clocks only
- * when we are actually using them so we don't block stuff like
- * frequency change or oscillator power-off */
-static int clk_users;
-static DEFINE_MUTEX(clk_lock);
-
 static unsigned int rates[33 * 2];
 #ifdef ENFORCE_RATES
 static struct snd_pcm_hw_constraint_list hw_constraints_rates = {
@@ -57,26 +54,24 @@ static struct snd_pcm_hw_constraint_list hw_constraints_rates = {
 static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct s3c24xx_uda134x *priv = snd_soc_card_get_drvdata(rtd->card);
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-#ifdef ENFORCE_RATES
-        struct snd_pcm_runtime *runtime = substream->runtime;
-#endif
         int ret = 0;
 
-        mutex_lock(&clk_lock);
+        mutex_lock(&priv->clk_lock);
 
-        if (clk_users == 0) {
-                xtal = clk_get(rtd->dev, "xtal");
-                if (IS_ERR(xtal)) {
+        if (priv->clk_users == 0) {
+                priv->xtal = clk_get(rtd->dev, "xtal");
+                if (IS_ERR(priv->xtal)) {
                         dev_err(rtd->dev, "%s cannot get xtal\n", __func__);
-                        ret = PTR_ERR(xtal);
+                        ret = PTR_ERR(priv->xtal);
                 } else {
-                        pclk = clk_get(cpu_dai->dev, "iis");
-                        if (IS_ERR(pclk)) {
+                        priv->pclk = clk_get(cpu_dai->dev, "iis");
+                        if (IS_ERR(priv->pclk)) {
                                 dev_err(rtd->dev, "%s cannot get pclk\n",
                                         __func__);
-                                clk_put(xtal);
-                                ret = PTR_ERR(pclk);
+                                clk_put(priv->xtal);
+                                ret = PTR_ERR(priv->pclk);
                         }
                 }
                 if (!ret) {
@@ -85,18 +80,19 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream)
                         for (i = 0; i < 2; i++) {
                                 int fs = i ? 256 : 384;
 
-                                rates[i*33] = clk_get_rate(xtal) / fs;
+                                rates[i*33] = clk_get_rate(priv->xtal) / fs;
                                 for (j = 1; j < 33; j++)
-                                        rates[i*33 + j] = clk_get_rate(pclk) /
+                                        rates[i*33 + j] = clk_get_rate(priv->pclk) /
                                                 (j * fs);
                         }
                 }
         }
-        clk_users += 1;
-        mutex_unlock(&clk_lock);
+        priv->clk_users += 1;
+        mutex_unlock(&priv->clk_lock);
+
         if (!ret) {
 #ifdef ENFORCE_RATES
-                ret = snd_pcm_hw_constraint_list(runtime, 0,
+                ret = snd_pcm_hw_constraint_list(substream->runtime, 0,
                                                  SNDRV_PCM_HW_PARAM_RATE,
                                                  &hw_constraints_rates);
                 if (ret < 0)
@@ -109,15 +105,18 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream)
 
 static void s3c24xx_uda134x_shutdown(struct snd_pcm_substream *substream)
 {
-        mutex_lock(&clk_lock);
-        clk_users -= 1;
-        if (clk_users == 0) {
-                clk_put(xtal);
-                xtal = NULL;
-                clk_put(pclk);
-                pclk = NULL;
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct s3c24xx_uda134x *priv = snd_soc_card_get_drvdata(rtd->card);
+
+        mutex_lock(&priv->clk_lock);
+        priv->clk_users -= 1;
+        if (priv->clk_users == 0) {
+                clk_put(priv->xtal);
+                priv->xtal = NULL;
+                clk_put(priv->pclk);
+                priv->pclk = NULL;
         }
-        mutex_unlock(&clk_lock);
+        mutex_unlock(&priv->clk_lock);
 }
 
 static int s3c24xx_uda134x_hw_params(struct snd_pcm_substream *substream,
@@ -228,10 +227,18 @@ static struct snd_soc_card snd_soc_s3c24xx_uda134x = {
 static int s3c24xx_uda134x_probe(struct platform_device *pdev)
 {
         struct snd_soc_card *card = &snd_soc_s3c24xx_uda134x;
+        struct s3c24xx_uda134x *priv;
         int ret;
 
-        platform_set_drvdata(pdev, card);
+        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        mutex_init(&priv->clk_lock);
+
         card->dev = &pdev->dev;
+        platform_set_drvdata(pdev, card);
+        snd_soc_card_set_drvdata(card, priv);
 
         ret = devm_snd_soc_register_card(&pdev->dev, card);
         if (ret)
diff --git a/sound/soc/samsung/smdk2443_wm9710.c b/sound/soc/samsung/smdk2443_wm9710.c
deleted file mode 100644
index c390aad68cfb..000000000000
--- a/sound/soc/samsung/smdk2443_wm9710.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * smdk2443_wm9710.c  --  SoC audio for smdk2443
- *
- * Copyright 2007 Wolfson Microelectronics PLC.
- * Author: Graeme Gregory
- *         graeme.gregory@wolfsonmicro.com or linux@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.
- *
- */
-
-#include <linux/module.h>
-#include <sound/soc.h>
-
-static struct snd_soc_card smdk2443;
-
-static struct snd_soc_dai_link smdk2443_dai[] = {
-{
-        .name = "AC97",
-        .stream_name = "AC97 HiFi",
-        .cpu_dai_name = "samsung-ac97",
-        .codec_dai_name = "ac97-hifi",
-        .codec_name = "ac97-codec",
-        .platform_name = "samsung-ac97",
-},
-};
-
-static struct snd_soc_card smdk2443 = {
-        .name = "SMDK2443",
-        .owner = THIS_MODULE,
-        .dai_link = smdk2443_dai,
-        .num_links = ARRAY_SIZE(smdk2443_dai),
-};
-
-static struct platform_device *smdk2443_snd_ac97_device;
-
-static int __init smdk2443_init(void)
-{
-        int ret;
-
-        smdk2443_snd_ac97_device = platform_device_alloc("soc-audio", -1);
-        if (!smdk2443_snd_ac97_device)
-                return -ENOMEM;
-
-        platform_set_drvdata(smdk2443_snd_ac97_device, &smdk2443);
-        ret = platform_device_add(smdk2443_snd_ac97_device);
-
-        if (ret)
-                platform_device_put(smdk2443_snd_ac97_device);
-
-        return ret;
-}
-
-static void __exit smdk2443_exit(void)
-{
-        platform_device_unregister(smdk2443_snd_ac97_device);
-}
-
-module_init(smdk2443_init);
-module_exit(smdk2443_exit);
-
-/* Module information */
-MODULE_AUTHOR("Graeme Gregory, graeme.gregory@wolfsonmicro.com, www.wolfsonmicro.com");
-MODULE_DESCRIPTION("ALSA SoC WM9710 SMDK2443");
-MODULE_LICENSE("GPL");
diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c
index 548bfd993788..de724ce7b955 100644
--- a/sound/soc/samsung/smdk_wm8580.c
+++ b/sound/soc/samsung/smdk_wm8580.c
@@ -14,8 +14,6 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <asm/mach-types.h>
-
 #include "../codecs/wm8580.h"
 #include "i2s.h"
 
@@ -147,7 +145,6 @@ static int smdk_wm8580_init_paiftx(struct snd_soc_pcm_runtime *rtd)
 enum {
         PRI_PLAYBACK = 0,
         PRI_CAPTURE,
-        SEC_PLAYBACK,
 };
 
 #define SMDK_DAI_FMT (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | \
@@ -157,7 +154,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
         [PRI_PLAYBACK] = { /* Primary Playback i/f */
                 .name = "WM8580 PAIF RX",
                 .stream_name = "Playback",
-                .cpu_dai_name = "samsung-i2s.0",
+                .cpu_dai_name = "samsung-i2s.2",
                 .codec_dai_name = "wm8580-hifi-playback",
                 .platform_name = "samsung-i2s.0",
                 .codec_name = "wm8580.0-001b",
@@ -167,7 +164,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
         [PRI_CAPTURE] = { /* Primary Capture i/f */
                 .name = "WM8580 PAIF TX",
                 .stream_name = "Capture",
-                .cpu_dai_name = "samsung-i2s.0",
+                .cpu_dai_name = "samsung-i2s.2",
                 .codec_dai_name = "wm8580-hifi-capture",
                 .platform_name = "samsung-i2s.0",
                 .codec_name = "wm8580.0-001b",
@@ -175,23 +172,13 @@ static struct snd_soc_dai_link smdk_dai[] = {
                 .init = smdk_wm8580_init_paiftx,
                 .ops = &smdk_ops,
         },
-        [SEC_PLAYBACK] = { /* Sec_Fifo Playback i/f */
-                .name = "Sec_FIFO TX",
-                .stream_name = "Playback",
-                .cpu_dai_name = "samsung-i2s-sec",
-                .codec_dai_name = "wm8580-hifi-playback",
-                .platform_name = "samsung-i2s-sec",
-                .codec_name = "wm8580.0-001b",
-                .dai_fmt = SMDK_DAI_FMT,
-                .ops = &smdk_ops,
-        },
 };
 
 static struct snd_soc_card smdk = {
         .name = "SMDK-I2S",
         .owner = THIS_MODULE,
         .dai_link = smdk_dai,
-        .num_links = 2,
+        .num_links = ARRAY_SIZE(smdk_dai),
 
         .dapm_widgets = smdk_wm8580_dapm_widgets,
         .num_dapm_widgets = ARRAY_SIZE(smdk_wm8580_dapm_widgets),
@@ -204,17 +191,6 @@ static struct platform_device *smdk_snd_device;
 static int __init smdk_audio_init(void)
 {
         int ret;
-        char *str;
-
-        if (machine_is_smdkc100()
-                        || machine_is_smdkv210() || machine_is_smdkc110()) {
-                smdk.num_links = 3;
-        } else if (machine_is_smdk6410()) {
-                str = (char *)smdk_dai[PRI_PLAYBACK].cpu_dai_name;
-                str[strlen(str) - 1] = '2';
-                str = (char *)smdk_dai[PRI_CAPTURE].cpu_dai_name;
-                str[strlen(str) - 1] = '2';
-        }
 
         smdk_snd_device = platform_device_alloc("soc-audio", -1);
         if (!smdk_snd_device)
diff --git a/sound/soc/samsung/smdk_wm8580pcm.c b/sound/soc/samsung/smdk_wm8580pcm.c
deleted file mode 100644
index a6d223310c67..000000000000
--- a/sound/soc/samsung/smdk_wm8580pcm.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *  sound/soc/samsung/smdk_wm8580pcm.c
- *
- *  Copyright (c) 2011 Samsung Electronics Co. Ltd
- *
- *  This program is free software; you can redistribute  it and/or  modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- */
-#include <linux/module.h>
-#include <sound/soc.h>
-#include <sound/pcm_params.h>
-#include <sound/pcm.h>
-
-#include <asm/mach-types.h>
-
-#include "../codecs/wm8580.h"
-#include "pcm.h"
-
-/*
- * Board Settings:
- *  o '1' means 'ON'
- *  o '0' means 'OFF'
- *  o 'X' means 'Don't care'
- *
- * SMDK6410 Base B/D: CFG1-0000, CFG2-1111
- * SMDKC110, SMDKV210: CFGB11-100100, CFGB12-0000
- */
-
-#define SMDK_WM8580_EXT_OSC 12000000
-#define SMDK_WM8580_EXT_MCLK 4096000
-#define SMDK_WM8580_EXT_VOICE 2048000
-
-static unsigned long mclk_freq;
-static unsigned long xtal_freq;
-
-/*
- * If MCLK clock directly gets from XTAL, we don't have to use PLL
- * to make MCLK, but if XTAL clock source connects with other codec
- * pin (like XTI), we should have to set codec's PLL to make MCLK.
- * Because Samsung SoC does not support pcmcdclk output like I2S.
- */
-
-static int smdk_wm8580_pcm_hw_params(struct snd_pcm_substream *substream,
-                              struct snd_pcm_hw_params *params)
-{
-        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;
-        int rfs, ret;
-
-        switch (params_rate(params)) {
-        case 8000:
-                break;
-        default:
-                printk(KERN_ERR "%s:%d Sampling Rate %u not supported!\n",
-                __func__, __LINE__, params_rate(params));
-                return -EINVAL;
-        }
-
-        rfs = mclk_freq / params_rate(params) / 2;
-
-        if (mclk_freq == xtal_freq) {
-                ret = snd_soc_dai_set_sysclk(codec_dai, WM8580_CLKSRC_MCLK,
-                                                mclk_freq, SND_SOC_CLOCK_IN);
-                if (ret < 0)
-                        return ret;
-
-                ret = snd_soc_dai_set_clkdiv(codec_dai, WM8580_MCLK,
-                                                WM8580_CLKSRC_MCLK);
-                if (ret < 0)
-                        return ret;
-        } else {
-                ret = snd_soc_dai_set_sysclk(codec_dai, WM8580_CLKSRC_PLLA,
-                                                mclk_freq, SND_SOC_CLOCK_IN);
-                if (ret < 0)
-                        return ret;
-
-                ret = snd_soc_dai_set_clkdiv(codec_dai, WM8580_MCLK,
-                                                WM8580_CLKSRC_PLLA);
-                if (ret < 0)
-                        return ret;
-
-                ret = snd_soc_dai_set_pll(codec_dai, WM8580_PLLA, 0,
-                                                xtal_freq, mclk_freq);
-                if (ret < 0)
-                        return ret;
-        }
-
-        /* Set PCM source clock on CPU */
-        ret = snd_soc_dai_set_sysclk(cpu_dai, S3C_PCM_CLKSRC_MUX,
-                                        mclk_freq, SND_SOC_CLOCK_IN);
-        if (ret < 0)
-                return ret;
-
-        /* Set SCLK_DIV for making bclk */
-        ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C_PCM_SCLK_PER_FS, rfs);
-        if (ret < 0)
-                return ret;
-
-        return 0;
-}
-
-static struct snd_soc_ops smdk_wm8580_pcm_ops = {
-        .hw_params = smdk_wm8580_pcm_hw_params,
-};
-
-#define SMDK_DAI_FMT (SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF | \
-        SND_SOC_DAIFMT_CBS_CFS)
-
-static struct snd_soc_dai_link smdk_dai[] = {
-        {
-                .name = "WM8580 PAIF PCM RX",
-                .stream_name = "Playback",
-                .cpu_dai_name = "samsung-pcm.0",
-                .codec_dai_name = "wm8580-hifi-playback",
-                .platform_name = "samsung-audio",
-                .codec_name = "wm8580.0-001b",
-                .dai_fmt = SMDK_DAI_FMT,
-                .ops = &smdk_wm8580_pcm_ops,
-        }, {
-                .name = "WM8580 PAIF PCM TX",
-                .stream_name = "Capture",
-                .cpu_dai_name = "samsung-pcm.0",
-                .codec_dai_name = "wm8580-hifi-capture",
-                .platform_name = "samsung-pcm.0",
-                .codec_name = "wm8580.0-001b",
-                .dai_fmt = SMDK_DAI_FMT,
-                .ops = &smdk_wm8580_pcm_ops,
-        },
-};
-
-static struct snd_soc_card smdk_pcm = {
-        .name = "SMDK-PCM",
-        .owner = THIS_MODULE,
-        .dai_link = smdk_dai,
-        .num_links = 2,
-};
-
-/*
- * After SMDKC110 Base Board's Rev is '0.1', 12MHz External OSC(X1)
- * is absent (or not connected), so we connect EXT_VOICE_CLK(OSC4),
- * 2.0484Mhz, directly with MCLK both Codec and SoC.
- */
-static int snd_smdk_probe(struct platform_device *pdev)
-{
-        int ret = 0;
-
-        xtal_freq = SMDK_WM8580_EXT_OSC;
-        mclk_freq = SMDK_WM8580_EXT_MCLK;
-
-        if (machine_is_smdkc110() || machine_is_smdkv210())
-                xtal_freq = mclk_freq = SMDK_WM8580_EXT_VOICE;
-
-        smdk_pcm.dev = &pdev->dev;
-        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;
-}
-
-static struct platform_driver snd_smdk_driver = {
-        .driver = {
-                .name = "samsung-smdk-pcm",
-        },
-        .probe = snd_smdk_probe,
-};
-
-module_platform_driver(snd_smdk_driver);
-
-MODULE_AUTHOR("Sangbeom Kim, <sbkim73@samsung.com>");
-MODULE_DESCRIPTION("ALSA SoC SMDK WM8580 for PCM");
-MODULE_LICENSE("GPL");
diff --git a/sound/soc/samsung/smdk_wm9713.c b/sound/soc/samsung/smdk_wm9713.c
deleted file mode 100644
index 0d20e4ed27aa..000000000000
--- a/sound/soc/samsung/smdk_wm9713.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * smdk_wm9713.c  --  SoC audio for SMDK
- *
- * Copyright 2010 Samsung Electronics Co. Ltd.
- * Author: Jaswinder Singh Brar <jassisinghbrar@gmail.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.
- *
- */
-
-#include <linux/module.h>
-#include <sound/soc.h>
-
-static struct snd_soc_card smdk;
-
-/*
- * Default CFG switch settings to use this driver:
- *
- *   SMDK6410: Set CFG1 1-3 On, CFG2 1-4 Off
- *   SMDKC100: Set CFG6 1-3 On, CFG7 1   On
- *   SMDKC110: Set CFGB10 1-2 Off, CFGB12 1-3 On
- *   SMDKV210: Set CFGB10 1-2 Off, CFGB12 1-3 On
- *   SMDKV310: Set CFG2 1-2 Off, CFG4 All On, CFG7 All Off, CFG8 1-On
- */
-
-/*
- Playback (HeadPhone):-
-        $ amixer sset 'Headphone' unmute
-        $ amixer sset 'Right Headphone Out Mux' 'Headphone'
-        $ amixer sset 'Left Headphone Out Mux' 'Headphone'
-        $ amixer sset 'Right HP Mixer PCM' unmute
-        $ amixer sset 'Left HP Mixer PCM' unmute
-
- Capture (LineIn):-
-        $ amixer sset 'Right Capture Source' 'Line'
-        $ amixer sset 'Left Capture Source' 'Line'
-*/
-
-static struct snd_soc_dai_link smdk_dai = {
-        .name = "AC97",
-        .stream_name = "AC97 PCM",
-        .platform_name = "samsung-ac97",
-        .cpu_dai_name = "samsung-ac97",
-        .codec_dai_name = "wm9713-hifi",
-        .codec_name = "wm9713-codec",
-};
-
-static struct snd_soc_card smdk = {
-        .name = "SMDK WM9713",
-        .owner = THIS_MODULE,
-        .dai_link = &smdk_dai,
-        .num_links = 1,
-};
-
-static struct platform_device *smdk_snd_wm9713_device;
-static struct platform_device *smdk_snd_ac97_device;
-
-static int __init smdk_init(void)
-{
-        int ret;
-
-        smdk_snd_wm9713_device = platform_device_alloc("wm9713-codec", -1);
-        if (!smdk_snd_wm9713_device)
-                return -ENOMEM;
-
-        ret = platform_device_add(smdk_snd_wm9713_device);
-        if (ret)
-                goto err1;
-
-        smdk_snd_ac97_device = platform_device_alloc("soc-audio", -1);
-        if (!smdk_snd_ac97_device) {
-                ret = -ENOMEM;
-                goto err2;
-        }
-
-        platform_set_drvdata(smdk_snd_ac97_device, &smdk);
-
-        ret = platform_device_add(smdk_snd_ac97_device);
-        if (ret)
-                goto err3;
-
-        return 0;
-
-err3:
-        platform_device_put(smdk_snd_ac97_device);
-err2:
-        platform_device_del(smdk_snd_wm9713_device);
-err1:
-        platform_device_put(smdk_snd_wm9713_device);
-        return ret;
-}
-
-static void __exit smdk_exit(void)
-{
-        platform_device_unregister(smdk_snd_ac97_device);
-        platform_device_unregister(smdk_snd_wm9713_device);
-}
-
-module_init(smdk_init);
-module_exit(smdk_exit);
-
-/* Module information */
-MODULE_AUTHOR("Jaswinder Singh Brar, jassisinghbrar@gmail.com");
-MODULE_DESCRIPTION("ALSA SoC SMDK+WM9713");
-MODULE_LICENSE("GPL");
diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c
new file mode 100644
index 000000000000..5cdf7d19b87f
--- /dev/null
+++ b/sound/soc/samsung/tm2_wm5110.c
@@ -0,0 +1,552 @@
+/*
+ * Copyright (C) 2015 - 2016 Samsung Electronics Co., Ltd.
+ *
+ * Authors: Inha Song <ideal.song@samsung.com>
+ *          Sylwester Nawrocki <s.nawrocki@samsung.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/clk.h>
+#include <linux/gpio.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+
+#include "i2s.h"
+#include "../codecs/wm5110.h"
+
+/*
+ * The source clock is XCLKOUT with its mux set to the external fixed rate
+ * oscillator (XXTI).
+ */
+#define MCLK_RATE       24000000U
+
+#define TM2_DAI_AIF1    0
+#define TM2_DAI_AIF2    1
+
+struct tm2_machine_priv {
+        struct snd_soc_codec *codec;
+        unsigned int sysclk_rate;
+        struct gpio_desc *gpio_mic_bias;
+};
+
+static int tm2_start_sysclk(struct snd_soc_card *card)
+{
+        struct tm2_machine_priv *priv = snd_soc_card_get_drvdata(card);
+        struct snd_soc_codec *codec = priv->codec;
+        int ret;
+
+        ret = snd_soc_codec_set_pll(codec, WM5110_FLL1_REFCLK,
+                                    ARIZONA_FLL_SRC_MCLK1,
+                                    MCLK_RATE,
+                                    priv->sysclk_rate);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to set FLL1 source: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_codec_set_pll(codec, WM5110_FLL1,
+                                    ARIZONA_FLL_SRC_MCLK1,
+                                    MCLK_RATE,
+                                    priv->sysclk_rate);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to start FLL1: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_codec_set_sysclk(codec, ARIZONA_CLK_SYSCLK,
+                                       ARIZONA_CLK_SRC_FLL1,
+                                       priv->sysclk_rate,
+                                       SND_SOC_CLOCK_IN);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to set SYSCLK source: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int tm2_stop_sysclk(struct snd_soc_card *card)
+{
+        struct tm2_machine_priv *priv = snd_soc_card_get_drvdata(card);
+        struct snd_soc_codec *codec = priv->codec;
+        int ret;
+
+        ret = snd_soc_codec_set_pll(codec, WM5110_FLL1, 0, 0, 0);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to stop FLL1: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_codec_set_sysclk(codec, ARIZONA_CLK_SYSCLK,
+                                       ARIZONA_CLK_SRC_FLL1, 0, 0);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to stop SYSCLK: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int tm2_aif1_hw_params(struct snd_pcm_substream *substream,
+                                struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_codec *codec = rtd->codec;
+        struct tm2_machine_priv *priv = snd_soc_card_get_drvdata(rtd->card);
+
+        switch (params_rate(params)) {
+        case 4000:
+        case 8000:
+        case 12000:
+        case 16000:
+        case 24000:
+        case 32000:
+        case 48000:
+        case 96000:
+        case 192000:
+                /* Highest possible SYSCLK frequency: 147.456MHz */
+                priv->sysclk_rate = 147456000U;
+                break;
+        case 11025:
+        case 22050:
+        case 44100:
+        case 88200:
+        case 176400:
+                /* Highest possible SYSCLK frequency: 135.4752 MHz */
+                priv->sysclk_rate = 135475200U;
+                break;
+        default:
+                dev_err(codec->dev, "Not supported sample rate: %d\n",
+                        params_rate(params));
+                return -EINVAL;
+        }
+
+        return tm2_start_sysclk(rtd->card);
+}
+
+static struct snd_soc_ops tm2_aif1_ops = {
+        .hw_params = tm2_aif1_hw_params,
+};
+
+static int tm2_aif2_hw_params(struct snd_pcm_substream *substream,
+                                struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_codec *codec = rtd->codec;
+        unsigned int asyncclk_rate;
+        int ret;
+
+        switch (params_rate(params)) {
+        case 8000:
+        case 12000:
+        case 16000:
+                /* Highest possible ASYNCCLK frequency: 49.152MHz */
+                asyncclk_rate = 49152000U;
+                break;
+        case 11025:
+                /* Highest possible ASYNCCLK frequency: 45.1584 MHz */
+                asyncclk_rate = 45158400U;
+                break;
+        default:
+                dev_err(codec->dev, "Not supported sample rate: %d\n",
+                        params_rate(params));
+                return -EINVAL;
+        }
+
+        ret = snd_soc_codec_set_pll(codec, WM5110_FLL2_REFCLK,
+                                    ARIZONA_FLL_SRC_MCLK1,
+                                    MCLK_RATE,
+                                    asyncclk_rate);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to set FLL2 source: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_codec_set_pll(codec, WM5110_FLL2,
+                                    ARIZONA_FLL_SRC_MCLK1,
+                                    MCLK_RATE,
+                                    asyncclk_rate);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to start FLL2: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_codec_set_sysclk(codec, ARIZONA_CLK_ASYNCCLK,
+                                       ARIZONA_CLK_SRC_FLL2,
+                                       asyncclk_rate,
+                                       SND_SOC_CLOCK_IN);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to set ASYNCCLK source: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int tm2_aif2_hw_free(struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_codec *codec = rtd->codec;
+        int ret;
+
+        /* disable FLL2 */
+        ret = snd_soc_codec_set_pll(codec, WM5110_FLL2, ARIZONA_FLL_SRC_MCLK1,
+                                    0, 0);
+        if (ret < 0)
+                dev_err(codec->dev, "Failed to stop FLL2: %d\n", ret);
+
+        return ret;
+}
+
+static struct snd_soc_ops tm2_aif2_ops = {
+        .hw_params = tm2_aif2_hw_params,
+        .hw_free = tm2_aif2_hw_free,
+};
+
+static int tm2_mic_bias(struct snd_soc_dapm_widget *w,
+                                struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_card *card = w->dapm->card;
+        struct tm2_machine_priv *priv = snd_soc_card_get_drvdata(card);
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                gpiod_set_value_cansleep(priv->gpio_mic_bias,  1);
+                break;
+        case SND_SOC_DAPM_POST_PMD:
+                gpiod_set_value_cansleep(priv->gpio_mic_bias,  0);
+                break;
+        }
+
+        return 0;
+}
+
+static int tm2_set_bias_level(struct snd_soc_card *card,
+                                struct snd_soc_dapm_context *dapm,
+                                enum snd_soc_bias_level level)
+{
+        struct snd_soc_pcm_runtime *rtd;
+
+        rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);
+
+        if (dapm->dev != rtd->codec_dai->dev)
+                return 0;
+
+        switch (level) {
+        case SND_SOC_BIAS_STANDBY:
+                if (card->dapm.bias_level == SND_SOC_BIAS_OFF)
+                        tm2_start_sysclk(card);
+                break;
+        case SND_SOC_BIAS_OFF:
+                tm2_stop_sysclk(card);
+                break;
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+static struct snd_soc_aux_dev tm2_speaker_amp_dev;
+
+static int tm2_late_probe(struct snd_soc_card *card)
+{
+        struct tm2_machine_priv *priv = snd_soc_card_get_drvdata(card);
+        struct snd_soc_dai_link_component dlc = { 0 };
+        unsigned int ch_map[] = { 0, 1 };
+        struct snd_soc_dai *amp_pdm_dai;
+        struct snd_soc_pcm_runtime *rtd;
+        struct snd_soc_dai *aif1_dai;
+        struct snd_soc_dai *aif2_dai;
+        int ret;
+
+        rtd = snd_soc_get_pcm_runtime(card, card->dai_link[TM2_DAI_AIF1].name);
+        aif1_dai = rtd->codec_dai;
+        priv->codec = rtd->codec;
+
+        ret = snd_soc_dai_set_sysclk(aif1_dai, ARIZONA_CLK_SYSCLK, 0, 0);
+        if (ret < 0) {
+                dev_err(aif1_dai->dev, "Failed to set SYSCLK: %d\n", ret);
+                return ret;
+        }
+
+        rtd = snd_soc_get_pcm_runtime(card, card->dai_link[TM2_DAI_AIF2].name);
+        aif2_dai = rtd->codec_dai;
+
+        ret = snd_soc_dai_set_sysclk(aif2_dai, ARIZONA_CLK_ASYNCCLK, 0, 0);
+        if (ret < 0) {
+                dev_err(aif2_dai->dev, "Failed to set ASYNCCLK: %d\n", ret);
+                return ret;
+        }
+
+        dlc.of_node = tm2_speaker_amp_dev.codec_of_node;
+        amp_pdm_dai = snd_soc_find_dai(&dlc);
+        if (!amp_pdm_dai)
+                return -ENODEV;
+
+        /* Set the MAX98504 V/I sense PDM Tx DAI channel mapping */
+        ret = snd_soc_dai_set_channel_map(amp_pdm_dai, ARRAY_SIZE(ch_map),
+                                          ch_map, 0, NULL);
+        if (ret < 0)
+                return ret;
+
+        ret = snd_soc_dai_set_tdm_slot(amp_pdm_dai, 0x3, 0x0, 2, 16);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static const struct snd_kcontrol_new tm2_controls[] = {
+        SOC_DAPM_PIN_SWITCH("HP"),
+        SOC_DAPM_PIN_SWITCH("SPK"),
+        SOC_DAPM_PIN_SWITCH("RCV"),
+        SOC_DAPM_PIN_SWITCH("VPS"),
+        SOC_DAPM_PIN_SWITCH("HDMI"),
+
+        SOC_DAPM_PIN_SWITCH("Main Mic"),
+        SOC_DAPM_PIN_SWITCH("Sub Mic"),
+        SOC_DAPM_PIN_SWITCH("Third Mic"),
+
+        SOC_DAPM_PIN_SWITCH("Headset Mic"),
+};
+
+const struct snd_soc_dapm_widget tm2_dapm_widgets[] = {
+        SND_SOC_DAPM_HP("HP", NULL),
+        SND_SOC_DAPM_SPK("SPK", NULL),
+        SND_SOC_DAPM_SPK("RCV", NULL),
+        SND_SOC_DAPM_LINE("VPS", NULL),
+        SND_SOC_DAPM_LINE("HDMI", NULL),
+
+        SND_SOC_DAPM_MIC("Main Mic", tm2_mic_bias),
+        SND_SOC_DAPM_MIC("Sub Mic", NULL),
+        SND_SOC_DAPM_MIC("Third Mic", NULL),
+
+        SND_SOC_DAPM_MIC("Headset Mic", NULL),
+};
+
+static const struct snd_soc_component_driver tm2_component = {
+        .name   = "tm2-audio",
+};
+
+static struct snd_soc_dai_driver tm2_ext_dai[] = {
+        {
+                .name = "Voice call",
+                .playback = {
+                        .channels_min = 1,
+                        .channels_max = 4,
+                        .rate_min = 8000,
+                        .rate_max = 48000,
+                        .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
+                                        SNDRV_PCM_RATE_48000),
+                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                },
+                .capture = {
+                        .channels_min = 1,
+                        .channels_max = 4,
+                        .rate_min = 8000,
+                        .rate_max = 48000,
+                        .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
+                                        SNDRV_PCM_RATE_48000),
+                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                },
+        },
+        {
+                .name = "Bluetooth",
+                .playback = {
+                        .channels_min = 1,
+                        .channels_max = 4,
+                        .rate_min = 8000,
+                        .rate_max = 16000,
+                        .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000),
+                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                },
+                .capture = {
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rate_min = 8000,
+                        .rate_max = 16000,
+                        .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000),
+                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                },
+        },
+};
+
+static struct snd_soc_dai_link tm2_dai_links[] = {
+        {
+                .name           = "WM5110 AIF1",
+                .stream_name    = "HiFi Primary",
+                .codec_dai_name = "wm5110-aif1",
+                .ops            = &tm2_aif1_ops,
+                .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                                  SND_SOC_DAIFMT_CBM_CFM,
+        }, {
+                .name           = "WM5110 Voice",
+                .stream_name    = "Voice call",
+                .codec_dai_name = "wm5110-aif2",
+                .ops            = &tm2_aif2_ops,
+                .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                                  SND_SOC_DAIFMT_CBM_CFM,
+                .ignore_suspend = 1,
+        }, {
+                .name           = "WM5110 BT",
+                .stream_name    = "Bluetooth",
+                .codec_dai_name = "wm5110-aif3",
+                .dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                                  SND_SOC_DAIFMT_CBM_CFM,
+                .ignore_suspend = 1,
+        }
+};
+
+static struct snd_soc_card tm2_card = {
+        .owner                  = THIS_MODULE,
+
+        .dai_link               = tm2_dai_links,
+        .num_links              = ARRAY_SIZE(tm2_dai_links),
+        .controls               = tm2_controls,
+        .num_controls           = ARRAY_SIZE(tm2_controls),
+        .dapm_widgets           = tm2_dapm_widgets,
+        .num_dapm_widgets       = ARRAY_SIZE(tm2_dapm_widgets),
+        .aux_dev                = &tm2_speaker_amp_dev,
+        .num_aux_devs           = 1,
+
+        .late_probe             = tm2_late_probe,
+        .set_bias_level         = tm2_set_bias_level,
+};
+
+static int tm2_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct snd_soc_card *card = &tm2_card;
+        struct tm2_machine_priv *priv;
+        struct device_node *cpu_dai_node, *codec_dai_node;
+        int ret, i;
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        snd_soc_card_set_drvdata(card, priv);
+        card->dev = dev;
+
+        priv->gpio_mic_bias = devm_gpiod_get(dev, "mic-bias",
+                                                GPIOF_OUT_INIT_LOW);
+        if (IS_ERR(priv->gpio_mic_bias)) {
+                dev_err(dev, "Failed to get mic bias gpio\n");
+                return PTR_ERR(priv->gpio_mic_bias);
+        }
+
+        ret = snd_soc_of_parse_card_name(card, "model");
+        if (ret < 0) {
+                dev_err(dev, "Card name is not specified\n");
+                return ret;
+        }
+
+        ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing");
+        if (ret < 0) {
+                dev_err(dev, "Audio routing is not specified or invalid\n");
+                return ret;
+        }
+
+        card->aux_dev[0].codec_of_node = of_parse_phandle(dev->of_node,
+                                                        "audio-amplifier", 0);
+        if (!card->aux_dev[0].codec_of_node) {
+                dev_err(dev, "audio-amplifier property invalid or missing\n");
+                return -EINVAL;
+        }
+
+        cpu_dai_node = of_parse_phandle(dev->of_node, "i2s-controller", 0);
+        if (!cpu_dai_node) {
+                dev_err(dev, "i2s-controllers property invalid or missing\n");
+                ret = -EINVAL;
+                goto amp_node_put;
+        }
+
+        codec_dai_node = of_parse_phandle(dev->of_node, "audio-codec", 0);
+        if (!codec_dai_node) {
+                dev_err(dev, "audio-codec property invalid or missing\n");
+                ret = -EINVAL;
+                goto cpu_dai_node_put;
+        }
+
+        for (i = 0; i < card->num_links; i++) {
+                card->dai_link[i].cpu_dai_name = NULL;
+                card->dai_link[i].cpu_name = NULL;
+                card->dai_link[i].platform_name = NULL;
+                card->dai_link[i].codec_of_node = codec_dai_node;
+                card->dai_link[i].cpu_of_node = cpu_dai_node;
+                card->dai_link[i].platform_of_node = cpu_dai_node;
+        }
+
+        ret = devm_snd_soc_register_component(dev, &tm2_component,
+                                tm2_ext_dai, ARRAY_SIZE(tm2_ext_dai));
+        if (ret < 0) {
+                dev_err(dev, "Failed to register component: %d\n", ret);
+                goto codec_dai_node_put;
+        }
+
+        ret = devm_snd_soc_register_card(dev, card);
+        if (ret < 0) {
+                dev_err(dev, "Failed to register card: %d\n", ret);
+                goto codec_dai_node_put;
+        }
+
+codec_dai_node_put:
+        of_node_put(codec_dai_node);
+cpu_dai_node_put:
+        of_node_put(cpu_dai_node);
+amp_node_put:
+        of_node_put(card->aux_dev[0].codec_of_node);
+        return ret;
+}
+
+static int tm2_pm_prepare(struct device *dev)
+{
+        struct snd_soc_card *card = dev_get_drvdata(dev);
+
+        return tm2_stop_sysclk(card);
+}
+
+static void tm2_pm_complete(struct device *dev)
+{
+        struct snd_soc_card *card = dev_get_drvdata(dev);
+
+        tm2_start_sysclk(card);
+}
+
+const struct dev_pm_ops tm2_pm_ops = {
+        .prepare        = tm2_pm_prepare,
+        .suspend        = snd_soc_suspend,
+        .resume         = snd_soc_resume,
+        .complete       = tm2_pm_complete,
+        .freeze         = snd_soc_suspend,
+        .thaw           = snd_soc_resume,
+        .poweroff       = snd_soc_poweroff,
+        .restore        = snd_soc_resume,
+};
+
+static const struct of_device_id tm2_of_match[] = {
+        { .compatible = "samsung,tm2-audio" },
+        { },
+};
+MODULE_DEVICE_TABLE(of, tm2_of_match);
+
+static struct platform_driver tm2_driver = {
+        .driver = {
+                .name           = "tm2-audio",
+                .pm             = &tm2_pm_ops,
+                .of_match_table = tm2_of_match,
+        },
+        .probe  = tm2_probe,
+};
+module_platform_driver(tm2_driver);
+
+MODULE_AUTHOR("Inha Song <ideal.song@samsung.com>");
+MODULE_DESCRIPTION("ALSA SoC Exynos TM2 Audio Support");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
index 6db6405d952f..147ebecfed94 100644
--- a/sound/soc/sh/Kconfig
+++ b/sound/soc/sh/Kconfig
@@ -1,5 +1,5 @@
 menu "SoC Audio support for SuperH"
-        depends on SUPERH || ARCH_SHMOBILE
+        depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
 
 config SND_SOC_PCM_SH7760
         tristate "SoC Audio support for Renesas SH7760"
@@ -37,6 +37,7 @@ config SND_SOC_SH4_SIU
 config SND_SOC_RCAR
         tristate "R-Car series SRU/SCU/SSIU/SSI support"
         depends on COMMON_CLK
+        depends on OF || COMPILE_TEST
         select SND_SIMPLE_CARD
         select REGMAP_MMIO
         help
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 2145957d0229..85a33ac0a5c4 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -34,6 +34,9 @@ struct rsnd_adg {
         struct clk_onecell_data onecell;
         struct rsnd_mod mod;
         u32 flags;
+        u32 ckr;
+        u32 rbga;
+        u32 rbgb;
 
         int rbga_rate_for_441khz; /* RBGA */
         int rbgb_rate_for_48khz;  /* RBGB */
@@ -316,9 +319,11 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod, unsigned int rate)
         struct rsnd_priv *priv = rsnd_mod_to_priv(ssi_mod);
         struct rsnd_adg *adg = rsnd_priv_to_adg(priv);
         struct device *dev = rsnd_priv_to_dev(priv);
+        struct rsnd_mod *adg_mod = rsnd_mod_get(adg);
         struct clk *clk;
         int i;
         u32 data;
+        u32 ckr = 0;
         int sel_table[] = {
                 [CLKA] = 0x1,
                 [CLKB] = 0x2,
@@ -360,15 +365,14 @@ found_clock:
         rsnd_adg_set_ssi_clk(ssi_mod, data);
 
         if (!(adg_mode_flags(adg) & LRCLK_ASYNC)) {
-                struct rsnd_mod *adg_mod = rsnd_mod_get(adg);
-                u32 ckr = 0;
-
                 if (0 == (rate % 8000))
                         ckr = 0x80000000;
-
-                rsnd_mod_bset(adg_mod, SSICKR, 0x80000000, ckr);
         }
 
+        rsnd_mod_bset(adg_mod, BRGCKR, 0x80FF0000, adg->ckr | ckr);
+        rsnd_mod_write(adg_mod, BRRA,  adg->rbga);
+        rsnd_mod_write(adg_mod, BRRB,  adg->rbgb);
+
         dev_dbg(dev, "ADG: %s[%d] selects 0x%x for %d\n",
                 rsnd_mod_name(ssi_mod), rsnd_mod_id(ssi_mod),
                 data, rate);
@@ -376,6 +380,25 @@ found_clock:
         return 0;
 }
 
+void rsnd_adg_clk_control(struct rsnd_priv *priv, int enable)
+{
+        struct rsnd_adg *adg = rsnd_priv_to_adg(priv);
+        struct device *dev = rsnd_priv_to_dev(priv);
+        struct clk *clk;
+        int i, ret;
+
+        for_each_rsnd_clk(clk, adg, i) {
+                ret = 0;
+                if (enable)
+                        ret = clk_prepare_enable(clk);
+                else
+                        clk_disable_unprepare(clk);
+
+                if (ret < 0)
+                        dev_warn(dev, "can't use clk %d\n", i);
+        }
+}
+
 static void rsnd_adg_get_clkin(struct rsnd_priv *priv,
                                struct rsnd_adg *adg)
 {
@@ -387,27 +410,21 @@ static void rsnd_adg_get_clkin(struct rsnd_priv *priv,
                 [CLKC]  = "clk_c",
                 [CLKI]  = "clk_i",
         };
-        int i, ret;
+        int i;
 
         for (i = 0; i < CLKMAX; i++) {
                 clk = devm_clk_get(dev, clk_name[i]);
                 adg->clk[i] = IS_ERR(clk) ? NULL : clk;
         }
 
-        for_each_rsnd_clk(clk, adg, i) {
-                ret = clk_prepare_enable(clk);
-                if (ret < 0)
-                        dev_warn(dev, "can't use clk %d\n", i);
-
+        for_each_rsnd_clk(clk, adg, i)
                 dev_dbg(dev, "clk %d : %p : %ld\n", i, clk, clk_get_rate(clk));
-        }
 }
 
 static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
                                 struct rsnd_adg *adg)
 {
         struct clk *clk;
-        struct rsnd_mod *adg_mod = rsnd_mod_get(adg);
         struct device *dev = rsnd_priv_to_dev(priv);
         struct device_node *np = dev->of_node;
         u32 ckr, rbgx, rbga, rbgb;
@@ -532,13 +549,13 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
                 }
         }
 
-        rsnd_mod_bset(adg_mod, SSICKR, 0x80FF0000, ckr);
-        rsnd_mod_write(adg_mod, BRRA,  rbga);
-        rsnd_mod_write(adg_mod, BRRB,  rbgb);
+        adg->ckr = ckr;
+        adg->rbga = rbga;
+        adg->rbgb = rbgb;
 
         for_each_rsnd_clkout(clk, adg, i)
                 dev_dbg(dev, "clkout %d : %p : %ld\n", i, clk, clk_get_rate(clk));
-        dev_dbg(dev, "SSICKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n",
+        dev_dbg(dev, "BRGCKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n",
                 ckr, rbga, rbgb);
 }
 
@@ -565,16 +582,12 @@ int rsnd_adg_probe(struct rsnd_priv *priv)
 
         priv->adg = adg;
 
+        rsnd_adg_clk_enable(priv);
+
         return 0;
 }
 
 void rsnd_adg_remove(struct rsnd_priv *priv)
 {
-        struct rsnd_adg *adg = rsnd_priv_to_adg(priv);
-        struct clk *clk;
-        int i;
-
-        for_each_rsnd_clk(clk, adg, i) {
-                clk_disable_unprepare(clk);
-        }
+        rsnd_adg_clk_disable(priv);
 }
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index f18141098b50..4bd68de76130 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -306,7 +306,7 @@ u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
  */
 u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
 {
-        struct rsnd_mod *ssi = rsnd_io_to_mod_ssi(io);
+        struct rsnd_mod *ssiu = rsnd_io_to_mod_ssiu(io);
         struct rsnd_mod *target;
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         u32 val = 0x76543210;
@@ -315,11 +315,11 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
         if (rsnd_io_is_play(io)) {
                 struct rsnd_mod *src = rsnd_io_to_mod_src(io);
 
-                target = src ? src : ssi;
+                target = src ? src : ssiu;
         } else {
                 struct rsnd_mod *cmd = rsnd_io_to_mod_cmd(io);
 
-                target = cmd ? cmd : ssi;
+                target = cmd ? cmd : ssiu;
         }
 
         mask <<= runtime->channels * 4;
@@ -348,32 +348,28 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
 /*
  *      rsnd_dai functions
  */
-#define rsnd_mod_call(idx, io, func, param...)                  \
-({                                                              \
-        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);         \
-        struct rsnd_mod *mod = (io)->mod[idx];                  \
-        struct device *dev = rsnd_priv_to_dev(priv);            \
-        u32 *status = mod->get_status(io, mod, idx);                    \
-        u32 mask = 0xF << __rsnd_mod_shift_##func;                      \
-        u8 val  = (*status >> __rsnd_mod_shift_##func) & 0xF;           \
-        u8 add  = ((val + __rsnd_mod_add_##func) & 0xF);                \
-        int ret = 0;                                                    \
-        int call = (val == __rsnd_mod_call_##func) && (mod)->ops->func; \
-        if (add == 0xF)                                                 \
-                call = 0;                                               \
-        else                                                            \
-                *status = (*status & ~mask) +                           \
-                        (add << __rsnd_mod_shift_##func);               \
-        dev_dbg(dev, "%s[%d]\t0x%08x %s\n",                             \
-                rsnd_mod_name(mod), rsnd_mod_id(mod),                   \
-                *status, call ? #func : "");                            \
-        if (call)                                                       \
-                ret = (mod)->ops->func(mod, io, param);                 \
-        if (ret)                                                        \
-                dev_dbg(dev, "%s[%d] : rsnd_mod_call error %d\n",       \
-                        rsnd_mod_name(mod), rsnd_mod_id(mod), ret);     \
-        ret;                                                            \
-})
+struct rsnd_mod *rsnd_mod_next(int *iterator,
+                               struct rsnd_dai_stream *io,
+                               enum rsnd_mod_type *array,
+                               int array_size)
+{
+        struct rsnd_mod *mod;
+        enum rsnd_mod_type type;
+        int max = array ? array_size : RSND_MOD_MAX;
+
+        for (; *iterator < max; (*iterator)++) {
+                type = (array) ? array[*iterator] : *iterator;
+                mod = io->mod[type];
+                if (!mod)
+                        continue;
+
+                (*iterator)++;
+
+                return mod;
+        }
+
+        return NULL;
+}
 
 static enum rsnd_mod_type rsnd_mod_sequence[][RSND_MOD_MAX] = {
         {
@@ -409,19 +405,49 @@ static enum rsnd_mod_type rsnd_mod_sequence[][RSND_MOD_MAX] = {
         },
 };
 
-#define rsnd_dai_call(fn, io, param...)                         \
-({                                                              \
-        struct rsnd_mod *mod;                                   \
-        int type, is_play = rsnd_io_is_play(io);                \
-        int ret = 0, i;                                         \
-        for (i = 0; i < RSND_MOD_MAX; i++) {                    \
-                type = rsnd_mod_sequence[is_play][i];           \
-                mod = (io)->mod[type];                          \
-                if (!mod)                                       \
-                        continue;                               \
-                ret |= rsnd_mod_call(type, io, fn, param);      \
-        }                                                       \
-        ret;                                                    \
+static int rsnd_status_update(u32 *status,
+                              int shift, int add, int timing)
+{
+        u32 mask        = 0xF << shift;
+        u8 val          = (*status >> shift) & 0xF;
+        u8 next_val     = (val + add) & 0xF;
+        int func_call   = (val == timing);
+
+        if (next_val == 0xF) /* underflow case */
+                func_call = 0;
+        else
+                *status = (*status & ~mask) + (next_val << shift);
+
+        return func_call;
+}
+
+#define rsnd_dai_call(fn, io, param...)                                 \
+({                                                                      \
+        struct rsnd_priv *priv = rsnd_io_to_priv(io);                   \
+        struct device *dev = rsnd_priv_to_dev(priv);                    \
+        struct rsnd_mod *mod;                                           \
+        int is_play = rsnd_io_is_play(io);                              \
+        int ret = 0, i;                                                 \
+        enum rsnd_mod_type *types = rsnd_mod_sequence[is_play];         \
+        for_each_rsnd_mod_arrays(i, mod, io, types, RSND_MOD_MAX) {     \
+                int tmp = 0;                                            \
+                u32 *status = mod->get_status(io, mod, types[i]);       \
+                int func_call = rsnd_status_update(status,              \
+                                                __rsnd_mod_shift_##fn,  \
+                                                __rsnd_mod_add_##fn,    \
+                                                __rsnd_mod_call_##fn);  \
+                dev_dbg(dev, "%s[%d]\t0x%08x %s\n",                     \
+                        rsnd_mod_name(mod), rsnd_mod_id(mod), *status,  \
+                        (func_call && (mod)->ops->fn) ? #fn : "");      \
+                if (func_call && (mod)->ops->fn)                        \
+                        tmp = (mod)->ops->fn(mod, io, param);           \
+                if (tmp)                                                \
+                        dev_err(dev, "%s[%d] : %s error %d\n",          \
+                                rsnd_mod_name(mod), rsnd_mod_id(mod),   \
+                                                     #fn, tmp);         \
+                ret |= tmp;                                             \
+        }                                                               \
+        ret;                                                            \
 })
 
 int rsnd_dai_connect(struct rsnd_mod *mod,
@@ -690,7 +716,33 @@ static int rsnd_soc_set_dai_tdm_slot(struct snd_soc_dai *dai,
         return 0;
 }
 
+static int rsnd_soc_dai_startup(struct snd_pcm_substream *substream,
+                                struct snd_soc_dai *dai)
+{
+        struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
+        struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream);
+
+        /*
+         * call rsnd_dai_call without spinlock
+         */
+        return rsnd_dai_call(nolock_start, io, priv);
+}
+
+static void rsnd_soc_dai_shutdown(struct snd_pcm_substream *substream,
+                                  struct snd_soc_dai *dai)
+{
+        struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
+        struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream);
+
+        /*
+         * call rsnd_dai_call without spinlock
+         */
+        rsnd_dai_call(nolock_stop, io, priv);
+}
+
 static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
+        .startup        = rsnd_soc_dai_startup,
+        .shutdown       = rsnd_soc_dai_shutdown,
         .trigger        = rsnd_soc_dai_trigger,
         .set_fmt        = rsnd_soc_dai_set_fmt,
         .set_tdm_slot   = rsnd_soc_set_dai_tdm_slot,
@@ -993,7 +1045,11 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod,
 
 void _rsnd_kctrl_remove(struct rsnd_kctrl_cfg *cfg)
 {
-        snd_ctl_remove(cfg->card, cfg->kctrl);
+        if (cfg->card && cfg->kctrl)
+                snd_ctl_remove(cfg->card, cfg->kctrl);
+
+        cfg->card = NULL;
+        cfg->kctrl = NULL;
 }
 
 int rsnd_kctrl_new_m(struct rsnd_mod *mod,
@@ -1070,8 +1126,8 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
 
         return snd_pcm_lib_preallocate_pages_for_all(
                 rtd->pcm,
-                SNDRV_DMA_TYPE_DEV,
-                rtd->card->snd_card->dev,
+                SNDRV_DMA_TYPE_CONTINUOUS,
+                snd_dma_continuous_data(GFP_KERNEL),
                 PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);
 }
 
@@ -1092,6 +1148,7 @@ static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv,
         ret = rsnd_dai_call(probe, io, priv);
         if (ret == -EAGAIN) {
                 struct rsnd_mod *ssi_mod = rsnd_io_to_mod_ssi(io);
+                struct rsnd_mod *mod;
                 int i;
 
                 /*
@@ -1111,8 +1168,8 @@ static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv,
                  * remove all mod from io
                  * and, re connect ssi
                  */
-                for (i = 0; i < RSND_MOD_MAX; i++)
-                        rsnd_dai_disconnect((io)->mod[i], io, i);
+                for_each_rsnd_mod(i, mod, io)
+                        rsnd_dai_disconnect(mod, io, i);
                 rsnd_dai_connect(ssi_mod, io, RSND_MOD_SSI);
 
                 /*
@@ -1251,9 +1308,33 @@ static int rsnd_remove(struct platform_device *pdev)
         return ret;
 }
 
+static int rsnd_suspend(struct device *dev)
+{
+        struct rsnd_priv *priv = dev_get_drvdata(dev);
+
+        rsnd_adg_clk_disable(priv);
+
+        return 0;
+}
+
+static int rsnd_resume(struct device *dev)
+{
+        struct rsnd_priv *priv = dev_get_drvdata(dev);
+
+        rsnd_adg_clk_enable(priv);
+
+        return 0;
+}
+
+static struct dev_pm_ops rsnd_pm_ops = {
+        .suspend                = rsnd_suspend,
+        .resume                 = rsnd_resume,
+};
+
 static struct platform_driver rsnd_driver = {
         .driver = {
                 .name   = "rcar_sound",
+                .pm     = &rsnd_pm_ops,
                 .of_match_table = rsnd_of_match,
         },
         .probe          = rsnd_probe,
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index 6bc93cbb3049..1f405c833867 100644
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -25,6 +25,10 @@
 
 struct rsnd_dmaen {
         struct dma_chan         *chan;
+        dma_addr_t              dma_buf;
+        unsigned int            dma_len;
+        unsigned int            dma_period;
+        unsigned int            dma_cnt;
 };
 
 struct rsnd_dmapp {
@@ -34,6 +38,8 @@ struct rsnd_dmapp {
 
 struct rsnd_dma {
         struct rsnd_mod         mod;
+        struct rsnd_mod         *mod_from;
+        struct rsnd_mod         *mod_to;
         dma_addr_t              src_addr;
         dma_addr_t              dst_addr;
         union {
@@ -56,10 +62,38 @@ struct rsnd_dma_ctrl {
 /*
  *              Audio DMAC
  */
+#define rsnd_dmaen_sync(dmaen, io, i)   __rsnd_dmaen_sync(dmaen, io, i, 1)
+#define rsnd_dmaen_unsync(dmaen, io, i) __rsnd_dmaen_sync(dmaen, io, i, 0)
+static void __rsnd_dmaen_sync(struct rsnd_dmaen *dmaen, struct rsnd_dai_stream *io,
+                              int i, int sync)
+{
+        struct device *dev = dmaen->chan->device->dev;
+        enum dma_data_direction dir;
+        int is_play = rsnd_io_is_play(io);
+        dma_addr_t buf;
+        int len, max;
+        size_t period;
+
+        len     = dmaen->dma_len;
+        period  = dmaen->dma_period;
+        max     = len / period;
+        i       = i % max;
+        buf     = dmaen->dma_buf + (period * i);
+
+        dir = is_play ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
+
+        if (sync)
+                dma_sync_single_for_device(dev, buf, period, dir);
+        else
+                dma_sync_single_for_cpu(dev, buf, period, dir);
+}
+
 static void __rsnd_dmaen_complete(struct rsnd_mod *mod,
                                   struct rsnd_dai_stream *io)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
+        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
         bool elapsed = false;
         unsigned long flags;
 
@@ -76,9 +110,22 @@ static void __rsnd_dmaen_complete(struct rsnd_mod *mod,
          */
         spin_lock_irqsave(&priv->lock, flags);
 
-        if (rsnd_io_is_working(io))
+        if (rsnd_io_is_working(io)) {
+                rsnd_dmaen_unsync(dmaen, io, dmaen->dma_cnt);
+
+                /*
+                 * Next period is already started.
+                 * Let's sync Next Next period
+                 * see
+                 *      rsnd_dmaen_start()
+                 */
+                rsnd_dmaen_sync(dmaen, io, dmaen->dma_cnt + 2);
+
                 elapsed = rsnd_dai_pointer_update(io, io->byte_per_period);
 
+                dmaen->dma_cnt++;
+        }
+
         spin_unlock_irqrestore(&priv->lock, flags);
 
         if (elapsed)
@@ -92,6 +139,20 @@ static void rsnd_dmaen_complete(void *data)
         rsnd_mod_interrupt(mod, __rsnd_dmaen_complete);
 }
 
+static struct dma_chan *rsnd_dmaen_request_channel(struct rsnd_dai_stream *io,
+                                                   struct rsnd_mod *mod_from,
+                                                   struct rsnd_mod *mod_to)
+{
+        if ((!mod_from && !mod_to) ||
+            (mod_from && mod_to))
+                return NULL;
+
+        if (mod_from)
+                return rsnd_mod_dma_req(io, mod_from);
+        else
+                return rsnd_mod_dma_req(io, mod_to);
+}
+
 static int rsnd_dmaen_stop(struct rsnd_mod *mod,
                            struct rsnd_dai_stream *io,
                            struct rsnd_priv *priv)
@@ -99,7 +160,66 @@ static int rsnd_dmaen_stop(struct rsnd_mod *mod,
         struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
         struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
 
-        dmaengine_terminate_all(dmaen->chan);
+        if (dmaen->chan) {
+                int is_play = rsnd_io_is_play(io);
+
+                dmaengine_terminate_all(dmaen->chan);
+                dma_unmap_single(dmaen->chan->device->dev,
+                                 dmaen->dma_buf, dmaen->dma_len,
+                                 is_play ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
+        }
+
+        return 0;
+}
+
+static int rsnd_dmaen_nolock_stop(struct rsnd_mod *mod,
+                                   struct rsnd_dai_stream *io,
+                                   struct rsnd_priv *priv)
+{
+        struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
+        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
+
+        /*
+         * DMAEngine release uses mutex lock.
+         * Thus, it shouldn't be called under spinlock.
+         * Let's call it under nolock_start
+         */
+        if (dmaen->chan)
+                dma_release_channel(dmaen->chan);
+
+        dmaen->chan = NULL;
+
+        return 0;
+}
+
+static int rsnd_dmaen_nolock_start(struct rsnd_mod *mod,
+                            struct rsnd_dai_stream *io,
+                            struct rsnd_priv *priv)
+{
+        struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
+        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
+        struct device *dev = rsnd_priv_to_dev(priv);
+
+        if (dmaen->chan) {
+                dev_err(dev, "it already has dma channel\n");
+                return -EIO;
+        }
+
+        /*
+         * DMAEngine request uses mutex lock.
+         * Thus, it shouldn't be called under spinlock.
+         * Let's call it under nolock_start
+         */
+        dmaen->chan = rsnd_dmaen_request_channel(io,
+                                                 dma->mod_from,
+                                                 dma->mod_to);
+        if (IS_ERR_OR_NULL(dmaen->chan)) {
+                int ret = PTR_ERR(dmaen->chan);
+
+                dmaen->chan = NULL;
+                dev_err(dev, "can't get dma channel\n");
+                return ret;
+        }
 
         return 0;
 }
@@ -113,12 +233,41 @@ static int rsnd_dmaen_start(struct rsnd_mod *mod,
         struct snd_pcm_substream *substream = io->substream;
         struct device *dev = rsnd_priv_to_dev(priv);
         struct dma_async_tx_descriptor *desc;
+        struct dma_slave_config cfg = {};
+        dma_addr_t buf;
+        size_t len;
+        size_t period;
         int is_play = rsnd_io_is_play(io);
+        int i;
+        int ret;
+
+        cfg.direction   = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
+        cfg.src_addr    = dma->src_addr;
+        cfg.dst_addr    = dma->dst_addr;
+        cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+        cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+
+        dev_dbg(dev, "%s[%d] %pad -> %pad\n",
+                rsnd_mod_name(mod), rsnd_mod_id(mod),
+                &cfg.src_addr, &cfg.dst_addr);
+
+        ret = dmaengine_slave_config(dmaen->chan, &cfg);
+        if (ret < 0)
+                return ret;
+
+        len     = snd_pcm_lib_buffer_bytes(substream);
+        period  = snd_pcm_lib_period_bytes(substream);
+        buf     = dma_map_single(dmaen->chan->device->dev,
+                                 substream->runtime->dma_area,
+                                 len,
+                                 is_play ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
+        if (dma_mapping_error(dmaen->chan->device->dev, buf)) {
+                dev_err(dev, "dma map failed\n");
+                return -EIO;
+        }
 
         desc = dmaengine_prep_dma_cyclic(dmaen->chan,
-                                         substream->runtime->dma_addr,
-                                         snd_pcm_lib_buffer_bytes(substream),
-                                         snd_pcm_lib_period_bytes(substream),
+                                         buf, len, period,
                                          is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM,
                                          DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
 
@@ -130,6 +279,19 @@ static int rsnd_dmaen_start(struct rsnd_mod *mod,
         desc->callback          = rsnd_dmaen_complete;
         desc->callback_param    = rsnd_mod_get(dma);
 
+        dmaen->dma_buf          = buf;
+        dmaen->dma_len          = len;
+        dmaen->dma_period       = period;
+        dmaen->dma_cnt          = 0;
+
+        /*
+         * synchronize this and next period
+         * see
+         *      __rsnd_dmaen_complete()
+         */
+        for (i = 0; i < 2; i++)
+                rsnd_dmaen_sync(dmaen, io, i);
+
         if (dmaengine_submit(desc) < 0) {
                 dev_err(dev, "dmaengine_submit() fail\n");
                 return -EIO;
@@ -143,124 +305,55 @@ static int rsnd_dmaen_start(struct rsnd_mod *mod,
 struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node,
                                           struct rsnd_mod *mod, char *name)
 {
-        struct dma_chan *chan;
+        struct dma_chan *chan = NULL;
         struct device_node *np;
         int i = 0;
 
         for_each_child_of_node(of_node, np) {
-                if (i == rsnd_mod_id(mod))
-                        break;
+                if (i == rsnd_mod_id(mod) && (!chan))
+                        chan = of_dma_request_slave_channel(np, name);
                 i++;
         }
 
-        chan = of_dma_request_slave_channel(np, name);
-
-        of_node_put(np);
+        /* It should call of_node_put(), since, it is rsnd_xxx_of_node() */
         of_node_put(of_node);
 
         return chan;
 }
 
-static struct dma_chan *rsnd_dmaen_request_channel(struct rsnd_dai_stream *io,
-                                                   struct rsnd_mod *mod_from,
-                                                   struct rsnd_mod *mod_to)
-{
-        if ((!mod_from && !mod_to) ||
-            (mod_from && mod_to))
-                return NULL;
-
-        if (mod_from)
-                return rsnd_mod_dma_req(io, mod_from);
-        else
-                return rsnd_mod_dma_req(io, mod_to);
-}
-
-static int rsnd_dmaen_remove(struct rsnd_mod *mod,
-                              struct rsnd_dai_stream *io,
-                              struct rsnd_priv *priv)
-{
-        struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
-        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
-
-        if (dmaen->chan)
-                dma_release_channel(dmaen->chan);
-
-        dmaen->chan = NULL;
-
-        return 0;
-}
-
 static int rsnd_dmaen_attach(struct rsnd_dai_stream *io,
-                           struct rsnd_dma *dma, int id,
+                           struct rsnd_dma *dma,
                            struct rsnd_mod *mod_from, struct rsnd_mod *mod_to)
 {
-        struct rsnd_mod *mod = rsnd_mod_get(dma);
-        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
         struct rsnd_priv *priv = rsnd_io_to_priv(io);
         struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv);
-        struct device *dev = rsnd_priv_to_dev(priv);
-        struct dma_slave_config cfg = {};
-        int is_play = rsnd_io_is_play(io);
-        int ret;
-
-        if (dmaen->chan) {
-                dev_err(dev, "it already has dma channel\n");
-                return -EIO;
-        }
-
-        if (dev->of_node) {
-                dmaen->chan = rsnd_dmaen_request_channel(io, mod_from, mod_to);
-        } else {
-                dma_cap_mask_t mask;
-
-                dma_cap_zero(mask);
-                dma_cap_set(DMA_SLAVE, mask);
+        struct dma_chan *chan;
 
-                dmaen->chan = dma_request_channel(mask, shdma_chan_filter,
-                                                  (void *)(uintptr_t)id);
-        }
-        if (IS_ERR_OR_NULL(dmaen->chan)) {
-                dmaen->chan = NULL;
-                dev_err(dev, "can't get dma channel\n");
-                goto rsnd_dma_channel_err;
+        /* try to get DMAEngine channel */
+        chan = rsnd_dmaen_request_channel(io, mod_from, mod_to);
+        if (IS_ERR_OR_NULL(chan)) {
+                /*
+                 * DMA failed. try to PIO mode
+                 * see
+                 *      rsnd_ssi_fallback()
+                 *      rsnd_rdai_continuance_probe()
+                 */
+                return -EAGAIN;
         }
 
-        cfg.direction   = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
-        cfg.src_addr    = dma->src_addr;
-        cfg.dst_addr    = dma->dst_addr;
-        cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-        cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-
-        dev_dbg(dev, "%s[%d] %pad -> %pad\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod),
-                &cfg.src_addr, &cfg.dst_addr);
-
-        ret = dmaengine_slave_config(dmaen->chan, &cfg);
-        if (ret < 0)
-                goto rsnd_dma_attach_err;
+        dma_release_channel(chan);
 
         dmac->dmaen_num++;
 
         return 0;
-
-rsnd_dma_attach_err:
-        rsnd_dmaen_remove(mod, io, priv);
-rsnd_dma_channel_err:
-
-        /*
-         * DMA failed. try to PIO mode
-         * see
-         *      rsnd_ssi_fallback()
-         *      rsnd_rdai_continuance_probe()
-         */
-        return -EAGAIN;
 }
 
 static struct rsnd_mod_ops rsnd_dmaen_ops = {
         .name   = "audmac",
+        .nolock_start = rsnd_dmaen_nolock_start,
+        .nolock_stop  = rsnd_dmaen_nolock_stop,
         .start  = rsnd_dmaen_start,
         .stop   = rsnd_dmaen_stop,
-        .remove = rsnd_dmaen_remove,
 };
 
 /*
@@ -394,7 +487,7 @@ static int rsnd_dmapp_start(struct rsnd_mod *mod,
 }
 
 static int rsnd_dmapp_attach(struct rsnd_dai_stream *io,
-                             struct rsnd_dma *dma, int id,
+                             struct rsnd_dma *dma,
                              struct rsnd_mod *mod_from, struct rsnd_mod *mod_to)
 {
         struct rsnd_dmapp *dmapp = rsnd_dma_to_dmapp(dma);
@@ -627,7 +720,7 @@ static void rsnd_dma_of_path(struct rsnd_mod *this,
 }
 
 int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod,
-                    struct rsnd_mod **dma_mod, int id)
+                    struct rsnd_mod **dma_mod)
 {
         struct rsnd_mod *mod_from = NULL;
         struct rsnd_mod *mod_to = NULL;
@@ -636,7 +729,7 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod,
         struct device *dev = rsnd_priv_to_dev(priv);
         struct rsnd_mod_ops *ops;
         enum rsnd_mod_type type;
-        int (*attach)(struct rsnd_dai_stream *io, struct rsnd_dma *dma, int id,
+        int (*attach)(struct rsnd_dai_stream *io, struct rsnd_dma *dma,
                       struct rsnd_mod *mod_from, struct rsnd_mod *mod_to);
         int is_play = rsnd_io_is_play(io);
         int ret, dma_id;
@@ -682,9 +775,6 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod,
 
                 *dma_mod = rsnd_mod_get(dma);
 
-                dma->src_addr = rsnd_dma_addr(io, mod_from, is_play, 1);
-                dma->dst_addr = rsnd_dma_addr(io, mod_to,   is_play, 0);
-
                 ret = rsnd_mod_init(priv, *dma_mod, ops, NULL,
                                     rsnd_mod_get_status, type, dma_id);
                 if (ret < 0)
@@ -695,9 +785,14 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod,
                         rsnd_mod_name(mod_from), rsnd_mod_id(mod_from),
                         rsnd_mod_name(mod_to),   rsnd_mod_id(mod_to));
 
-                ret = attach(io, dma, id, mod_from, mod_to);
+                ret = attach(io, dma, mod_from, mod_to);
                 if (ret < 0)
                         return ret;
+
+                dma->src_addr = rsnd_dma_addr(io, mod_from, is_play, 1);
+                dma->dst_addr = rsnd_dma_addr(io, mod_to,   is_play, 0);
+                dma->mod_from = mod_from;
+                dma->mod_to   = mod_to;
         }
 
         ret = rsnd_dai_connect(*dma_mod, io, type);
diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index 02d971f69eff..cf8f59cdd8d7 100644
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -48,8 +48,6 @@ struct rsnd_dvc {
 
 #define rsnd_dvc_get(priv, id) ((struct rsnd_dvc *)(priv->dvc) + id)
 #define rsnd_dvc_nr(priv) ((priv)->dvc_nr)
-#define rsnd_dvc_of_node(priv) \
-        of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,dvc")
 
 #define rsnd_mod_to_dvc(_mod)   \
         container_of((_mod), struct rsnd_dvc, mod)
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index 7d2fdf8dd188..63b6d3c28021 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -211,6 +211,14 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
                 RSND_GEN_S_REG(SSI_MODE1,       0x804),
                 RSND_GEN_S_REG(SSI_MODE2,       0x808),
                 RSND_GEN_S_REG(SSI_CONTROL,     0x810),
+                RSND_GEN_S_REG(SSI_SYS_STATUS0, 0x840),
+                RSND_GEN_S_REG(SSI_SYS_STATUS1, 0x844),
+                RSND_GEN_S_REG(SSI_SYS_STATUS2, 0x848),
+                RSND_GEN_S_REG(SSI_SYS_STATUS3, 0x84c),
+                RSND_GEN_S_REG(SSI_SYS_STATUS4, 0x880),
+                RSND_GEN_S_REG(SSI_SYS_STATUS5, 0x884),
+                RSND_GEN_S_REG(SSI_SYS_STATUS6, 0x888),
+                RSND_GEN_S_REG(SSI_SYS_STATUS7, 0x88c),
 
                 /* FIXME: it needs SSI_MODE2/3 in the future */
                 RSND_GEN_M_REG(SSI_BUSIF_MODE,  0x0,    0x80),
@@ -311,7 +319,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
         static const struct rsnd_regmap_field_conf conf_adg[] = {
                 RSND_GEN_S_REG(BRRA,            0x00),
                 RSND_GEN_S_REG(BRRB,            0x04),
-                RSND_GEN_S_REG(SSICKR,          0x08),
+                RSND_GEN_S_REG(BRGCKR,          0x08),
                 RSND_GEN_S_REG(AUDIO_CLK_SEL0,  0x0c),
                 RSND_GEN_S_REG(AUDIO_CLK_SEL1,  0x10),
                 RSND_GEN_S_REG(AUDIO_CLK_SEL2,  0x14),
@@ -362,7 +370,7 @@ static int rsnd_gen1_probe(struct rsnd_priv *priv)
         static const struct rsnd_regmap_field_conf conf_adg[] = {
                 RSND_GEN_S_REG(BRRA,            0x00),
                 RSND_GEN_S_REG(BRRB,            0x04),
-                RSND_GEN_S_REG(SSICKR,          0x08),
+                RSND_GEN_S_REG(BRGCKR,          0x08),
                 RSND_GEN_S_REG(AUDIO_CLK_SEL0,  0x0c),
                 RSND_GEN_S_REG(AUDIO_CLK_SEL1,  0x10),
         };
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index a8f61d79333b..b90df77662df 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -43,17 +43,7 @@
  * see gen1/gen2 for detail
  */
 enum rsnd_reg {
-        /* SCU (SRC/SSIU/MIX/CTU/DVC) */
-        RSND_REG_SSI_MODE,              /* Gen2 only */
-        RSND_REG_SSI_MODE0,
-        RSND_REG_SSI_MODE1,
-        RSND_REG_SSI_MODE2,
-        RSND_REG_SSI_CONTROL,
-        RSND_REG_SSI_CTRL,              /* Gen2 only */
-        RSND_REG_SSI_BUSIF_MODE,        /* Gen2 only */
-        RSND_REG_SSI_BUSIF_ADINR,       /* Gen2 only */
-        RSND_REG_SSI_BUSIF_DALIGN,      /* Gen2 only */
-        RSND_REG_SSI_INT_ENABLE,        /* Gen2 only */
+        /* SCU (MIX/CTU/DVC) */
         RSND_REG_SRC_I_BUSIF_MODE,
         RSND_REG_SRC_O_BUSIF_MODE,
         RSND_REG_SRC_ROUTE_MODE0,
@@ -63,29 +53,29 @@ enum rsnd_reg {
         RSND_REG_SRC_IFSCR,
         RSND_REG_SRC_IFSVR,
         RSND_REG_SRC_SRCCR,
-        RSND_REG_SRC_CTRL,              /* Gen2 only */
-        RSND_REG_SRC_BSDSR,             /* Gen2 only */
-        RSND_REG_SRC_BSISR,             /* Gen2 only */
-        RSND_REG_SRC_INT_ENABLE0,       /* Gen2 only */
-        RSND_REG_SRC_BUSIF_DALIGN,      /* Gen2 only */
-        RSND_REG_SRCIN_TIMSEL0,         /* Gen2 only */
-        RSND_REG_SRCIN_TIMSEL1,         /* Gen2 only */
-        RSND_REG_SRCIN_TIMSEL2,         /* Gen2 only */
-        RSND_REG_SRCIN_TIMSEL3,         /* Gen2 only */
-        RSND_REG_SRCIN_TIMSEL4,         /* Gen2 only */
-        RSND_REG_SRCOUT_TIMSEL0,        /* Gen2 only */
-        RSND_REG_SRCOUT_TIMSEL1,        /* Gen2 only */
-        RSND_REG_SRCOUT_TIMSEL2,        /* Gen2 only */
-        RSND_REG_SRCOUT_TIMSEL3,        /* Gen2 only */
-        RSND_REG_SRCOUT_TIMSEL4,        /* Gen2 only */
+        RSND_REG_SRC_CTRL,
+        RSND_REG_SRC_BSDSR,
+        RSND_REG_SRC_BSISR,
+        RSND_REG_SRC_INT_ENABLE0,
+        RSND_REG_SRC_BUSIF_DALIGN,
+        RSND_REG_SRCIN_TIMSEL0,
+        RSND_REG_SRCIN_TIMSEL1,
+        RSND_REG_SRCIN_TIMSEL2,
+        RSND_REG_SRCIN_TIMSEL3,
+        RSND_REG_SRCIN_TIMSEL4,
+        RSND_REG_SRCOUT_TIMSEL0,
+        RSND_REG_SRCOUT_TIMSEL1,
+        RSND_REG_SRCOUT_TIMSEL2,
+        RSND_REG_SRCOUT_TIMSEL3,
+        RSND_REG_SRCOUT_TIMSEL4,
         RSND_REG_SCU_SYS_STATUS0,
-        RSND_REG_SCU_SYS_STATUS1,       /* Gen2 only */
+        RSND_REG_SCU_SYS_STATUS1,
         RSND_REG_SCU_SYS_INT_EN0,
-        RSND_REG_SCU_SYS_INT_EN1,       /* Gen2 only */
-        RSND_REG_CMD_CTRL,              /* Gen2 only */
-        RSND_REG_CMD_BUSIF_DALIGN,      /* Gen2 only */
+        RSND_REG_SCU_SYS_INT_EN1,
+        RSND_REG_CMD_CTRL,
+        RSND_REG_CMD_BUSIF_DALIGN,
         RSND_REG_CMD_ROUTE_SLCT,
-        RSND_REG_CMDOUT_TIMSEL,         /* Gen2 only */
+        RSND_REG_CMDOUT_TIMSEL,
         RSND_REG_CTU_SWRSR,
         RSND_REG_CTU_CTUIR,
         RSND_REG_CTU_ADINR,
@@ -147,18 +137,38 @@ enum rsnd_reg {
         RSND_REG_DVC_VOL6R,
         RSND_REG_DVC_VOL7R,
         RSND_REG_DVC_DVUER,
-        RSND_REG_DVC_VRCTR,             /* Gen2 only */
-        RSND_REG_DVC_VRPDR,             /* Gen2 only */
-        RSND_REG_DVC_VRDBR,             /* Gen2 only */
+        RSND_REG_DVC_VRCTR,
+        RSND_REG_DVC_VRPDR,
+        RSND_REG_DVC_VRDBR,
 
         /* ADG */
         RSND_REG_BRRA,
         RSND_REG_BRRB,
-        RSND_REG_SSICKR,
-        RSND_REG_DIV_EN,                /* Gen2 only */
+        RSND_REG_BRGCKR,
+        RSND_REG_DIV_EN,
         RSND_REG_AUDIO_CLK_SEL0,
         RSND_REG_AUDIO_CLK_SEL1,
-        RSND_REG_AUDIO_CLK_SEL2,        /* Gen2 only */
+        RSND_REG_AUDIO_CLK_SEL2,
+
+        /* SSIU */
+        RSND_REG_SSI_MODE,
+        RSND_REG_SSI_MODE0,
+        RSND_REG_SSI_MODE1,
+        RSND_REG_SSI_MODE2,
+        RSND_REG_SSI_CONTROL,
+        RSND_REG_SSI_CTRL,
+        RSND_REG_SSI_BUSIF_MODE,
+        RSND_REG_SSI_BUSIF_ADINR,
+        RSND_REG_SSI_BUSIF_DALIGN,
+        RSND_REG_SSI_INT_ENABLE,
+        RSND_REG_SSI_SYS_STATUS0,
+        RSND_REG_SSI_SYS_STATUS1,
+        RSND_REG_SSI_SYS_STATUS2,
+        RSND_REG_SSI_SYS_STATUS3,
+        RSND_REG_SSI_SYS_STATUS4,
+        RSND_REG_SSI_SYS_STATUS5,
+        RSND_REG_SSI_SYS_STATUS6,
+        RSND_REG_SSI_SYS_STATUS7,
 
         /* SSI */
         RSND_REG_SSICR,
@@ -199,7 +209,7 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io);
  *      R-Car DMA
  */
 int rsnd_dma_attach(struct rsnd_dai_stream *io,
-                    struct rsnd_mod *mod, struct rsnd_mod **dma_mod, int id);
+                    struct rsnd_mod *mod, struct rsnd_mod **dma_mod);
 int rsnd_dma_probe(struct rsnd_priv *priv);
 struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node,
                                           struct rsnd_mod *mod, char *name);
@@ -259,6 +269,12 @@ struct rsnd_mod_ops {
         int (*fallback)(struct rsnd_mod *mod,
                         struct rsnd_dai_stream *io,
                         struct rsnd_priv *priv);
+        int (*nolock_start)(struct rsnd_mod *mod,
+                    struct rsnd_dai_stream *io,
+                    struct rsnd_priv *priv);
+        int (*nolock_stop)(struct rsnd_mod *mod,
+                    struct rsnd_dai_stream *io,
+                    struct rsnd_priv *priv);
 };
 
 struct rsnd_dai_stream;
@@ -278,7 +294,7 @@ struct rsnd_mod {
  *
  * 0xH0000CBA
  *
- * A    0: probe        1: remove
+ * A    0: nolock_start 1: nolock_stop
  * B    0: init         1: quit
  * C    0: start        1: stop
  *
@@ -288,19 +304,23 @@ struct rsnd_mod {
  * H    0: fallback
  * H    0: hw_params
  */
-#define __rsnd_mod_shift_probe          0
-#define __rsnd_mod_shift_remove         0
+#define __rsnd_mod_shift_nolock_start   0
+#define __rsnd_mod_shift_nolock_stop    0
 #define __rsnd_mod_shift_init           4
 #define __rsnd_mod_shift_quit           4
 #define __rsnd_mod_shift_start          8
 #define __rsnd_mod_shift_stop           8
+#define __rsnd_mod_shift_probe          28 /* always called */
+#define __rsnd_mod_shift_remove         28 /* always called */
 #define __rsnd_mod_shift_irq            28 /* always called */
 #define __rsnd_mod_shift_pcm_new        28 /* always called */
 #define __rsnd_mod_shift_fallback       28 /* always called */
 #define __rsnd_mod_shift_hw_params      28 /* always called */
 
-#define __rsnd_mod_add_probe             1
-#define __rsnd_mod_add_remove           -1
+#define __rsnd_mod_add_probe            0
+#define __rsnd_mod_add_remove           0
+#define __rsnd_mod_add_nolock_start      1
+#define __rsnd_mod_add_nolock_stop      -1
 #define __rsnd_mod_add_init              1
 #define __rsnd_mod_add_quit             -1
 #define __rsnd_mod_add_start             1
@@ -311,7 +331,7 @@ struct rsnd_mod {
 #define __rsnd_mod_add_hw_params        0
 
 #define __rsnd_mod_call_probe           0
-#define __rsnd_mod_call_remove          1
+#define __rsnd_mod_call_remove          0
 #define __rsnd_mod_call_init            0
 #define __rsnd_mod_call_quit            1
 #define __rsnd_mod_call_start           0
@@ -320,6 +340,8 @@ struct rsnd_mod {
 #define __rsnd_mod_call_pcm_new         0
 #define __rsnd_mod_call_fallback        0
 #define __rsnd_mod_call_hw_params       0
+#define __rsnd_mod_call_nolock_start    0
+#define __rsnd_mod_call_nolock_stop     1
 
 #define rsnd_mod_to_priv(mod) ((mod)->priv)
 #define rsnd_mod_id(mod) ((mod) ? (mod)->id : -1)
@@ -346,6 +368,18 @@ void rsnd_mod_interrupt(struct rsnd_mod *mod,
 u32 *rsnd_mod_get_status(struct rsnd_dai_stream *io,
                          struct rsnd_mod *mod,
                          enum rsnd_mod_type type);
+struct rsnd_mod *rsnd_mod_next(int *iterator,
+                               struct rsnd_dai_stream *io,
+                               enum rsnd_mod_type *array,
+                               int array_size);
+#define for_each_rsnd_mod(iterator, pos, io)                            \
+        for (iterator = 0;                                              \
+             (pos = rsnd_mod_next(&iterator, io, NULL, 0));)
+#define for_each_rsnd_mod_arrays(iterator, pos, io, array, size)        \
+        for (iterator = 0;                                              \
+             (pos = rsnd_mod_next(&iterator, io, array, size));)
+#define for_each_rsnd_mod_array(iterator, pos, io, array)               \
+        for_each_rsnd_mod_arrays(iterator, pos, io, array, ARRAY_SIZE(array))
 
 void rsnd_parse_connect_common(struct rsnd_dai *rdai,
                 struct rsnd_mod* (*mod_get)(struct rsnd_priv *priv, int id),
@@ -365,6 +399,18 @@ int rsnd_runtime_is_ssi_multi(struct rsnd_dai_stream *io);
 int rsnd_runtime_is_ssi_tdm(struct rsnd_dai_stream *io);
 
 /*
+ * DT
+ */
+#define rsnd_parse_of_node(priv, node)                                  \
+        of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, node)
+#define RSND_NODE_DAI   "rcar_sound,dai"
+#define RSND_NODE_SSI   "rcar_sound,ssi"
+#define RSND_NODE_SRC   "rcar_sound,src"
+#define RSND_NODE_CTU   "rcar_sound,ctu"
+#define RSND_NODE_MIX   "rcar_sound,mix"
+#define RSND_NODE_DVC   "rcar_sound,dvc"
+
+/*
  *      R-Car sound DAI
  */
 #define RSND_DAI_NAME_SIZE      16
@@ -382,6 +428,7 @@ struct rsnd_dai_stream {
 };
 #define rsnd_io_to_mod(io, i)   ((i) < RSND_MOD_MAX ? (io)->mod[(i)] : NULL)
 #define rsnd_io_to_mod_ssi(io)  rsnd_io_to_mod((io), RSND_MOD_SSI)
+#define rsnd_io_to_mod_ssiu(io) rsnd_io_to_mod((io), RSND_MOD_SSIU)
 #define rsnd_io_to_mod_ssip(io) rsnd_io_to_mod((io), RSND_MOD_SSIP)
 #define rsnd_io_to_mod_src(io)  rsnd_io_to_mod((io), RSND_MOD_SRC)
 #define rsnd_io_to_mod_ctu(io)  rsnd_io_to_mod((io), RSND_MOD_CTU)
@@ -428,8 +475,7 @@ int rsnd_dai_pointer_offset(struct rsnd_dai_stream *io, int additional);
 int rsnd_dai_connect(struct rsnd_mod *mod,
                      struct rsnd_dai_stream *io,
                      enum rsnd_mod_type type);
-#define rsnd_dai_of_node(priv)                                          \
-        of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,dai")
+#define rsnd_dai_of_node(priv) rsnd_parse_of_node(priv, RSND_NODE_DAI)
 
 /*
  *      R-Car Gen1/Gen2
@@ -453,6 +499,9 @@ int rsnd_adg_set_src_timesel_gen2(struct rsnd_mod *src_mod,
                                   unsigned int out_rate);
 int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_mod *mod,
                                  struct rsnd_dai_stream *io);
+#define rsnd_adg_clk_enable(priv)       rsnd_adg_clk_control(priv, 1)
+#define rsnd_adg_clk_disable(priv)      rsnd_adg_clk_control(priv, 0)
+void rsnd_adg_clk_control(struct rsnd_priv *priv, int enable);
 
 /*
  *      R-Car sound priv
@@ -606,8 +655,7 @@ u32 rsnd_ssi_multi_slaves_runtime(struct rsnd_dai_stream *io);
         __rsnd_ssi_is_pin_sharing(rsnd_io_to_mod_ssi(io))
 int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod);
 
-#define rsnd_ssi_of_node(priv)                                          \
-        of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,ssi")
+#define rsnd_ssi_of_node(priv) rsnd_parse_of_node(priv, RSND_NODE_SSI)
 void rsnd_parse_connect_ssi(struct rsnd_dai *rdai,
                             struct device_node *playback,
                             struct device_node *capture);
@@ -633,8 +681,7 @@ unsigned int rsnd_src_get_rate(struct rsnd_priv *priv,
                                struct rsnd_dai_stream *io,
                                int is_in);
 
-#define rsnd_src_of_node(priv)                                          \
-        of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,src")
+#define rsnd_src_of_node(priv) rsnd_parse_of_node(priv, RSND_NODE_SRC)
 #define rsnd_parse_connect_src(rdai, playback, capture)                 \
         rsnd_parse_connect_common(rdai, rsnd_src_mod_get,               \
                                   rsnd_src_of_node(rsnd_rdai_to_priv(rdai)), \
@@ -647,8 +694,7 @@ int rsnd_ctu_probe(struct rsnd_priv *priv);
 void rsnd_ctu_remove(struct rsnd_priv *priv);
 int rsnd_ctu_converted_channel(struct rsnd_mod *mod);
 struct rsnd_mod *rsnd_ctu_mod_get(struct rsnd_priv *priv, int id);
-#define rsnd_ctu_of_node(priv)                                          \
-        of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,ctu")
+#define rsnd_ctu_of_node(priv) rsnd_parse_of_node(priv, RSND_NODE_CTU)
 #define rsnd_parse_connect_ctu(rdai, playback, capture)                 \
         rsnd_parse_connect_common(rdai, rsnd_ctu_mod_get,               \
                                   rsnd_ctu_of_node(rsnd_rdai_to_priv(rdai)), \
@@ -660,8 +706,7 @@ struct rsnd_mod *rsnd_ctu_mod_get(struct rsnd_priv *priv, int id);
 int rsnd_mix_probe(struct rsnd_priv *priv);
 void rsnd_mix_remove(struct rsnd_priv *priv);
 struct rsnd_mod *rsnd_mix_mod_get(struct rsnd_priv *priv, int id);
-#define rsnd_mix_of_node(priv)                                          \
-        of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,mix")
+#define rsnd_mix_of_node(priv) rsnd_parse_of_node(priv, RSND_NODE_MIX)
 #define rsnd_parse_connect_mix(rdai, playback, capture)                 \
         rsnd_parse_connect_common(rdai, rsnd_mix_mod_get,               \
                                   rsnd_mix_of_node(rsnd_rdai_to_priv(rdai)), \
@@ -673,8 +718,7 @@ struct rsnd_mod *rsnd_mix_mod_get(struct rsnd_priv *priv, int id);
 int rsnd_dvc_probe(struct rsnd_priv *priv);
 void rsnd_dvc_remove(struct rsnd_priv *priv);
 struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id);
-#define rsnd_dvc_of_node(priv)                                          \
-        of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,dvc")
+#define rsnd_dvc_of_node(priv) rsnd_parse_of_node(priv, RSND_NODE_DVC)
 #define rsnd_parse_connect_dvc(rdai, playback, capture)                 \
         rsnd_parse_connect_common(rdai, rsnd_dvc_mod_get,               \
                                   rsnd_dvc_of_node(rsnd_rdai_to_priv(rdai)), \
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 969a5169de25..3a8f65bd1bf9 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -189,6 +189,7 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
+        int use_src = 0;
         u32 fin, fout;
         u32 ifscr, fsrate, adinr;
         u32 cr, route;
@@ -214,6 +215,8 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
                 return;
         }
 
+        use_src = (fin != fout) | rsnd_src_sync_is_enabled(mod);
+
         /*
          *      SRC_ADINR
          */
@@ -225,7 +228,7 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
          */
         ifscr = 0;
         fsrate = 0;
-        if (fin != fout) {
+        if (use_src) {
                 u64 n;
 
                 ifscr = 1;
@@ -239,7 +242,7 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
          */
         cr      = 0x00011110;
         route   = 0x0;
-        if (fin != fout) {
+        if (use_src) {
                 route   = 0x1;
 
                 if (rsnd_src_sync_is_enabled(mod)) {
@@ -327,8 +330,8 @@ static void rsnd_src_status_clear(struct rsnd_mod *mod)
 {
         u32 val = OUF_SRC(rsnd_mod_id(mod));
 
-        rsnd_mod_bset(mod, SCU_SYS_STATUS0, val, val);
-        rsnd_mod_bset(mod, SCU_SYS_STATUS1, val, val);
+        rsnd_mod_write(mod, SCU_SYS_STATUS0, val);
+        rsnd_mod_write(mod, SCU_SYS_STATUS1, val);
 }
 
 static bool rsnd_src_error_occurred(struct rsnd_mod *mod)
@@ -475,7 +478,7 @@ static int rsnd_src_probe_(struct rsnd_mod *mod,
                         return ret;
         }
 
-        ret = rsnd_dma_attach(io, mod, &src->dma, 0);
+        ret = rsnd_dma_attach(io, mod, &src->dma);
 
         return ret;
 }
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 6cb6db005fc4..411bda2387ad 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -417,11 +417,14 @@ static int rsnd_ssi_hw_params(struct rsnd_mod *mod,
         int chan = params_channels(params);
 
         /*
-         * Already working.
-         * It will happen if SSI has parent/child connection.
+         * snd_pcm_ops::hw_params will be called *before*
+         * snd_soc_dai_ops::trigger. Thus, ssi->usrcnt is 0
+         * in 1st call.
          */
-        if (ssi->usrcnt > 1) {
+        if (ssi->usrcnt) {
                 /*
+                 * Already working.
+                 * It will happen if SSI has parent/child connection.
                  * it is error if child <-> parent SSI uses
                  * different channels.
                  */
@@ -644,10 +647,14 @@ static int rsnd_ssi_common_probe(struct rsnd_mod *mod,
         if (ret < 0)
                 return ret;
 
-        ret = devm_request_irq(dev, ssi->irq,
-                               rsnd_ssi_interrupt,
-                               IRQF_SHARED,
-                               dev_name(dev), mod);
+        /*
+         * SSI might be called again as PIO fallback
+         * It is easy to manual handling for IRQ request/free
+         */
+        ret = request_irq(ssi->irq,
+                          rsnd_ssi_interrupt,
+                          IRQF_SHARED,
+                          dev_name(dev), mod);
 
         return ret;
 }
@@ -669,7 +676,6 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
                               struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-        int dma_id = 0; /* not needed */
         int ret;
 
         /*
@@ -684,7 +690,7 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
                 return ret;
 
         /* SSI probe might be called many times in MUX multi path */
-        ret = rsnd_dma_attach(io, mod, &ssi->dma, dma_id);
+        ret = rsnd_dma_attach(io, mod, &ssi->dma);
 
         return ret;
 }
@@ -694,11 +700,9 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
                                struct rsnd_priv *priv)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-        struct device *dev = rsnd_priv_to_dev(priv);
-        int irq = ssi->irq;
 
         /* PIO will request IRQ again */
-        devm_free_irq(dev, irq, mod);
+        free_irq(ssi->irq, mod);
 
         return 0;
 }
diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c
index 6f9b388ec5a8..4e817c8a18c0 100644
--- a/sound/soc/sh/rcar/ssiu.c
+++ b/sound/soc/sh/rcar/ssiu.c
@@ -33,6 +33,26 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod,
         u32 mask1, val1;
         u32 mask2, val2;
 
+        /* clear status */
+        switch (id) {
+        case 0:
+        case 1:
+        case 2:
+        case 3:
+        case 4:
+                rsnd_mod_write(mod, SSI_SYS_STATUS0, 0xf << (id * 4));
+                rsnd_mod_write(mod, SSI_SYS_STATUS2, 0xf << (id * 4));
+                rsnd_mod_write(mod, SSI_SYS_STATUS4, 0xf << (id * 4));
+                rsnd_mod_write(mod, SSI_SYS_STATUS6, 0xf << (id * 4));
+                break;
+        case 9:
+                rsnd_mod_write(mod, SSI_SYS_STATUS1, 0xf << 4);
+                rsnd_mod_write(mod, SSI_SYS_STATUS3, 0xf << 4);
+                rsnd_mod_write(mod, SSI_SYS_STATUS5, 0xf << 4);
+                rsnd_mod_write(mod, SSI_SYS_STATUS7, 0xf << 4);
+                break;
+        }
+
         /*
          * SSI_MODE0
          */
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index bf7b52fce597..bfd71b873ca2 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -30,16 +30,26 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
 {
         struct snd_soc_pcm_runtime *rtd = cstream->private_data;
         struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int ret = 0;
 
         mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
 
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->startup) {
+                ret = cpu_dai->driver->cops->startup(cstream, cpu_dai);
+                if (ret < 0) {
+                        dev_err(cpu_dai->dev, "Compress ASoC: can't open interface %s: %d\n",
+                                cpu_dai->name, ret);
+                        goto out;
+                }
+        }
+
         if (platform->driver->compr_ops && platform->driver->compr_ops->open) {
                 ret = platform->driver->compr_ops->open(cstream);
                 if (ret < 0) {
                         pr_err("compress asoc: can't open platform %s\n",
                                 platform->component.name);
-                        goto out;
+                        goto plat_err;
                 }
         }
 
@@ -60,6 +70,9 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
 machine_err:
         if (platform->driver->compr_ops && platform->driver->compr_ops->free)
                 platform->driver->compr_ops->free(cstream);
+plat_err:
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown)
+                cpu_dai->driver->cops->shutdown(cstream, cpu_dai);
 out:
         mutex_unlock(&rtd->pcm_mutex);
         return ret;
@@ -70,6 +83,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
         struct snd_soc_pcm_runtime *fe = cstream->private_data;
         struct snd_pcm_substream *fe_substream = fe->pcm->streams[0].substream;
         struct snd_soc_platform *platform = fe->platform;
+        struct snd_soc_dai *cpu_dai = fe->cpu_dai;
         struct snd_soc_dpcm *dpcm;
         struct snd_soc_dapm_widget_list *list;
         int stream;
@@ -82,12 +96,22 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
 
         mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
 
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->startup) {
+                ret = cpu_dai->driver->cops->startup(cstream, cpu_dai);
+                if (ret < 0) {
+                        dev_err(cpu_dai->dev, "Compress ASoC: can't open interface %s: %d\n",
+                                cpu_dai->name, ret);
+                        goto out;
+                }
+        }
+
+
         if (platform->driver->compr_ops && platform->driver->compr_ops->open) {
                 ret = platform->driver->compr_ops->open(cstream);
                 if (ret < 0) {
                         pr_err("compress asoc: can't open platform %s\n",
                                 platform->component.name);
-                        goto out;
+                        goto plat_err;
                 }
         }
 
@@ -144,6 +168,9 @@ fe_err:
 machine_err:
         if (platform->driver->compr_ops && platform->driver->compr_ops->free)
                 platform->driver->compr_ops->free(cstream);
+plat_err:
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown)
+                cpu_dai->driver->cops->shutdown(cstream, cpu_dai);
 out:
         fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;
         mutex_unlock(&fe->card->mutex);
@@ -210,6 +237,9 @@ 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);
 
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown)
+                cpu_dai->driver->cops->shutdown(cstream, cpu_dai);
+
         if (cstream->direction == SND_COMPRESS_PLAYBACK) {
                 if (snd_soc_runtime_ignore_pmdown_time(rtd)) {
                         snd_soc_dapm_stream_event(rtd,
@@ -236,6 +266,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream)
 {
         struct snd_soc_pcm_runtime *fe = cstream->private_data;
         struct snd_soc_platform *platform = fe->platform;
+        struct snd_soc_dai *cpu_dai = fe->cpu_dai;
         struct snd_soc_dpcm *dpcm;
         int stream, ret;
 
@@ -275,6 +306,9 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream)
         if (platform->driver->compr_ops && platform->driver->compr_ops->free)
                 platform->driver->compr_ops->free(cstream);
 
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown)
+                cpu_dai->driver->cops->shutdown(cstream, cpu_dai);
+
         mutex_unlock(&fe->card->mutex);
         return 0;
 }
@@ -285,6 +319,7 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
         struct snd_soc_pcm_runtime *rtd = cstream->private_data;
         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;
         int ret = 0;
 
         mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
@@ -295,6 +330,10 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
                         goto out;
         }
 
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger)
+                cpu_dai->driver->cops->trigger(cstream, cmd, cpu_dai);
+
+
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
                 snd_soc_dai_digital_mute(codec_dai, 0, cstream->direction);
@@ -313,6 +352,7 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
 {
         struct snd_soc_pcm_runtime *fe = cstream->private_data;
         struct snd_soc_platform *platform = fe->platform;
+        struct snd_soc_dai *cpu_dai = fe->cpu_dai;
         int ret = 0, stream;
 
         if (cmd == SND_COMPR_TRIGGER_PARTIAL_DRAIN ||
@@ -332,6 +372,12 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
 
         mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
 
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger) {
+                ret = cpu_dai->driver->cops->trigger(cstream, cmd, cpu_dai);
+                if (ret < 0)
+                        goto out;
+        }
+
         if (platform->driver->compr_ops && platform->driver->compr_ops->trigger) {
                 ret = platform->driver->compr_ops->trigger(cstream, cmd);
                 if (ret < 0)
@@ -368,6 +414,7 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream,
 {
         struct snd_soc_pcm_runtime *rtd = cstream->private_data;
         struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int ret = 0;
 
         mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
@@ -378,6 +425,12 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream,
          * expectation is that platform and machine will configure everything
          * for this compress path, like configuring pcm port for codec
          */
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->set_params) {
+                ret = cpu_dai->driver->cops->set_params(cstream, params, cpu_dai);
+                if (ret < 0)
+                        goto err;
+        }
+
         if (platform->driver->compr_ops && platform->driver->compr_ops->set_params) {
                 ret = platform->driver->compr_ops->set_params(cstream, params);
                 if (ret < 0)
@@ -416,6 +469,7 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,
         struct snd_soc_pcm_runtime *fe = cstream->private_data;
         struct snd_pcm_substream *fe_substream = fe->pcm->streams[0].substream;
         struct snd_soc_platform *platform = fe->platform;
+        struct snd_soc_dai *cpu_dai = fe->cpu_dai;
         int ret = 0, stream;
 
         if (cstream->direction == SND_COMPRESS_PLAYBACK)
@@ -425,6 +479,12 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,
 
         mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
 
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->set_params) {
+                ret = cpu_dai->driver->cops->set_params(cstream, params, cpu_dai);
+                if (ret < 0)
+                        goto out;
+        }
+
         if (platform->driver->compr_ops && platform->driver->compr_ops->set_params) {
                 ret = platform->driver->compr_ops->set_params(cstream, params);
                 if (ret < 0)
@@ -469,13 +529,21 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream,
 {
         struct snd_soc_pcm_runtime *rtd = cstream->private_data;
         struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int ret = 0;
 
         mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
 
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->get_params) {
+                ret = cpu_dai->driver->cops->get_params(cstream, params, cpu_dai);
+                if (ret < 0)
+                        goto err;
+        }
+
         if (platform->driver->compr_ops && platform->driver->compr_ops->get_params)
                 ret = platform->driver->compr_ops->get_params(cstream, params);
 
+err:
         mutex_unlock(&rtd->pcm_mutex);
         return ret;
 }
@@ -516,13 +584,21 @@ static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes)
 {
         struct snd_soc_pcm_runtime *rtd = cstream->private_data;
         struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int ret = 0;
 
         mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
 
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->ack) {
+                ret = cpu_dai->driver->cops->ack(cstream, bytes, cpu_dai);
+                if (ret < 0)
+                        goto err;
+        }
+
         if (platform->driver->compr_ops && platform->driver->compr_ops->ack)
                 ret = platform->driver->compr_ops->ack(cstream, bytes);
 
+err:
         mutex_unlock(&rtd->pcm_mutex);
         return ret;
 }
@@ -533,9 +609,13 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
         struct snd_soc_pcm_runtime *rtd = cstream->private_data;
         struct snd_soc_platform *platform = rtd->platform;
         int ret = 0;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
 
         mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
 
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->pointer)
+                cpu_dai->driver->cops->pointer(cstream, tstamp, cpu_dai);
+
         if (platform->driver->compr_ops && platform->driver->compr_ops->pointer)
                 ret = platform->driver->compr_ops->pointer(cstream, tstamp);
 
@@ -564,8 +644,15 @@ static int soc_compr_set_metadata(struct snd_compr_stream *cstream,
 {
         struct snd_soc_pcm_runtime *rtd = cstream->private_data;
         struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int ret = 0;
 
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->set_metadata) {
+                ret = cpu_dai->driver->cops->set_metadata(cstream, metadata, cpu_dai);
+                if (ret < 0)
+                        return ret;
+        }
+
         if (platform->driver->compr_ops && platform->driver->compr_ops->set_metadata)
                 ret = platform->driver->compr_ops->set_metadata(cstream, metadata);
 
@@ -577,8 +664,15 @@ static int soc_compr_get_metadata(struct snd_compr_stream *cstream,
 {
         struct snd_soc_pcm_runtime *rtd = cstream->private_data;
         struct snd_soc_platform *platform = rtd->platform;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int ret = 0;
 
+        if (cpu_dai->driver->cops && cpu_dai->driver->cops->get_metadata) {
+                ret = cpu_dai->driver->cops->get_metadata(cstream, metadata, cpu_dai);
+                if (ret < 0)
+                        return ret;
+        }
+
         if (platform->driver->compr_ops && platform->driver->compr_ops->get_metadata)
                 ret = platform->driver->compr_ops->get_metadata(cstream, metadata);
 
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index c0bbcd903261..f1901bb1466e 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -626,7 +626,7 @@ static void codec2codec_close_delayed_work(struct work_struct *work)
 int snd_soc_suspend(struct device *dev)
 {
         struct snd_soc_card *card = dev_get_drvdata(dev);
-        struct snd_soc_codec *codec;
+        struct snd_soc_component *component;
         struct snd_soc_pcm_runtime *rtd;
         int i;
 
@@ -702,39 +702,39 @@ int snd_soc_suspend(struct device *dev)
         dapm_mark_endpoints_dirty(card);
         snd_soc_dapm_sync(&card->dapm);
 
-        /* suspend all CODECs */
-        list_for_each_entry(codec, &card->codec_dev_list, card_list) {
-                struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
+        /* suspend all COMPONENTs */
+        list_for_each_entry(component, &card->component_dev_list, card_list) {
+                struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
 
-                /* If there are paths active then the CODEC will be held with
+                /* If there are paths active then the COMPONENT will be held with
                  * bias _ON and should not be suspended. */
-                if (!codec->suspended) {
+                if (!component->suspended) {
                         switch (snd_soc_dapm_get_bias_level(dapm)) {
                         case SND_SOC_BIAS_STANDBY:
                                 /*
-                                 * If the CODEC is capable of idle
+                                 * If the COMPONENT is capable of idle
                                  * bias off then being in STANDBY
                                  * means it's doing something,
                                  * otherwise fall through.
                                  */
                                 if (dapm->idle_bias_off) {
-                                        dev_dbg(codec->dev,
+                                        dev_dbg(component->dev,
                                                 "ASoC: idle_bias_off CODEC on over suspend\n");
                                         break;
                                 }
 
                         case SND_SOC_BIAS_OFF:
-                                if (codec->driver->suspend)
-                                        codec->driver->suspend(codec);
-                                codec->suspended = 1;
-                                if (codec->component.regmap)
-                                        regcache_mark_dirty(codec->component.regmap);
+                                if (component->suspend)
+                                        component->suspend(component);
+                                component->suspended = 1;
+                                if (component->regmap)
+                                        regcache_mark_dirty(component->regmap);
                                 /* deactivate pins to sleep state */
-                                pinctrl_pm_select_sleep_state(codec->dev);
+                                pinctrl_pm_select_sleep_state(component->dev);
                                 break;
                         default:
-                                dev_dbg(codec->dev,
-                                        "ASoC: CODEC is on over suspend\n");
+                                dev_dbg(component->dev,
+                                        "ASoC: COMPONENT is on over suspend\n");
                                 break;
                         }
                 }
@@ -768,7 +768,7 @@ static void soc_resume_deferred(struct work_struct *work)
         struct snd_soc_card *card =
                         container_of(work, struct snd_soc_card, deferred_resume_work);
         struct snd_soc_pcm_runtime *rtd;
-        struct snd_soc_codec *codec;
+        struct snd_soc_component *component;
         int i;
 
         /* our power state is still SNDRV_CTL_POWER_D3hot from suspend time,
@@ -794,11 +794,11 @@ static void soc_resume_deferred(struct work_struct *work)
                         cpu_dai->driver->resume(cpu_dai);
         }
 
-        list_for_each_entry(codec, &card->codec_dev_list, card_list) {
-                if (codec->suspended) {
-                        if (codec->driver->resume)
-                                codec->driver->resume(codec);
-                        codec->suspended = 0;
+        list_for_each_entry(component, &card->component_dev_list, card_list) {
+                if (component->suspended) {
+                        if (component->resume)
+                                component->resume(component);
+                        component->suspended = 0;
                 }
         }
 
@@ -972,6 +972,48 @@ struct snd_soc_dai *snd_soc_find_dai(
 }
 EXPORT_SYMBOL_GPL(snd_soc_find_dai);
 
+
+/**
+ * snd_soc_find_dai_link - Find a DAI link
+ *
+ * @card: soc card
+ * @id: DAI link ID to match
+ * @name: DAI link name to match, optional
+ * @stream name: DAI link stream name to match, optional
+ *
+ * This function will search all existing DAI links of the soc card to
+ * find the link of the same ID. Since DAI links may not have their
+ * unique ID, so name and stream name should also match if being
+ * specified.
+ *
+ * Return: pointer of DAI link, or NULL if not found.
+ */
+struct snd_soc_dai_link *snd_soc_find_dai_link(struct snd_soc_card *card,
+                                               int id, const char *name,
+                                               const char *stream_name)
+{
+        struct snd_soc_dai_link *link, *_link;
+
+        lockdep_assert_held(&client_mutex);
+
+        list_for_each_entry_safe(link, _link, &card->dai_link_list, list) {
+                if (link->id != id)
+                        continue;
+
+                if (name && (!link->name || strcmp(name, link->name)))
+                        continue;
+
+                if (stream_name && (!link->stream_name
+                        || strcmp(stream_name, link->stream_name)))
+                        continue;
+
+                return link;
+        }
+
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(snd_soc_find_dai_link);
+
 static bool soc_is_dai_link_bound(struct snd_soc_card *card,
                 struct snd_soc_dai_link *dai_link)
 {
@@ -993,6 +1035,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
         struct snd_soc_dai_link_component cpu_dai_component;
         struct snd_soc_dai **codec_dais;
         struct snd_soc_platform *platform;
+        struct device_node *platform_of_node;
         const char *platform_name;
         int i;
 
@@ -1042,9 +1085,12 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
 
         /* find one from the set of registered platforms */
         list_for_each_entry(platform, &platform_list, list) {
+                platform_of_node = platform->dev->of_node;
+                if (!platform_of_node && platform->dev->parent->of_node)
+                        platform_of_node = platform->dev->parent->of_node;
+
                 if (dai_link->platform_of_node) {
-                        if (platform->dev->of_node !=
-                            dai_link->platform_of_node)
+                        if (platform_of_node != dai_link->platform_of_node)
                                 continue;
                 } else {
                         if (strcmp(platform->component.name, platform_name))
@@ -1072,9 +1118,7 @@ static void soc_remove_component(struct snd_soc_component *component)
         if (!component->card)
                 return;
 
-        /* This is a HACK and will be removed soon */
-        if (component->codec)
-                list_del(&component->codec->card_list);
+        list_del(&component->card_list);
 
         if (component->remove)
                 component->remove(component);
@@ -1443,10 +1487,7 @@ static int soc_probe_component(struct snd_soc_card *card,
                                         component->num_dapm_routes);
 
         list_add(&dapm->list, &card->dapm_list);
-
-        /* This is a HACK and will be removed soon */
-        if (component->codec)
-                list_add(&component->codec->card_list, &card->codec_dev_list);
+        list_add(&component->card_list, &card->component_dev_list);
 
         return 0;
 
@@ -1706,7 +1747,8 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
         }
 
         component->init = aux_dev->init;
-        list_add(&component->list_aux, &card->aux_comp_list);
+        component->auxiliary = 1;
+
         return 0;
 
 err_defer:
@@ -1722,7 +1764,10 @@ static int soc_probe_aux_devices(struct snd_soc_card *card)
 
         for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
                 order++) {
-                list_for_each_entry(comp, &card->aux_comp_list, list_aux) {
+                list_for_each_entry(comp, &card->component_dev_list, card_list) {
+                        if (!comp->auxiliary)
+                                continue;
+
                         if (comp->driver->probe_order == order) {
                                 ret = soc_probe_component(card, comp);
                                 if (ret < 0) {
@@ -1746,11 +1791,14 @@ static void soc_remove_aux_devices(struct snd_soc_card *card)
         for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
                 order++) {
                 list_for_each_entry_safe(comp, _comp,
-                        &card->aux_comp_list, list_aux) {
+                        &card->component_dev_list, card_list) {
+
+                        if (!comp->auxiliary)
+                                continue;
+
                         if (comp->driver->remove_order == order) {
                                 soc_remove_component(comp);
-                                /* remove it from the card's aux_comp_list */
-                                list_del(&comp->list_aux);
+                                comp->auxiliary = 0;
                         }
                 }
         }
@@ -2926,6 +2974,8 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
         component->driver = driver;
         component->probe = component->driver->probe;
         component->remove = component->driver->remove;
+        component->suspend = component->driver->suspend;
+        component->resume = component->driver->resume;
 
         dapm = &component->dapm;
         dapm->dev = dev;
@@ -3275,6 +3325,20 @@ static void snd_soc_codec_drv_remove(struct snd_soc_component *component)
         codec->driver->remove(codec);
 }
 
+static int snd_soc_codec_drv_suspend(struct snd_soc_component *component)
+{
+        struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
+
+        return codec->driver->suspend(codec);
+}
+
+static int snd_soc_codec_drv_resume(struct snd_soc_component *component)
+{
+        struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
+
+        return codec->driver->resume(codec);
+}
+
 static int snd_soc_codec_drv_write(struct snd_soc_component *component,
         unsigned int reg, unsigned int val)
 {
@@ -3336,6 +3400,10 @@ int snd_soc_register_codec(struct device *dev,
                 codec->component.probe = snd_soc_codec_drv_probe;
         if (codec_drv->remove)
                 codec->component.remove = snd_soc_codec_drv_remove;
+        if (codec_drv->suspend)
+                codec->component.suspend = snd_soc_codec_drv_suspend;
+        if (codec_drv->resume)
+                codec->component.resume = snd_soc_codec_drv_resume;
         if (codec_drv->write)
                 codec->component.write = snd_soc_codec_drv_write;
         if (codec_drv->read)
@@ -3424,10 +3492,10 @@ found:
 EXPORT_SYMBOL_GPL(snd_soc_unregister_codec);
 
 /* Retrieve a card's name from device tree */
-int snd_soc_of_parse_card_name(struct snd_soc_card *card,
-                               const char *propname)
+int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card,
+                                         struct device_node *np,
+                                         const char *propname)
 {
-        struct device_node *np;
         int ret;
 
         if (!card->dev) {
@@ -3435,7 +3503,8 @@ int snd_soc_of_parse_card_name(struct snd_soc_card *card,
                 return -EINVAL;
         }
 
-        np = card->dev->of_node;
+        if (!np)
+                np = card->dev->of_node;
 
         ret = of_property_read_string_index(np, propname, 0, &card->name);
         /*
@@ -3452,7 +3521,7 @@ int snd_soc_of_parse_card_name(struct snd_soc_card *card,
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(snd_soc_of_parse_card_name);
+EXPORT_SYMBOL_GPL(snd_soc_of_parse_card_name_from_node);
 
 static const struct snd_soc_dapm_widget simple_widgets[] = {
         SND_SOC_DAPM_MIC("Microphone", NULL),
@@ -3461,14 +3530,17 @@ static const struct snd_soc_dapm_widget simple_widgets[] = {
         SND_SOC_DAPM_SPK("Speaker", NULL),
 };
 
-int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,
+int snd_soc_of_parse_audio_simple_widgets_from_node(struct snd_soc_card *card,
+                                          struct device_node *np,
                                           const char *propname)
 {
-        struct device_node *np = card->dev->of_node;
         struct snd_soc_dapm_widget *widgets;
         const char *template, *wname;
         int i, j, num_widgets, ret;
 
+        if (!np)
+                np = card->dev->of_node;
+
         num_widgets = of_property_count_strings(np, propname);
         if (num_widgets < 0) {
                 dev_err(card->dev,
@@ -3539,7 +3611,7 @@ int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_simple_widgets);
+EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_simple_widgets_from_node);
 
 static int snd_soc_of_get_slot_mask(struct device_node *np,
                                     const char *prop_name,
@@ -3595,15 +3667,18 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np,
 }
 EXPORT_SYMBOL_GPL(snd_soc_of_parse_tdm_slot);
 
-void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,
+void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card,
+                                   struct device_node *np,
                                    struct snd_soc_codec_conf *codec_conf,
                                    struct device_node *of_node,
                                    const char *propname)
 {
-        struct device_node *np = card->dev->of_node;
         const char *str;
         int ret;
 
+        if (!np)
+                np = card->dev->of_node;
+
         ret = of_property_read_string(np, propname, &str);
         if (ret < 0) {
                 /* no prefix is not error */
@@ -3613,16 +3688,19 @@ void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,
         codec_conf->of_node     = of_node;
         codec_conf->name_prefix = str;
 }
-EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix);
+EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix_from_node);
 
-int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
+int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,
+                                   struct device_node *np,
                                    const char *propname)
 {
-        struct device_node *np = card->dev->of_node;
         int num_routes;
         struct snd_soc_dapm_route *routes;
         int i, ret;
 
+        if (!np)
+                np = card->dev->of_node;
+
         num_routes = of_property_count_strings(np, propname);
         if (num_routes < 0 || num_routes & 1) {
                 dev_err(card->dev,
@@ -3669,7 +3747,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_routing);
+EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_routing_from_node);
 
 unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
                                      const char *prefix,
@@ -3784,7 +3862,7 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
 }
 EXPORT_SYMBOL_GPL(snd_soc_of_parse_daifmt);
 
-static int snd_soc_get_dai_name(struct of_phandle_args *args,
+int snd_soc_get_dai_name(struct of_phandle_args *args,
                                 const char **dai_name)
 {
         struct snd_soc_component *pos;
@@ -3836,6 +3914,7 @@ static int snd_soc_get_dai_name(struct of_phandle_args *args,
         mutex_unlock(&client_mutex);
         return ret;
 }
+EXPORT_SYMBOL_GPL(snd_soc_get_dai_name);
 
 int snd_soc_of_get_dai_name(struct device_node *of_node,
                             const char **dai_name)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 3bbe32ee4630..27dd02e57b31 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -330,6 +330,11 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
         case snd_soc_dapm_mixer_named_ctl:
                 mc = (struct soc_mixer_control *)kcontrol->private_value;
 
+                if (mc->autodisable && snd_soc_volsw_is_stereo(mc))
+                        dev_warn(widget->dapm->dev,
+                                 "ASoC: Unsupported stereo autodisable control '%s'\n",
+                                 ctrl_name);
+
                 if (mc->autodisable) {
                         struct snd_soc_dapm_widget template;
 
@@ -723,7 +728,8 @@ static int dapm_connect_mux(struct snd_soc_dapm_context *dapm,
 }
 
 /* set up initial codec paths */
-static void dapm_set_mixer_path_status(struct snd_soc_dapm_path *p, int i)
+static void dapm_set_mixer_path_status(struct snd_soc_dapm_path *p, int i,
+                                       int nth_path)
 {
         struct soc_mixer_control *mc = (struct soc_mixer_control *)
                 p->sink->kcontrol_news[i].private_value;
@@ -736,7 +742,25 @@ static void dapm_set_mixer_path_status(struct snd_soc_dapm_path *p, int i)
 
         if (reg != SND_SOC_NOPM) {
                 soc_dapm_read(p->sink->dapm, reg, &val);
-                val = (val >> shift) & mask;
+                /*
+                 * The nth_path argument allows this function to know
+                 * which path of a kcontrol it is setting the initial
+                 * status for. Ideally this would support any number
+                 * of paths and channels. But since kcontrols only come
+                 * in mono and stereo variants, we are limited to 2
+                 * channels.
+                 *
+                 * The following code assumes for stereo controls the
+                 * first path is the left channel, and all remaining
+                 * paths are the right channel.
+                 */
+                if (snd_soc_volsw_is_stereo(mc) && nth_path > 0) {
+                        if (reg != mc->rreg)
+                                soc_dapm_read(p->sink->dapm, mc->rreg, &val);
+                        val = (val >> mc->rshift) & mask;
+                } else {
+                        val = (val >> shift) & mask;
+                }
                 if (invert)
                         val = max - val;
                 p->connect = !!val;
@@ -749,13 +773,13 @@ static void dapm_set_mixer_path_status(struct snd_soc_dapm_path *p, int i)
 static int dapm_connect_mixer(struct snd_soc_dapm_context *dapm,
         struct snd_soc_dapm_path *path, const char *control_name)
 {
-        int i;
+        int i, nth_path = 0;
 
         /* search for mixer kcontrol */
         for (i = 0; i < path->sink->num_kcontrols; i++) {
                 if (!strcmp(control_name, path->sink->kcontrol_news[i].name)) {
                         path->name = path->sink->kcontrol_news[i].name;
-                        dapm_set_mixer_path_status(path, i);
+                        dapm_set_mixer_path_status(path, i, nth_path++);
                         return 0;
                 }
         }
@@ -1626,6 +1650,15 @@ static void dapm_widget_update(struct snd_soc_card *card)
                 dev_err(w->dapm->dev, "ASoC: %s DAPM update failed: %d\n",
                         w->name, ret);
 
+        if (update->has_second_set) {
+                ret = soc_dapm_update_bits(w->dapm, update->reg2,
+                                           update->mask2, update->val2);
+                if (ret < 0)
+                        dev_err(w->dapm->dev,
+                                "ASoC: %s DAPM update failed: %d\n",
+                                w->name, ret);
+        }
+
         for (wi = 0; wi < wlist->num_widgets; wi++) {
                 w = wlist->widgets[wi];
 
@@ -2177,7 +2210,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_mux_update_power);
 
 /* test and update the power status of a mixer or switch widget */
 static int soc_dapm_mixer_update_power(struct snd_soc_card *card,
-                                   struct snd_kcontrol *kcontrol, int connect)
+                                       struct snd_kcontrol *kcontrol,
+                                       int connect, int rconnect)
 {
         struct snd_soc_dapm_path *path;
         int found = 0;
@@ -2186,8 +2220,33 @@ static int soc_dapm_mixer_update_power(struct snd_soc_card *card,
 
         /* find dapm widget path assoc with kcontrol */
         dapm_kcontrol_for_each_path(path, kcontrol) {
+                /*
+                 * Ideally this function should support any number of
+                 * paths and channels. But since kcontrols only come
+                 * in mono and stereo variants, we are limited to 2
+                 * channels.
+                 *
+                 * The following code assumes for stereo controls the
+                 * first path (when 'found == 0') is the left channel,
+                 * and all remaining paths (when 'found == 1') are the
+                 * right channel.
+                 *
+                 * A stereo control is signified by a valid 'rconnect'
+                 * value, either 0 for unconnected, or >= 0 for connected.
+                 * This is chosen instead of using snd_soc_volsw_is_stereo,
+                 * so that the behavior of snd_soc_dapm_mixer_update_power
+                 * doesn't change even when the kcontrol passed in is
+                 * stereo.
+                 *
+                 * It passes 'connect' as the path connect status for
+                 * the left channel, and 'rconnect' for the right
+                 * channel.
+                 */
+                if (found && rconnect >= 0)
+                        soc_dapm_connect_path(path, rconnect, "mixer update");
+                else
+                        soc_dapm_connect_path(path, connect, "mixer update");
                 found = 1;
-                soc_dapm_connect_path(path, connect, "mixer update");
         }
 
         if (found)
@@ -2205,7 +2264,7 @@ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm,
 
         mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
         card->update = update;
-        ret = soc_dapm_mixer_update_power(card, kcontrol, connect);
+        ret = soc_dapm_mixer_update_power(card, kcontrol, connect, -1);
         card->update = NULL;
         mutex_unlock(&card->dapm_mutex);
         if (ret > 0)
@@ -3030,22 +3089,28 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol,
         int reg = mc->reg;
         unsigned int shift = mc->shift;
         int max = mc->max;
+        unsigned int width = fls(max);
         unsigned int mask = (1 << fls(max)) - 1;
         unsigned int invert = mc->invert;
-        unsigned int val;
+        unsigned int reg_val, val, rval = 0;
         int ret = 0;
 
-        if (snd_soc_volsw_is_stereo(mc))
-                dev_warn(dapm->dev,
-                         "ASoC: Control '%s' is stereo, which is not supported\n",
-                         kcontrol->id.name);
-
         mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
         if (dapm_kcontrol_is_powered(kcontrol) && reg != SND_SOC_NOPM) {
-                ret = soc_dapm_read(dapm, reg, &val);
-                val = (val >> shift) & mask;
+                ret = soc_dapm_read(dapm, reg, &reg_val);
+                val = (reg_val >> shift) & mask;
+
+                if (ret == 0 && reg != mc->rreg)
+                        ret = soc_dapm_read(dapm, mc->rreg, &reg_val);
+
+                if (snd_soc_volsw_is_stereo(mc))
+                        rval = (reg_val >> mc->rshift) & mask;
         } else {
-                val = dapm_kcontrol_get_value(kcontrol);
+                reg_val = dapm_kcontrol_get_value(kcontrol);
+                val = reg_val & mask;
+
+                if (snd_soc_volsw_is_stereo(mc))
+                        rval = (reg_val >> width) & mask;
         }
         mutex_unlock(&card->dapm_mutex);
 
@@ -3057,6 +3122,13 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol,
         else
                 ucontrol->value.integer.value[0] = val;
 
+        if (snd_soc_volsw_is_stereo(mc)) {
+                if (invert)
+                        ucontrol->value.integer.value[1] = max - rval;
+                else
+                        ucontrol->value.integer.value[1] = rval;
+        }
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_get_volsw);
@@ -3080,46 +3152,66 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
         int reg = mc->reg;
         unsigned int shift = mc->shift;
         int max = mc->max;
-        unsigned int mask = (1 << fls(max)) - 1;
+        unsigned int width = fls(max);
+        unsigned int mask = (1 << width) - 1;
         unsigned int invert = mc->invert;
-        unsigned int val;
-        int connect, change, reg_change = 0;
-        struct snd_soc_dapm_update update;
+        unsigned int val, rval = 0;
+        int connect, rconnect = -1, change, reg_change = 0;
+        struct snd_soc_dapm_update update = { NULL };
         int ret = 0;
 
-        if (snd_soc_volsw_is_stereo(mc))
-                dev_warn(dapm->dev,
-                         "ASoC: Control '%s' is stereo, which is not supported\n",
-                         kcontrol->id.name);
-
         val = (ucontrol->value.integer.value[0] & mask);
         connect = !!val;
 
         if (invert)
                 val = max - val;
 
+        if (snd_soc_volsw_is_stereo(mc)) {
+                rval = (ucontrol->value.integer.value[1] & mask);
+                rconnect = !!rval;
+                if (invert)
+                        rval = max - rval;
+        }
+
         mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
 
-        change = dapm_kcontrol_set_value(kcontrol, val);
+        /* This assumes field width < (bits in unsigned int / 2) */
+        if (width > sizeof(unsigned int) * 8 / 2)
+                dev_warn(dapm->dev,
+                         "ASoC: control %s field width limit exceeded\n",
+                         kcontrol->id.name);
+        change = dapm_kcontrol_set_value(kcontrol, val | (rval << width));
 
         if (reg != SND_SOC_NOPM) {
-                mask = mask << shift;
                 val = val << shift;
+                rval = rval << mc->rshift;
+
+                reg_change = soc_dapm_test_bits(dapm, reg, mask << shift, val);
 
-                reg_change = soc_dapm_test_bits(dapm, reg, mask, val);
+                if (snd_soc_volsw_is_stereo(mc))
+                        reg_change |= soc_dapm_test_bits(dapm, mc->rreg,
+                                                         mask << mc->rshift,
+                                                         rval);
         }
 
         if (change || reg_change) {
                 if (reg_change) {
+                        if (snd_soc_volsw_is_stereo(mc)) {
+                                update.has_second_set = true;
+                                update.reg2 = mc->rreg;
+                                update.mask2 = mask << mc->rshift;
+                                update.val2 = rval;
+                        }
                         update.kcontrol = kcontrol;
                         update.reg = reg;
-                        update.mask = mask;
+                        update.mask = mask << shift;
                         update.val = val;
                         card->update = &update;
                 }
                 change |= reg_change;
 
-                ret = soc_dapm_mixer_update_power(card, kcontrol, connect);
+                ret = soc_dapm_mixer_update_power(card, kcontrol, connect,
+                                                  rconnect);
 
                 card->update = NULL;
         }
@@ -3192,7 +3284,7 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
         unsigned int *item = ucontrol->value.enumerated.item;
         unsigned int val, change, reg_change = 0;
         unsigned int mask;
-        struct snd_soc_dapm_update update;
+        struct snd_soc_dapm_update update = { NULL };
         int ret = 0;
 
         if (item[0] >= e->items)
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 6cef3977507a..17eb14935577 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -263,7 +263,6 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
         struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
         const struct snd_dmaengine_pcm_config *config = pcm->config;
         struct device *dev = rtd->platform->dev;
-        struct snd_dmaengine_dai_dma_data *dma_data;
         struct snd_pcm_substream *substream;
         size_t prealloc_buffer_size;
         size_t max_buffer_size;
@@ -278,19 +277,11 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
                 max_buffer_size = SIZE_MAX;
         }
 
-
         for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
                 substream = rtd->pcm->streams[i].substream;
                 if (!substream)
                         continue;
 
-                dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
-
-                if (!pcm->chan[i] &&
-                    (pcm->flags & SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME))
-                        pcm->chan[i] = dma_request_slave_channel(dev,
-                                dma_data->chan_name);
-
                 if (!pcm->chan[i] && (pcm->flags & SND_DMAENGINE_PCM_FLAG_COMPAT)) {
                         pcm->chan[i] = dmaengine_pcm_compat_request_channel(rtd,
                                 substream);
@@ -359,9 +350,7 @@ static int dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
         const char *name;
         struct dma_chan *chan;
 
-        if ((pcm->flags & (SND_DMAENGINE_PCM_FLAG_NO_DT |
-                           SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME)) ||
-            !dev->of_node)
+        if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !dev->of_node)
                 return 0;
 
         if (config && config->dma_dev) {
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index d56a16a0f6fa..e7a1eaa2772f 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2882,7 +2882,7 @@ int snd_soc_platform_trigger(struct snd_pcm_substream *substream,
 EXPORT_SYMBOL_GPL(snd_soc_platform_trigger);
 
 #ifdef CONFIG_DEBUG_FS
-static char *dpcm_state_string(enum snd_soc_dpcm_state state)
+static const char *dpcm_state_string(enum snd_soc_dpcm_state state)
 {
         switch (state) {
         case SND_SOC_DPCM_STATE_NEW:
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 6b05047a4134..65670b2b408c 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -49,10 +49,68 @@
 #define SOC_TPLG_PASS_GRAPH             5
 #define SOC_TPLG_PASS_PINS              6
 #define SOC_TPLG_PASS_BE_DAI            7
+#define SOC_TPLG_PASS_LINK              8
 
 #define SOC_TPLG_PASS_START     SOC_TPLG_PASS_MANIFEST
-#define SOC_TPLG_PASS_END       SOC_TPLG_PASS_BE_DAI
+#define SOC_TPLG_PASS_END       SOC_TPLG_PASS_LINK
 
+/*
+ * Old version of ABI structs, supported for backward compatibility.
+ */
+
+/* Manifest v4 */
+struct snd_soc_tplg_manifest_v4 {
+        __le32 size;            /* in bytes of this structure */
+        __le32 control_elems;   /* number of control elements */
+        __le32 widget_elems;    /* number of widget elements */
+        __le32 graph_elems;     /* number of graph elements */
+        __le32 pcm_elems;       /* number of PCM elements */
+        __le32 dai_link_elems;  /* number of DAI link elements */
+        struct snd_soc_tplg_private priv;
+} __packed;
+
+/* Stream Capabilities v4 */
+struct snd_soc_tplg_stream_caps_v4 {
+        __le32 size;            /* in bytes of this structure */
+        char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+        __le64 formats; /* supported formats SNDRV_PCM_FMTBIT_* */
+        __le32 rates;           /* supported rates SNDRV_PCM_RATE_* */
+        __le32 rate_min;        /* min rate */
+        __le32 rate_max;        /* max rate */
+        __le32 channels_min;    /* min channels */
+        __le32 channels_max;    /* max channels */
+        __le32 periods_min;     /* min number of periods */
+        __le32 periods_max;     /* max number of periods */
+        __le32 period_size_min; /* min period size bytes */
+        __le32 period_size_max; /* max period size bytes */
+        __le32 buffer_size_min; /* min buffer size bytes */
+        __le32 buffer_size_max; /* max buffer size bytes */
+} __packed;
+
+/* PCM v4 */
+struct snd_soc_tplg_pcm_v4 {
+        __le32 size;            /* in bytes of this structure */
+        char pcm_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+        char dai_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+        __le32 pcm_id;          /* unique ID - used to match with DAI link */
+        __le32 dai_id;          /* unique ID - used to match */
+        __le32 playback;        /* supports playback mode */
+        __le32 capture;         /* supports capture mode */
+        __le32 compress;        /* 1 = compressed; 0 = PCM */
+        struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* for DAI link */
+        __le32 num_streams;     /* number of streams */
+        struct snd_soc_tplg_stream_caps_v4 caps[2]; /* playback and capture for DAI */
+} __packed;
+
+/* Physical link config v4 */
+struct snd_soc_tplg_link_config_v4 {
+        __le32 size;            /* in bytes of this structure */
+        __le32 id;              /* unique ID - used to match */
+        struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* supported configs playback and captrure */
+        __le32 num_streams;     /* number of streams */
+} __packed;
+
+/* topology context */
 struct soc_tplg {
         const struct firmware *fw;
 
@@ -428,33 +486,41 @@ static void remove_widget(struct snd_soc_component *comp,
                 dobj->ops->widget_unload(comp, dobj);
 
         /*
-         * Dynamic Widgets either have 1 enum kcontrol or 1..N mixers.
+         * Dynamic Widgets either have 1..N enum kcontrols or mixers.
          * The enum may either have an array of values or strings.
          */
-        if (dobj->widget.kcontrol_enum) {
+        if (dobj->widget.kcontrol_type == SND_SOC_TPLG_TYPE_ENUM) {
                 /* enumerated widget mixer */
-                struct soc_enum *se =
-                        (struct soc_enum *)w->kcontrols[0]->private_value;
+                for (i = 0; i < w->num_kcontrols; i++) {
+                        struct snd_kcontrol *kcontrol = w->kcontrols[i];
+                        struct soc_enum *se =
+                                (struct soc_enum *)kcontrol->private_value;
 
-                snd_ctl_remove(card, w->kcontrols[0]);
+                        snd_ctl_remove(card, kcontrol);
 
-                kfree(se->dobj.control.dvalues);
-                for (i = 0; i < se->items; i++)
-                        kfree(se->dobj.control.dtexts[i]);
+                        kfree(se->dobj.control.dvalues);
+                        for (i = 0; i < se->items; i++)
+                                kfree(se->dobj.control.dtexts[i]);
 
-                kfree(se);
+                        kfree(se);
+                }
                 kfree(w->kcontrol_news);
         } else {
-                /* non enumerated widget mixer */
+                /* volume mixer or bytes controls */
                 for (i = 0; i < w->num_kcontrols; i++) {
                         struct snd_kcontrol *kcontrol = w->kcontrols[i];
-                        struct soc_mixer_control *sm =
-                        (struct soc_mixer_control *) kcontrol->private_value;
 
-                        kfree(w->kcontrols[i]->tlv.p);
+                        if (dobj->widget.kcontrol_type
+                            == SND_SOC_TPLG_TYPE_MIXER)
+                                kfree(kcontrol->tlv.p);
 
-                        snd_ctl_remove(card, w->kcontrols[i]);
-                        kfree(sm);
+                        snd_ctl_remove(card, kcontrol);
+
+                        /* Private value is used as struct soc_mixer_control
+                         * for volume mixers or soc_bytes_ext for bytes
+                         * controls.
+                         */
+                        kfree((void *)kcontrol->private_value);
                 }
                 kfree(w->kcontrol_news);
         }
@@ -474,6 +540,7 @@ static void remove_dai(struct snd_soc_component *comp,
         if (dobj->ops && dobj->ops->dai_unload)
                 dobj->ops->dai_unload(comp, dobj);
 
+        kfree(dai_drv->name);
         list_del(&dobj->list);
         kfree(dai_drv);
 }
@@ -491,6 +558,10 @@ static void remove_link(struct snd_soc_component *comp,
         if (dobj->ops && dobj->ops->link_unload)
                 dobj->ops->link_unload(comp, dobj);
 
+        kfree(link->name);
+        kfree(link->stream_name);
+        kfree(link->cpu_dai_name);
+
         list_del(&dobj->list);
         snd_soc_remove_dai_link(comp->card, link);
         kfree(link);
@@ -1193,98 +1264,105 @@ err:
 }
 
 static struct snd_kcontrol_new *soc_tplg_dapm_widget_denum_create(
-        struct soc_tplg *tplg)
+        struct soc_tplg *tplg, int num_kcontrols)
 {
         struct snd_kcontrol_new *kc;
         struct snd_soc_tplg_enum_control *ec;
         struct soc_enum *se;
-        int i, err;
-
-        ec = (struct snd_soc_tplg_enum_control *)tplg->pos;
-        tplg->pos += (sizeof(struct snd_soc_tplg_enum_control) +
-                ec->priv.size);
+        int i, j, err;
 
-        /* validate kcontrol */
-        if (strnlen(ec->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) ==
-                SNDRV_CTL_ELEM_ID_NAME_MAXLEN)
-                return NULL;
-
-        kc = kzalloc(sizeof(*kc), GFP_KERNEL);
+        kc = kcalloc(num_kcontrols, sizeof(*kc), GFP_KERNEL);
         if (kc == NULL)
                 return NULL;
 
-        se = kzalloc(sizeof(*se), GFP_KERNEL);
-        if (se == NULL)
-                goto err;
+        for (i = 0; i < num_kcontrols; i++) {
+                ec = (struct snd_soc_tplg_enum_control *)tplg->pos;
+                /* validate kcontrol */
+                if (strnlen(ec->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) ==
+                            SNDRV_CTL_ELEM_ID_NAME_MAXLEN)
+                        return NULL;
 
-        dev_dbg(tplg->dev, " adding DAPM widget enum control %s\n",
-                ec->hdr.name);
+                se = kzalloc(sizeof(*se), GFP_KERNEL);
+                if (se == NULL)
+                        goto err;
 
-        kc->name = ec->hdr.name;
-        kc->private_value = (long)se;
-        kc->iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        kc->access = ec->hdr.access;
+                dev_dbg(tplg->dev, " adding DAPM widget enum control %s\n",
+                        ec->hdr.name);
+
+                kc[i].name = ec->hdr.name;
+                kc[i].private_value = (long)se;
+                kc[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+                kc[i].access = ec->hdr.access;
 
-        /* we only support FL/FR channel mapping atm */
-        se->reg = tplc_chan_get_reg(tplg, ec->channel, SNDRV_CHMAP_FL);
-        se->shift_l = tplc_chan_get_shift(tplg, ec->channel, SNDRV_CHMAP_FL);
-        se->shift_r = tplc_chan_get_shift(tplg, ec->channel, SNDRV_CHMAP_FR);
+                /* we only support FL/FR channel mapping atm */
+                se->reg = tplc_chan_get_reg(tplg, ec->channel, SNDRV_CHMAP_FL);
+                se->shift_l = tplc_chan_get_shift(tplg, ec->channel,
+                                                  SNDRV_CHMAP_FL);
+                se->shift_r = tplc_chan_get_shift(tplg, ec->channel,
+                                                  SNDRV_CHMAP_FR);
 
-        se->items = ec->items;
-        se->mask = ec->mask;
-        se->dobj.index = tplg->index;
+                se->items = ec->items;
+                se->mask = ec->mask;
+                se->dobj.index = tplg->index;
 
-        switch (ec->hdr.ops.info) {
-        case SND_SOC_TPLG_CTL_ENUM_VALUE:
-        case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE:
-                err = soc_tplg_denum_create_values(se, ec);
-                if (err < 0) {
-                        dev_err(tplg->dev, "ASoC: could not create values for %s\n",
-                                ec->hdr.name);
+                switch (ec->hdr.ops.info) {
+                case SND_SOC_TPLG_CTL_ENUM_VALUE:
+                case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE:
+                        err = soc_tplg_denum_create_values(se, ec);
+                        if (err < 0) {
+                                dev_err(tplg->dev, "ASoC: could not create values for %s\n",
+                                        ec->hdr.name);
+                                goto err_se;
+                        }
+                        /* fall through to create texts */
+                case SND_SOC_TPLG_CTL_ENUM:
+                case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE:
+                case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT:
+                        err = soc_tplg_denum_create_texts(se, ec);
+                        if (err < 0) {
+                                dev_err(tplg->dev, "ASoC: could not create texts for %s\n",
+                                        ec->hdr.name);
+                                goto err_se;
+                        }
+                        break;
+                default:
+                        dev_err(tplg->dev, "ASoC: invalid enum control type %d for %s\n",
+                                ec->hdr.ops.info, ec->hdr.name);
                         goto err_se;
                 }
-                /* fall through to create texts */
-        case SND_SOC_TPLG_CTL_ENUM:
-        case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE:
-        case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT:
-                err = soc_tplg_denum_create_texts(se, ec);
+
+                /* map io handlers */
+                err = soc_tplg_kcontrol_bind_io(&ec->hdr, &kc[i], tplg);
+                if (err) {
+                        soc_control_err(tplg, &ec->hdr, ec->hdr.name);
+                        goto err_se;
+                }
+
+                /* pass control to driver for optional further init */
+                err = soc_tplg_init_kcontrol(tplg, &kc[i],
+                        (struct snd_soc_tplg_ctl_hdr *)ec);
                 if (err < 0) {
-                        dev_err(tplg->dev, "ASoC: could not create texts for %s\n",
+                        dev_err(tplg->dev, "ASoC: failed to init %s\n",
                                 ec->hdr.name);
                         goto err_se;
                 }
-                break;
-        default:
-                dev_err(tplg->dev, "ASoC: invalid enum control type %d for %s\n",
-                        ec->hdr.ops.info, ec->hdr.name);
-                goto err_se;
-        }
 
-        /* map io handlers */
-        err = soc_tplg_kcontrol_bind_io(&ec->hdr, kc, tplg);
-        if (err) {
-                soc_control_err(tplg, &ec->hdr, ec->hdr.name);
-                goto err_se;
-        }
-
-        /* pass control to driver for optional further init */
-        err = soc_tplg_init_kcontrol(tplg, kc,
-                (struct snd_soc_tplg_ctl_hdr *)ec);
-        if (err < 0) {
-                dev_err(tplg->dev, "ASoC: failed to init %s\n",
-                        ec->hdr.name);
-                goto err_se;
+                tplg->pos += (sizeof(struct snd_soc_tplg_enum_control) +
+                                ec->priv.size);
         }
 
         return kc;
 
 err_se:
-        /* free values and texts */
-        kfree(se->dobj.control.dvalues);
-        for (i = 0; i < ec->items; i++)
-                kfree(se->dobj.control.dtexts[i]);
+        for (; i >= 0; i--) {
+                /* free values and texts */
+                se = (struct soc_enum *)kc[i].private_value;
+                kfree(se->dobj.control.dvalues);
+                for (j = 0; j < ec->items; j++)
+                        kfree(se->dobj.control.dtexts[j]);
 
-        kfree(se);
+                kfree(se);
+        }
 err:
         kfree(kc);
 
@@ -1366,6 +1444,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg,
         struct snd_soc_dapm_widget template, *widget;
         struct snd_soc_tplg_ctl_hdr *control_hdr;
         struct snd_soc_card *card = tplg->comp->card;
+        unsigned int kcontrol_type;
         int ret = 0;
 
         if (strnlen(w->name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) ==
@@ -1406,6 +1485,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg,
         tplg->pos +=
                 (sizeof(struct snd_soc_tplg_dapm_widget) + w->priv.size);
         if (w->num_kcontrols == 0) {
+                kcontrol_type = 0;
                 template.num_kcontrols = 0;
                 goto widget;
         }
@@ -1421,6 +1501,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg,
         case SND_SOC_TPLG_CTL_VOLSW_XR_SX:
         case SND_SOC_TPLG_CTL_RANGE:
         case SND_SOC_TPLG_DAPM_CTL_VOLSW:
+                kcontrol_type = SND_SOC_TPLG_TYPE_MIXER;  /* volume mixer */
                 template.num_kcontrols = w->num_kcontrols;
                 template.kcontrol_news =
                         soc_tplg_dapm_widget_dmixer_create(tplg,
@@ -1435,16 +1516,18 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg,
         case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE:
         case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT:
         case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE:
-                template.dobj.widget.kcontrol_enum = 1;
-                template.num_kcontrols = 1;
+                kcontrol_type = SND_SOC_TPLG_TYPE_ENUM; /* enumerated mixer */
+                template.num_kcontrols = w->num_kcontrols;
                 template.kcontrol_news =
-                        soc_tplg_dapm_widget_denum_create(tplg);
+                        soc_tplg_dapm_widget_denum_create(tplg,
+                        template.num_kcontrols);
                 if (!template.kcontrol_news) {
                         ret = -ENOMEM;
                         goto hdr_err;
                 }
                 break;
         case SND_SOC_TPLG_CTL_BYTES:
+                kcontrol_type = SND_SOC_TPLG_TYPE_BYTES; /* bytes control */
                 template.num_kcontrols = w->num_kcontrols;
                 template.kcontrol_news =
                         soc_tplg_dapm_widget_dbytes_create(tplg,
@@ -1481,6 +1564,7 @@ widget:
         }
 
         widget->dobj.type = SND_SOC_DOBJ_WIDGET;
+        widget->dobj.widget.kcontrol_type = kcontrol_type;
         widget->dobj.ops = tplg->ops;
         widget->dobj.index = tplg->index;
         kfree(template.sname);
@@ -1589,7 +1673,8 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
         if (dai_drv == NULL)
                 return -ENOMEM;
 
-        dai_drv->name = pcm->dai_name;
+        if (strlen(pcm->dai_name))
+                dai_drv->name = kstrdup(pcm->dai_name, GFP_KERNEL);
         dai_drv->id = pcm->dai_id;
 
         if (pcm->playback) {
@@ -1621,8 +1706,31 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
         return snd_soc_register_dai(tplg->comp, dai_drv);
 }
 
+static void set_link_flags(struct snd_soc_dai_link *link,
+                unsigned int flag_mask, unsigned int flags)
+{
+        if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_RATES)
+                link->symmetric_rates =
+                        flags & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_RATES ? 1 : 0;
+
+        if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_CHANNELS)
+                link->symmetric_channels =
+                        flags & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_CHANNELS ?
+                        1 : 0;
+
+        if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS)
+                link->symmetric_samplebits =
+                        flags & SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS ?
+                        1 : 0;
+
+        if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP)
+                link->ignore_suspend =
+                flags & SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP ?
+                1 : 0;
+}
+
 /* create the FE DAI link */
-static int soc_tplg_link_create(struct soc_tplg *tplg,
+static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
         struct snd_soc_tplg_pcm *pcm)
 {
         struct snd_soc_dai_link *link;
@@ -1632,11 +1740,15 @@ static int soc_tplg_link_create(struct soc_tplg *tplg,
         if (link == NULL)
                 return -ENOMEM;
 
-        link->name = pcm->pcm_name;
-        link->stream_name = pcm->pcm_name;
+        if (strlen(pcm->pcm_name)) {
+                link->name = kstrdup(pcm->pcm_name, GFP_KERNEL);
+                link->stream_name = kstrdup(pcm->pcm_name, GFP_KERNEL);
+        }
         link->id = pcm->pcm_id;
 
-        link->cpu_dai_name = pcm->dai_name;
+        if (strlen(pcm->dai_name))
+                link->cpu_dai_name = kstrdup(pcm->dai_name, GFP_KERNEL);
+
         link->codec_name = "snd-soc-dummy";
         link->codec_dai_name = "snd-soc-dummy-dai";
 
@@ -1644,6 +1756,8 @@ static int soc_tplg_link_create(struct soc_tplg *tplg,
         link->dynamic = 1;
         link->dpcm_playback = pcm->playback;
         link->dpcm_capture = pcm->capture;
+        if (pcm->flag_mask)
+                set_link_flags(link, pcm->flag_mask, pcm->flags);
 
         /* pass control to component driver for optional further init */
         ret = soc_tplg_dai_link_load(tplg, link);
@@ -1672,55 +1786,351 @@ static int soc_tplg_pcm_create(struct soc_tplg *tplg,
         if (ret < 0)
                 return ret;
 
-        return  soc_tplg_link_create(tplg, pcm);
+        return  soc_tplg_fe_link_create(tplg, pcm);
+}
+
+/* copy stream caps from the old version 4 of source */
+static void stream_caps_new_ver(struct snd_soc_tplg_stream_caps *dest,
+                                struct snd_soc_tplg_stream_caps_v4 *src)
+{
+        dest->size = sizeof(*dest);
+        memcpy(dest->name, src->name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+        dest->formats = src->formats;
+        dest->rates = src->rates;
+        dest->rate_min = src->rate_min;
+        dest->rate_max = src->rate_max;
+        dest->channels_min = src->channels_min;
+        dest->channels_max = src->channels_max;
+        dest->periods_min = src->periods_min;
+        dest->periods_max = src->periods_max;
+        dest->period_size_min = src->period_size_min;
+        dest->period_size_max = src->period_size_max;
+        dest->buffer_size_min = src->buffer_size_min;
+        dest->buffer_size_max = src->buffer_size_max;
+}
+
+/**
+ * pcm_new_ver - Create the new version of PCM from the old version.
+ * @tplg: topology context
+ * @src: older version of pcm as a source
+ * @pcm: latest version of pcm created from the source
+ *
+ * Support from vesion 4. User should free the returned pcm manually.
+ */
+static int pcm_new_ver(struct soc_tplg *tplg,
+                       struct snd_soc_tplg_pcm *src,
+                       struct snd_soc_tplg_pcm **pcm)
+{
+        struct snd_soc_tplg_pcm *dest;
+        struct snd_soc_tplg_pcm_v4 *src_v4;
+        int i;
+
+        *pcm = NULL;
+
+        if (src->size != sizeof(*src_v4)) {
+                dev_err(tplg->dev, "ASoC: invalid PCM size\n");
+                return -EINVAL;
+        }
+
+        dev_warn(tplg->dev, "ASoC: old version of PCM\n");
+        src_v4 = (struct snd_soc_tplg_pcm_v4 *)src;
+        dest = kzalloc(sizeof(*dest), GFP_KERNEL);
+        if (!dest)
+                return -ENOMEM;
+
+        dest->size = sizeof(*dest);     /* size of latest abi version */
+        memcpy(dest->pcm_name, src_v4->pcm_name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+        memcpy(dest->dai_name, src_v4->dai_name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+        dest->pcm_id = src_v4->pcm_id;
+        dest->dai_id = src_v4->dai_id;
+        dest->playback = src_v4->playback;
+        dest->capture = src_v4->capture;
+        dest->compress = src_v4->compress;
+        dest->num_streams = src_v4->num_streams;
+        for (i = 0; i < dest->num_streams; i++)
+                memcpy(&dest->stream[i], &src_v4->stream[i],
+                       sizeof(struct snd_soc_tplg_stream));
+
+        for (i = 0; i < 2; i++)
+                stream_caps_new_ver(&dest->caps[i], &src_v4->caps[i]);
+
+        *pcm = dest;
+        return 0;
 }
 
 static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg,
         struct snd_soc_tplg_hdr *hdr)
 {
-        struct snd_soc_tplg_pcm *pcm;
+        struct snd_soc_tplg_pcm *pcm, *_pcm;
         int count = hdr->count;
-        int i;
+        int i, err;
+        bool abi_match;
 
         if (tplg->pass != SOC_TPLG_PASS_PCM_DAI)
                 return 0;
 
+        /* check the element size and count */
+        pcm = (struct snd_soc_tplg_pcm *)tplg->pos;
+        if (pcm->size > sizeof(struct snd_soc_tplg_pcm)
+                || pcm->size < sizeof(struct snd_soc_tplg_pcm_v4)) {
+                dev_err(tplg->dev, "ASoC: invalid size %d for PCM elems\n",
+                        pcm->size);
+                return -EINVAL;
+        }
+
         if (soc_tplg_check_elem_count(tplg,
-                sizeof(struct snd_soc_tplg_pcm), count,
+                pcm->size, count,
                 hdr->payload_size, "PCM DAI")) {
                 dev_err(tplg->dev, "ASoC: invalid count %d for PCM DAI elems\n",
                         count);
                 return -EINVAL;
         }
 
-        /* create the FE DAIs and DAI links */
-        pcm = (struct snd_soc_tplg_pcm *)tplg->pos;
         for (i = 0; i < count; i++) {
-                if (pcm->size != sizeof(*pcm)) {
-                        dev_err(tplg->dev, "ASoC: invalid pcm size\n");
-                        return -EINVAL;
+                pcm = (struct snd_soc_tplg_pcm *)tplg->pos;
+
+                /* check ABI version by size, create a new version of pcm
+                 * if abi not match.
+                 */
+                if (pcm->size == sizeof(*pcm)) {
+                        abi_match = true;
+                        _pcm = pcm;
+                } else {
+                        abi_match = false;
+                        err = pcm_new_ver(tplg, pcm, &_pcm);
                 }
 
-                soc_tplg_pcm_create(tplg, pcm);
-                pcm++;
+                /* create the FE DAIs and DAI links */
+                soc_tplg_pcm_create(tplg, _pcm);
+
+                /* offset by version-specific struct size and
+                 * real priv data size
+                 */
+                tplg->pos += pcm->size + _pcm->priv.size;
+
+                if (!abi_match)
+                        kfree(_pcm); /* free the duplicated one */
         }
 
         dev_dbg(tplg->dev, "ASoC: adding %d PCM DAIs\n", count);
-        tplg->pos += sizeof(struct snd_soc_tplg_pcm) * count;
 
         return 0;
 }
 
-/* *
- * soc_tplg_be_dai_config - Find and configure an existing BE DAI.
+/**
+ * set_link_hw_format - Set the HW audio format of the physical DAI link.
+ * @tplg: topology context
+ * @cfg: physical link configs.
+ *
+ * Topology context contains a list of supported HW formats (configs) and
+ * a default format ID for the physical link. This function will use this
+ * default ID to choose the HW format to set the link's DAI format for init.
+ */
+static void set_link_hw_format(struct snd_soc_dai_link *link,
+                        struct snd_soc_tplg_link_config *cfg)
+{
+        struct snd_soc_tplg_hw_config *hw_config;
+        unsigned char bclk_master, fsync_master;
+        unsigned char invert_bclk, invert_fsync;
+        int i;
+
+        for (i = 0; i < cfg->num_hw_configs; i++) {
+                hw_config = &cfg->hw_config[i];
+                if (hw_config->id != cfg->default_hw_config_id)
+                        continue;
+
+                link->dai_fmt = hw_config->fmt & SND_SOC_DAIFMT_FORMAT_MASK;
+
+                /* clock signal polarity */
+                invert_bclk = hw_config->invert_bclk;
+                invert_fsync = hw_config->invert_fsync;
+                if (!invert_bclk && !invert_fsync)
+                        link->dai_fmt |= SND_SOC_DAIFMT_NB_NF;
+                else if (!invert_bclk && invert_fsync)
+                        link->dai_fmt |= SND_SOC_DAIFMT_NB_IF;
+                else if (invert_bclk && !invert_fsync)
+                        link->dai_fmt |= SND_SOC_DAIFMT_IB_NF;
+                else
+                        link->dai_fmt |= SND_SOC_DAIFMT_IB_IF;
+
+                /* clock masters */
+                bclk_master = hw_config->bclk_master;
+                fsync_master = hw_config->fsync_master;
+                if (!bclk_master && !fsync_master)
+                        link->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;
+                else if (bclk_master && !fsync_master)
+                        link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFM;
+                else if (!bclk_master && fsync_master)
+                        link->dai_fmt |= SND_SOC_DAIFMT_CBM_CFS;
+                else
+                        link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;
+        }
+}
+
+/**
+ * link_new_ver - Create a new physical link config from the old
+ * version of source.
+ * @toplogy: topology context
+ * @src: old version of phyical link config as a source
+ * @link: latest version of physical link config created from the source
+ *
+ * Support from vesion 4. User need free the returned link config manually.
+ */
+static int link_new_ver(struct soc_tplg *tplg,
+                        struct snd_soc_tplg_link_config *src,
+                        struct snd_soc_tplg_link_config **link)
+{
+        struct snd_soc_tplg_link_config *dest;
+        struct snd_soc_tplg_link_config_v4 *src_v4;
+        int i;
+
+        *link = NULL;
+
+        if (src->size != sizeof(struct snd_soc_tplg_link_config_v4)) {
+                dev_err(tplg->dev, "ASoC: invalid physical link config size\n");
+                return -EINVAL;
+        }
+
+        dev_warn(tplg->dev, "ASoC: old version of physical link config\n");
+
+        src_v4 = (struct snd_soc_tplg_link_config_v4 *)src;
+        dest = kzalloc(sizeof(*dest), GFP_KERNEL);
+        if (!dest)
+                return -ENOMEM;
+
+        dest->size = sizeof(*dest);
+        dest->id = src_v4->id;
+        dest->num_streams = src_v4->num_streams;
+        for (i = 0; i < dest->num_streams; i++)
+                memcpy(&dest->stream[i], &src_v4->stream[i],
+                       sizeof(struct snd_soc_tplg_stream));
+
+        *link = dest;
+        return 0;
+}
+
+/* Find and configure an existing physical DAI link */
+static int soc_tplg_link_config(struct soc_tplg *tplg,
+        struct snd_soc_tplg_link_config *cfg)
+{
+        struct snd_soc_dai_link *link;
+        const char *name, *stream_name;
+        size_t len;
+        int ret;
+
+        len = strnlen(cfg->name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+        if (len == SNDRV_CTL_ELEM_ID_NAME_MAXLEN)
+                return -EINVAL;
+        else if (len)
+                name = cfg->name;
+        else
+                name = NULL;
+
+        len = strnlen(cfg->stream_name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+        if (len == SNDRV_CTL_ELEM_ID_NAME_MAXLEN)
+                return -EINVAL;
+        else if (len)
+                stream_name = cfg->stream_name;
+        else
+                stream_name = NULL;
+
+        link = snd_soc_find_dai_link(tplg->comp->card, cfg->id,
+                                     name, stream_name);
+        if (!link) {
+                dev_err(tplg->dev, "ASoC: physical link %s (id %d) not exist\n",
+                        name, cfg->id);
+                return -EINVAL;
+        }
+
+        /* hw format */
+        if (cfg->num_hw_configs)
+                set_link_hw_format(link, cfg);
+
+        /* flags */
+        if (cfg->flag_mask)
+                set_link_flags(link, cfg->flag_mask, cfg->flags);
+
+        /* pass control to component driver for optional further init */
+        ret = soc_tplg_dai_link_load(tplg, link);
+        if (ret < 0) {
+                dev_err(tplg->dev, "ASoC: physical link loading failed\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+
+/* Load physical link config elements from the topology context */
+static int soc_tplg_link_elems_load(struct soc_tplg *tplg,
+        struct snd_soc_tplg_hdr *hdr)
+{
+        struct snd_soc_tplg_link_config *link, *_link;
+        int count = hdr->count;
+        int i, ret;
+        bool abi_match;
+
+        if (tplg->pass != SOC_TPLG_PASS_LINK) {
+                tplg->pos += hdr->size + hdr->payload_size;
+                return 0;
+        };
+
+        /* check the element size and count */
+        link = (struct snd_soc_tplg_link_config *)tplg->pos;
+        if (link->size > sizeof(struct snd_soc_tplg_link_config)
+                || link->size < sizeof(struct snd_soc_tplg_link_config_v4)) {
+                dev_err(tplg->dev, "ASoC: invalid size %d for physical link elems\n",
+                        link->size);
+                return -EINVAL;
+        }
+
+        if (soc_tplg_check_elem_count(tplg,
+                link->size, count,
+                hdr->payload_size, "physical link config")) {
+                dev_err(tplg->dev, "ASoC: invalid count %d for physical link elems\n",
+                        count);
+                return -EINVAL;
+        }
+
+        /* config physical DAI links */
+        for (i = 0; i < count; i++) {
+                link = (struct snd_soc_tplg_link_config *)tplg->pos;
+                if (link->size == sizeof(*link)) {
+                        abi_match = true;
+                        _link = link;
+                } else {
+                        abi_match = false;
+                        ret = link_new_ver(tplg, link, &_link);
+                        if (ret < 0)
+                                return ret;
+                }
+
+                ret = soc_tplg_link_config(tplg, _link);
+                if (ret < 0)
+                        return ret;
+
+                /* offset by version-specific struct size and
+                 * real priv data size
+                 */
+                tplg->pos += link->size + _link->priv.size;
+
+                if (!abi_match)
+                        kfree(_link); /* free the duplicated one */
+        }
+
+        return 0;
+}
+
+/**
+ * soc_tplg_dai_config - Find and configure an existing physical DAI.
  * @tplg: topology context
- * @be: topology BE DAI configs.
+ * @d: physical DAI configs.
  *
- * The BE dai should already be registered by the platform driver. The
- * platform driver should specify the BE DAI name and ID for matching.
+ * The physical dai should already be registered by the platform driver.
+ * The platform driver should specify the DAI name and ID for matching.
  */
-static int soc_tplg_be_dai_config(struct soc_tplg *tplg,
-                                  struct snd_soc_tplg_be_dai *be)
+static int soc_tplg_dai_config(struct soc_tplg *tplg,
+                               struct snd_soc_tplg_dai *d)
 {
         struct snd_soc_dai_link_component dai_component = {0};
         struct snd_soc_dai *dai;
@@ -1729,17 +2139,17 @@ static int soc_tplg_be_dai_config(struct soc_tplg *tplg,
         struct snd_soc_tplg_stream_caps *caps;
         int ret;
 
-        dai_component.dai_name = be->dai_name;
+        dai_component.dai_name = d->dai_name;
         dai = snd_soc_find_dai(&dai_component);
         if (!dai) {
-                dev_err(tplg->dev, "ASoC: BE DAI %s not registered\n",
-                        be->dai_name);
+                dev_err(tplg->dev, "ASoC: physical DAI %s not registered\n",
+                        d->dai_name);
                 return -EINVAL;
         }
 
-        if (be->dai_id != dai->id) {
-                dev_err(tplg->dev, "ASoC: BE DAI %s id mismatch\n",
-                        be->dai_name);
+        if (d->dai_id != dai->id) {
+                dev_err(tplg->dev, "ASoC: physical DAI %s id mismatch\n",
+                        d->dai_name);
                 return -EINVAL;
         }
 
@@ -1747,20 +2157,20 @@ static int soc_tplg_be_dai_config(struct soc_tplg *tplg,
         if (!dai_drv)
                 return -EINVAL;
 
-        if (be->playback) {
+        if (d->playback) {
                 stream = &dai_drv->playback;
-                caps = &be->caps[SND_SOC_TPLG_STREAM_PLAYBACK];
+                caps = &d->caps[SND_SOC_TPLG_STREAM_PLAYBACK];
                 set_stream_info(stream, caps);
         }
 
-        if (be->capture) {
+        if (d->capture) {
                 stream = &dai_drv->capture;
-                caps = &be->caps[SND_SOC_TPLG_STREAM_CAPTURE];
+                caps = &d->caps[SND_SOC_TPLG_STREAM_CAPTURE];
                 set_stream_info(stream, caps);
         }
 
-        if (be->flag_mask)
-                set_dai_flags(dai_drv, be->flag_mask, be->flags);
+        if (d->flag_mask)
+                set_dai_flags(dai_drv, d->flag_mask, d->flags);
 
         /* pass control to component driver for optional further init */
         ret = soc_tplg_dai_load(tplg, dai_drv);
@@ -1772,10 +2182,11 @@ static int soc_tplg_be_dai_config(struct soc_tplg *tplg,
         return 0;
 }
 
-static int soc_tplg_be_dai_elems_load(struct soc_tplg *tplg,
-                                      struct snd_soc_tplg_hdr *hdr)
+/* load physical DAI elements */
+static int soc_tplg_dai_elems_load(struct soc_tplg *tplg,
+                                   struct snd_soc_tplg_hdr *hdr)
 {
-        struct snd_soc_tplg_be_dai *be;
+        struct snd_soc_tplg_dai *dai;
         int count = hdr->count;
         int i;
 
@@ -1784,41 +2195,95 @@ static int soc_tplg_be_dai_elems_load(struct soc_tplg *tplg,
 
         /* config the existing BE DAIs */
         for (i = 0; i < count; i++) {
-                be = (struct snd_soc_tplg_be_dai *)tplg->pos;
-                if (be->size != sizeof(*be)) {
-                        dev_err(tplg->dev, "ASoC: invalid BE DAI size\n");
+                dai = (struct snd_soc_tplg_dai *)tplg->pos;
+                if (dai->size != sizeof(*dai)) {
+                        dev_err(tplg->dev, "ASoC: invalid physical DAI size\n");
                         return -EINVAL;
                 }
 
-                soc_tplg_be_dai_config(tplg, be);
-                tplg->pos += (sizeof(*be) + be->priv.size);
+                soc_tplg_dai_config(tplg, dai);
+                tplg->pos += (sizeof(*dai) + dai->priv.size);
         }
 
         dev_dbg(tplg->dev, "ASoC: Configure %d BE DAIs\n", count);
         return 0;
 }
 
+/**
+ * manifest_new_ver - Create a new version of manifest from the old version
+ * of source.
+ * @toplogy: topology context
+ * @src: old version of manifest as a source
+ * @manifest: latest version of manifest created from the source
+ *
+ * Support from vesion 4. Users need free the returned manifest manually.
+ */
+static int manifest_new_ver(struct soc_tplg *tplg,
+                            struct snd_soc_tplg_manifest *src,
+                            struct snd_soc_tplg_manifest **manifest)
+{
+        struct snd_soc_tplg_manifest *dest;
+        struct snd_soc_tplg_manifest_v4 *src_v4;
+
+        *manifest = NULL;
+
+        if (src->size != sizeof(*src_v4)) {
+                dev_err(tplg->dev, "ASoC: invalid manifest size\n");
+                return -EINVAL;
+        }
+
+        dev_warn(tplg->dev, "ASoC: old version of manifest\n");
+
+        src_v4 = (struct snd_soc_tplg_manifest_v4 *)src;
+        dest = kzalloc(sizeof(*dest) + src_v4->priv.size, GFP_KERNEL);
+        if (!dest)
+                return -ENOMEM;
+
+        dest->size = sizeof(*dest);     /* size of latest abi version */
+        dest->control_elems = src_v4->control_elems;
+        dest->widget_elems = src_v4->widget_elems;
+        dest->graph_elems = src_v4->graph_elems;
+        dest->pcm_elems = src_v4->pcm_elems;
+        dest->dai_link_elems = src_v4->dai_link_elems;
+        dest->priv.size = src_v4->priv.size;
+        if (dest->priv.size)
+                memcpy(dest->priv.data, src_v4->priv.data,
+                       src_v4->priv.size);
+
+        *manifest = dest;
+        return 0;
+}
 
 static int soc_tplg_manifest_load(struct soc_tplg *tplg,
                                   struct snd_soc_tplg_hdr *hdr)
 {
-        struct snd_soc_tplg_manifest *manifest;
+        struct snd_soc_tplg_manifest *manifest, *_manifest;
+        bool abi_match;
+        int err;
 
         if (tplg->pass != SOC_TPLG_PASS_MANIFEST)
                 return 0;
 
         manifest = (struct snd_soc_tplg_manifest *)tplg->pos;
-        if (manifest->size != sizeof(*manifest)) {
-                dev_err(tplg->dev, "ASoC: invalid manifest size\n");
-                return -EINVAL;
-        }
 
-        tplg->pos += sizeof(struct snd_soc_tplg_manifest);
+        /* check ABI version by size, create a new manifest if abi not match */
+        if (manifest->size == sizeof(*manifest)) {
+                abi_match = true;
+                _manifest = manifest;
+        } else {
+                abi_match = false;
+                err = manifest_new_ver(tplg, manifest, &_manifest);
+                if (err < 0)
+                        return err;
+        }
 
+        /* pass control to component driver for optional further init */
         if (tplg->comp && tplg->ops && tplg->ops->manifest)
-                return tplg->ops->manifest(tplg->comp, manifest);
+                return tplg->ops->manifest(tplg->comp, _manifest);
+
+        if (!abi_match) /* free the duplicated one */
+                kfree(_manifest);
 
-        dev_err(tplg->dev, "ASoC: Firmware manifest not supported\n");
         return 0;
 }
 
@@ -1854,7 +2319,9 @@ static int soc_valid_header(struct soc_tplg *tplg,
                 return -EINVAL;
         }
 
-        if (hdr->abi != SND_SOC_TPLG_ABI_VERSION) {
+        /* Support ABI from version 4 */
+        if (hdr->abi > SND_SOC_TPLG_ABI_VERSION
+                || hdr->abi < SND_SOC_TPLG_ABI_VERSION_MIN) {
                 dev_err(tplg->dev,
                         "ASoC: pass %d invalid ABI version got 0x%x need 0x%x at offset 0x%lx size 0x%zx.\n",
                         tplg->pass, hdr->abi,
@@ -1902,8 +2369,12 @@ static int soc_tplg_load_header(struct soc_tplg *tplg,
                 return soc_tplg_dapm_widget_elems_load(tplg, hdr);
         case SND_SOC_TPLG_TYPE_PCM:
                 return soc_tplg_pcm_elems_load(tplg, hdr);
-        case SND_SOC_TPLG_TYPE_BE_DAI:
-                return soc_tplg_be_dai_elems_load(tplg, hdr);
+        case SND_SOC_TPLG_TYPE_DAI:
+                return soc_tplg_dai_elems_load(tplg, hdr);
+        case SND_SOC_TPLG_TYPE_DAI_LINK:
+        case SND_SOC_TPLG_TYPE_BACKEND_LINK:
+                /* physical link configurations */
+                return soc_tplg_link_elems_load(tplg, hdr);
         case SND_SOC_TPLG_TYPE_MANIFEST:
                 return soc_tplg_manifest_load(tplg, hdr);
         default:
diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c
index 393e8f0fe2cc..644d9a9ebfbc 100644
--- a/sound/soc/soc-utils.c
+++ b/sound/soc/soc-utils.c
@@ -58,6 +58,205 @@ int snd_soc_params_to_bclk(struct snd_pcm_hw_params *params)
 }
 EXPORT_SYMBOL_GPL(snd_soc_params_to_bclk);
 
+int snd_soc_component_enable_pin(struct snd_soc_component *component,
+                                 const char *pin)
+{
+        struct snd_soc_dapm_context *dapm =
+                snd_soc_component_get_dapm(component);
+        char *full_name;
+        int ret;
+
+        if (!component->name_prefix)
+                return snd_soc_dapm_enable_pin(dapm, pin);
+
+        full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+        if (!full_name)
+                return -ENOMEM;
+
+        ret = snd_soc_dapm_enable_pin(dapm, full_name);
+        kfree(full_name);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_enable_pin);
+
+int snd_soc_component_enable_pin_unlocked(struct snd_soc_component *component,
+                                          const char *pin)
+{
+        struct snd_soc_dapm_context *dapm =
+                snd_soc_component_get_dapm(component);
+        char *full_name;
+        int ret;
+
+        if (!component->name_prefix)
+                return snd_soc_dapm_enable_pin_unlocked(dapm, pin);
+
+        full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+        if (!full_name)
+                return -ENOMEM;
+
+        ret = snd_soc_dapm_enable_pin_unlocked(dapm, full_name);
+        kfree(full_name);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_enable_pin_unlocked);
+
+int snd_soc_component_disable_pin(struct snd_soc_component *component,
+                                  const char *pin)
+{
+        struct snd_soc_dapm_context *dapm =
+                snd_soc_component_get_dapm(component);
+        char *full_name;
+        int ret;
+
+        if (!component->name_prefix)
+                return snd_soc_dapm_disable_pin(dapm, pin);
+
+        full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+        if (!full_name)
+                return -ENOMEM;
+
+        ret = snd_soc_dapm_disable_pin(dapm, full_name);
+        kfree(full_name);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_disable_pin);
+
+int snd_soc_component_disable_pin_unlocked(struct snd_soc_component *component,
+                                           const char *pin)
+{
+        struct snd_soc_dapm_context *dapm =
+                snd_soc_component_get_dapm(component);
+        char *full_name;
+        int ret;
+
+        if (!component->name_prefix)
+                return snd_soc_dapm_disable_pin_unlocked(dapm, pin);
+
+        full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+        if (!full_name)
+                return -ENOMEM;
+
+        ret = snd_soc_dapm_disable_pin_unlocked(dapm, full_name);
+        kfree(full_name);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_disable_pin_unlocked);
+
+int snd_soc_component_nc_pin(struct snd_soc_component *component,
+                             const char *pin)
+{
+        struct snd_soc_dapm_context *dapm =
+                snd_soc_component_get_dapm(component);
+        char *full_name;
+        int ret;
+
+        if (!component->name_prefix)
+                return snd_soc_dapm_nc_pin(dapm, pin);
+
+        full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+        if (!full_name)
+                return -ENOMEM;
+
+        ret = snd_soc_dapm_nc_pin(dapm, full_name);
+        kfree(full_name);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_nc_pin);
+
+int snd_soc_component_nc_pin_unlocked(struct snd_soc_component *component,
+                                      const char *pin)
+{
+        struct snd_soc_dapm_context *dapm =
+                snd_soc_component_get_dapm(component);
+        char *full_name;
+        int ret;
+
+        if (!component->name_prefix)
+                return snd_soc_dapm_nc_pin_unlocked(dapm, pin);
+
+        full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+        if (!full_name)
+                return -ENOMEM;
+
+        ret = snd_soc_dapm_nc_pin_unlocked(dapm, full_name);
+        kfree(full_name);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_nc_pin_unlocked);
+
+int snd_soc_component_get_pin_status(struct snd_soc_component *component,
+                                     const char *pin)
+{
+        struct snd_soc_dapm_context *dapm =
+                snd_soc_component_get_dapm(component);
+        char *full_name;
+        int ret;
+
+        if (!component->name_prefix)
+                return snd_soc_dapm_get_pin_status(dapm, pin);
+
+        full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+        if (!full_name)
+                return -ENOMEM;
+
+        ret = snd_soc_dapm_get_pin_status(dapm, full_name);
+        kfree(full_name);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_get_pin_status);
+
+int snd_soc_component_force_enable_pin(struct snd_soc_component *component,
+                                       const char *pin)
+{
+        struct snd_soc_dapm_context *dapm =
+                snd_soc_component_get_dapm(component);
+        char *full_name;
+        int ret;
+
+        if (!component->name_prefix)
+                return snd_soc_dapm_force_enable_pin(dapm, pin);
+
+        full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+        if (!full_name)
+                return -ENOMEM;
+
+        ret = snd_soc_dapm_force_enable_pin(dapm, full_name);
+        kfree(full_name);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_force_enable_pin);
+
+int snd_soc_component_force_enable_pin_unlocked(
+                                        struct snd_soc_component *component,
+                                        const char *pin)
+{
+        struct snd_soc_dapm_context *dapm =
+                snd_soc_component_get_dapm(component);
+        char *full_name;
+        int ret;
+
+        if (!component->name_prefix)
+                return snd_soc_dapm_force_enable_pin_unlocked(dapm, pin);
+
+        full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+        if (!full_name)
+                return -ENOMEM;
+
+        ret = snd_soc_dapm_force_enable_pin_unlocked(dapm, full_name);
+        kfree(full_name);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_force_enable_pin_unlocked);
+
 static const struct snd_pcm_hardware dummy_dma_hardware = {
         /* Random values to keep userspace happy when checking constraints */
         .info                   = SNDRV_PCM_INFO_INTERLEAVED |
diff --git a/sound/soc/sti/sti_uniperif.c b/sound/soc/sti/sti_uniperif.c
index 549fac349fa0..98eb205a0b62 100644
--- a/sound/soc/sti/sti_uniperif.c
+++ b/sound/soc/sti/sti_uniperif.c
@@ -7,6 +7,7 @@
 
 #include <linux/module.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/delay.h>
 
 #include "uniperif.h"
 
@@ -97,6 +98,28 @@ static const struct of_device_id snd_soc_sti_match[] = {
         {},
 };
 
+int  sti_uniperiph_reset(struct uniperif *uni)
+{
+        int count = 10;
+
+        /* Reset uniperipheral uni */
+        SET_UNIPERIF_SOFT_RST_SOFT_RST(uni);
+
+        if (uni->ver < SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0) {
+                while (GET_UNIPERIF_SOFT_RST_SOFT_RST(uni) && count) {
+                        udelay(5);
+                        count--;
+                }
+        }
+
+        if (!count) {
+                dev_err(uni->dev, "Failed to reset uniperif\n");
+                return -EIO;
+        }
+
+        return 0;
+}
+
 int sti_uniperiph_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
                                unsigned int rx_mask, int slots,
                                int slot_width)
@@ -293,7 +316,7 @@ static int sti_uniperiph_dai_suspend(struct snd_soc_dai *dai)
 
         /* The uniperipheral should be in stopped state */
         if (uni->state != UNIPERIF_STATE_STOPPED) {
-                dev_err(uni->dev, "%s: invalid uni state( %d)",
+                dev_err(uni->dev, "%s: invalid uni state( %d)\n",
                         __func__, (int)uni->state);
                 return -EBUSY;
         }
@@ -301,7 +324,7 @@ static int sti_uniperiph_dai_suspend(struct snd_soc_dai *dai)
         /* Pinctrl: switch pinstate to sleep */
         ret = pinctrl_pm_select_sleep_state(uni->dev);
         if (ret)
-                dev_err(uni->dev, "%s: failed to select pinctrl state",
+                dev_err(uni->dev, "%s: failed to select pinctrl state\n",
                         __func__);
 
         return ret;
@@ -322,7 +345,7 @@ static int sti_uniperiph_dai_resume(struct snd_soc_dai *dai)
         /* pinctrl: switch pinstate to default */
         ret = pinctrl_pm_select_default_state(uni->dev);
         if (ret)
-                dev_err(uni->dev, "%s: failed to select pinctrl state",
+                dev_err(uni->dev, "%s: failed to select pinctrl state\n",
                         __func__);
 
         return ret;
@@ -366,11 +389,12 @@ static int sti_uniperiph_cpu_dai_of(struct device_node *node,
         const struct of_device_id *of_id;
         const struct sti_uniperiph_dev_data *dev_data;
         const char *mode;
+        int ret;
 
         /* Populate data structure depending on compatibility */
         of_id = of_match_node(snd_soc_sti_match, node);
         if (!of_id->data) {
-                dev_err(dev, "data associated to device is missing");
+                dev_err(dev, "data associated to device is missing\n");
                 return -EINVAL;
         }
         dev_data = (struct sti_uniperiph_dev_data *)of_id->data;
@@ -389,7 +413,7 @@ static int sti_uniperiph_cpu_dai_of(struct device_node *node,
         uni->mem_region = platform_get_resource(priv->pdev, IORESOURCE_MEM, 0);
 
         if (!uni->mem_region) {
-                dev_err(dev, "Failed to get memory resource");
+                dev_err(dev, "Failed to get memory resource\n");
                 return -ENODEV;
         }
 
@@ -403,7 +427,7 @@ static int sti_uniperiph_cpu_dai_of(struct device_node *node,
 
         uni->irq = platform_get_irq(priv->pdev, 0);
         if (uni->irq < 0) {
-                dev_err(dev, "Failed to get IRQ resource");
+                dev_err(dev, "Failed to get IRQ resource\n");
                 return -ENXIO;
         }
 
@@ -421,12 +445,15 @@ static int sti_uniperiph_cpu_dai_of(struct device_node *node,
         dai_data->stream = dev_data->stream;
 
         if (priv->dai_data.stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                uni_player_init(priv->pdev, uni);
+                ret = uni_player_init(priv->pdev, uni);
                 stream = &dai->playback;
         } else {
-                uni_reader_init(priv->pdev, uni);
+                ret = uni_reader_init(priv->pdev, uni);
                 stream = &dai->capture;
         }
+        if (ret < 0)
+                return ret;
+
         dai->ops = uni->dai_ops;
 
         stream->stream_name = dai->name;
diff --git a/sound/soc/sti/uniperif.h b/sound/soc/sti/uniperif.h
index 1993c655fb79..d487dd2ef016 100644
--- a/sound/soc/sti/uniperif.h
+++ b/sound/soc/sti/uniperif.h
@@ -1397,6 +1397,8 @@ static inline int sti_uniperiph_get_unip_tdm_frame_size(struct uniperif *uni)
         return (uni->tdm_slot.slots * uni->tdm_slot.slot_width / 8);
 }
 
+int  sti_uniperiph_reset(struct uniperif *uni);
+
 int sti_uniperiph_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
                                unsigned int rx_mask, int slots,
                                int slot_width);
diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c
index ad54d4cf58ad..60ae31a303ab 100644
--- a/sound/soc/sti/uniperif_player.c
+++ b/sound/soc/sti/uniperif_player.c
@@ -6,8 +6,6 @@
  */
 
 #include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/io.h>
 #include <linux/mfd/syscon.h>
 
 #include <sound/asoundef.h>
@@ -55,25 +53,6 @@ static const struct snd_pcm_hardware uni_player_pcm_hw = {
         .buffer_bytes_max = 256 * PAGE_SIZE
 };
 
-static inline int reset_player(struct uniperif *player)
-{
-        int count = 10;
-
-        if (player->ver < SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0) {
-                while (GET_UNIPERIF_SOFT_RST_SOFT_RST(player) && count) {
-                        udelay(5);
-                        count--;
-                }
-        }
-
-        if (!count) {
-                dev_err(player->dev, "Failed to reset uniperif");
-                return -EIO;
-        }
-
-        return 0;
-}
-
 /*
  * uni_player_irq_handler
  * In case of error audio stream is stopped; stop action is protected via PCM
@@ -97,7 +76,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id)
 
         /* Check for fifo error (underrun) */
         if (unlikely(status & UNIPERIF_ITS_FIFO_ERROR_MASK(player))) {
-                dev_err(player->dev, "FIFO underflow error detected");
+                dev_err(player->dev, "FIFO underflow error detected\n");
 
                 /* Interrupt is just for information when underflow recovery */
                 if (player->underflow_enabled) {
@@ -119,7 +98,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id)
 
         /* Check for dma error (overrun) */
         if (unlikely(status & UNIPERIF_ITS_DMA_ERROR_MASK(player))) {
-                dev_err(player->dev, "DMA error detected");
+                dev_err(player->dev, "DMA error detected\n");
 
                 /* Disable interrupt so doesn't continually fire */
                 SET_UNIPERIF_ITM_BCLR_DMA_ERROR(player);
@@ -135,11 +114,14 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id)
         /* Check for underflow recovery done */
         if (unlikely(status & UNIPERIF_ITM_UNDERFLOW_REC_DONE_MASK(player))) {
                 if (!player->underflow_enabled) {
-                        dev_err(player->dev, "unexpected Underflow recovering");
+                        dev_err(player->dev,
+                                "unexpected Underflow recovering\n");
                         return -EPERM;
                 }
                 /* Read the underflow recovery duration */
                 tmp = GET_UNIPERIF_STATUS_1_UNDERFLOW_DURATION(player);
+                dev_dbg(player->dev, "Underflow recovered (%d LR clocks max)\n",
+                        tmp);
 
                 /* Clear the underflow recovery duration */
                 SET_UNIPERIF_BIT_CONTROL_CLR_UNDERFLOW_DURATION(player);
@@ -153,7 +135,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id)
         /* Check if underflow recovery failed */
         if (unlikely(status &
                      UNIPERIF_ITM_UNDERFLOW_REC_FAILED_MASK(player))) {
-                dev_err(player->dev, "Underflow recovery failed");
+                dev_err(player->dev, "Underflow recovery failed\n");
 
                 /* Stop the player */
                 snd_pcm_stream_lock(player->substream);
@@ -336,7 +318,7 @@ static int uni_player_prepare_iec958(struct uniperif *player,
 
         /* Oversampling must be multiple of 128 as iec958 frame is 32-bits */
         if ((clk_div % 128) || (clk_div <= 0)) {
-                dev_err(player->dev, "%s: invalid clk_div %d",
+                dev_err(player->dev, "%s: invalid clk_div %d\n",
                         __func__, clk_div);
                 return -EINVAL;
         }
@@ -359,7 +341,7 @@ static int uni_player_prepare_iec958(struct uniperif *player,
                 SET_UNIPERIF_I2S_FMT_DATA_SIZE_24(player);
                 break;
         default:
-                dev_err(player->dev, "format not supported");
+                dev_err(player->dev, "format not supported\n");
                 return -EINVAL;
         }
 
@@ -448,12 +430,12 @@ static int uni_player_prepare_pcm(struct uniperif *player,
          * for 16 bits must be a multiple of 64
          */
         if ((slot_width == 32) && (clk_div % 128)) {
-                dev_err(player->dev, "%s: invalid clk_div", __func__);
+                dev_err(player->dev, "%s: invalid clk_div\n", __func__);
                 return -EINVAL;
         }
 
         if ((slot_width == 16) && (clk_div % 64)) {
-                dev_err(player->dev, "%s: invalid clk_div", __func__);
+                dev_err(player->dev, "%s: invalid clk_div\n", __func__);
                 return -EINVAL;
         }
 
@@ -471,7 +453,7 @@ static int uni_player_prepare_pcm(struct uniperif *player,
                 SET_UNIPERIF_I2S_FMT_DATA_SIZE_16(player);
                 break;
         default:
-                dev_err(player->dev, "subframe format not supported");
+                dev_err(player->dev, "subframe format not supported\n");
                 return -EINVAL;
         }
 
@@ -491,7 +473,7 @@ static int uni_player_prepare_pcm(struct uniperif *player,
                 break;
 
         default:
-                dev_err(player->dev, "format not supported");
+                dev_err(player->dev, "format not supported\n");
                 return -EINVAL;
         }
 
@@ -504,7 +486,7 @@ static int uni_player_prepare_pcm(struct uniperif *player,
         /* Number of channelsmust be even*/
         if ((runtime->channels % 2) || (runtime->channels < 2) ||
             (runtime->channels > 10)) {
-                dev_err(player->dev, "%s: invalid nb of channels", __func__);
+                dev_err(player->dev, "%s: invalid nb of channels\n", __func__);
                 return -EINVAL;
         }
 
@@ -762,7 +744,7 @@ static int uni_player_prepare(struct snd_pcm_substream *substream,
 
         /* The player should be stopped */
         if (player->state != UNIPERIF_STATE_STOPPED) {
-                dev_err(player->dev, "%s: invalid player state %d", __func__,
+                dev_err(player->dev, "%s: invalid player state %d\n", __func__,
                         player->state);
                 return -EINVAL;
         }
@@ -791,7 +773,8 @@ static int uni_player_prepare(struct snd_pcm_substream *substream,
         /* Trigger limit must be an even number */
         if ((!trigger_limit % 2) || (trigger_limit != 1 && transfer_size % 2) ||
             (trigger_limit > UNIPERIF_CONFIG_DMA_TRIG_LIMIT_MASK(player))) {
-                dev_err(player->dev, "invalid trigger limit %d", trigger_limit);
+                dev_err(player->dev, "invalid trigger limit %d\n",
+                        trigger_limit);
                 return -EINVAL;
         }
 
@@ -812,7 +795,7 @@ static int uni_player_prepare(struct snd_pcm_substream *substream,
                 ret = uni_player_prepare_tdm(player, runtime);
                 break;
         default:
-                dev_err(player->dev, "invalid player type");
+                dev_err(player->dev, "invalid player type\n");
                 return -EINVAL;
         }
 
@@ -852,16 +835,14 @@ static int uni_player_prepare(struct snd_pcm_substream *substream,
                 SET_UNIPERIF_I2S_FMT_PADDING_SONY_MODE(player);
                 break;
         default:
-                dev_err(player->dev, "format not supported");
+                dev_err(player->dev, "format not supported\n");
                 return -EINVAL;
         }
 
         SET_UNIPERIF_I2S_FMT_NO_OF_SAMPLES_TO_READ(player, 0);
 
-        /* Reset uniperipheral player */
-        SET_UNIPERIF_SOFT_RST_SOFT_RST(player);
 
-        return reset_player(player);
+        return sti_uniperiph_reset(player);
 }
 
 static int uni_player_start(struct uniperif *player)
@@ -870,13 +851,13 @@ static int uni_player_start(struct uniperif *player)
 
         /* The player should be stopped */
         if (player->state != UNIPERIF_STATE_STOPPED) {
-                dev_err(player->dev, "%s: invalid player state", __func__);
+                dev_err(player->dev, "%s: invalid player state\n", __func__);
                 return -EINVAL;
         }
 
         ret = clk_prepare_enable(player->clk);
         if (ret) {
-                dev_err(player->dev, "%s: Failed to enable clock", __func__);
+                dev_err(player->dev, "%s: Failed to enable clock\n", __func__);
                 return ret;
         }
 
@@ -893,10 +874,7 @@ static int uni_player_start(struct uniperif *player)
                 SET_UNIPERIF_ITM_BSET_UNDERFLOW_REC_FAILED(player);
         }
 
-        /* Reset uniperipheral player */
-        SET_UNIPERIF_SOFT_RST_SOFT_RST(player);
-
-        ret = reset_player(player);
+        ret = sti_uniperiph_reset(player);
         if (ret < 0) {
                 clk_disable_unprepare(player->clk);
                 return ret;
@@ -938,17 +916,14 @@ static int uni_player_stop(struct uniperif *player)
 
         /* The player should not be in stopped state */
         if (player->state == UNIPERIF_STATE_STOPPED) {
-                dev_err(player->dev, "%s: invalid player state", __func__);
+                dev_err(player->dev, "%s: invalid player state\n", __func__);
                 return -EINVAL;
         }
 
         /* Turn the player off */
         SET_UNIPERIF_CTRL_OPERATION_OFF(player);
 
-        /* Soft reset the player */
-        SET_UNIPERIF_SOFT_RST_SOFT_RST(player);
-
-        ret = reset_player(player);
+        ret = sti_uniperiph_reset(player);
         if (ret < 0)
                 return ret;
 
@@ -973,7 +948,7 @@ int uni_player_resume(struct uniperif *player)
                 ret = regmap_field_write(player->clk_sel, 1);
                 if (ret) {
                         dev_err(player->dev,
-                                "%s: Failed to select freq synth clock",
+                                "%s: Failed to select freq synth clock\n",
                                 __func__);
                         return ret;
                 }
@@ -1070,7 +1045,7 @@ int uni_player_init(struct platform_device *pdev,
         ret = uni_player_parse_dt_audio_glue(pdev, player);
 
         if (ret < 0) {
-                dev_err(player->dev, "Failed to parse DeviceTree");
+                dev_err(player->dev, "Failed to parse DeviceTree\n");
                 return ret;
         }
 
@@ -1085,15 +1060,17 @@ int uni_player_init(struct platform_device *pdev,
 
         /* Get uniperif resource */
         player->clk = of_clk_get(pdev->dev.of_node, 0);
-        if (IS_ERR(player->clk))
+        if (IS_ERR(player->clk)) {
+                dev_err(player->dev, "Failed to get clock\n");
                 ret = PTR_ERR(player->clk);
+        }
 
         /* Select the frequency synthesizer clock */
         if (player->clk_sel) {
                 ret = regmap_field_write(player->clk_sel, 1);
                 if (ret) {
                         dev_err(player->dev,
-                                "%s: Failed to select freq synth clock",
+                                "%s: Failed to select freq synth clock\n",
                                 __func__);
                         return ret;
                 }
@@ -1105,7 +1082,7 @@ int uni_player_init(struct platform_device *pdev,
                 ret = regmap_field_write(player->valid_sel, player->id);
                 if (ret) {
                         dev_err(player->dev,
-                                "%s: unable to connect to tdm bus", __func__);
+                                "%s: unable to connect to tdm bus\n", __func__);
                         return ret;
                 }
         }
@@ -1113,8 +1090,10 @@ int uni_player_init(struct platform_device *pdev,
         ret = devm_request_irq(&pdev->dev, player->irq,
                                uni_player_irq_handler, IRQF_SHARED,
                                dev_name(&pdev->dev), player);
-        if (ret < 0)
+        if (ret < 0) {
+                dev_err(player->dev, "unable to request IRQ %d\n", player->irq);
                 return ret;
+        }
 
         mutex_init(&player->ctrl_lock);
 
diff --git a/sound/soc/sti/uniperif_reader.c b/sound/soc/sti/uniperif_reader.c
index 0e1c3ee56675..5992c6ab3833 100644
--- a/sound/soc/sti/uniperif_reader.c
+++ b/sound/soc/sti/uniperif_reader.c
@@ -5,10 +5,6 @@
  * License terms:  GNU General Public License (GPL), version 2
  */
 
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-
 #include <sound/soc.h>
 
 #include "uniperif.h"
@@ -52,7 +48,7 @@ static irqreturn_t uni_reader_irq_handler(int irq, void *dev_id)
 
         if (reader->state == UNIPERIF_STATE_STOPPED) {
                 /* Unexpected IRQ: do nothing */
-                dev_warn(reader->dev, "unexpected IRQ ");
+                dev_warn(reader->dev, "unexpected IRQ\n");
                 return IRQ_HANDLED;
         }
 
@@ -62,7 +58,7 @@ static irqreturn_t uni_reader_irq_handler(int irq, void *dev_id)
 
         /* Check for fifo overflow error */
         if (unlikely(status & UNIPERIF_ITS_FIFO_ERROR_MASK(reader))) {
-                dev_err(reader->dev, "FIFO error detected");
+                dev_err(reader->dev, "FIFO error detected\n");
 
                 snd_pcm_stream_lock(reader->substream);
                 snd_pcm_stop(reader->substream, SNDRV_PCM_STATE_XRUN);
@@ -105,7 +101,7 @@ static int uni_reader_prepare_pcm(struct snd_pcm_runtime *runtime,
                 SET_UNIPERIF_I2S_FMT_DATA_SIZE_16(reader);
                 break;
         default:
-                dev_err(reader->dev, "subframe format not supported");
+                dev_err(reader->dev, "subframe format not supported\n");
                 return -EINVAL;
         }
 
@@ -125,14 +121,14 @@ static int uni_reader_prepare_pcm(struct snd_pcm_runtime *runtime,
                 break;
 
         default:
-                dev_err(reader->dev, "format not supported");
+                dev_err(reader->dev, "format not supported\n");
                 return -EINVAL;
         }
 
         /* Number of channels must be even */
         if ((runtime->channels % 2) || (runtime->channels < 2) ||
             (runtime->channels > 10)) {
-                dev_err(reader->dev, "%s: invalid nb of channels", __func__);
+                dev_err(reader->dev, "%s: invalid nb of channels\n", __func__);
                 return -EINVAL;
         }
 
@@ -186,11 +182,10 @@ static int uni_reader_prepare(struct snd_pcm_substream *substream,
         struct uniperif *reader = priv->dai_data.uni;
         struct snd_pcm_runtime *runtime = substream->runtime;
         int transfer_size, trigger_limit, ret;
-        int count = 10;
 
         /* The reader should be stopped */
         if (reader->state != UNIPERIF_STATE_STOPPED) {
-                dev_err(reader->dev, "%s: invalid reader state %d", __func__,
+                dev_err(reader->dev, "%s: invalid reader state %d\n", __func__,
                         reader->state);
                 return -EINVAL;
         }
@@ -219,7 +214,8 @@ static int uni_reader_prepare(struct snd_pcm_substream *substream,
         if ((!trigger_limit % 2) ||
             (trigger_limit != 1 && transfer_size % 2) ||
             (trigger_limit > UNIPERIF_CONFIG_DMA_TRIG_LIMIT_MASK(reader))) {
-                dev_err(reader->dev, "invalid trigger limit %d", trigger_limit);
+                dev_err(reader->dev, "invalid trigger limit %d\n",
+                        trigger_limit);
                 return -EINVAL;
         }
 
@@ -246,7 +242,7 @@ static int uni_reader_prepare(struct snd_pcm_substream *substream,
                 SET_UNIPERIF_I2S_FMT_PADDING_SONY_MODE(reader);
                 break;
         default:
-                dev_err(reader->dev, "format not supported");
+                dev_err(reader->dev, "format not supported\n");
                 return -EINVAL;
         }
 
@@ -287,25 +283,14 @@ static int uni_reader_prepare(struct snd_pcm_substream *substream,
         }
 
         /* Reset uniperipheral reader */
-        SET_UNIPERIF_SOFT_RST_SOFT_RST(reader);
-
-        while (GET_UNIPERIF_SOFT_RST_SOFT_RST(reader)) {
-                udelay(5);
-                count--;
-        }
-        if (!count) {
-                dev_err(reader->dev, "Failed to reset uniperif");
-                return -EIO;
-        }
-
-        return 0;
+        return sti_uniperiph_reset(reader);
 }
 
 static int uni_reader_start(struct uniperif *reader)
 {
         /* The reader should be stopped */
         if (reader->state != UNIPERIF_STATE_STOPPED) {
-                dev_err(reader->dev, "%s: invalid reader state", __func__);
+                dev_err(reader->dev, "%s: invalid reader state\n", __func__);
                 return -EINVAL;
         }
 
@@ -325,7 +310,7 @@ static int uni_reader_stop(struct uniperif *reader)
 {
         /* The reader should not be in stopped state */
         if (reader->state == UNIPERIF_STATE_STOPPED) {
-                dev_err(reader->dev, "%s: invalid reader state", __func__);
+                dev_err(reader->dev, "%s: invalid reader state\n", __func__);
                 return -EINVAL;
         }
 
@@ -423,7 +408,7 @@ int uni_reader_init(struct platform_device *pdev,
                                uni_reader_irq_handler, IRQF_SHARED,
                                dev_name(&pdev->dev), reader);
         if (ret < 0) {
-                dev_err(&pdev->dev, "Failed to request IRQ");
+                dev_err(&pdev->dev, "Failed to request IRQ\n");
                 return -EBUSY;
         }
 
diff --git a/sound/soc/sunxi/Kconfig b/sound/soc/sunxi/Kconfig
index dd2368297fd3..6c344e16aca4 100644
--- a/sound/soc/sunxi/Kconfig
+++ b/sound/soc/sunxi/Kconfig
@@ -9,6 +9,14 @@ config SND_SUN4I_CODEC
           Select Y or M to add support for the Codec embedded in the Allwinner
           A10 and affiliated SoCs.
 
+config SND_SUN8I_CODEC_ANALOG
+        tristate "Allwinner sun8i Codec Analog Controls Support"
+        depends on MACH_SUN8I || COMPILE_TEST
+        select REGMAP
+        help
+          Say Y or M if you want to add support for the analog controls for
+          the codec embedded in newer Allwinner SoCs.
+
 config SND_SUN4I_I2S
         tristate "Allwinner A10 I2S Support"
         select SND_SOC_GENERIC_DMAENGINE_PCM
diff --git a/sound/soc/sunxi/Makefile b/sound/soc/sunxi/Makefile
index 604c7b842837..241c0df9ca0c 100644
--- a/sound/soc/sunxi/Makefile
+++ b/sound/soc/sunxi/Makefile
@@ -1,3 +1,4 @@
 obj-$(CONFIG_SND_SUN4I_CODEC) += sun4i-codec.o
 obj-$(CONFIG_SND_SUN4I_I2S) += sun4i-i2s.o
 obj-$(CONFIG_SND_SUN4I_SPDIF) += sun4i-spdif.o
+obj-$(CONFIG_SND_SUN8I_CODEC_ANALOG) += sun8i-codec-analog.o
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 56ed9472e89f..848af01692a0 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -3,6 +3,7 @@
  * Copyright 2014 Jon Smirl <jonsmirl@gmail.com>
  * Copyright 2015 Maxime Ripard <maxime.ripard@free-electrons.com>
  * Copyright 2015 Adam Sampson <ats@offog.org>
+ * Copyright 2016 Chen-Yu Tsai <wens@csie.org>
  *
  * Based on the Allwinner SDK driver, released under the GPL.
  *
@@ -24,10 +25,12 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/of.h>
-#include <linux/of_platform.h>
 #include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
 #include <linux/clk.h>
 #include <linux/regmap.h>
+#include <linux/reset.h>
 #include <linux/gpio/consumer.h>
 
 #include <sound/core.h>
@@ -38,7 +41,7 @@
 #include <sound/initval.h>
 #include <sound/dmaengine_pcm.h>
 
-/* Codec DAC register offsets and bit fields */
+/* Codec DAC digital controls and FIFO registers */
 #define SUN4I_CODEC_DAC_DPC                     (0x00)
 #define SUN4I_CODEC_DAC_DPC_EN_DA                       (31)
 #define SUN4I_CODEC_DAC_DPC_DVOL                        (12)
@@ -55,6 +58,8 @@
 #define SUN4I_CODEC_DAC_FIFOC_FIFO_FLUSH                (0)
 #define SUN4I_CODEC_DAC_FIFOS                   (0x08)
 #define SUN4I_CODEC_DAC_TXDATA                  (0x0c)
+
+/* Codec DAC side analog signal controls */
 #define SUN4I_CODEC_DAC_ACTL                    (0x10)
 #define SUN4I_CODEC_DAC_ACTL_DACAENR                    (31)
 #define SUN4I_CODEC_DAC_ACTL_DACAENL                    (30)
@@ -69,7 +74,7 @@
 #define SUN4I_CODEC_DAC_TUNE                    (0x14)
 #define SUN4I_CODEC_DAC_DEBUG                   (0x18)
 
-/* Codec ADC register offsets and bit fields */
+/* Codec ADC digital controls and FIFO registers */
 #define SUN4I_CODEC_ADC_FIFOC                   (0x1c)
 #define SUN4I_CODEC_ADC_FIFOC_ADC_FS                    (29)
 #define SUN4I_CODEC_ADC_FIFOC_EN_AD                     (28)
@@ -81,6 +86,8 @@
 #define SUN4I_CODEC_ADC_FIFOC_FIFO_FLUSH                (0)
 #define SUN4I_CODEC_ADC_FIFOS                   (0x20)
 #define SUN4I_CODEC_ADC_RXDATA                  (0x24)
+
+/* Codec ADC side analog signal controls */
 #define SUN4I_CODEC_ADC_ACTL                    (0x28)
 #define SUN4I_CODEC_ADC_ACTL_ADC_R_EN                   (31)
 #define SUN4I_CODEC_ADC_ACTL_ADC_L_EN                   (30)
@@ -93,19 +100,141 @@
 #define SUN4I_CODEC_ADC_ACTL_DDE                        (3)
 #define SUN4I_CODEC_ADC_DEBUG                   (0x2c)
 
-/* Other various ADC registers */
+/* FIFO counters */
 #define SUN4I_CODEC_DAC_TXCNT                   (0x30)
 #define SUN4I_CODEC_ADC_RXCNT                   (0x34)
+
+/* Calibration register (sun7i only) */
 #define SUN7I_CODEC_AC_DAC_CAL                  (0x38)
+
+/* Microphone controls (sun7i only) */
 #define SUN7I_CODEC_AC_MIC_PHONE_CAL            (0x3c)
 
+/*
+ * sun6i specific registers
+ *
+ * sun6i shares the same digital control and FIFO registers as sun4i,
+ * but only the DAC digital controls are at the same offset. The others
+ * have been moved around to accommodate extra analog controls.
+ */
+
+/* Codec DAC digital controls and FIFO registers */
+#define SUN6I_CODEC_ADC_FIFOC                   (0x10)
+#define SUN6I_CODEC_ADC_FIFOC_EN_AD                     (28)
+#define SUN6I_CODEC_ADC_FIFOS                   (0x14)
+#define SUN6I_CODEC_ADC_RXDATA                  (0x18)
+
+/* Output mixer and gain controls */
+#define SUN6I_CODEC_OM_DACA_CTRL                (0x20)
+#define SUN6I_CODEC_OM_DACA_CTRL_DACAREN                (31)
+#define SUN6I_CODEC_OM_DACA_CTRL_DACALEN                (30)
+#define SUN6I_CODEC_OM_DACA_CTRL_RMIXEN                 (29)
+#define SUN6I_CODEC_OM_DACA_CTRL_LMIXEN                 (28)
+#define SUN6I_CODEC_OM_DACA_CTRL_RMIX_MIC1              (23)
+#define SUN6I_CODEC_OM_DACA_CTRL_RMIX_MIC2              (22)
+#define SUN6I_CODEC_OM_DACA_CTRL_RMIX_PHONE             (21)
+#define SUN6I_CODEC_OM_DACA_CTRL_RMIX_PHONEP            (20)
+#define SUN6I_CODEC_OM_DACA_CTRL_RMIX_LINEINR           (19)
+#define SUN6I_CODEC_OM_DACA_CTRL_RMIX_DACR              (18)
+#define SUN6I_CODEC_OM_DACA_CTRL_RMIX_DACL              (17)
+#define SUN6I_CODEC_OM_DACA_CTRL_LMIX_MIC1              (16)
+#define SUN6I_CODEC_OM_DACA_CTRL_LMIX_MIC2              (15)
+#define SUN6I_CODEC_OM_DACA_CTRL_LMIX_PHONE             (14)
+#define SUN6I_CODEC_OM_DACA_CTRL_LMIX_PHONEN            (13)
+#define SUN6I_CODEC_OM_DACA_CTRL_LMIX_LINEINL           (12)
+#define SUN6I_CODEC_OM_DACA_CTRL_LMIX_DACL              (11)
+#define SUN6I_CODEC_OM_DACA_CTRL_LMIX_DACR              (10)
+#define SUN6I_CODEC_OM_DACA_CTRL_RHPIS                  (9)
+#define SUN6I_CODEC_OM_DACA_CTRL_LHPIS                  (8)
+#define SUN6I_CODEC_OM_DACA_CTRL_RHPPAMUTE              (7)
+#define SUN6I_CODEC_OM_DACA_CTRL_LHPPAMUTE              (6)
+#define SUN6I_CODEC_OM_DACA_CTRL_HPVOL                  (0)
+#define SUN6I_CODEC_OM_PA_CTRL                  (0x24)
+#define SUN6I_CODEC_OM_PA_CTRL_HPPAEN                   (31)
+#define SUN6I_CODEC_OM_PA_CTRL_HPCOM_CTL                (29)
+#define SUN6I_CODEC_OM_PA_CTRL_COMPTEN                  (28)
+#define SUN6I_CODEC_OM_PA_CTRL_MIC1G                    (15)
+#define SUN6I_CODEC_OM_PA_CTRL_MIC2G                    (12)
+#define SUN6I_CODEC_OM_PA_CTRL_LINEING                  (9)
+#define SUN6I_CODEC_OM_PA_CTRL_PHONEG                   (6)
+#define SUN6I_CODEC_OM_PA_CTRL_PHONEPG                  (3)
+#define SUN6I_CODEC_OM_PA_CTRL_PHONENG                  (0)
+
+/* Microphone, line out and phone out controls */
+#define SUN6I_CODEC_MIC_CTRL                    (0x28)
+#define SUN6I_CODEC_MIC_CTRL_HBIASEN                    (31)
+#define SUN6I_CODEC_MIC_CTRL_MBIASEN                    (30)
+#define SUN6I_CODEC_MIC_CTRL_MIC1AMPEN                  (28)
+#define SUN6I_CODEC_MIC_CTRL_MIC1BOOST                  (25)
+#define SUN6I_CODEC_MIC_CTRL_MIC2AMPEN                  (24)
+#define SUN6I_CODEC_MIC_CTRL_MIC2BOOST                  (21)
+#define SUN6I_CODEC_MIC_CTRL_MIC2SLT                    (20)
+#define SUN6I_CODEC_MIC_CTRL_LINEOUTLEN                 (19)
+#define SUN6I_CODEC_MIC_CTRL_LINEOUTREN                 (18)
+#define SUN6I_CODEC_MIC_CTRL_LINEOUTLSRC                (17)
+#define SUN6I_CODEC_MIC_CTRL_LINEOUTRSRC                (16)
+#define SUN6I_CODEC_MIC_CTRL_LINEOUTVC                  (11)
+#define SUN6I_CODEC_MIC_CTRL_PHONEPREG                  (8)
+
+/* ADC mixer controls */
+#define SUN6I_CODEC_ADC_ACTL                    (0x2c)
+#define SUN6I_CODEC_ADC_ACTL_ADCREN                     (31)
+#define SUN6I_CODEC_ADC_ACTL_ADCLEN                     (30)
+#define SUN6I_CODEC_ADC_ACTL_ADCRG                      (27)
+#define SUN6I_CODEC_ADC_ACTL_ADCLG                      (24)
+#define SUN6I_CODEC_ADC_ACTL_RADCMIX_MIC1               (13)
+#define SUN6I_CODEC_ADC_ACTL_RADCMIX_MIC2               (12)
+#define SUN6I_CODEC_ADC_ACTL_RADCMIX_PHONE              (11)
+#define SUN6I_CODEC_ADC_ACTL_RADCMIX_PHONEP             (10)
+#define SUN6I_CODEC_ADC_ACTL_RADCMIX_LINEINR            (9)
+#define SUN6I_CODEC_ADC_ACTL_RADCMIX_OMIXR              (8)
+#define SUN6I_CODEC_ADC_ACTL_RADCMIX_OMIXL              (7)
+#define SUN6I_CODEC_ADC_ACTL_LADCMIX_MIC1               (6)
+#define SUN6I_CODEC_ADC_ACTL_LADCMIX_MIC2               (5)
+#define SUN6I_CODEC_ADC_ACTL_LADCMIX_PHONE              (4)
+#define SUN6I_CODEC_ADC_ACTL_LADCMIX_PHONEN             (3)
+#define SUN6I_CODEC_ADC_ACTL_LADCMIX_LINEINL            (2)
+#define SUN6I_CODEC_ADC_ACTL_LADCMIX_OMIXL              (1)
+#define SUN6I_CODEC_ADC_ACTL_LADCMIX_OMIXR              (0)
+
+/* Analog performance tuning controls */
+#define SUN6I_CODEC_ADDA_TUNE                   (0x30)
+
+/* Calibration controls */
+#define SUN6I_CODEC_CALIBRATION                 (0x34)
+
+/* FIFO counters */
+#define SUN6I_CODEC_DAC_TXCNT                   (0x40)
+#define SUN6I_CODEC_ADC_RXCNT                   (0x44)
+
+/* headset jack detection and button support registers */
+#define SUN6I_CODEC_HMIC_CTL                    (0x50)
+#define SUN6I_CODEC_HMIC_DATA                   (0x54)
+
+/* TODO sun6i DAP (Digital Audio Processing) bits */
+
+/* FIFO counters moved on A23 */
+#define SUN8I_A23_CODEC_DAC_TXCNT               (0x1c)
+#define SUN8I_A23_CODEC_ADC_RXCNT               (0x20)
+
+/* TX FIFO moved on H3 */
+#define SUN8I_H3_CODEC_DAC_TXDATA               (0x20)
+#define SUN8I_H3_CODEC_DAC_DBG                  (0x48)
+#define SUN8I_H3_CODEC_ADC_DBG                  (0x4c)
+
+/* TODO H3 DAP (Digital Audio Processing) bits */
+
 struct sun4i_codec {
         struct device   *dev;
         struct regmap   *regmap;
         struct clk      *clk_apb;
         struct clk      *clk_module;
+        struct reset_control *rst;
         struct gpio_desc *gpio_pa;
 
+        /* ADC_FIFOC register is at different offset on different SoCs */
+        struct regmap_field *reg_adc_fifoc;
+
         struct snd_dmaengine_dai_dma_data       capture_dma_data;
         struct snd_dmaengine_dai_dma_data       playback_dma_data;
 };
@@ -134,16 +263,16 @@ static void sun4i_codec_stop_playback(struct sun4i_codec *scodec)
 static void sun4i_codec_start_capture(struct sun4i_codec *scodec)
 {
         /* Enable ADC DRQ */
-        regmap_update_bits(scodec->regmap, SUN4I_CODEC_ADC_FIFOC,
-                           BIT(SUN4I_CODEC_ADC_FIFOC_ADC_DRQ_EN),
-                           BIT(SUN4I_CODEC_ADC_FIFOC_ADC_DRQ_EN));
+        regmap_field_update_bits(scodec->reg_adc_fifoc,
+                                 BIT(SUN4I_CODEC_ADC_FIFOC_ADC_DRQ_EN),
+                                 BIT(SUN4I_CODEC_ADC_FIFOC_ADC_DRQ_EN));
 }
 
 static void sun4i_codec_stop_capture(struct sun4i_codec *scodec)
 {
         /* Disable ADC DRQ */
-        regmap_update_bits(scodec->regmap, SUN4I_CODEC_ADC_FIFOC,
-                           BIT(SUN4I_CODEC_ADC_FIFOC_ADC_DRQ_EN), 0);
+        regmap_field_update_bits(scodec->reg_adc_fifoc,
+                                 BIT(SUN4I_CODEC_ADC_FIFOC_ADC_DRQ_EN), 0);
 }
 
 static int sun4i_codec_trigger(struct snd_pcm_substream *substream, int cmd,
@@ -186,24 +315,29 @@ static int sun4i_codec_prepare_capture(struct snd_pcm_substream *substream,
 
 
         /* Flush RX FIFO */
-        regmap_update_bits(scodec->regmap, SUN4I_CODEC_ADC_FIFOC,
-                           BIT(SUN4I_CODEC_ADC_FIFOC_FIFO_FLUSH),
-                           BIT(SUN4I_CODEC_ADC_FIFOC_FIFO_FLUSH));
+        regmap_field_update_bits(scodec->reg_adc_fifoc,
+                                 BIT(SUN4I_CODEC_ADC_FIFOC_FIFO_FLUSH),
+                                 BIT(SUN4I_CODEC_ADC_FIFOC_FIFO_FLUSH));
 
 
         /* Set RX FIFO trigger level */
-        regmap_update_bits(scodec->regmap, SUN4I_CODEC_ADC_FIFOC,
-                           0xf << SUN4I_CODEC_ADC_FIFOC_RX_TRIG_LEVEL,
-                           0x7 << SUN4I_CODEC_ADC_FIFOC_RX_TRIG_LEVEL);
+        regmap_field_update_bits(scodec->reg_adc_fifoc,
+                                 0xf << SUN4I_CODEC_ADC_FIFOC_RX_TRIG_LEVEL,
+                                 0x7 << SUN4I_CODEC_ADC_FIFOC_RX_TRIG_LEVEL);
 
         /*
          * FIXME: Undocumented in the datasheet, but
          *        Allwinner's code mentions that it is related
          *        related to microphone gain
          */
-        regmap_update_bits(scodec->regmap, SUN4I_CODEC_ADC_ACTL,
-                           0x3 << 25,
-                           0x1 << 25);
+        if (of_device_is_compatible(scodec->dev->of_node,
+                                    "allwinner,sun4i-a10-codec") ||
+            of_device_is_compatible(scodec->dev->of_node,
+                                    "allwinner,sun7i-a20-codec")) {
+                regmap_update_bits(scodec->regmap, SUN4I_CODEC_ADC_ACTL,
+                                   0x3 << 25,
+                                   0x1 << 25);
+        }
 
         if (of_device_is_compatible(scodec->dev->of_node,
                                     "allwinner,sun7i-a20-codec"))
@@ -213,9 +347,9 @@ static int sun4i_codec_prepare_capture(struct snd_pcm_substream *substream,
                                    0x1 << 8);
 
         /* Fill most significant bits with valid data MSB */
-        regmap_update_bits(scodec->regmap, SUN4I_CODEC_ADC_FIFOC,
-                           BIT(SUN4I_CODEC_ADC_FIFOC_RX_FIFO_MODE),
-                           BIT(SUN4I_CODEC_ADC_FIFOC_RX_FIFO_MODE));
+        regmap_field_update_bits(scodec->reg_adc_fifoc,
+                                 BIT(SUN4I_CODEC_ADC_FIFOC_RX_FIFO_MODE),
+                                 BIT(SUN4I_CODEC_ADC_FIFOC_RX_FIFO_MODE));
 
         return 0;
 }
@@ -342,18 +476,19 @@ static int sun4i_codec_hw_params_capture(struct sun4i_codec *scodec,
                                          unsigned int hwrate)
 {
         /* Set ADC sample rate */
-        regmap_update_bits(scodec->regmap, SUN4I_CODEC_ADC_FIFOC,
-                           7 << SUN4I_CODEC_ADC_FIFOC_ADC_FS,
-                           hwrate << SUN4I_CODEC_ADC_FIFOC_ADC_FS);
+        regmap_field_update_bits(scodec->reg_adc_fifoc,
+                                 7 << SUN4I_CODEC_ADC_FIFOC_ADC_FS,
+                                 hwrate << SUN4I_CODEC_ADC_FIFOC_ADC_FS);
 
         /* Set the number of channels we want to use */
         if (params_channels(params) == 1)
-                regmap_update_bits(scodec->regmap, SUN4I_CODEC_ADC_FIFOC,
-                                   BIT(SUN4I_CODEC_ADC_FIFOC_MONO_EN),
-                                   BIT(SUN4I_CODEC_ADC_FIFOC_MONO_EN));
+                regmap_field_update_bits(scodec->reg_adc_fifoc,
+                                         BIT(SUN4I_CODEC_ADC_FIFOC_MONO_EN),
+                                         BIT(SUN4I_CODEC_ADC_FIFOC_MONO_EN));
         else
-                regmap_update_bits(scodec->regmap, SUN4I_CODEC_ADC_FIFOC,
-                                   BIT(SUN4I_CODEC_ADC_FIFOC_MONO_EN), 0);
+                regmap_field_update_bits(scodec->reg_adc_fifoc,
+                                         BIT(SUN4I_CODEC_ADC_FIFOC_MONO_EN),
+                                         0);
 
         return 0;
 }
@@ -502,7 +637,7 @@ static struct snd_soc_dai_driver sun4i_codec_dai = {
         },
 };
 
-/*** Codec ***/
+/*** sun4i Codec ***/
 static const struct snd_kcontrol_new sun4i_codec_pa_mute =
         SOC_DAPM_SINGLE("Switch", SUN4I_CODEC_DAC_ACTL,
                         SUN4I_CODEC_DAC_ACTL_PA_MUTE, 1, 0);
@@ -638,6 +773,337 @@ static struct snd_soc_codec_driver sun4i_codec_codec = {
         },
 };
 
+/*** sun6i Codec ***/
+
+/* mixer controls */
+static const struct snd_kcontrol_new sun6i_codec_mixer_controls[] = {
+        SOC_DAPM_DOUBLE("DAC Playback Switch",
+                        SUN6I_CODEC_OM_DACA_CTRL,
+                        SUN6I_CODEC_OM_DACA_CTRL_LMIX_DACL,
+                        SUN6I_CODEC_OM_DACA_CTRL_RMIX_DACR, 1, 0),
+        SOC_DAPM_DOUBLE("DAC Reversed Playback Switch",
+                        SUN6I_CODEC_OM_DACA_CTRL,
+                        SUN6I_CODEC_OM_DACA_CTRL_LMIX_DACR,
+                        SUN6I_CODEC_OM_DACA_CTRL_RMIX_DACL, 1, 0),
+        SOC_DAPM_DOUBLE("Line In Playback Switch",
+                        SUN6I_CODEC_OM_DACA_CTRL,
+                        SUN6I_CODEC_OM_DACA_CTRL_LMIX_LINEINL,
+                        SUN6I_CODEC_OM_DACA_CTRL_RMIX_LINEINR, 1, 0),
+        SOC_DAPM_DOUBLE("Mic1 Playback Switch",
+                        SUN6I_CODEC_OM_DACA_CTRL,
+                        SUN6I_CODEC_OM_DACA_CTRL_LMIX_MIC1,
+                        SUN6I_CODEC_OM_DACA_CTRL_RMIX_MIC1, 1, 0),
+        SOC_DAPM_DOUBLE("Mic2 Playback Switch",
+                        SUN6I_CODEC_OM_DACA_CTRL,
+                        SUN6I_CODEC_OM_DACA_CTRL_LMIX_MIC2,
+                        SUN6I_CODEC_OM_DACA_CTRL_RMIX_MIC2, 1, 0),
+};
+
+/* ADC mixer controls */
+static const struct snd_kcontrol_new sun6i_codec_adc_mixer_controls[] = {
+        SOC_DAPM_DOUBLE("Mixer Capture Switch",
+                        SUN6I_CODEC_ADC_ACTL,
+                        SUN6I_CODEC_ADC_ACTL_LADCMIX_OMIXL,
+                        SUN6I_CODEC_ADC_ACTL_RADCMIX_OMIXR, 1, 0),
+        SOC_DAPM_DOUBLE("Mixer Reversed Capture Switch",
+                        SUN6I_CODEC_ADC_ACTL,
+                        SUN6I_CODEC_ADC_ACTL_LADCMIX_OMIXR,
+                        SUN6I_CODEC_ADC_ACTL_RADCMIX_OMIXL, 1, 0),
+        SOC_DAPM_DOUBLE("Line In Capture Switch",
+                        SUN6I_CODEC_ADC_ACTL,
+                        SUN6I_CODEC_ADC_ACTL_LADCMIX_LINEINL,
+                        SUN6I_CODEC_ADC_ACTL_RADCMIX_LINEINR, 1, 0),
+        SOC_DAPM_DOUBLE("Mic1 Capture Switch",
+                        SUN6I_CODEC_ADC_ACTL,
+                        SUN6I_CODEC_ADC_ACTL_LADCMIX_MIC1,
+                        SUN6I_CODEC_ADC_ACTL_RADCMIX_MIC1, 1, 0),
+        SOC_DAPM_DOUBLE("Mic2 Capture Switch",
+                        SUN6I_CODEC_ADC_ACTL,
+                        SUN6I_CODEC_ADC_ACTL_LADCMIX_MIC2,
+                        SUN6I_CODEC_ADC_ACTL_RADCMIX_MIC2, 1, 0),
+};
+
+/* headphone controls */
+static const char * const sun6i_codec_hp_src_enum_text[] = {
+        "DAC", "Mixer",
+};
+
+static SOC_ENUM_DOUBLE_DECL(sun6i_codec_hp_src_enum,
+                            SUN6I_CODEC_OM_DACA_CTRL,
+                            SUN6I_CODEC_OM_DACA_CTRL_LHPIS,
+                            SUN6I_CODEC_OM_DACA_CTRL_RHPIS,
+                            sun6i_codec_hp_src_enum_text);
+
+static const struct snd_kcontrol_new sun6i_codec_hp_src[] = {
+        SOC_DAPM_ENUM("Headphone Source Playback Route",
+                      sun6i_codec_hp_src_enum),
+};
+
+/* microphone controls */
+static const char * const sun6i_codec_mic2_src_enum_text[] = {
+        "Mic2", "Mic3",
+};
+
+static SOC_ENUM_SINGLE_DECL(sun6i_codec_mic2_src_enum,
+                            SUN6I_CODEC_MIC_CTRL,
+                            SUN6I_CODEC_MIC_CTRL_MIC2SLT,
+                            sun6i_codec_mic2_src_enum_text);
+
+static const struct snd_kcontrol_new sun6i_codec_mic2_src[] = {
+        SOC_DAPM_ENUM("Mic2 Amplifier Source Route",
+                      sun6i_codec_mic2_src_enum),
+};
+
+/* line out controls */
+static const char * const sun6i_codec_lineout_src_enum_text[] = {
+        "Stereo", "Mono Differential",
+};
+
+static SOC_ENUM_DOUBLE_DECL(sun6i_codec_lineout_src_enum,
+                            SUN6I_CODEC_MIC_CTRL,
+                            SUN6I_CODEC_MIC_CTRL_LINEOUTLSRC,
+                            SUN6I_CODEC_MIC_CTRL_LINEOUTRSRC,
+                            sun6i_codec_lineout_src_enum_text);
+
+static const struct snd_kcontrol_new sun6i_codec_lineout_src[] = {
+        SOC_DAPM_ENUM("Line Out Source Playback Route",
+                      sun6i_codec_lineout_src_enum),
+};
+
+/* volume / mute controls */
+static const DECLARE_TLV_DB_SCALE(sun6i_codec_dvol_scale, -7308, 116, 0);
+static const DECLARE_TLV_DB_SCALE(sun6i_codec_hp_vol_scale, -6300, 100, 1);
+static const DECLARE_TLV_DB_SCALE(sun6i_codec_out_mixer_pregain_scale,
+                                  -450, 150, 0);
+static const DECLARE_TLV_DB_RANGE(sun6i_codec_lineout_vol_scale,
+        0, 1, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 1),
+        2, 31, TLV_DB_SCALE_ITEM(-4350, 150, 0),
+);
+static const DECLARE_TLV_DB_RANGE(sun6i_codec_mic_gain_scale,
+        0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
+        1, 7, TLV_DB_SCALE_ITEM(2400, 300, 0),
+);
+
+static const struct snd_kcontrol_new sun6i_codec_codec_widgets[] = {
+        SOC_SINGLE_TLV("DAC Playback Volume", SUN4I_CODEC_DAC_DPC,
+                       SUN4I_CODEC_DAC_DPC_DVOL, 0x3f, 1,
+                       sun6i_codec_dvol_scale),
+        SOC_SINGLE_TLV("Headphone Playback Volume",
+                       SUN6I_CODEC_OM_DACA_CTRL,
+                       SUN6I_CODEC_OM_DACA_CTRL_HPVOL, 0x3f, 0,
+                       sun6i_codec_hp_vol_scale),
+        SOC_SINGLE_TLV("Line Out Playback Volume",
+                       SUN6I_CODEC_MIC_CTRL,
+                       SUN6I_CODEC_MIC_CTRL_LINEOUTVC, 0x1f, 0,
+                       sun6i_codec_lineout_vol_scale),
+        SOC_DOUBLE("Headphone Playback Switch",
+                   SUN6I_CODEC_OM_DACA_CTRL,
+                   SUN6I_CODEC_OM_DACA_CTRL_LHPPAMUTE,
+                   SUN6I_CODEC_OM_DACA_CTRL_RHPPAMUTE, 1, 0),
+        SOC_DOUBLE("Line Out Playback Switch",
+                   SUN6I_CODEC_MIC_CTRL,
+                   SUN6I_CODEC_MIC_CTRL_LINEOUTLEN,
+                   SUN6I_CODEC_MIC_CTRL_LINEOUTREN, 1, 0),
+        /* Mixer pre-gains */
+        SOC_SINGLE_TLV("Line In Playback Volume",
+                       SUN6I_CODEC_OM_PA_CTRL, SUN6I_CODEC_OM_PA_CTRL_LINEING,
+                       0x7, 0, sun6i_codec_out_mixer_pregain_scale),
+        SOC_SINGLE_TLV("Mic1 Playback Volume",
+                       SUN6I_CODEC_OM_PA_CTRL, SUN6I_CODEC_OM_PA_CTRL_MIC1G,
+                       0x7, 0, sun6i_codec_out_mixer_pregain_scale),
+        SOC_SINGLE_TLV("Mic2 Playback Volume",
+                       SUN6I_CODEC_OM_PA_CTRL, SUN6I_CODEC_OM_PA_CTRL_MIC2G,
+                       0x7, 0, sun6i_codec_out_mixer_pregain_scale),
+
+        /* Microphone Amp boost gains */
+        SOC_SINGLE_TLV("Mic1 Boost Volume", SUN6I_CODEC_MIC_CTRL,
+                       SUN6I_CODEC_MIC_CTRL_MIC1BOOST, 0x7, 0,
+                       sun6i_codec_mic_gain_scale),
+        SOC_SINGLE_TLV("Mic2 Boost Volume", SUN6I_CODEC_MIC_CTRL,
+                       SUN6I_CODEC_MIC_CTRL_MIC2BOOST, 0x7, 0,
+                       sun6i_codec_mic_gain_scale),
+        SOC_DOUBLE_TLV("ADC Capture Volume",
+                       SUN6I_CODEC_ADC_ACTL, SUN6I_CODEC_ADC_ACTL_ADCLG,
+                       SUN6I_CODEC_ADC_ACTL_ADCRG, 0x7, 0,
+                       sun6i_codec_out_mixer_pregain_scale),
+};
+
+static const struct snd_soc_dapm_widget sun6i_codec_codec_dapm_widgets[] = {
+        /* Microphone inputs */
+        SND_SOC_DAPM_INPUT("MIC1"),
+        SND_SOC_DAPM_INPUT("MIC2"),
+        SND_SOC_DAPM_INPUT("MIC3"),
+
+        /* Microphone Bias */
+        SND_SOC_DAPM_SUPPLY("HBIAS", SUN6I_CODEC_MIC_CTRL,
+                            SUN6I_CODEC_MIC_CTRL_HBIASEN, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("MBIAS", SUN6I_CODEC_MIC_CTRL,
+                            SUN6I_CODEC_MIC_CTRL_MBIASEN, 0, NULL, 0),
+
+        /* Mic input path */
+        SND_SOC_DAPM_MUX("Mic2 Amplifier Source Route",
+                         SND_SOC_NOPM, 0, 0, sun6i_codec_mic2_src),
+        SND_SOC_DAPM_PGA("Mic1 Amplifier", SUN6I_CODEC_MIC_CTRL,
+                         SUN6I_CODEC_MIC_CTRL_MIC1AMPEN, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Mic2 Amplifier", SUN6I_CODEC_MIC_CTRL,
+                         SUN6I_CODEC_MIC_CTRL_MIC2AMPEN, 0, NULL, 0),
+
+        /* Line In */
+        SND_SOC_DAPM_INPUT("LINEIN"),
+
+        /* Digital parts of the ADCs */
+        SND_SOC_DAPM_SUPPLY("ADC Enable", SUN6I_CODEC_ADC_FIFOC,
+                            SUN6I_CODEC_ADC_FIFOC_EN_AD, 0,
+                            NULL, 0),
+
+        /* Analog parts of the ADCs */
+        SND_SOC_DAPM_ADC("Left ADC", "Codec Capture", SUN6I_CODEC_ADC_ACTL,
+                         SUN6I_CODEC_ADC_ACTL_ADCLEN, 0),
+        SND_SOC_DAPM_ADC("Right ADC", "Codec Capture", SUN6I_CODEC_ADC_ACTL,
+                         SUN6I_CODEC_ADC_ACTL_ADCREN, 0),
+
+        /* ADC Mixers */
+        SOC_MIXER_ARRAY("Left ADC Mixer", SND_SOC_NOPM, 0, 0,
+                        sun6i_codec_adc_mixer_controls),
+        SOC_MIXER_ARRAY("Right ADC Mixer", SND_SOC_NOPM, 0, 0,
+                        sun6i_codec_adc_mixer_controls),
+
+        /* Digital parts of the DACs */
+        SND_SOC_DAPM_SUPPLY("DAC Enable", SUN4I_CODEC_DAC_DPC,
+                            SUN4I_CODEC_DAC_DPC_EN_DA, 0,
+                            NULL, 0),
+
+        /* Analog parts of the DACs */
+        SND_SOC_DAPM_DAC("Left DAC", "Codec Playback",
+                         SUN6I_CODEC_OM_DACA_CTRL,
+                         SUN6I_CODEC_OM_DACA_CTRL_DACALEN, 0),
+        SND_SOC_DAPM_DAC("Right DAC", "Codec Playback",
+                         SUN6I_CODEC_OM_DACA_CTRL,
+                         SUN6I_CODEC_OM_DACA_CTRL_DACAREN, 0),
+
+        /* Mixers */
+        SOC_MIXER_ARRAY("Left Mixer", SUN6I_CODEC_OM_DACA_CTRL,
+                        SUN6I_CODEC_OM_DACA_CTRL_LMIXEN, 0,
+                        sun6i_codec_mixer_controls),
+        SOC_MIXER_ARRAY("Right Mixer", SUN6I_CODEC_OM_DACA_CTRL,
+                        SUN6I_CODEC_OM_DACA_CTRL_RMIXEN, 0,
+                        sun6i_codec_mixer_controls),
+
+        /* Headphone output path */
+        SND_SOC_DAPM_MUX("Headphone Source Playback Route",
+                         SND_SOC_NOPM, 0, 0, sun6i_codec_hp_src),
+        SND_SOC_DAPM_OUT_DRV("Headphone Amp", SUN6I_CODEC_OM_PA_CTRL,
+                             SUN6I_CODEC_OM_PA_CTRL_HPPAEN, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("HPCOM Protection", SUN6I_CODEC_OM_PA_CTRL,
+                            SUN6I_CODEC_OM_PA_CTRL_COMPTEN, 0, NULL, 0),
+        SND_SOC_DAPM_REG(snd_soc_dapm_supply, "HPCOM", SUN6I_CODEC_OM_PA_CTRL,
+                         SUN6I_CODEC_OM_PA_CTRL_HPCOM_CTL, 0x3, 0x3, 0),
+        SND_SOC_DAPM_OUTPUT("HP"),
+
+        /* Line Out path */
+        SND_SOC_DAPM_MUX("Line Out Source Playback Route",
+                         SND_SOC_NOPM, 0, 0, sun6i_codec_lineout_src),
+        SND_SOC_DAPM_OUTPUT("LINEOUT"),
+};
+
+static const struct snd_soc_dapm_route sun6i_codec_codec_dapm_routes[] = {
+        /* DAC Routes */
+        { "Left DAC", NULL, "DAC Enable" },
+        { "Right DAC", NULL, "DAC Enable" },
+
+        /* Microphone Routes */
+        { "Mic1 Amplifier", NULL, "MIC1"},
+        { "Mic2 Amplifier Source Route", "Mic2", "MIC2" },
+        { "Mic2 Amplifier Source Route", "Mic3", "MIC3" },
+        { "Mic2 Amplifier", NULL, "Mic2 Amplifier Source Route"},
+
+        /* Left Mixer Routes */
+        { "Left Mixer", "DAC Playback Switch", "Left DAC" },
+        { "Left Mixer", "DAC Reversed Playback Switch", "Right DAC" },
+        { "Left Mixer", "Line In Playback Switch", "LINEIN" },
+        { "Left Mixer", "Mic1 Playback Switch", "Mic1 Amplifier" },
+        { "Left Mixer", "Mic2 Playback Switch", "Mic2 Amplifier" },
+
+        /* Right Mixer Routes */
+        { "Right Mixer", "DAC Playback Switch", "Right DAC" },
+        { "Right Mixer", "DAC Reversed Playback Switch", "Left DAC" },
+        { "Right Mixer", "Line In Playback Switch", "LINEIN" },
+        { "Right Mixer", "Mic1 Playback Switch", "Mic1 Amplifier" },
+        { "Right Mixer", "Mic2 Playback Switch", "Mic2 Amplifier" },
+
+        /* Left ADC Mixer Routes */
+        { "Left ADC Mixer", "Mixer Capture Switch", "Left Mixer" },
+        { "Left ADC Mixer", "Mixer Reversed Capture Switch", "Right Mixer" },
+        { "Left ADC Mixer", "Line In Capture Switch", "LINEIN" },
+        { "Left ADC Mixer", "Mic1 Capture Switch", "Mic1 Amplifier" },
+        { "Left ADC Mixer", "Mic2 Capture Switch", "Mic2 Amplifier" },
+
+        /* Right ADC Mixer Routes */
+        { "Right ADC Mixer", "Mixer Capture Switch", "Right Mixer" },
+        { "Right ADC Mixer", "Mixer Reversed Capture Switch", "Left Mixer" },
+        { "Right ADC Mixer", "Line In Capture Switch", "LINEIN" },
+        { "Right ADC Mixer", "Mic1 Capture Switch", "Mic1 Amplifier" },
+        { "Right ADC Mixer", "Mic2 Capture Switch", "Mic2 Amplifier" },
+
+        /* Headphone Routes */
+        { "Headphone Source Playback Route", "DAC", "Left DAC" },
+        { "Headphone Source Playback Route", "DAC", "Right DAC" },
+        { "Headphone Source Playback Route", "Mixer", "Left Mixer" },
+        { "Headphone Source Playback Route", "Mixer", "Right Mixer" },
+        { "Headphone Amp", NULL, "Headphone Source Playback Route" },
+        { "HP", NULL, "Headphone Amp" },
+        { "HPCOM", NULL, "HPCOM Protection" },
+
+        /* Line Out Routes */
+        { "Line Out Source Playback Route", "Stereo", "Left Mixer" },
+        { "Line Out Source Playback Route", "Stereo", "Right Mixer" },
+        { "Line Out Source Playback Route", "Mono Differential", "Left Mixer" },
+        { "LINEOUT", NULL, "Line Out Source Playback Route" },
+
+        /* ADC Routes */
+        { "Left ADC", NULL, "ADC Enable" },
+        { "Right ADC", NULL, "ADC Enable" },
+        { "Left ADC", NULL, "Left ADC Mixer" },
+        { "Right ADC", NULL, "Right ADC Mixer" },
+};
+
+static struct snd_soc_codec_driver sun6i_codec_codec = {
+        .component_driver = {
+                .controls               = sun6i_codec_codec_widgets,
+                .num_controls           = ARRAY_SIZE(sun6i_codec_codec_widgets),
+                .dapm_widgets           = sun6i_codec_codec_dapm_widgets,
+                .num_dapm_widgets       = ARRAY_SIZE(sun6i_codec_codec_dapm_widgets),
+                .dapm_routes            = sun6i_codec_codec_dapm_routes,
+                .num_dapm_routes        = ARRAY_SIZE(sun6i_codec_codec_dapm_routes),
+        },
+};
+
+/* sun8i A23 codec */
+static const struct snd_kcontrol_new sun8i_a23_codec_codec_controls[] = {
+        SOC_SINGLE_TLV("DAC Playback Volume", SUN4I_CODEC_DAC_DPC,
+                       SUN4I_CODEC_DAC_DPC_DVOL, 0x3f, 1,
+                       sun6i_codec_dvol_scale),
+};
+
+static const struct snd_soc_dapm_widget sun8i_a23_codec_codec_widgets[] = {
+        /* Digital parts of the ADCs */
+        SND_SOC_DAPM_SUPPLY("ADC Enable", SUN6I_CODEC_ADC_FIFOC,
+                            SUN6I_CODEC_ADC_FIFOC_EN_AD, 0, NULL, 0),
+        /* Digital parts of the DACs */
+        SND_SOC_DAPM_SUPPLY("DAC Enable", SUN4I_CODEC_DAC_DPC,
+                            SUN4I_CODEC_DAC_DPC_EN_DA, 0, NULL, 0),
+
+};
+
+static struct snd_soc_codec_driver sun8i_a23_codec_codec = {
+        .component_driver = {
+                .controls               = sun8i_a23_codec_codec_controls,
+                .num_controls           = ARRAY_SIZE(sun8i_a23_codec_codec_controls),
+                .dapm_widgets           = sun8i_a23_codec_codec_widgets,
+                .num_dapm_widgets       = ARRAY_SIZE(sun8i_a23_codec_codec_widgets),
+        },
+};
+
 static const struct snd_soc_component_driver sun4i_codec_component = {
         .name = "sun4i-codec",
 };
@@ -678,45 +1144,6 @@ static struct snd_soc_dai_driver dummy_cpu_dai = {
          },
 };
 
-static const struct regmap_config sun4i_codec_regmap_config = {
-        .reg_bits       = 32,
-        .reg_stride     = 4,
-        .val_bits       = 32,
-        .max_register   = SUN4I_CODEC_ADC_RXCNT,
-};
-
-static const struct regmap_config sun7i_codec_regmap_config = {
-        .reg_bits       = 32,
-        .reg_stride     = 4,
-        .val_bits       = 32,
-        .max_register   = SUN7I_CODEC_AC_MIC_PHONE_CAL,
-};
-
-struct sun4i_codec_quirks {
-        const struct regmap_config *regmap_config;
-};
-
-static const struct sun4i_codec_quirks sun4i_codec_quirks = {
-        .regmap_config = &sun4i_codec_regmap_config,
-};
-
-static const struct sun4i_codec_quirks sun7i_codec_quirks = {
-        .regmap_config = &sun7i_codec_regmap_config,
-};
-
-static const struct of_device_id sun4i_codec_of_match[] = {
-        {
-                .compatible = "allwinner,sun4i-a10-codec",
-                .data = &sun4i_codec_quirks,
-        },
-        {
-                .compatible = "allwinner,sun7i-a20-codec",
-                .data = &sun7i_codec_quirks,
-        },
-        {}
-};
-MODULE_DEVICE_TABLE(of, sun4i_codec_of_match);
-
 static struct snd_soc_dai_link *sun4i_codec_create_link(struct device *dev,
                                                         int *num_links)
 {
@@ -781,6 +1208,259 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev)
         return card;
 };
 
+static const struct snd_soc_dapm_widget sun6i_codec_card_dapm_widgets[] = {
+        SND_SOC_DAPM_HP("Headphone", NULL),
+        SND_SOC_DAPM_LINE("Line In", NULL),
+        SND_SOC_DAPM_LINE("Line Out", NULL),
+        SND_SOC_DAPM_MIC("Headset Mic", NULL),
+        SND_SOC_DAPM_MIC("Mic", NULL),
+        SND_SOC_DAPM_SPK("Speaker", sun4i_codec_spk_event),
+};
+
+static struct snd_soc_card *sun6i_codec_create_card(struct device *dev)
+{
+        struct snd_soc_card *card;
+        int ret;
+
+        card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
+        if (!card)
+                return ERR_PTR(-ENOMEM);
+
+        card->dai_link = sun4i_codec_create_link(dev, &card->num_links);
+        if (!card->dai_link)
+                return ERR_PTR(-ENOMEM);
+
+        card->dev               = dev;
+        card->name              = "A31 Audio Codec";
+        card->dapm_widgets      = sun6i_codec_card_dapm_widgets;
+        card->num_dapm_widgets  = ARRAY_SIZE(sun6i_codec_card_dapm_widgets);
+        card->fully_routed      = true;
+
+        ret = snd_soc_of_parse_audio_routing(card, "allwinner,audio-routing");
+        if (ret)
+                dev_warn(dev, "failed to parse audio-routing: %d\n", ret);
+
+        return card;
+};
+
+/* Connect digital side enables to analog side widgets */
+static const struct snd_soc_dapm_route sun8i_codec_card_routes[] = {
+        /* ADC Routes */
+        { "Left ADC", NULL, "ADC Enable" },
+        { "Right ADC", NULL, "ADC Enable" },
+        { "Codec Capture", NULL, "Left ADC" },
+        { "Codec Capture", NULL, "Right ADC" },
+
+        /* DAC Routes */
+        { "Left DAC", NULL, "DAC Enable" },
+        { "Right DAC", NULL, "DAC Enable" },
+        { "Left DAC", NULL, "Codec Playback" },
+        { "Right DAC", NULL, "Codec Playback" },
+};
+
+static struct snd_soc_aux_dev aux_dev = {
+        .name = "Codec Analog Controls",
+};
+
+static struct snd_soc_card *sun8i_a23_codec_create_card(struct device *dev)
+{
+        struct snd_soc_card *card;
+        int ret;
+
+        card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
+        if (!card)
+                return ERR_PTR(-ENOMEM);
+
+        aux_dev.codec_of_node = of_parse_phandle(dev->of_node,
+                                                 "allwinner,codec-analog-controls",
+                                                 0);
+        if (!aux_dev.codec_of_node) {
+                dev_err(dev, "Can't find analog controls for codec.\n");
+                return ERR_PTR(-EINVAL);
+        };
+
+        card->dai_link = sun4i_codec_create_link(dev, &card->num_links);
+        if (!card->dai_link)
+                return ERR_PTR(-ENOMEM);
+
+        card->dev               = dev;
+        card->name              = "A23 Audio Codec";
+        card->dapm_widgets      = sun6i_codec_card_dapm_widgets;
+        card->num_dapm_widgets  = ARRAY_SIZE(sun6i_codec_card_dapm_widgets);
+        card->dapm_routes       = sun8i_codec_card_routes;
+        card->num_dapm_routes   = ARRAY_SIZE(sun8i_codec_card_routes);
+        card->aux_dev           = &aux_dev;
+        card->num_aux_devs      = 1;
+        card->fully_routed      = true;
+
+        ret = snd_soc_of_parse_audio_routing(card, "allwinner,audio-routing");
+        if (ret)
+                dev_warn(dev, "failed to parse audio-routing: %d\n", ret);
+
+        return card;
+};
+
+static struct snd_soc_card *sun8i_h3_codec_create_card(struct device *dev)
+{
+        struct snd_soc_card *card;
+        int ret;
+
+        card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
+        if (!card)
+                return ERR_PTR(-ENOMEM);
+
+        aux_dev.codec_of_node = of_parse_phandle(dev->of_node,
+                                                 "allwinner,codec-analog-controls",
+                                                 0);
+        if (!aux_dev.codec_of_node) {
+                dev_err(dev, "Can't find analog controls for codec.\n");
+                return ERR_PTR(-EINVAL);
+        };
+
+        card->dai_link = sun4i_codec_create_link(dev, &card->num_links);
+        if (!card->dai_link)
+                return ERR_PTR(-ENOMEM);
+
+        card->dev               = dev;
+        card->name              = "H3 Audio Codec";
+        card->dapm_widgets      = sun6i_codec_card_dapm_widgets;
+        card->num_dapm_widgets  = ARRAY_SIZE(sun6i_codec_card_dapm_widgets);
+        card->dapm_routes       = sun8i_codec_card_routes;
+        card->num_dapm_routes   = ARRAY_SIZE(sun8i_codec_card_routes);
+        card->aux_dev           = &aux_dev;
+        card->num_aux_devs      = 1;
+        card->fully_routed      = true;
+
+        ret = snd_soc_of_parse_audio_routing(card, "allwinner,audio-routing");
+        if (ret)
+                dev_warn(dev, "failed to parse audio-routing: %d\n", ret);
+
+        return card;
+};
+
+static const struct regmap_config sun4i_codec_regmap_config = {
+        .reg_bits       = 32,
+        .reg_stride     = 4,
+        .val_bits       = 32,
+        .max_register   = SUN4I_CODEC_ADC_RXCNT,
+};
+
+static const struct regmap_config sun6i_codec_regmap_config = {
+        .reg_bits       = 32,
+        .reg_stride     = 4,
+        .val_bits       = 32,
+        .max_register   = SUN6I_CODEC_HMIC_DATA,
+};
+
+static const struct regmap_config sun7i_codec_regmap_config = {
+        .reg_bits       = 32,
+        .reg_stride     = 4,
+        .val_bits       = 32,
+        .max_register   = SUN7I_CODEC_AC_MIC_PHONE_CAL,
+};
+
+static const struct regmap_config sun8i_a23_codec_regmap_config = {
+        .reg_bits       = 32,
+        .reg_stride     = 4,
+        .val_bits       = 32,
+        .max_register   = SUN8I_A23_CODEC_ADC_RXCNT,
+};
+
+static const struct regmap_config sun8i_h3_codec_regmap_config = {
+        .reg_bits       = 32,
+        .reg_stride     = 4,
+        .val_bits       = 32,
+        .max_register   = SUN8I_H3_CODEC_ADC_DBG,
+};
+
+struct sun4i_codec_quirks {
+        const struct regmap_config *regmap_config;
+        const struct snd_soc_codec_driver *codec;
+        struct snd_soc_card * (*create_card)(struct device *dev);
+        struct reg_field reg_adc_fifoc; /* used for regmap_field */
+        unsigned int reg_dac_txdata;    /* TX FIFO offset for DMA config */
+        unsigned int reg_adc_rxdata;    /* RX FIFO offset for DMA config */
+        bool has_reset;
+};
+
+static const struct sun4i_codec_quirks sun4i_codec_quirks = {
+        .regmap_config  = &sun4i_codec_regmap_config,
+        .codec          = &sun4i_codec_codec,
+        .create_card    = sun4i_codec_create_card,
+        .reg_adc_fifoc  = REG_FIELD(SUN4I_CODEC_ADC_FIFOC, 0, 31),
+        .reg_dac_txdata = SUN4I_CODEC_DAC_TXDATA,
+        .reg_adc_rxdata = SUN4I_CODEC_ADC_RXDATA,
+};
+
+static const struct sun4i_codec_quirks sun6i_a31_codec_quirks = {
+        .regmap_config  = &sun6i_codec_regmap_config,
+        .codec          = &sun6i_codec_codec,
+        .create_card    = sun6i_codec_create_card,
+        .reg_adc_fifoc  = REG_FIELD(SUN6I_CODEC_ADC_FIFOC, 0, 31),
+        .reg_dac_txdata = SUN4I_CODEC_DAC_TXDATA,
+        .reg_adc_rxdata = SUN6I_CODEC_ADC_RXDATA,
+        .has_reset      = true,
+};
+
+static const struct sun4i_codec_quirks sun7i_codec_quirks = {
+        .regmap_config  = &sun7i_codec_regmap_config,
+        .codec          = &sun4i_codec_codec,
+        .create_card    = sun4i_codec_create_card,
+        .reg_adc_fifoc  = REG_FIELD(SUN4I_CODEC_ADC_FIFOC, 0, 31),
+        .reg_dac_txdata = SUN4I_CODEC_DAC_TXDATA,
+        .reg_adc_rxdata = SUN4I_CODEC_ADC_RXDATA,
+};
+
+static const struct sun4i_codec_quirks sun8i_a23_codec_quirks = {
+        .regmap_config  = &sun8i_a23_codec_regmap_config,
+        .codec          = &sun8i_a23_codec_codec,
+        .create_card    = sun8i_a23_codec_create_card,
+        .reg_adc_fifoc  = REG_FIELD(SUN6I_CODEC_ADC_FIFOC, 0, 31),
+        .reg_dac_txdata = SUN4I_CODEC_DAC_TXDATA,
+        .reg_adc_rxdata = SUN6I_CODEC_ADC_RXDATA,
+        .has_reset      = true,
+};
+
+static const struct sun4i_codec_quirks sun8i_h3_codec_quirks = {
+        .regmap_config  = &sun8i_h3_codec_regmap_config,
+        /*
+         * TODO Share the codec structure with A23 for now.
+         * This should be split out when adding digital audio
+         * processing support for the H3.
+         */
+        .codec          = &sun8i_a23_codec_codec,
+        .create_card    = sun8i_h3_codec_create_card,
+        .reg_adc_fifoc  = REG_FIELD(SUN6I_CODEC_ADC_FIFOC, 0, 31),
+        .reg_dac_txdata = SUN8I_H3_CODEC_DAC_TXDATA,
+        .reg_adc_rxdata = SUN6I_CODEC_ADC_RXDATA,
+        .has_reset      = true,
+};
+
+static const struct of_device_id sun4i_codec_of_match[] = {
+        {
+                .compatible = "allwinner,sun4i-a10-codec",
+                .data = &sun4i_codec_quirks,
+        },
+        {
+                .compatible = "allwinner,sun6i-a31-codec",
+                .data = &sun6i_a31_codec_quirks,
+        },
+        {
+                .compatible = "allwinner,sun7i-a20-codec",
+                .data = &sun7i_codec_quirks,
+        },
+        {
+                .compatible = "allwinner,sun8i-a23-codec",
+                .data = &sun8i_a23_codec_quirks,
+        },
+        {
+                .compatible = "allwinner,sun8i-h3-codec",
+                .data = &sun8i_h3_codec_quirks,
+        },
+        {}
+};
+MODULE_DEVICE_TABLE(of, sun4i_codec_of_match);
+
 static int sun4i_codec_probe(struct platform_device *pdev)
 {
         struct snd_soc_card *card;
@@ -829,6 +1509,14 @@ static int sun4i_codec_probe(struct platform_device *pdev)
                 return PTR_ERR(scodec->clk_module);
         }
 
+        if (quirks->has_reset) {
+                scodec->rst = devm_reset_control_get(&pdev->dev, NULL);
+                if (IS_ERR(scodec->rst)) {
+                        dev_err(&pdev->dev, "Failed to get reset control\n");
+                        return PTR_ERR(scodec->rst);
+                }
+        }
+
         scodec->gpio_pa = devm_gpiod_get_optional(&pdev->dev, "allwinner,pa",
                                                   GPIOD_OUT_LOW);
         if (IS_ERR(scodec->gpio_pa)) {
@@ -838,27 +1526,48 @@ static int sun4i_codec_probe(struct platform_device *pdev)
                 return ret;
         }
 
+        /* reg_field setup */
+        scodec->reg_adc_fifoc = devm_regmap_field_alloc(&pdev->dev,
+                                                        scodec->regmap,
+                                                        quirks->reg_adc_fifoc);
+        if (IS_ERR(scodec->reg_adc_fifoc)) {
+                ret = PTR_ERR(scodec->reg_adc_fifoc);
+                dev_err(&pdev->dev, "Failed to create regmap fields: %d\n",
+                        ret);
+                return ret;
+        }
+
         /* Enable the bus clock */
         if (clk_prepare_enable(scodec->clk_apb)) {
                 dev_err(&pdev->dev, "Failed to enable the APB clock\n");
                 return -EINVAL;
         }
 
+        /* Deassert the reset control */
+        if (scodec->rst) {
+                ret = reset_control_deassert(scodec->rst);
+                if (ret) {
+                        dev_err(&pdev->dev,
+                                "Failed to deassert the reset control\n");
+                        goto err_clk_disable;
+                }
+        }
+
         /* DMA configuration for TX FIFO */
-        scodec->playback_dma_data.addr = res->start + SUN4I_CODEC_DAC_TXDATA;
-        scodec->playback_dma_data.maxburst = 4;
+        scodec->playback_dma_data.addr = res->start + quirks->reg_dac_txdata;
+        scodec->playback_dma_data.maxburst = 8;
         scodec->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
 
         /* DMA configuration for RX FIFO */
-        scodec->capture_dma_data.addr = res->start + SUN4I_CODEC_ADC_RXDATA;
-        scodec->capture_dma_data.maxburst = 4;
+        scodec->capture_dma_data.addr = res->start + quirks->reg_adc_rxdata;
+        scodec->capture_dma_data.maxburst = 8;
         scodec->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
 
-        ret = snd_soc_register_codec(&pdev->dev, &sun4i_codec_codec,
+        ret = snd_soc_register_codec(&pdev->dev, quirks->codec,
                                      &sun4i_codec_dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "Failed to register our codec\n");
-                goto err_clk_disable;
+                goto err_assert_reset;
         }
 
         ret = devm_snd_soc_register_component(&pdev->dev,
@@ -875,7 +1584,7 @@ static int sun4i_codec_probe(struct platform_device *pdev)
                 goto err_unregister_codec;
         }
 
-        card = sun4i_codec_create_card(&pdev->dev);
+        card = quirks->create_card(&pdev->dev);
         if (IS_ERR(card)) {
                 ret = PTR_ERR(card);
                 dev_err(&pdev->dev, "Failed to create our card\n");
@@ -895,6 +1604,9 @@ static int sun4i_codec_probe(struct platform_device *pdev)
 
 err_unregister_codec:
         snd_soc_unregister_codec(&pdev->dev);
+err_assert_reset:
+        if (scodec->rst)
+                reset_control_assert(scodec->rst);
 err_clk_disable:
         clk_disable_unprepare(scodec->clk_apb);
         return ret;
@@ -907,6 +1619,8 @@ static int sun4i_codec_remove(struct platform_device *pdev)
 
         snd_soc_unregister_card(card);
         snd_soc_unregister_codec(&pdev->dev);
+        if (scodec->rst)
+                reset_control_assert(scodec->rst);
         clk_disable_unprepare(scodec->clk_apb);
 
         return 0;
@@ -926,4 +1640,5 @@ MODULE_DESCRIPTION("Allwinner A10 codec driver");
 MODULE_AUTHOR("Emilio López <emilio@elopez.com.ar>");
 MODULE_AUTHOR("Jon Smirl <jonsmirl@gmail.com>");
 MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
+MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 687a8f83dbe5..f24d19526603 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -93,6 +93,9 @@ struct sun4i_i2s {
         struct clk      *mod_clk;
         struct regmap   *regmap;
 
+        unsigned int    mclk_freq;
+
+        struct snd_dmaengine_dai_dma_data       capture_dma_data;
         struct snd_dmaengine_dai_dma_data       playback_dma_data;
 };
 
@@ -157,14 +160,24 @@ static int sun4i_i2s_get_mclk_div(struct sun4i_i2s *i2s,
 }
 
 static int sun4i_i2s_oversample_rates[] = { 128, 192, 256, 384, 512, 768 };
+static bool sun4i_i2s_oversample_is_valid(unsigned int oversample)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(sun4i_i2s_oversample_rates); i++)
+                if (sun4i_i2s_oversample_rates[i] == oversample)
+                        return true;
+
+        return false;
+}
 
 static int sun4i_i2s_set_clk_rate(struct sun4i_i2s *i2s,
                                   unsigned int rate,
                                   unsigned int word_size)
 {
-        unsigned int clk_rate;
+        unsigned int oversample_rate, clk_rate;
         int bclk_div, mclk_div;
-        int ret, i;
+        int ret;
 
         switch (rate) {
         case 176400:
@@ -196,21 +209,18 @@ static int sun4i_i2s_set_clk_rate(struct sun4i_i2s *i2s,
         if (ret)
                 return ret;
 
-        /* Always favor the highest oversampling rate */
-        for (i = (ARRAY_SIZE(sun4i_i2s_oversample_rates) - 1); i >= 0; i--) {
-                unsigned int oversample_rate = sun4i_i2s_oversample_rates[i];
-
-                bclk_div = sun4i_i2s_get_bclk_div(i2s, oversample_rate,
-                                                  word_size);
-                mclk_div = sun4i_i2s_get_mclk_div(i2s, oversample_rate,
-                                                  clk_rate,
-                                                  rate);
+        oversample_rate = i2s->mclk_freq / rate;
+        if (!sun4i_i2s_oversample_is_valid(oversample_rate))
+                return -EINVAL;
 
-                if ((bclk_div >= 0) && (mclk_div >= 0))
-                        break;
-        }
+        bclk_div = sun4i_i2s_get_bclk_div(i2s, oversample_rate,
+                                          word_size);
+        if (bclk_div < 0)
+                return -EINVAL;
 
-        if ((bclk_div < 0) || (mclk_div < 0))
+        mclk_div = sun4i_i2s_get_mclk_div(i2s, oversample_rate,
+                                          clk_rate, rate);
+        if (mclk_div < 0)
                 return -EINVAL;
 
         regmap_write(i2s->regmap, SUN4I_I2S_CLK_DIV_REG,
@@ -341,6 +351,27 @@ static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
         return 0;
 }
 
+static void sun4i_i2s_start_capture(struct sun4i_i2s *i2s)
+{
+        /* Flush RX FIFO */
+        regmap_update_bits(i2s->regmap, SUN4I_I2S_FIFO_CTRL_REG,
+                           SUN4I_I2S_FIFO_CTRL_FLUSH_RX,
+                           SUN4I_I2S_FIFO_CTRL_FLUSH_RX);
+
+        /* Clear RX counter */
+        regmap_write(i2s->regmap, SUN4I_I2S_RX_CNT_REG, 0);
+
+        /* Enable RX Block */
+        regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
+                           SUN4I_I2S_CTRL_RX_EN,
+                           SUN4I_I2S_CTRL_RX_EN);
+
+        /* Enable RX DRQ */
+        regmap_update_bits(i2s->regmap, SUN4I_I2S_DMA_INT_CTRL_REG,
+                           SUN4I_I2S_DMA_INT_CTRL_RX_DRQ_EN,
+                           SUN4I_I2S_DMA_INT_CTRL_RX_DRQ_EN);
+}
+
 static void sun4i_i2s_start_playback(struct sun4i_i2s *i2s)
 {
         /* Flush TX FIFO */
@@ -362,6 +393,18 @@ static void sun4i_i2s_start_playback(struct sun4i_i2s *i2s)
                            SUN4I_I2S_DMA_INT_CTRL_TX_DRQ_EN);
 }
 
+static void sun4i_i2s_stop_capture(struct sun4i_i2s *i2s)
+{
+        /* Disable RX Block */
+        regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
+                           SUN4I_I2S_CTRL_RX_EN,
+                           0);
+
+        /* Disable RX DRQ */
+        regmap_update_bits(i2s->regmap, SUN4I_I2S_DMA_INT_CTRL_REG,
+                           SUN4I_I2S_DMA_INT_CTRL_RX_DRQ_EN,
+                           0);
+}
 
 static void sun4i_i2s_stop_playback(struct sun4i_i2s *i2s)
 {
@@ -388,7 +431,7 @@ static int sun4i_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                         sun4i_i2s_start_playback(i2s);
                 else
-                        return -EINVAL;
+                        sun4i_i2s_start_capture(i2s);
                 break;
 
         case SNDRV_PCM_TRIGGER_STOP:
@@ -397,7 +440,7 @@ static int sun4i_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                         sun4i_i2s_stop_playback(i2s);
                 else
-                        return -EINVAL;
+                        sun4i_i2s_stop_capture(i2s);
                 break;
 
         default:
@@ -447,9 +490,23 @@ static void sun4i_i2s_shutdown(struct snd_pcm_substream *substream,
         regmap_write(i2s->regmap, SUN4I_I2S_CTRL_REG, 0);
 }
 
+static int sun4i_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id,
+                                unsigned int freq, int dir)
+{
+        struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai);
+
+        if (clk_id != 0)
+                return -EINVAL;
+
+        i2s->mclk_freq = freq;
+
+        return 0;
+}
+
 static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = {
         .hw_params      = sun4i_i2s_hw_params,
         .set_fmt        = sun4i_i2s_set_fmt,
+        .set_sysclk     = sun4i_i2s_set_sysclk,
         .shutdown       = sun4i_i2s_shutdown,
         .startup        = sun4i_i2s_startup,
         .trigger        = sun4i_i2s_trigger,
@@ -459,7 +516,9 @@ static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai)
 {
         struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai);
 
-        snd_soc_dai_init_dma_data(dai, &i2s->playback_dma_data, NULL);
+        snd_soc_dai_init_dma_data(dai,
+                                  &i2s->playback_dma_data,
+                                  &i2s->capture_dma_data);
 
         snd_soc_dai_set_drvdata(dai, i2s);
 
@@ -468,6 +527,13 @@ static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai)
 
 static struct snd_soc_dai_driver sun4i_i2s_dai = {
         .probe = sun4i_i2s_dai_probe,
+        .capture = {
+                .stream_name = "Capture",
+                .channels_min = 2,
+                .channels_max = 2,
+                .rates = SNDRV_PCM_RATE_8000_192000,
+                .formats = SNDRV_PCM_FMTBIT_S16_LE,
+        },
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 2,
@@ -630,6 +696,9 @@ static int sun4i_i2s_probe(struct platform_device *pdev)
         i2s->playback_dma_data.addr = res->start + SUN4I_I2S_FIFO_TX_REG;
         i2s->playback_dma_data.maxburst = 4;
 
+        i2s->capture_dma_data.addr = res->start + SUN4I_I2S_FIFO_RX_REG;
+        i2s->capture_dma_data.maxburst = 4;
+
         pm_runtime_enable(&pdev->dev);
         if (!pm_runtime_enabled(&pdev->dev)) {
                 ret = sun4i_i2s_runtime_resume(&pdev->dev);
diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c
new file mode 100644
index 000000000000..af02290ebe49
--- /dev/null
+++ b/sound/soc/sunxi/sun8i-codec-analog.c
@@ -0,0 +1,665 @@
+/*
+ * This driver supports the analog controls for the internal codec
+ * found in Allwinner's A31s, A23, A33 and H3 SoCs.
+ *
+ * Copyright 2016 Chen-Yu Tsai <wens@csie.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/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/tlv.h>
+
+/* Codec analog control register offsets and bit fields */
+#define SUN8I_ADDA_HP_VOLC              0x00
+#define SUN8I_ADDA_HP_VOLC_PA_CLK_GATE          7
+#define SUN8I_ADDA_HP_VOLC_HP_VOL               0
+#define SUN8I_ADDA_LOMIXSC              0x01
+#define SUN8I_ADDA_LOMIXSC_MIC1                 6
+#define SUN8I_ADDA_LOMIXSC_MIC2                 5
+#define SUN8I_ADDA_LOMIXSC_PHONE                4
+#define SUN8I_ADDA_LOMIXSC_PHONEN               3
+#define SUN8I_ADDA_LOMIXSC_LINEINL              2
+#define SUN8I_ADDA_LOMIXSC_DACL                 1
+#define SUN8I_ADDA_LOMIXSC_DACR                 0
+#define SUN8I_ADDA_ROMIXSC              0x02
+#define SUN8I_ADDA_ROMIXSC_MIC1                 6
+#define SUN8I_ADDA_ROMIXSC_MIC2                 5
+#define SUN8I_ADDA_ROMIXSC_PHONE                4
+#define SUN8I_ADDA_ROMIXSC_PHONEP               3
+#define SUN8I_ADDA_ROMIXSC_LINEINR              2
+#define SUN8I_ADDA_ROMIXSC_DACR                 1
+#define SUN8I_ADDA_ROMIXSC_DACL                 0
+#define SUN8I_ADDA_DAC_PA_SRC           0x03
+#define SUN8I_ADDA_DAC_PA_SRC_DACAREN           7
+#define SUN8I_ADDA_DAC_PA_SRC_DACALEN           6
+#define SUN8I_ADDA_DAC_PA_SRC_RMIXEN            5
+#define SUN8I_ADDA_DAC_PA_SRC_LMIXEN            4
+#define SUN8I_ADDA_DAC_PA_SRC_RHPPAMUTE         3
+#define SUN8I_ADDA_DAC_PA_SRC_LHPPAMUTE         2
+#define SUN8I_ADDA_DAC_PA_SRC_RHPIS             1
+#define SUN8I_ADDA_DAC_PA_SRC_LHPIS             0
+#define SUN8I_ADDA_PHONEIN_GCTRL        0x04
+#define SUN8I_ADDA_PHONEIN_GCTRL_PHONEPG        4
+#define SUN8I_ADDA_PHONEIN_GCTRL_PHONENG        0
+#define SUN8I_ADDA_LINEIN_GCTRL         0x05
+#define SUN8I_ADDA_LINEIN_GCTRL_LINEING         4
+#define SUN8I_ADDA_LINEIN_GCTRL_PHONEG          0
+#define SUN8I_ADDA_MICIN_GCTRL          0x06
+#define SUN8I_ADDA_MICIN_GCTRL_MIC1G            4
+#define SUN8I_ADDA_MICIN_GCTRL_MIC2G            0
+#define SUN8I_ADDA_PAEN_HP_CTRL         0x07
+#define SUN8I_ADDA_PAEN_HP_CTRL_HPPAEN          7
+#define SUN8I_ADDA_PAEN_HP_CTRL_LINEOUTEN       7       /* H3 specific */
+#define SUN8I_ADDA_PAEN_HP_CTRL_HPCOM_FC        5
+#define SUN8I_ADDA_PAEN_HP_CTRL_COMPTEN         4
+#define SUN8I_ADDA_PAEN_HP_CTRL_PA_ANTI_POP_CTRL        2
+#define SUN8I_ADDA_PAEN_HP_CTRL_LTRNMUTE        1
+#define SUN8I_ADDA_PAEN_HP_CTRL_RTLNMUTE        0
+#define SUN8I_ADDA_PHONEOUT_CTRL        0x08
+#define SUN8I_ADDA_PHONEOUT_CTRL_PHONEOUTG      5
+#define SUN8I_ADDA_PHONEOUT_CTRL_PHONEOUTEN     4
+#define SUN8I_ADDA_PHONEOUT_CTRL_PHONEOUT_MIC1  3
+#define SUN8I_ADDA_PHONEOUT_CTRL_PHONEOUT_MIC2  2
+#define SUN8I_ADDA_PHONEOUT_CTRL_PHONEOUT_RMIX  1
+#define SUN8I_ADDA_PHONEOUT_CTRL_PHONEOUT_LMIX  0
+#define SUN8I_ADDA_PHONE_GAIN_CTRL      0x09
+#define SUN8I_ADDA_PHONE_GAIN_CTRL_LINEOUT_VOL  3
+#define SUN8I_ADDA_PHONE_GAIN_CTRL_PHONEPREG    0
+#define SUN8I_ADDA_MIC2G_CTRL           0x0a
+#define SUN8I_ADDA_MIC2G_CTRL_MIC2AMPEN         7
+#define SUN8I_ADDA_MIC2G_CTRL_MIC2BOOST         4
+#define SUN8I_ADDA_MIC2G_CTRL_LINEOUTLEN        3
+#define SUN8I_ADDA_MIC2G_CTRL_LINEOUTREN        2
+#define SUN8I_ADDA_MIC2G_CTRL_LINEOUTLSRC       1
+#define SUN8I_ADDA_MIC2G_CTRL_LINEOUTRSRC       0
+#define SUN8I_ADDA_MIC1G_MICBIAS_CTRL   0x0b
+#define SUN8I_ADDA_MIC1G_MICBIAS_CTRL_HMICBIASEN        7
+#define SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MMICBIASEN        6
+#define SUN8I_ADDA_MIC1G_MICBIAS_CTRL_HMICBIAS_MODE     5
+#define SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MIC1AMPEN         3
+#define SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MIC1BOOST         0
+#define SUN8I_ADDA_LADCMIXSC            0x0c
+#define SUN8I_ADDA_LADCMIXSC_MIC1               6
+#define SUN8I_ADDA_LADCMIXSC_MIC2               5
+#define SUN8I_ADDA_LADCMIXSC_PHONE              4
+#define SUN8I_ADDA_LADCMIXSC_PHONEN             3
+#define SUN8I_ADDA_LADCMIXSC_LINEINL            2
+#define SUN8I_ADDA_LADCMIXSC_OMIXRL             1
+#define SUN8I_ADDA_LADCMIXSC_OMIXRR             0
+#define SUN8I_ADDA_RADCMIXSC            0x0d
+#define SUN8I_ADDA_RADCMIXSC_MIC1               6
+#define SUN8I_ADDA_RADCMIXSC_MIC2               5
+#define SUN8I_ADDA_RADCMIXSC_PHONE              4
+#define SUN8I_ADDA_RADCMIXSC_PHONEP             3
+#define SUN8I_ADDA_RADCMIXSC_LINEINR            2
+#define SUN8I_ADDA_RADCMIXSC_OMIXR              1
+#define SUN8I_ADDA_RADCMIXSC_OMIXL              0
+#define SUN8I_ADDA_RES                  0x0e
+#define SUN8I_ADDA_RES_MMICBIAS_SEL             4
+#define SUN8I_ADDA_RES_PA_ANTI_POP_CTRL         0
+#define SUN8I_ADDA_ADC_AP_EN            0x0f
+#define SUN8I_ADDA_ADC_AP_EN_ADCREN             7
+#define SUN8I_ADDA_ADC_AP_EN_ADCLEN             6
+#define SUN8I_ADDA_ADC_AP_EN_ADCG               0
+
+/* Analog control register access bits */
+#define ADDA_PR                 0x0             /* PRCM base + 0x1c0 */
+#define ADDA_PR_RESET                   BIT(28)
+#define ADDA_PR_WRITE                   BIT(24)
+#define ADDA_PR_ADDR_SHIFT              16
+#define ADDA_PR_ADDR_MASK               GENMASK(4, 0)
+#define ADDA_PR_DATA_IN_SHIFT           8
+#define ADDA_PR_DATA_IN_MASK            GENMASK(7, 0)
+#define ADDA_PR_DATA_OUT_SHIFT          0
+#define ADDA_PR_DATA_OUT_MASK           GENMASK(7, 0)
+
+/* regmap access bits */
+static int adda_reg_read(void *context, unsigned int reg, unsigned int *val)
+{
+        void __iomem *base = (void __iomem *)context;
+        u32 tmp;
+
+        /* De-assert reset */
+        writel(readl(base) | ADDA_PR_RESET, base);
+
+        /* Clear write bit */
+        writel(readl(base) & ~ADDA_PR_WRITE, base);
+
+        /* Set register address */
+        tmp = readl(base);
+        tmp &= ~(ADDA_PR_ADDR_MASK << ADDA_PR_ADDR_SHIFT);
+        tmp |= (reg & ADDA_PR_ADDR_MASK) << ADDA_PR_ADDR_SHIFT;
+        writel(tmp, base);
+
+        /* Read back value */
+        *val = readl(base) & ADDA_PR_DATA_OUT_MASK;
+
+        return 0;
+}
+
+static int adda_reg_write(void *context, unsigned int reg, unsigned int val)
+{
+        void __iomem *base = (void __iomem *)context;
+        u32 tmp;
+
+        /* De-assert reset */
+        writel(readl(base) | ADDA_PR_RESET, base);
+
+        /* Set register address */
+        tmp = readl(base);
+        tmp &= ~(ADDA_PR_ADDR_MASK << ADDA_PR_ADDR_SHIFT);
+        tmp |= (reg & ADDA_PR_ADDR_MASK) << ADDA_PR_ADDR_SHIFT;
+        writel(tmp, base);
+
+        /* Set data to write */
+        tmp = readl(base);
+        tmp &= ~(ADDA_PR_DATA_IN_MASK << ADDA_PR_DATA_IN_SHIFT);
+        tmp |= (val & ADDA_PR_DATA_IN_MASK) << ADDA_PR_DATA_IN_SHIFT;
+        writel(tmp, base);
+
+        /* Set write bit to signal a write */
+        writel(readl(base) | ADDA_PR_WRITE, base);
+
+        /* Clear write bit */
+        writel(readl(base) & ~ADDA_PR_WRITE, base);
+
+        return 0;
+}
+
+static const struct regmap_config adda_pr_regmap_cfg = {
+        .name           = "adda-pr",
+        .reg_bits       = 5,
+        .reg_stride     = 1,
+        .val_bits       = 8,
+        .reg_read       = adda_reg_read,
+        .reg_write      = adda_reg_write,
+        .fast_io        = true,
+        .max_register   = 24,
+};
+
+/* mixer controls */
+static const struct snd_kcontrol_new sun8i_codec_mixer_controls[] = {
+        SOC_DAPM_DOUBLE_R("DAC Playback Switch",
+                          SUN8I_ADDA_LOMIXSC,
+                          SUN8I_ADDA_ROMIXSC,
+                          SUN8I_ADDA_LOMIXSC_DACL, 1, 0),
+        SOC_DAPM_DOUBLE_R("DAC Reversed Playback Switch",
+                          SUN8I_ADDA_LOMIXSC,
+                          SUN8I_ADDA_ROMIXSC,
+                          SUN8I_ADDA_LOMIXSC_DACR, 1, 0),
+        SOC_DAPM_DOUBLE_R("Line In Playback Switch",
+                          SUN8I_ADDA_LOMIXSC,
+                          SUN8I_ADDA_ROMIXSC,
+                          SUN8I_ADDA_LOMIXSC_LINEINL, 1, 0),
+        SOC_DAPM_DOUBLE_R("Mic1 Playback Switch",
+                          SUN8I_ADDA_LOMIXSC,
+                          SUN8I_ADDA_ROMIXSC,
+                          SUN8I_ADDA_LOMIXSC_MIC1, 1, 0),
+        SOC_DAPM_DOUBLE_R("Mic2 Playback Switch",
+                          SUN8I_ADDA_LOMIXSC,
+                          SUN8I_ADDA_ROMIXSC,
+                          SUN8I_ADDA_LOMIXSC_MIC2, 1, 0),
+};
+
+/* ADC mixer controls */
+static const struct snd_kcontrol_new sun8i_codec_adc_mixer_controls[] = {
+        SOC_DAPM_DOUBLE_R("Mixer Capture Switch",
+                          SUN8I_ADDA_LADCMIXSC,
+                          SUN8I_ADDA_RADCMIXSC,
+                          SUN8I_ADDA_LADCMIXSC_OMIXRL, 1, 0),
+        SOC_DAPM_DOUBLE_R("Mixer Reversed Capture Switch",
+                          SUN8I_ADDA_LADCMIXSC,
+                          SUN8I_ADDA_RADCMIXSC,
+                          SUN8I_ADDA_LADCMIXSC_OMIXRR, 1, 0),
+        SOC_DAPM_DOUBLE_R("Line In Capture Switch",
+                          SUN8I_ADDA_LADCMIXSC,
+                          SUN8I_ADDA_RADCMIXSC,
+                          SUN8I_ADDA_LADCMIXSC_LINEINL, 1, 0),
+        SOC_DAPM_DOUBLE_R("Mic1 Capture Switch",
+                          SUN8I_ADDA_LADCMIXSC,
+                          SUN8I_ADDA_RADCMIXSC,
+                          SUN8I_ADDA_LADCMIXSC_MIC1, 1, 0),
+        SOC_DAPM_DOUBLE_R("Mic2 Capture Switch",
+                          SUN8I_ADDA_LADCMIXSC,
+                          SUN8I_ADDA_RADCMIXSC,
+                          SUN8I_ADDA_LADCMIXSC_MIC2, 1, 0),
+};
+
+/* volume / mute controls */
+static const DECLARE_TLV_DB_SCALE(sun8i_codec_out_mixer_pregain_scale,
+                                  -450, 150, 0);
+static const DECLARE_TLV_DB_RANGE(sun8i_codec_mic_gain_scale,
+        0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
+        1, 7, TLV_DB_SCALE_ITEM(2400, 300, 0),
+);
+
+static const struct snd_kcontrol_new sun8i_codec_common_controls[] = {
+        /* Mixer pre-gains */
+        SOC_SINGLE_TLV("Line In Playback Volume", SUN8I_ADDA_LINEIN_GCTRL,
+                       SUN8I_ADDA_LINEIN_GCTRL_LINEING,
+                       0x7, 0, sun8i_codec_out_mixer_pregain_scale),
+        SOC_SINGLE_TLV("Mic1 Playback Volume", SUN8I_ADDA_MICIN_GCTRL,
+                       SUN8I_ADDA_MICIN_GCTRL_MIC1G,
+                       0x7, 0, sun8i_codec_out_mixer_pregain_scale),
+        SOC_SINGLE_TLV("Mic2 Playback Volume",
+                       SUN8I_ADDA_MICIN_GCTRL, SUN8I_ADDA_MICIN_GCTRL_MIC2G,
+                       0x7, 0, sun8i_codec_out_mixer_pregain_scale),
+
+        /* Microphone Amp boost gains */
+        SOC_SINGLE_TLV("Mic1 Boost Volume", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
+                       SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MIC1BOOST, 0x7, 0,
+                       sun8i_codec_mic_gain_scale),
+        SOC_SINGLE_TLV("Mic2 Boost Volume", SUN8I_ADDA_MIC2G_CTRL,
+                       SUN8I_ADDA_MIC2G_CTRL_MIC2BOOST, 0x7, 0,
+                       sun8i_codec_mic_gain_scale),
+
+        /* ADC */
+        SOC_SINGLE_TLV("ADC Gain Capture Volume", SUN8I_ADDA_ADC_AP_EN,
+                       SUN8I_ADDA_ADC_AP_EN_ADCG, 0x7, 0,
+                       sun8i_codec_out_mixer_pregain_scale),
+};
+
+static const struct snd_soc_dapm_widget sun8i_codec_common_widgets[] = {
+        /* ADC */
+        SND_SOC_DAPM_ADC("Left ADC", NULL, SUN8I_ADDA_ADC_AP_EN,
+                         SUN8I_ADDA_ADC_AP_EN_ADCLEN, 0),
+        SND_SOC_DAPM_ADC("Right ADC", NULL, SUN8I_ADDA_ADC_AP_EN,
+                         SUN8I_ADDA_ADC_AP_EN_ADCREN, 0),
+
+        /* DAC */
+        SND_SOC_DAPM_DAC("Left DAC", NULL, SUN8I_ADDA_DAC_PA_SRC,
+                         SUN8I_ADDA_DAC_PA_SRC_DACALEN, 0),
+        SND_SOC_DAPM_DAC("Right DAC", NULL, SUN8I_ADDA_DAC_PA_SRC,
+                         SUN8I_ADDA_DAC_PA_SRC_DACAREN, 0),
+        /*
+         * Due to this component and the codec belonging to separate DAPM
+         * contexts, we need to manually link the above widgets to their
+         * stream widgets at the card level.
+         */
+
+        /* Line In */
+        SND_SOC_DAPM_INPUT("LINEIN"),
+
+        /* Microphone inputs */
+        SND_SOC_DAPM_INPUT("MIC1"),
+        SND_SOC_DAPM_INPUT("MIC2"),
+
+        /* Microphone Bias */
+        SND_SOC_DAPM_SUPPLY("MBIAS", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
+                            SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MMICBIASEN,
+                            0, NULL, 0),
+
+        /* Mic input path */
+        SND_SOC_DAPM_PGA("Mic1 Amplifier", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
+                         SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MIC1AMPEN, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Mic2 Amplifier", SUN8I_ADDA_MIC2G_CTRL,
+                         SUN8I_ADDA_MIC2G_CTRL_MIC2AMPEN, 0, NULL, 0),
+
+        /* Mixers */
+        SND_SOC_DAPM_MIXER("Left Mixer", SUN8I_ADDA_DAC_PA_SRC,
+                           SUN8I_ADDA_DAC_PA_SRC_LMIXEN, 0,
+                           sun8i_codec_mixer_controls,
+                           ARRAY_SIZE(sun8i_codec_mixer_controls)),
+        SND_SOC_DAPM_MIXER("Right Mixer", SUN8I_ADDA_DAC_PA_SRC,
+                           SUN8I_ADDA_DAC_PA_SRC_RMIXEN, 0,
+                           sun8i_codec_mixer_controls,
+                           ARRAY_SIZE(sun8i_codec_mixer_controls)),
+        SND_SOC_DAPM_MIXER("Left ADC Mixer", SUN8I_ADDA_ADC_AP_EN,
+                           SUN8I_ADDA_ADC_AP_EN_ADCLEN, 0,
+                           sun8i_codec_adc_mixer_controls,
+                           ARRAY_SIZE(sun8i_codec_adc_mixer_controls)),
+        SND_SOC_DAPM_MIXER("Right ADC Mixer", SUN8I_ADDA_ADC_AP_EN,
+                           SUN8I_ADDA_ADC_AP_EN_ADCREN, 0,
+                           sun8i_codec_adc_mixer_controls,
+                           ARRAY_SIZE(sun8i_codec_adc_mixer_controls)),
+};
+
+static const struct snd_soc_dapm_route sun8i_codec_common_routes[] = {
+        /* Microphone Routes */
+        { "Mic1 Amplifier", NULL, "MIC1"},
+        { "Mic2 Amplifier", NULL, "MIC2"},
+
+        /* Left Mixer Routes */
+        { "Left Mixer", "DAC Playback Switch", "Left DAC" },
+        { "Left Mixer", "DAC Reversed Playback Switch", "Right DAC" },
+        { "Left Mixer", "Line In Playback Switch", "LINEIN" },
+        { "Left Mixer", "Mic1 Playback Switch", "Mic1 Amplifier" },
+        { "Left Mixer", "Mic2 Playback Switch", "Mic2 Amplifier" },
+
+        /* Right Mixer Routes */
+        { "Right Mixer", "DAC Playback Switch", "Right DAC" },
+        { "Right Mixer", "DAC Reversed Playback Switch", "Left DAC" },
+        { "Right Mixer", "Line In Playback Switch", "LINEIN" },
+        { "Right Mixer", "Mic1 Playback Switch", "Mic1 Amplifier" },
+        { "Right Mixer", "Mic2 Playback Switch", "Mic2 Amplifier" },
+
+        /* Left ADC Mixer Routes */
+        { "Left ADC Mixer", "Mixer Capture Switch", "Left Mixer" },
+        { "Left ADC Mixer", "Mixer Reversed Capture Switch", "Right Mixer" },
+        { "Left ADC Mixer", "Line In Capture Switch", "LINEIN" },
+        { "Left ADC Mixer", "Mic1 Capture Switch", "Mic1 Amplifier" },
+        { "Left ADC Mixer", "Mic2 Capture Switch", "Mic2 Amplifier" },
+
+        /* Right ADC Mixer Routes */
+        { "Right ADC Mixer", "Mixer Capture Switch", "Right Mixer" },
+        { "Right ADC Mixer", "Mixer Reversed Capture Switch", "Left Mixer" },
+        { "Right ADC Mixer", "Line In Capture Switch", "LINEIN" },
+        { "Right ADC Mixer", "Mic1 Capture Switch", "Mic1 Amplifier" },
+        { "Right ADC Mixer", "Mic2 Capture Switch", "Mic2 Amplifier" },
+
+        /* ADC Routes */
+        { "Left ADC", NULL, "Left ADC Mixer" },
+        { "Right ADC", NULL, "Right ADC Mixer" },
+};
+
+/* headphone specific controls, widgets, and routes */
+static const DECLARE_TLV_DB_SCALE(sun8i_codec_hp_vol_scale, -6300, 100, 1);
+static const struct snd_kcontrol_new sun8i_codec_headphone_controls[] = {
+        SOC_SINGLE_TLV("Headphone Playback Volume",
+                       SUN8I_ADDA_HP_VOLC,
+                       SUN8I_ADDA_HP_VOLC_HP_VOL, 0x3f, 0,
+                       sun8i_codec_hp_vol_scale),
+        SOC_DOUBLE("Headphone Playback Switch",
+                   SUN8I_ADDA_DAC_PA_SRC,
+                   SUN8I_ADDA_DAC_PA_SRC_LHPPAMUTE,
+                   SUN8I_ADDA_DAC_PA_SRC_RHPPAMUTE, 1, 0),
+};
+
+static const char * const sun8i_codec_hp_src_enum_text[] = {
+        "DAC", "Mixer",
+};
+
+static SOC_ENUM_DOUBLE_DECL(sun8i_codec_hp_src_enum,
+                            SUN8I_ADDA_DAC_PA_SRC,
+                            SUN8I_ADDA_DAC_PA_SRC_LHPIS,
+                            SUN8I_ADDA_DAC_PA_SRC_RHPIS,
+                            sun8i_codec_hp_src_enum_text);
+
+static const struct snd_kcontrol_new sun8i_codec_hp_src[] = {
+        SOC_DAPM_ENUM("Headphone Source Playback Route",
+                      sun8i_codec_hp_src_enum),
+};
+
+static const struct snd_soc_dapm_widget sun8i_codec_headphone_widgets[] = {
+        SND_SOC_DAPM_MUX("Headphone Source Playback Route",
+                         SND_SOC_NOPM, 0, 0, sun8i_codec_hp_src),
+        SND_SOC_DAPM_OUT_DRV("Headphone Amp", SUN8I_ADDA_PAEN_HP_CTRL,
+                             SUN8I_ADDA_PAEN_HP_CTRL_HPPAEN, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("HPCOM Protection", SUN8I_ADDA_PAEN_HP_CTRL,
+                            SUN8I_ADDA_PAEN_HP_CTRL_COMPTEN, 0, NULL, 0),
+        SND_SOC_DAPM_REG(snd_soc_dapm_supply, "HPCOM", SUN8I_ADDA_PAEN_HP_CTRL,
+                         SUN8I_ADDA_PAEN_HP_CTRL_HPCOM_FC, 0x3, 0x3, 0),
+        SND_SOC_DAPM_OUTPUT("HP"),
+};
+
+static const struct snd_soc_dapm_route sun8i_codec_headphone_routes[] = {
+        { "Headphone Source Playback Route", "DAC", "Left DAC" },
+        { "Headphone Source Playback Route", "DAC", "Right DAC" },
+        { "Headphone Source Playback Route", "Mixer", "Left Mixer" },
+        { "Headphone Source Playback Route", "Mixer", "Right Mixer" },
+        { "Headphone Amp", NULL, "Headphone Source Playback Route" },
+        { "HPCOM", NULL, "HPCOM Protection" },
+        { "HP", NULL, "Headphone Amp" },
+};
+
+static int sun8i_codec_add_headphone(struct snd_soc_component *cmpnt)
+{
+        struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
+        struct device *dev = cmpnt->dev;
+        int ret;
+
+        ret = snd_soc_add_component_controls(cmpnt,
+                                             sun8i_codec_headphone_controls,
+                                             ARRAY_SIZE(sun8i_codec_headphone_controls));
+        if (ret) {
+                dev_err(dev, "Failed to add Headphone controls: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_dapm_new_controls(dapm, sun8i_codec_headphone_widgets,
+                                        ARRAY_SIZE(sun8i_codec_headphone_widgets));
+        if (ret) {
+                dev_err(dev, "Failed to add Headphone DAPM widgets: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_dapm_add_routes(dapm, sun8i_codec_headphone_routes,
+                                      ARRAY_SIZE(sun8i_codec_headphone_routes));
+        if (ret) {
+                dev_err(dev, "Failed to add Headphone DAPM routes: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+/* hmic specific widget */
+static const struct snd_soc_dapm_widget sun8i_codec_hmic_widgets[] = {
+        SND_SOC_DAPM_SUPPLY("HBIAS", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
+                            SUN8I_ADDA_MIC1G_MICBIAS_CTRL_HMICBIASEN,
+                            0, NULL, 0),
+};
+
+static int sun8i_codec_add_hmic(struct snd_soc_component *cmpnt)
+{
+        struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
+        struct device *dev = cmpnt->dev;
+        int ret;
+
+        ret = snd_soc_dapm_new_controls(dapm, sun8i_codec_hmic_widgets,
+                                        ARRAY_SIZE(sun8i_codec_hmic_widgets));
+        if (ret)
+                dev_err(dev, "Failed to add Mic3 DAPM widgets: %d\n", ret);
+
+        return ret;
+}
+
+/* line out specific controls, widgets and routes */
+static const DECLARE_TLV_DB_RANGE(sun8i_codec_lineout_vol_scale,
+        0, 1, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 1),
+        2, 31, TLV_DB_SCALE_ITEM(-4350, 150, 0),
+);
+static const struct snd_kcontrol_new sun8i_codec_lineout_controls[] = {
+        SOC_SINGLE_TLV("Line Out Playback Volume",
+                       SUN8I_ADDA_PHONE_GAIN_CTRL,
+                       SUN8I_ADDA_PHONE_GAIN_CTRL_LINEOUT_VOL, 0x1f, 0,
+                       sun8i_codec_lineout_vol_scale),
+        SOC_DOUBLE("Line Out Playback Switch",
+                   SUN8I_ADDA_MIC2G_CTRL,
+                   SUN8I_ADDA_MIC2G_CTRL_LINEOUTLEN,
+                   SUN8I_ADDA_MIC2G_CTRL_LINEOUTREN, 1, 0),
+};
+
+static const char * const sun8i_codec_lineout_src_enum_text[] = {
+        "Stereo", "Mono Differential",
+};
+
+static SOC_ENUM_DOUBLE_DECL(sun8i_codec_lineout_src_enum,
+                            SUN8I_ADDA_MIC2G_CTRL,
+                            SUN8I_ADDA_MIC2G_CTRL_LINEOUTLSRC,
+                            SUN8I_ADDA_MIC2G_CTRL_LINEOUTRSRC,
+                            sun8i_codec_lineout_src_enum_text);
+
+static const struct snd_kcontrol_new sun8i_codec_lineout_src[] = {
+        SOC_DAPM_ENUM("Line Out Source Playback Route",
+                      sun8i_codec_lineout_src_enum),
+};
+
+static const struct snd_soc_dapm_widget sun8i_codec_lineout_widgets[] = {
+        SND_SOC_DAPM_MUX("Line Out Source Playback Route",
+                         SND_SOC_NOPM, 0, 0, sun8i_codec_lineout_src),
+        /* It is unclear if this is a buffer or gate, model it as a supply */
+        SND_SOC_DAPM_SUPPLY("Line Out Enable", SUN8I_ADDA_PAEN_HP_CTRL,
+                            SUN8I_ADDA_PAEN_HP_CTRL_LINEOUTEN, 0, NULL, 0),
+        SND_SOC_DAPM_OUTPUT("LINEOUT"),
+};
+
+static const struct snd_soc_dapm_route sun8i_codec_lineout_routes[] = {
+        { "Line Out Source Playback Route", "Stereo", "Left Mixer" },
+        { "Line Out Source Playback Route", "Stereo", "Right Mixer" },
+        { "Line Out Source Playback Route", "Mono Differential", "Left Mixer" },
+        { "Line Out Source Playback Route", "Mono Differential", "Right Mixer" },
+        { "LINEOUT", NULL, "Line Out Source Playback Route" },
+        { "LINEOUT", NULL, "Line Out Enable", },
+};
+
+static int sun8i_codec_add_lineout(struct snd_soc_component *cmpnt)
+{
+        struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
+        struct device *dev = cmpnt->dev;
+        int ret;
+
+        ret = snd_soc_add_component_controls(cmpnt,
+                                             sun8i_codec_lineout_controls,
+                                             ARRAY_SIZE(sun8i_codec_lineout_controls));
+        if (ret) {
+                dev_err(dev, "Failed to add Line Out controls: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_dapm_new_controls(dapm, sun8i_codec_lineout_widgets,
+                                        ARRAY_SIZE(sun8i_codec_lineout_widgets));
+        if (ret) {
+                dev_err(dev, "Failed to add Line Out DAPM widgets: %d\n", ret);
+                return ret;
+        }
+
+        ret = snd_soc_dapm_add_routes(dapm, sun8i_codec_lineout_routes,
+                                      ARRAY_SIZE(sun8i_codec_lineout_routes));
+        if (ret) {
+                dev_err(dev, "Failed to add Line Out DAPM routes: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+struct sun8i_codec_analog_quirks {
+        bool has_headphone;
+        bool has_hmic;
+        bool has_lineout;
+};
+
+static const struct sun8i_codec_analog_quirks sun8i_a23_quirks = {
+        .has_headphone  = true,
+        .has_hmic       = true,
+};
+
+static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = {
+        .has_lineout    = true,
+};
+
+static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt)
+{
+        struct device *dev = cmpnt->dev;
+        const struct sun8i_codec_analog_quirks *quirks;
+        int ret;
+
+        /*
+         * This would never return NULL unless someone directly registers a
+         * platform device matching this driver's name, without specifying a
+         * device tree node.
+         */
+        quirks = of_device_get_match_data(dev);
+
+        /* Add controls, widgets, and routes for individual features */
+
+        if (quirks->has_headphone) {
+                ret = sun8i_codec_add_headphone(cmpnt);
+                if (ret)
+                        return ret;
+        }
+
+        if (quirks->has_hmic) {
+                ret = sun8i_codec_add_hmic(cmpnt);
+                if (ret)
+                        return ret;
+        }
+
+        if (quirks->has_lineout) {
+                ret = sun8i_codec_add_lineout(cmpnt);
+                if (ret)
+                        return ret;
+        }
+
+        return 0;
+}
+
+static const struct snd_soc_component_driver sun8i_codec_analog_cmpnt_drv = {
+        .controls               = sun8i_codec_common_controls,
+        .num_controls           = ARRAY_SIZE(sun8i_codec_common_controls),
+        .dapm_widgets           = sun8i_codec_common_widgets,
+        .num_dapm_widgets       = ARRAY_SIZE(sun8i_codec_common_widgets),
+        .dapm_routes            = sun8i_codec_common_routes,
+        .num_dapm_routes        = ARRAY_SIZE(sun8i_codec_common_routes),
+        .probe                  = sun8i_codec_analog_cmpnt_probe,
+};
+
+static const struct of_device_id sun8i_codec_analog_of_match[] = {
+        {
+                .compatible = "allwinner,sun8i-a23-codec-analog",
+                .data = &sun8i_a23_quirks,
+        },
+        {
+                .compatible = "allwinner,sun8i-h3-codec-analog",
+                .data = &sun8i_h3_quirks,
+        },
+        {}
+};
+MODULE_DEVICE_TABLE(of, sun8i_codec_analog_of_match);
+
+static int sun8i_codec_analog_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+        struct regmap *regmap;
+        void __iomem *base;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(base)) {
+                dev_err(&pdev->dev, "Failed to map the registers\n");
+                return PTR_ERR(base);
+        }
+
+        regmap = devm_regmap_init(&pdev->dev, NULL, base, &adda_pr_regmap_cfg);
+        if (IS_ERR(regmap)) {
+                dev_err(&pdev->dev, "Failed to create regmap\n");
+                return PTR_ERR(regmap);
+        }
+
+        return devm_snd_soc_register_component(&pdev->dev,
+                                               &sun8i_codec_analog_cmpnt_drv,
+                                               NULL, 0);
+}
+
+static struct platform_driver sun8i_codec_analog_driver = {
+        .driver = {
+                .name = "sun8i-codec-analog",
+                .of_match_table = sun8i_codec_analog_of_match,
+        },
+        .probe = sun8i_codec_analog_probe,
+};
+module_platform_driver(sun8i_codec_analog_driver);
+
+MODULE_DESCRIPTION("Allwinner internal codec analog controls driver");
+MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:sun8i-codec-analog");
diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c
index deb597f7c302..eead6e7f205b 100644
--- a/sound/soc/tegra/tegra_alc5632.c
+++ b/sound/soc/tegra/tegra_alc5632.c
@@ -65,7 +65,7 @@ static int tegra_alc5632_asoc_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static struct snd_soc_ops tegra_alc5632_asoc_ops = {
+static const struct snd_soc_ops tegra_alc5632_asoc_ops = {
         .hw_params = tegra_alc5632_asoc_hw_params,
 };
 
diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c
index 902da36581d1..a403db6d563e 100644
--- a/sound/soc/tegra/tegra_max98090.c
+++ b/sound/soc/tegra/tegra_max98090.c
@@ -93,7 +93,7 @@ static int tegra_max98090_asoc_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static struct snd_soc_ops tegra_max98090_ops = {
+static const struct snd_soc_ops tegra_max98090_ops = {
         .hw_params = tegra_max98090_asoc_hw_params,
 };
 
diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c
index e5ef4e9c4ac5..25b9fc03ba62 100644
--- a/sound/soc/tegra/tegra_rt5640.c
+++ b/sound/soc/tegra/tegra_rt5640.c
@@ -76,7 +76,7 @@ static int tegra_rt5640_asoc_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static struct snd_soc_ops tegra_rt5640_ops = {
+static const struct snd_soc_ops tegra_rt5640_ops = {
         .hw_params = tegra_rt5640_asoc_hw_params,
 };
 
diff --git a/sound/soc/tegra/tegra_rt5677.c b/sound/soc/tegra/tegra_rt5677.c
index 1470873ecde6..ebf58d0e0f10 100644
--- a/sound/soc/tegra/tegra_rt5677.c
+++ b/sound/soc/tegra/tegra_rt5677.c
@@ -93,7 +93,7 @@ static int tegra_rt5677_event_hp(struct snd_soc_dapm_widget *w,
         return 0;
 }
 
-static struct snd_soc_ops tegra_rt5677_ops = {
+static const struct snd_soc_ops tegra_rt5677_ops = {
         .hw_params = tegra_rt5677_asoc_hw_params,
 };
 
diff --git a/sound/soc/tegra/tegra_sgtl5000.c b/sound/soc/tegra/tegra_sgtl5000.c
index 1e76869dd488..4bbab098f50b 100644
--- a/sound/soc/tegra/tegra_sgtl5000.c
+++ b/sound/soc/tegra/tegra_sgtl5000.c
@@ -82,7 +82,7 @@ static int tegra_sgtl5000_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static struct snd_soc_ops tegra_sgtl5000_ops = {
+static const struct snd_soc_ops tegra_sgtl5000_ops = {
         .hw_params = tegra_sgtl5000_hw_params,
 };
 
diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c
index f0cd01dbfc38..bdedd1028569 100644
--- a/sound/soc/tegra/tegra_wm8753.c
+++ b/sound/soc/tegra/tegra_wm8753.c
@@ -89,7 +89,7 @@ static int tegra_wm8753_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static struct snd_soc_ops tegra_wm8753_ops = {
+static const struct snd_soc_ops tegra_wm8753_ops = {
         .hw_params = tegra_wm8753_hw_params,
 };
 
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index e485278e027a..2013e9c4bba0 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -96,7 +96,7 @@ static int tegra_wm8903_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static struct snd_soc_ops tegra_wm8903_ops = {
+static const struct snd_soc_ops tegra_wm8903_ops = {
         .hw_params = tegra_wm8903_hw_params,
 };
 
diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c
index 2cea203c4f5f..870f84ab5005 100644
--- a/sound/soc/tegra/trimslice.c
+++ b/sound/soc/tegra/trimslice.c
@@ -74,7 +74,7 @@ static int trimslice_asoc_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static struct snd_soc_ops trimslice_asoc_ops = {
+static const struct snd_soc_ops trimslice_asoc_ops = {
         .hw_params = trimslice_asoc_hw_params,
 };
 
diff --git a/sound/soc/zte/Kconfig b/sound/soc/zte/Kconfig
index c47eb25e441f..6d8a90d36315 100644
--- a/sound/soc/zte/Kconfig
+++ b/sound/soc/zte/Kconfig
@@ -1,17 +1,17 @@
-config ZX296702_SPDIF
-        tristate "ZX296702 spdif"
-        depends on SOC_ZX296702 || COMPILE_TEST
+config ZX_SPDIF
+        tristate "ZTE ZX SPDIF Driver Support"
+        depends on ARCH_ZX || COMPILE_TEST
         depends on COMMON_CLK
         select SND_SOC_GENERIC_DMAENGINE_PCM
         help
           Say Y or M if you want to add support for codecs attached to the
-          zx296702 spdif interface
+          ZTE ZX SPDIF interface
 
-config ZX296702_I2S
-        tristate "ZX296702 i2s"
-        depends on SOC_ZX296702 || COMPILE_TEST
+config ZX_I2S
+        tristate "ZTE ZX I2S Driver Support"
+        depends on ARCH_ZX || COMPILE_TEST
         depends on COMMON_CLK
         select SND_SOC_GENERIC_DMAENGINE_PCM
         help
           Say Y or M if you want to add support for codecs attached to the
-          zx296702 i2s interface
+          ZTE ZX I2S interface
diff --git a/sound/soc/zte/Makefile b/sound/soc/zte/Makefile
index 254ed2c8c1a0..77768f5fd10c 100644
--- a/sound/soc/zte/Makefile
+++ b/sound/soc/zte/Makefile
@@ -1,2 +1,2 @@
-obj-$(CONFIG_ZX296702_SPDIF)    += zx296702-spdif.o
-obj-$(CONFIG_ZX296702_I2S)      += zx296702-i2s.o
+obj-$(CONFIG_ZX_SPDIF)  += zx-spdif.o
+obj-$(CONFIG_ZX_I2S)    += zx-i2s.o
diff --git a/sound/soc/zte/zx296702-i2s.c b/sound/soc/zte/zx-i2s.c
index 1cad93dc1fcf..1cad93dc1fcf 100644
--- a/sound/soc/zte/zx296702-i2s.c
+++ b/sound/soc/zte/zx-i2s.c
diff --git a/sound/soc/zte/zx296702-spdif.c b/sound/soc/zte/zx-spdif.c
index 26265ce4caca..9fa6463ce5d7 100644
--- a/sound/soc/zte/zx296702-spdif.c
+++ b/sound/soc/zte/zx-spdif.c
@@ -71,7 +71,7 @@
 #define ZX_VALID_RIGHT_TRACK            (2 << 0)
 #define ZX_VALID_TRACK_MASK             (3 << 0)
 
-#define ZX_SPDIF_CLK_RAT                (4 * 32)
+#define ZX_SPDIF_CLK_RAT                (2 * 32)
 
 struct zx_spdif_info {
         struct snd_dmaengine_dai_dma_data       dma_data;
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 0190cb6332f2..52063b262667 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -304,7 +304,7 @@ struct snd_dbri {
         spinlock_t lock;
 
         struct dbri_dma *dma;   /* Pointer to our DMA block */
-        u32 dma_dvma;           /* DBRI visible DMA address */
+        dma_addr_t dma_dvma;    /* DBRI visible DMA address */
 
         void __iomem *regs;     /* dbri HW regs */
         int dbri_irqp;          /* intr queue pointer */
@@ -657,12 +657,14 @@ static void dbri_cmdwait(struct snd_dbri *dbri)
  */
 static s32 *dbri_cmdlock(struct snd_dbri *dbri, int len)
 {
+        u32 dvma_addr = (u32)dbri->dma_dvma;
+
         /* Space for 2 WAIT cmds (replaced later by 1 JUMP cmd) */
         len += 2;
         spin_lock(&dbri->cmdlock);
         if (dbri->cmdptr - dbri->dma->cmd + len < DBRI_NO_CMDS - 2)
                 return dbri->cmdptr + 2;
-        else if (len < sbus_readl(dbri->regs + REG8) - dbri->dma_dvma)
+        else if (len < sbus_readl(dbri->regs + REG8) - dvma_addr)
                 return dbri->dma->cmd;
         else
                 printk(KERN_ERR "DBRI: no space for commands.");
@@ -680,6 +682,7 @@ static s32 *dbri_cmdlock(struct snd_dbri *dbri, int len)
  */
 static void dbri_cmdsend(struct snd_dbri *dbri, s32 *cmd, int len)
 {
+        u32 dvma_addr = (u32)dbri->dma_dvma;
         s32 tmp, addr;
         static int wait_id = 0;
 
@@ -689,7 +692,7 @@ static void dbri_cmdsend(struct snd_dbri *dbri, s32 *cmd, int len)
         *(cmd+1) = DBRI_CMD(D_WAIT, 1, wait_id);
 
         /* Replace the last command with JUMP */
-        addr = dbri->dma_dvma + (cmd - len - dbri->dma->cmd) * sizeof(s32);
+        addr = dvma_addr + (cmd - len - dbri->dma->cmd) * sizeof(s32);
         *(dbri->cmdptr+1) = addr;
         *(dbri->cmdptr) = DBRI_CMD(D_JUMP, 0, 0);
 
@@ -747,6 +750,7 @@ static void dbri_reset(struct snd_dbri *dbri)
 /* Lock must not be held before calling this */
 static void dbri_initialize(struct snd_dbri *dbri)
 {
+        u32 dvma_addr = (u32)dbri->dma_dvma;
         s32 *cmd;
         u32 dma_addr;
         unsigned long flags;
@@ -764,7 +768,7 @@ static void dbri_initialize(struct snd_dbri *dbri)
         /*
          * Initialize the interrupt ring buffer.
          */
-        dma_addr = dbri->dma_dvma + dbri_dma_off(intr, 0);
+        dma_addr = dvma_addr + dbri_dma_off(intr, 0);
         dbri->dma->intr[0] = dma_addr;
         dbri->dbri_irqp = 1;
         /*
@@ -778,7 +782,7 @@ static void dbri_initialize(struct snd_dbri *dbri)
         dbri->cmdptr = cmd;
         *(cmd++) = DBRI_CMD(D_WAIT, 1, 0);
         *(cmd++) = DBRI_CMD(D_WAIT, 1, 0);
-        dma_addr = dbri->dma_dvma + dbri_dma_off(cmd, 0);
+        dma_addr = dvma_addr + dbri_dma_off(cmd, 0);
         sbus_writel(dma_addr, dbri->regs + REG8);
         spin_unlock(&dbri->cmdlock);
 
@@ -1077,6 +1081,7 @@ static void recv_fixed(struct snd_dbri *dbri, int pipe, volatile __u32 *ptr)
 static int setup_descs(struct snd_dbri *dbri, int streamno, unsigned int period)
 {
         struct dbri_streaminfo *info = &dbri->stream_info[streamno];
+        u32 dvma_addr = (u32)dbri->dma_dvma;
         __u32 dvma_buffer;
         int desc;
         int len;
@@ -1177,7 +1182,7 @@ static int setup_descs(struct snd_dbri *dbri, int streamno, unsigned int period)
                 else {
                         dbri->next_desc[last_desc] = desc;
                         dbri->dma->desc[last_desc].nda =
-                            dbri->dma_dvma + dbri_dma_off(desc, desc);
+                            dvma_addr + dbri_dma_off(desc, desc);
                 }
 
                 last_desc = desc;
@@ -1192,7 +1197,7 @@ static int setup_descs(struct snd_dbri *dbri, int streamno, unsigned int period)
         }
 
         dbri->dma->desc[last_desc].nda =
-            dbri->dma_dvma + dbri_dma_off(desc, first_desc);
+            dvma_addr + dbri_dma_off(desc, first_desc);
         dbri->next_desc[last_desc] = first_desc;
         dbri->pipes[info->pipe].first_desc = first_desc;
         dbri->pipes[info->pipe].desc = first_desc;
@@ -1697,6 +1702,7 @@ interrupts are disabled.
 static void xmit_descs(struct snd_dbri *dbri)
 {
         struct dbri_streaminfo *info;
+        u32 dvma_addr;
         s32 *cmd;
         unsigned long flags;
         int first_td;
@@ -1704,6 +1710,7 @@ static void xmit_descs(struct snd_dbri *dbri)
         if (dbri == NULL)
                 return;         /* Disabled */
 
+        dvma_addr = (u32)dbri->dma_dvma;
         info = &dbri->stream_info[DBRI_REC];
         spin_lock_irqsave(&dbri->lock, flags);
 
@@ -1718,7 +1725,7 @@ static void xmit_descs(struct snd_dbri *dbri)
                         *(cmd++) = DBRI_CMD(D_SDP, 0,
                                             dbri->pipes[info->pipe].sdp
                                             | D_SDP_P | D_SDP_EVERY | D_SDP_C);
-                        *(cmd++) = dbri->dma_dvma +
+                        *(cmd++) = dvma_addr +
                                    dbri_dma_off(desc, first_td);
                         dbri_cmdsend(dbri, cmd, 2);
 
@@ -1740,7 +1747,7 @@ static void xmit_descs(struct snd_dbri *dbri)
                         *(cmd++) = DBRI_CMD(D_SDP, 0,
                                             dbri->pipes[info->pipe].sdp
                                             | D_SDP_P | D_SDP_EVERY | D_SDP_C);
-                        *(cmd++) = dbri->dma_dvma +
+                        *(cmd++) = dvma_addr +
                                    dbri_dma_off(desc, first_td);
                         dbri_cmdsend(dbri, cmd, 2);
 
@@ -2539,7 +2546,7 @@ static int snd_dbri_create(struct snd_card *card,
         if (!dbri->dma)
                 return -ENOMEM;
 
-        dprintk(D_GEN, "DMA Cmd Block 0x%p (0x%08x)\n",
+        dprintk(D_GEN, "DMA Cmd Block 0x%p (%pad)\n",
                 dbri->dma, dbri->dma_dvma);
 
         /* Map the registers into memory. */
diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c
index b63a31be1218..5e0dea2cdc01 100644
--- a/tools/objtool/arch/x86/decode.c
+++ b/tools/objtool/arch/x86/decode.c
@@ -99,7 +99,7 @@ int arch_decode_instruction(struct elf *elf, struct section *sec,
                 break;
 
         case 0x8d:
-                if (insn.rex_prefix.bytes &&
+                if (insn.rex_prefix.nbytes &&
                     insn.rex_prefix.bytes[0] == 0x48 &&
                     insn.modrm.nbytes && insn.modrm.bytes[0] == 0x2c &&
                     insn.sib.nbytes && insn.sib.bytes[0] == 0x24)
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 4ffff7be9299..a53fef0c673b 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1337,8 +1337,8 @@ static int hist_browser__show_hierarchy_entry(struct hist_browser *browser,
                 }
 
                 if (first) {
-                        ui_browser__printf(&browser->b, "%c", folded_sign);
-                        width--;
+                        ui_browser__printf(&browser->b, "%c ", folded_sign);
+                        width -= 2;
                         first = false;
                 } else {
                         ui_browser__printf(&browser->b, "  ");
@@ -1361,8 +1361,10 @@ static int hist_browser__show_hierarchy_entry(struct hist_browser *browser,
                 width -= hpp.buf - s;
         }
 
-        ui_browser__write_nstring(&browser->b, "", hierarchy_indent);
-        width -= hierarchy_indent;
+        if (!first) {
+                ui_browser__write_nstring(&browser->b, "", hierarchy_indent);
+                width -= hierarchy_indent;
+        }
 
         if (column >= browser->b.horiz_scroll) {
                 char s[2048];
@@ -1381,7 +1383,13 @@ static int hist_browser__show_hierarchy_entry(struct hist_browser *browser,
                 }
 
                 perf_hpp_list__for_each_format(entry->hpp_list, fmt) {
-                        ui_browser__write_nstring(&browser->b, "", 2);
+                        if (first) {
+                                ui_browser__printf(&browser->b, "%c ", folded_sign);
+                                first = false;
+                        } else {
+                                ui_browser__write_nstring(&browser->b, "", 2);
+                        }
+
                         width -= 2;
 
                         /*
@@ -1555,10 +1563,11 @@ static int hists_browser__scnprintf_hierarchy_headers(struct hist_browser *brows
         int indent = hists->nr_hpp_node - 2;
         bool first_node, first_col;
 
-        ret = scnprintf(buf, size, " ");
+        ret = scnprintf(buf, size, "  ");
         if (advance_hpp_check(&dummy_hpp, ret))
                 return ret;
 
+        first_node = true;
         /* the first hpp_list_node is for overhead columns */
         fmt_node = list_first_entry(&hists->hpp_formats,
                                     struct perf_hpp_list_node, list);
@@ -1573,12 +1582,16 @@ static int hists_browser__scnprintf_hierarchy_headers(struct hist_browser *brows
                 ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, "  ");
                 if (advance_hpp_check(&dummy_hpp, ret))
                         break;
+
+                first_node = false;
         }
 
-        ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, "%*s",
-                        indent * HIERARCHY_INDENT, "");
-        if (advance_hpp_check(&dummy_hpp, ret))
-                return ret;
+        if (!first_node) {
+                ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, "%*s",
+                                indent * HIERARCHY_INDENT, "");
+                if (advance_hpp_check(&dummy_hpp, ret))
+                        return ret;
+        }
 
         first_node = true;
         list_for_each_entry_continue(fmt_node, &hists->hpp_formats, list) {
@@ -2076,8 +2089,21 @@ void hist_browser__init(struct hist_browser *browser,
         browser->b.use_navkeypressed    = true;
         browser->show_headers           = symbol_conf.show_hist_headers;
 
-        hists__for_each_format(hists, fmt)
+        if (symbol_conf.report_hierarchy) {
+                struct perf_hpp_list_node *fmt_node;
+
+                /* count overhead columns (in the first node) */
+                fmt_node = list_first_entry(&hists->hpp_formats,
+                                            struct perf_hpp_list_node, list);
+                perf_hpp_list__for_each_format(&fmt_node->hpp, fmt)
+                        ++browser->b.columns;
+
+                /* add a single column for whole hierarchy sort keys*/
                 ++browser->b.columns;
+        } else {
+                hists__for_each_format(hists, fmt)
+                        ++browser->b.columns;
+        }
 
         hists__reset_column_width(hists);
 }
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index b02992efb513..a69f027368ef 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -1600,18 +1600,18 @@ static void hists__hierarchy_output_resort(struct hists *hists,
                 if (prog)
                         ui_progress__update(prog, 1);
 
+                hists->nr_entries++;
+                if (!he->filtered) {
+                        hists->nr_non_filtered_entries++;
+                        hists__calc_col_len(hists, he);
+                }
+
                 if (!he->leaf) {
                         hists__hierarchy_output_resort(hists, prog,
                                                        &he->hroot_in,
                                                        &he->hroot_out,
                                                        min_callchain_hits,
                                                        use_callchain);
-                        hists->nr_entries++;
-                        if (!he->filtered) {
-                                hists->nr_non_filtered_entries++;
-                                hists__calc_col_len(hists, he);
-                        }
-
                         continue;
                 }
 
diff --git a/tools/power/acpi/Makefile.config b/tools/power/acpi/Makefile.config
index a538ff44b108..a1883bbb0144 100644
--- a/tools/power/acpi/Makefile.config
+++ b/tools/power/acpi/Makefile.config
@@ -8,18 +8,19 @@
 # as published by the Free Software Foundation; version 2
 # of the License.
 
-include ../../../../scripts/Makefile.include
-
-OUTPUT=./
-ifeq ("$(origin O)", "command line")
-        OUTPUT := $(O)/
+ifeq ($(srctree),)
+srctree := $(patsubst %/,%,$(dir $(shell pwd)))
+srctree := $(patsubst %/,%,$(dir $(srctree)))
+#$(info Determined 'srctree' to be $(srctree))
 endif
 
-ifneq ($(OUTPUT),)
-# check that the output directory actually exists
-OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)
-$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
+include $(srctree)/../../scripts/Makefile.include
+
+OUTPUT=$(srctree)/
+ifeq ("$(origin O)", "command line")
+        OUTPUT := $(O)/power/acpi/
 endif
+#$(info Determined 'OUTPUT' to be $(OUTPUT))
 
 # --- CONFIGURATION BEGIN ---
 
@@ -70,8 +71,8 @@ WARNINGS := -Wall
 WARNINGS += $(call cc-supports,-Wstrict-prototypes)
 WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
 
-KERNEL_INCLUDE := ../../../include
-ACPICA_INCLUDE := ../../../drivers/acpi/acpica
+KERNEL_INCLUDE := $(OUTPUT)include
+ACPICA_INCLUDE := $(srctree)/../../../drivers/acpi/acpica
 CFLAGS += -D_LINUX -I$(KERNEL_INCLUDE) -I$(ACPICA_INCLUDE)
 CFLAGS += $(WARNINGS)
 
diff --git a/tools/power/acpi/Makefile.rules b/tools/power/acpi/Makefile.rules
index ec87a9e562c0..373738338f51 100644
--- a/tools/power/acpi/Makefile.rules
+++ b/tools/power/acpi/Makefile.rules
@@ -8,28 +8,42 @@
 # as published by the Free Software Foundation; version 2
 # of the License.
 
-$(OUTPUT)$(TOOL): $(TOOL_OBJS) FORCE
-        $(ECHO) "  LD      " $@
-        $(QUIET) $(LD) $(CFLAGS) $(LDFLAGS) $(TOOL_OBJS) -L$(OUTPUT) -o $@
+objdir := $(OUTPUT)tools/$(TOOL)/
+toolobjs := $(addprefix $(objdir),$(TOOL_OBJS))
+$(OUTPUT)$(TOOL): $(toolobjs) FORCE
+        $(ECHO) "  LD      " $(subst $(OUTPUT),,$@)
+        $(QUIET) $(LD) $(CFLAGS) $(LDFLAGS) $(toolobjs) -L$(OUTPUT) -o $@
+        $(ECHO) "  STRIP   " $(subst $(OUTPUT),,$@)
         $(QUIET) $(STRIPCMD) $@
 
-$(OUTPUT)%.o: %.c
-        $(ECHO) "  CC      " $@
+$(KERNEL_INCLUDE):
+        $(ECHO) "  MKDIR   " $(subst $(OUTPUT),,$@)
+        $(QUIET) mkdir -p $(KERNEL_INCLUDE)
+        $(ECHO) "  CP      " $(subst $(OUTPUT),,$@)
+        $(QUIET) cp -rf $(srctree)/../../../include/acpi $(KERNEL_INCLUDE)/
+
+$(objdir)%.o: %.c $(KERNEL_INCLUDE)
+        $(ECHO) "  CC      " $(subst $(OUTPUT),,$@)
         $(QUIET) $(CC) -c $(CFLAGS) -o $@ $<
 
 all: $(OUTPUT)$(TOOL)
 clean:
-        -find $(OUTPUT) \( -not -type d \) \
-        -and \( -name '*~' -o -name '*.[oas]' \) \
-        -type f -print \
-         | xargs rm -f
-        -rm -f $(OUTPUT)$(TOOL)
+        $(ECHO) "  RMOBJ   " $(subst $(OUTPUT),,$(objdir))
+        $(QUIET) find $(objdir) \( -not -type d \)\
+                 -and \( -name '*~' -o -name '*.[oas]' \)\
+                 -type f -print | xargs rm -f
+        $(ECHO) "  RM      " $(TOOL)
+        $(QUIET) rm -f $(OUTPUT)$(TOOL)
+        $(ECHO) "  RMINC   " $(subst $(OUTPUT),,$(KERNEL_INCLUDE))
+        $(QUIET) rm -rf $(KERNEL_INCLUDE)
 
 install-tools:
-        $(INSTALL) -d $(DESTDIR)${sbindir}
-        $(INSTALL_PROGRAM) $(OUTPUT)$(TOOL) $(DESTDIR)${sbindir}
+        $(ECHO) "  INST    " $(TOOL)
+        $(QUIET) $(INSTALL) -d $(DESTDIR)$(sbindir)
+        $(QUIET) $(INSTALL_PROGRAM) $(OUTPUT)$(TOOL) $(DESTDIR)$(sbindir)
 uninstall-tools:
-        - rm -f $(DESTDIR)${sbindir}/$(TOOL)
+        $(ECHO) "  UNINST  " $(TOOL)
+        $(QUIET) rm -f $(DESTDIR)$(sbindir)/$(TOOL)
 
 install: all install-tools $(EXTRA_INSTALL)
 uninstall: uninstall-tools $(EXTRA_UNINSTALL)
diff --git a/tools/power/acpi/tools/acpidbg/Makefile b/tools/power/acpi/tools/acpidbg/Makefile
index 352df4b41ae9..f2d06e773eb4 100644
--- a/tools/power/acpi/tools/acpidbg/Makefile
+++ b/tools/power/acpi/tools/acpidbg/Makefile
@@ -17,9 +17,7 @@ vpath %.c \
         ../../os_specific/service_layers\
         .
 CFLAGS += -DACPI_APPLICATION -DACPI_SINGLE_THREAD -DACPI_DEBUGGER\
-        -I.\
-        -I../../../../../drivers/acpi/acpica\
-        -I../../../../../include
+        -I.
 LDFLAGS += -lpthread
 TOOL_OBJS = \
         acpidbg.o
diff --git a/tools/power/acpi/tools/acpidbg/acpidbg.c b/tools/power/acpi/tools/acpidbg/acpidbg.c
index a88ac45b7756..4308362d7068 100644
--- a/tools/power/acpi/tools/acpidbg/acpidbg.c
+++ b/tools/power/acpi/tools/acpidbg/acpidbg.c
@@ -12,10 +12,16 @@
 #include <acpi/acpi.h>
 
 /* Headers not included by include/acpi/platform/aclinux.h */
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <error.h>
 #include <stdbool.h>
 #include <fcntl.h>
 #include <assert.h>
-#include <linux/circ_buf.h>
+#include <sys/select.h>
+#include "../../../../../include/linux/circ_buf.h"
 
 #define ACPI_AML_FILE           "/sys/kernel/debug/acpi/acpidbg"
 #define ACPI_AML_SEC_TICK       1
diff --git a/tools/power/acpi/tools/acpidump/Makefile b/tools/power/acpi/tools/acpidump/Makefile
index 04b5db7c7c0b..f7c7af1f9258 100644
--- a/tools/power/acpi/tools/acpidump/Makefile
+++ b/tools/power/acpi/tools/acpidump/Makefile
@@ -19,9 +19,7 @@ vpath %.c \
         ./\
         ../../common\
         ../../os_specific/service_layers
-CFLAGS += -DACPI_DUMP_APP -I.\
-        -I../../../../../drivers/acpi/acpica\
-        -I../../../../../include
+CFLAGS += -DACPI_DUMP_APP -I.
 TOOL_OBJS = \
         apdump.o\
         apfiles.o\
@@ -49,7 +47,9 @@ TOOL_OBJS = \
 
 include ../../Makefile.rules
 
-install-man: ../../man/acpidump.8
-        $(INSTALL_DATA) -D $< $(DESTDIR)${mandir}/man8/acpidump.8
+install-man: $(srctree)/man/acpidump.8
+        $(ECHO) "  INST    " acpidump.8
+        $(QUIET) $(INSTALL_DATA) -D $< $(DESTDIR)$(mandir)/man8/acpidump.8
 uninstall-man:
-        - rm -f $(DESTDIR)${mandir}/man8/acpidump.8
+        $(ECHO) "  UNINST  " acpidump.8
+        $(QUIET) rm -f $(DESTDIR)$(mandir)/man8/acpidump.8
diff --git a/tools/power/cpupower/utils/cpufreq-set.c b/tools/power/cpupower/utils/cpufreq-set.c
index b4bf76971dc9..1eef0aed6423 100644
--- a/tools/power/cpupower/utils/cpufreq-set.c
+++ b/tools/power/cpupower/utils/cpufreq-set.c
@@ -296,7 +296,7 @@ int cmd_freq_set(int argc, char **argv)
                         struct cpufreq_affected_cpus *cpus;
 
                         if (!bitmask_isbitset(cpus_chosen, cpu) ||
-                            cpupower_is_cpu_online(cpu))
+                            cpupower_is_cpu_online(cpu) != 1)
                                 continue;
 
                         cpus = cpufreq_get_related_cpus(cpu);
@@ -316,10 +316,7 @@ int cmd_freq_set(int argc, char **argv)
              cpu <= bitmask_last(cpus_chosen); cpu++) {
 
                 if (!bitmask_isbitset(cpus_chosen, cpu) ||
-                    cpupower_is_cpu_online(cpu))
-                        continue;
-
-                if (cpupower_is_cpu_online(cpu) != 1)
+                    cpupower_is_cpu_online(cpu) != 1)
                         continue;
 
                 printf(_("Setting cpu: %d\n"), cpu);
diff --git a/tools/testing/nvdimm/Kbuild b/tools/testing/nvdimm/Kbuild
index 582db95127ed..405212be044a 100644
--- a/tools/testing/nvdimm/Kbuild
+++ b/tools/testing/nvdimm/Kbuild
@@ -14,6 +14,7 @@ ldflags-y += --wrap=devm_memremap_pages
 ldflags-y += --wrap=insert_resource
 ldflags-y += --wrap=remove_resource
 ldflags-y += --wrap=acpi_evaluate_object
+ldflags-y += --wrap=acpi_evaluate_dsm
 
 DRIVERS := ../../../drivers
 NVDIMM_SRC := $(DRIVERS)/nvdimm
diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c
index 3ccef732fce9..64cae1a5deff 100644
--- a/tools/testing/nvdimm/test/iomap.c
+++ b/tools/testing/nvdimm/test/iomap.c
@@ -26,14 +26,17 @@ static LIST_HEAD(iomap_head);
 
 static struct iomap_ops {
         nfit_test_lookup_fn nfit_test_lookup;
+        nfit_test_evaluate_dsm_fn evaluate_dsm;
         struct list_head list;
 } iomap_ops = {
         .list = LIST_HEAD_INIT(iomap_ops.list),
 };
 
-void nfit_test_setup(nfit_test_lookup_fn lookup)
+void nfit_test_setup(nfit_test_lookup_fn lookup,
+                nfit_test_evaluate_dsm_fn evaluate)
 {
         iomap_ops.nfit_test_lookup = lookup;
+        iomap_ops.evaluate_dsm = evaluate;
         list_add_rcu(&iomap_ops.list, &iomap_head);
 }
 EXPORT_SYMBOL(nfit_test_setup);
@@ -367,4 +370,22 @@ acpi_status __wrap_acpi_evaluate_object(acpi_handle handle, acpi_string path,
 }
 EXPORT_SYMBOL(__wrap_acpi_evaluate_object);
 
+union acpi_object * __wrap_acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid,
+                u64 rev, u64 func, union acpi_object *argv4)
+{
+        union acpi_object *obj = ERR_PTR(-ENXIO);
+        struct iomap_ops *ops;
+
+        rcu_read_lock();
+        ops = list_first_or_null_rcu(&iomap_head, typeof(*ops), list);
+        if (ops)
+                obj = ops->evaluate_dsm(handle, uuid, rev, func, argv4);
+        rcu_read_unlock();
+
+        if (IS_ERR(obj))
+                return acpi_evaluate_dsm(handle, uuid, rev, func, argv4);
+        return obj;
+}
+EXPORT_SYMBOL(__wrap_acpi_evaluate_dsm);
+
 MODULE_LICENSE("GPL v2");
diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c
index c9a6458cb63e..71620fa95953 100644
--- a/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
@@ -23,6 +23,7 @@
 #include <linux/sizes.h>
 #include <linux/list.h>
 #include <linux/slab.h>
+#include <nd-core.h>
 #include <nfit.h>
 #include <nd.h>
 #include "nfit_test.h"
@@ -1506,6 +1507,225 @@ static int nfit_test_blk_do_io(struct nd_blk_region *ndbr, resource_size_t dpa,
         return 0;
 }
 
+static unsigned long nfit_ctl_handle;
+
+union acpi_object *result;
+
+static union acpi_object *nfit_test_evaluate_dsm(acpi_handle handle,
+                const u8 *uuid, u64 rev, u64 func, union acpi_object *argv4)
+{
+        if (handle != &nfit_ctl_handle)
+                return ERR_PTR(-ENXIO);
+
+        return result;
+}
+
+static int setup_result(void *buf, size_t size)
+{
+        result = kmalloc(sizeof(union acpi_object) + size, GFP_KERNEL);
+        if (!result)
+                return -ENOMEM;
+        result->package.type = ACPI_TYPE_BUFFER,
+        result->buffer.pointer = (void *) (result + 1);
+        result->buffer.length = size;
+        memcpy(result->buffer.pointer, buf, size);
+        memset(buf, 0, size);
+        return 0;
+}
+
+static int nfit_ctl_test(struct device *dev)
+{
+        int rc, cmd_rc;
+        struct nvdimm *nvdimm;
+        struct acpi_device *adev;
+        struct nfit_mem *nfit_mem;
+        struct nd_ars_record *record;
+        struct acpi_nfit_desc *acpi_desc;
+        const u64 test_val = 0x0123456789abcdefULL;
+        unsigned long mask, cmd_size, offset;
+        union {
+                struct nd_cmd_get_config_size cfg_size;
+                struct nd_cmd_ars_status ars_stat;
+                struct nd_cmd_ars_cap ars_cap;
+                char buf[sizeof(struct nd_cmd_ars_status)
+                        + sizeof(struct nd_ars_record)];
+        } cmds;
+
+        adev = devm_kzalloc(dev, sizeof(*adev), GFP_KERNEL);
+        if (!adev)
+                return -ENOMEM;
+        *adev = (struct acpi_device) {
+                .handle = &nfit_ctl_handle,
+                .dev = {
+                        .init_name = "test-adev",
+                },
+        };
+
+        acpi_desc = devm_kzalloc(dev, sizeof(*acpi_desc), GFP_KERNEL);
+        if (!acpi_desc)
+                return -ENOMEM;
+        *acpi_desc = (struct acpi_nfit_desc) {
+                .nd_desc = {
+                        .cmd_mask = 1UL << ND_CMD_ARS_CAP
+                                | 1UL << ND_CMD_ARS_START
+                                | 1UL << ND_CMD_ARS_STATUS
+                                | 1UL << ND_CMD_CLEAR_ERROR,
+                        .module = THIS_MODULE,
+                        .provider_name = "ACPI.NFIT",
+                        .ndctl = acpi_nfit_ctl,
+                },
+                .dev = &adev->dev,
+        };
+
+        nfit_mem = devm_kzalloc(dev, sizeof(*nfit_mem), GFP_KERNEL);
+        if (!nfit_mem)
+                return -ENOMEM;
+
+        mask = 1UL << ND_CMD_SMART | 1UL << ND_CMD_SMART_THRESHOLD
+                | 1UL << ND_CMD_DIMM_FLAGS | 1UL << ND_CMD_GET_CONFIG_SIZE
+                | 1UL << ND_CMD_GET_CONFIG_DATA | 1UL << ND_CMD_SET_CONFIG_DATA
+                | 1UL << ND_CMD_VENDOR;
+        *nfit_mem = (struct nfit_mem) {
+                .adev = adev,
+                .family = NVDIMM_FAMILY_INTEL,
+                .dsm_mask = mask,
+        };
+
+        nvdimm = devm_kzalloc(dev, sizeof(*nvdimm), GFP_KERNEL);
+        if (!nvdimm)
+                return -ENOMEM;
+        *nvdimm = (struct nvdimm) {
+                .provider_data = nfit_mem,
+                .cmd_mask = mask,
+                .dev = {
+                        .init_name = "test-dimm",
+                },
+        };
+
+
+        /* basic checkout of a typical 'get config size' command */
+        cmd_size = sizeof(cmds.cfg_size);
+        cmds.cfg_size = (struct nd_cmd_get_config_size) {
+                .status = 0,
+                .config_size = SZ_128K,
+                .max_xfer = SZ_4K,
+        };
+        rc = setup_result(cmds.buf, cmd_size);
+        if (rc)
+                return rc;
+        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, nvdimm, ND_CMD_GET_CONFIG_SIZE,
+                        cmds.buf, cmd_size, &cmd_rc);
+
+        if (rc < 0 || cmd_rc || cmds.cfg_size.status != 0
+                        || cmds.cfg_size.config_size != SZ_128K
+                        || cmds.cfg_size.max_xfer != SZ_4K) {
+                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
+                                __func__, __LINE__, rc, cmd_rc);
+                return -EIO;
+        }
+
+
+        /* test ars_status with zero output */
+        cmd_size = offsetof(struct nd_cmd_ars_status, address);
+        cmds.ars_stat = (struct nd_cmd_ars_status) {
+                .out_length = 0,
+        };
+        rc = setup_result(cmds.buf, cmd_size);
+        if (rc)
+                return rc;
+        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, NULL, ND_CMD_ARS_STATUS,
+                        cmds.buf, cmd_size, &cmd_rc);
+
+        if (rc < 0 || cmd_rc) {
+                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
+                                __func__, __LINE__, rc, cmd_rc);
+                return -EIO;
+        }
+
+
+        /* test ars_cap with benign extended status */
+        cmd_size = sizeof(cmds.ars_cap);
+        cmds.ars_cap = (struct nd_cmd_ars_cap) {
+                .status = ND_ARS_PERSISTENT << 16,
+        };
+        offset = offsetof(struct nd_cmd_ars_cap, status);
+        rc = setup_result(cmds.buf + offset, cmd_size - offset);
+        if (rc)
+                return rc;
+        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, NULL, ND_CMD_ARS_CAP,
+                        cmds.buf, cmd_size, &cmd_rc);
+
+        if (rc < 0 || cmd_rc) {
+                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
+                                __func__, __LINE__, rc, cmd_rc);
+                return -EIO;
+        }
+
+
+        /* test ars_status with 'status' trimmed from 'out_length' */
+        cmd_size = sizeof(cmds.ars_stat) + sizeof(struct nd_ars_record);
+        cmds.ars_stat = (struct nd_cmd_ars_status) {
+                .out_length = cmd_size - 4,
+        };
+        record = &cmds.ars_stat.records[0];
+        *record = (struct nd_ars_record) {
+                .length = test_val,
+        };
+        rc = setup_result(cmds.buf, cmd_size);
+        if (rc)
+                return rc;
+        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, NULL, ND_CMD_ARS_STATUS,
+                        cmds.buf, cmd_size, &cmd_rc);
+
+        if (rc < 0 || cmd_rc || record->length != test_val) {
+                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
+                                __func__, __LINE__, rc, cmd_rc);
+                return -EIO;
+        }
+
+
+        /* test ars_status with 'Output (Size)' including 'status' */
+        cmd_size = sizeof(cmds.ars_stat) + sizeof(struct nd_ars_record);
+        cmds.ars_stat = (struct nd_cmd_ars_status) {
+                .out_length = cmd_size,
+        };
+        record = &cmds.ars_stat.records[0];
+        *record = (struct nd_ars_record) {
+                .length = test_val,
+        };
+        rc = setup_result(cmds.buf, cmd_size);
+        if (rc)
+                return rc;
+        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, NULL, ND_CMD_ARS_STATUS,
+                        cmds.buf, cmd_size, &cmd_rc);
+
+        if (rc < 0 || cmd_rc || record->length != test_val) {
+                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
+                                __func__, __LINE__, rc, cmd_rc);
+                return -EIO;
+        }
+
+
+        /* test extended status for get_config_size results in failure */
+        cmd_size = sizeof(cmds.cfg_size);
+        cmds.cfg_size = (struct nd_cmd_get_config_size) {
+                .status = 1 << 16,
+        };
+        rc = setup_result(cmds.buf, cmd_size);
+        if (rc)
+                return rc;
+        rc = acpi_nfit_ctl(&acpi_desc->nd_desc, nvdimm, ND_CMD_GET_CONFIG_SIZE,
+                        cmds.buf, cmd_size, &cmd_rc);
+
+        if (rc < 0 || cmd_rc >= 0) {
+                dev_dbg(dev, "%s: failed at: %d rc: %d cmd_rc: %d\n",
+                                __func__, __LINE__, rc, cmd_rc);
+                return -EIO;
+        }
+
+        return 0;
+}
+
 static int nfit_test_probe(struct platform_device *pdev)
 {
         struct nvdimm_bus_descriptor *nd_desc;
@@ -1516,6 +1736,12 @@ static int nfit_test_probe(struct platform_device *pdev)
         union acpi_object *obj;
         int rc;
 
+        if (strcmp(dev_name(&pdev->dev), "nfit_test.0") == 0) {
+                rc = nfit_ctl_test(&pdev->dev);
+                if (rc)
+                        return rc;
+        }
+
         nfit_test = to_nfit_test(&pdev->dev);
 
         /* common alloc */
@@ -1639,11 +1865,13 @@ static __init int nfit_test_init(void)
 {
         int rc, i;
 
-        nfit_test_dimm = class_create(THIS_MODULE, "nfit_test_dimm");
-        if (IS_ERR(nfit_test_dimm))
-                return PTR_ERR(nfit_test_dimm);
+        nfit_test_setup(nfit_test_lookup, nfit_test_evaluate_dsm);
 
-        nfit_test_setup(nfit_test_lookup);
+        nfit_test_dimm = class_create(THIS_MODULE, "nfit_test_dimm");
+        if (IS_ERR(nfit_test_dimm)) {
+                rc = PTR_ERR(nfit_test_dimm);
+                goto err_register;
+        }
 
         for (i = 0; i < NUM_NFITS; i++) {
                 struct nfit_test *nfit_test;
diff --git a/tools/testing/nvdimm/test/nfit_test.h b/tools/testing/nvdimm/test/nfit_test.h
index c281dd2e5e2d..f54c0032c6ff 100644
--- a/tools/testing/nvdimm/test/nfit_test.h
+++ b/tools/testing/nvdimm/test/nfit_test.h
@@ -31,11 +31,17 @@ struct nfit_test_resource {
         void *buf;
 };
 
+union acpi_object;
+typedef void *acpi_handle;
+
 typedef struct nfit_test_resource *(*nfit_test_lookup_fn)(resource_size_t);
+typedef union acpi_object *(*nfit_test_evaluate_dsm_fn)(acpi_handle handle,
+                const u8 *uuid, u64 rev, u64 func, union acpi_object *argv4);
 void __iomem *__wrap_ioremap_nocache(resource_size_t offset,
                 unsigned long size);
 void __wrap_iounmap(volatile void __iomem *addr);
-void nfit_test_setup(nfit_test_lookup_fn lookup);
+void nfit_test_setup(nfit_test_lookup_fn lookup,
+                nfit_test_evaluate_dsm_fn evaluate);
 void nfit_test_teardown(void);
 struct nfit_test_resource *get_nfit_res(resource_size_t resource);
 #endif
diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c
index 6e9c40eea208..69ccce308458 100644
--- a/virt/kvm/arm/pmu.c
+++ b/virt/kvm/arm/pmu.c
@@ -305,7 +305,7 @@ void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val)
                         continue;
                 type = vcpu_sys_reg(vcpu, PMEVTYPER0_EL0 + i)
                        & ARMV8_PMU_EVTYPE_EVENT;
-                if ((type == ARMV8_PMU_EVTYPE_EVENT_SW_INCR)
+                if ((type == ARMV8_PMUV3_PERFCTR_SW_INCR)
                     && (enable & BIT(i))) {
                         reg = vcpu_sys_reg(vcpu, PMEVCNTR0_EL0 + i) + 1;
                         reg = lower_32_bits(reg);
@@ -379,7 +379,8 @@ void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu, u64 data,
         eventsel = data & ARMV8_PMU_EVTYPE_EVENT;
 
         /* Software increment event does't need to be backed by a perf event */
-        if (eventsel == ARMV8_PMU_EVTYPE_EVENT_SW_INCR)
+        if (eventsel == ARMV8_PMUV3_PERFCTR_SW_INCR &&
+            select_idx != ARMV8_PMU_CYCLE_IDX)
                 return;
 
         memset(&attr, 0, sizeof(struct perf_event_attr));
@@ -391,7 +392,8 @@ void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu, u64 data,
         attr.exclude_kernel = data & ARMV8_PMU_EXCLUDE_EL1 ? 1 : 0;
         attr.exclude_hv = 1; /* Don't count EL2 events */
         attr.exclude_host = 1; /* Don't count host events */
-        attr.config = eventsel;
+        attr.config = (select_idx == ARMV8_PMU_CYCLE_IDX) ?
+                ARMV8_PMUV3_PERFCTR_CPU_CYCLES : eventsel;
 
         counter = kvm_pmu_get_counter_value(vcpu, select_idx);
         /* The initial sample period (overflow count) of an event. */
diff --git a/virt/kvm/arm/vgic/vgic-mmio.c b/virt/kvm/arm/vgic/vgic-mmio.c
index e18b30ddcdce..ebe1b9fa3c4d 100644
--- a/virt/kvm/arm/vgic/vgic-mmio.c
+++ b/virt/kvm/arm/vgic/vgic-mmio.c
@@ -453,17 +453,33 @@ struct vgic_io_device *kvm_to_vgic_iodev(const struct kvm_io_device *dev)
         return container_of(dev, struct vgic_io_device, dev);
 }
 
-static bool check_region(const struct vgic_register_region *region,
+static bool check_region(const struct kvm *kvm,
+                         const struct vgic_register_region *region,
                          gpa_t addr, int len)
 {
-        if ((region->access_flags & VGIC_ACCESS_8bit) && len == 1)
-                return true;
-        if ((region->access_flags & VGIC_ACCESS_32bit) &&
-            len == sizeof(u32) && !(addr & 3))
-                return true;
-        if ((region->access_flags & VGIC_ACCESS_64bit) &&
-            len == sizeof(u64) && !(addr & 7))
-                return true;
+        int flags, nr_irqs = kvm->arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS;
+
+        switch (len) {
+        case sizeof(u8):
+                flags = VGIC_ACCESS_8bit;
+                break;
+        case sizeof(u32):
+                flags = VGIC_ACCESS_32bit;
+                break;
+        case sizeof(u64):
+                flags = VGIC_ACCESS_64bit;
+                break;
+        default:
+                return false;
+        }
+
+        if ((region->access_flags & flags) && IS_ALIGNED(addr, len)) {
+                if (!region->bits_per_irq)
+                        return true;
+
+                /* Do we access a non-allocated IRQ? */
+                return VGIC_ADDR_TO_INTID(addr, region->bits_per_irq) < nr_irqs;
+        }
 
         return false;
 }
@@ -477,7 +493,7 @@ static int dispatch_mmio_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,
 
         region = vgic_find_mmio_region(iodev->regions, iodev->nr_regions,
                                        addr - iodev->base_addr);
-        if (!region || !check_region(region, addr, len)) {
+        if (!region || !check_region(vcpu->kvm, region, addr, len)) {
                 memset(val, 0, len);
                 return 0;
         }
@@ -510,10 +526,7 @@ static int dispatch_mmio_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,
 
         region = vgic_find_mmio_region(iodev->regions, iodev->nr_regions,
                                        addr - iodev->base_addr);
-        if (!region)
-                return 0;
-
-        if (!check_region(region, addr, len))
+        if (!region || !check_region(vcpu->kvm, region, addr, len))
                 return 0;
 
         switch (iodev->iodev_type) {
diff --git a/virt/kvm/arm/vgic/vgic-mmio.h b/virt/kvm/arm/vgic/vgic-mmio.h
index 4c34d39d44a0..84961b4e4422 100644
--- a/virt/kvm/arm/vgic/vgic-mmio.h
+++ b/virt/kvm/arm/vgic/vgic-mmio.h
@@ -50,15 +50,15 @@ extern struct kvm_io_device_ops kvm_io_gic_ops;
 #define VGIC_ADDR_IRQ_MASK(bits) (((bits) * 1024 / 8) - 1)
 
 /*
- * (addr & mask) gives us the byte offset for the INT ID, so we want to
- * divide this with 'bytes per irq' to get the INT ID, which is given
- * by '(bits) / 8'.  But we do this with fixed-point-arithmetic and
- * take advantage of the fact that division by a fraction equals
- * multiplication with the inverted fraction, and scale up both the
- * numerator and denominator with 8 to support at most 64 bits per IRQ:
+ * (addr & mask) gives us the _byte_ offset for the INT ID.
+ * We multiply this by 8 the get the _bit_ offset, then divide this by
+ * the number of bits to learn the actual INT ID.
+ * But instead of a division (which requires a "long long div" implementation),
+ * we shift by the binary logarithm of <bits>.
+ * This assumes that <bits> is a power of two.
  */
 #define VGIC_ADDR_TO_INTID(addr, bits)  (((addr) & VGIC_ADDR_IRQ_MASK(bits)) * \
-                                        64 / (bits) / 8)
+                                        8 >> ilog2(bits))
 
 /*
  * Some VGIC registers store per-IRQ information, with a different number
diff --git a/virt/kvm/arm/vgic/vgic-v2.c b/virt/kvm/arm/vgic/vgic-v2.c
index 0a063af40565..9bab86757fa4 100644
--- a/virt/kvm/arm/vgic/vgic-v2.c
+++ b/virt/kvm/arm/vgic/vgic-v2.c
@@ -50,8 +50,10 @@ void vgic_v2_process_maintenance(struct kvm_vcpu *vcpu)
 
                         WARN_ON(cpuif->vgic_lr[lr] & GICH_LR_STATE);
 
-                        kvm_notify_acked_irq(vcpu->kvm, 0,
-                                             intid - VGIC_NR_PRIVATE_IRQS);
+                        /* Only SPIs require notification */
+                        if (vgic_valid_spi(vcpu->kvm, intid))
+                                kvm_notify_acked_irq(vcpu->kvm, 0,
+                                                     intid - VGIC_NR_PRIVATE_IRQS);
                 }
         }
 
diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
index 9f0dae397d9c..5c9f9745e6ca 100644
--- a/virt/kvm/arm/vgic/vgic-v3.c
+++ b/virt/kvm/arm/vgic/vgic-v3.c
@@ -41,8 +41,10 @@ void vgic_v3_process_maintenance(struct kvm_vcpu *vcpu)
 
                         WARN_ON(cpuif->vgic_lr[lr] & ICH_LR_STATE);
 
-                        kvm_notify_acked_irq(vcpu->kvm, 0,
-                                             intid - VGIC_NR_PRIVATE_IRQS);
+                        /* Only SPIs require notification */
+                        if (vgic_valid_spi(vcpu->kvm, intid))
+                                kvm_notify_acked_irq(vcpu->kvm, 0,
+                                                     intid - VGIC_NR_PRIVATE_IRQS);
                 }
 
                 /*
diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c
index 2893d5ba523a..6440b56ec90e 100644
--- a/virt/kvm/arm/vgic/vgic.c
+++ b/virt/kvm/arm/vgic/vgic.c
@@ -273,6 +273,18 @@ retry:
                  * no more work for us to do.
                  */
                 spin_unlock(&irq->irq_lock);
+
+                /*
+                 * We have to kick the VCPU here, because we could be
+                 * queueing an edge-triggered interrupt for which we
+                 * get no EOI maintenance interrupt. In that case,
+                 * while the IRQ is already on the VCPU's AP list, the
+                 * VCPU could have EOI'ed the original interrupt and
+                 * won't see this one until it exits for some other
+                 * reason.
+                 */
+                if (vcpu)
+                        kvm_vcpu_kick(vcpu);
                 return false;
         }
 
diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c
index 8035cc1eb955..efeceb0a222d 100644
--- a/virt/kvm/async_pf.c
+++ b/virt/kvm/async_pf.c
@@ -91,6 +91,7 @@ static void async_pf_execute(struct work_struct *work)
 
         spin_lock(&vcpu->async_pf.lock);
         list_add_tail(&apf->link, &vcpu->async_pf.done);
+        apf->vcpu = NULL;
         spin_unlock(&vcpu->async_pf.lock);
 
         /*
@@ -113,6 +114,8 @@ static void async_pf_execute(struct work_struct *work)
 
 void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu)
 {
+        spin_lock(&vcpu->async_pf.lock);
+
         /* cancel outstanding work queue item */
         while (!list_empty(&vcpu->async_pf.queue)) {
                 struct kvm_async_pf *work =
@@ -120,6 +123,14 @@ void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu)
                                          typeof(*work), queue);
                 list_del(&work->queue);
 
+                /*
+                 * We know it's present in vcpu->async_pf.done, do
+                 * nothing here.
+                 */
+                if (!work->vcpu)
+                        continue;
+
+                spin_unlock(&vcpu->async_pf.lock);
 #ifdef CONFIG_KVM_ASYNC_PF_SYNC
                 flush_work(&work->work);
 #else
@@ -129,9 +140,9 @@ void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu)
                         kmem_cache_free(async_pf_cache, work);
                 }
 #endif
+                spin_lock(&vcpu->async_pf.lock);
         }
 
-        spin_lock(&vcpu->async_pf.lock);
         while (!list_empty(&vcpu->async_pf.done)) {
                 struct kvm_async_pf *work =
                         list_first_entry(&vcpu->async_pf.done,
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 5c360347a1e9..7f9ee2929cfe 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2889,10 +2889,10 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
 
         ret = anon_inode_getfd(ops->name, &kvm_device_fops, dev, O_RDWR | O_CLOEXEC);
         if (ret < 0) {
-                ops->destroy(dev);
                 mutex_lock(&kvm->lock);
                 list_del(&dev->vm_node);
                 mutex_unlock(&kvm->lock);
+                ops->destroy(dev);
                 return ret;
         }