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

ASoC: Updates for v4.16

Some more updates for v4.16, the big things here are the ST DFSDM driver
and the IIO patches required to support that and even more in the
neverending series of code quality improvements for x86, including
Pierre's work to improve the Kconfig.  The unused SN95031 driver and
associated board support are also removed, they haven't been buildable
for a considerable time without anyone noticing.

200 files changed, 4285 insertions, 2279 deletions

diff --git a/.mailmap b/.mailmap
index 1469ff0d3f4d..e18cab73e209 100644
--- a/.mailmap
+++ b/.mailmap
@@ -107,6 +107,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
 Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
 Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
 Mark Brown <broonie@sirena.org.uk>
+Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
 Matthieu CASTET <castet.matthieu@free.fr>
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 b/Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32
new file mode 100644
index 000000000000..da9822309f07
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32
@@ -0,0 +1,16 @@
+What:           /sys/bus/iio/devices/iio:deviceX/in_voltage_spi_clk_freq
+KernelVersion:  4.14
+Contact:        arnaud.pouliquen@st.com
+Description:
+                For audio purpose only.
+                Used by audio driver to set/get the spi input frequency.
+                This is mandatory if DFSDM is slave on SPI bus, to
+                provide information on the SPI clock frequency during runtime
+                Notice that the SPI frequency should be a multiple of sample
+                frequency to ensure the precision.
+                if DFSDM input is SPI master
+                        Reading  SPI clkout frequency,
+                        error on writing
+                If DFSDM input is SPI Slave:
+                        Reading returns value previously set.
+                        Writing value before starting conversions.
\ No newline at end of file
diff --git a/Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt b/Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt
new file mode 100644
index 000000000000..e9ebb8a20e0d
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt
@@ -0,0 +1,13 @@
+Device-Tree bindings for sigma delta modulator
+
+Required properties:
+- compatible: should be "ads1201", "sd-modulator". "sd-modulator" can be use
+        as a generic SD modulator if modulator not specified in compatible list.
+- #io-channel-cells = <1>: See the IIO bindings section "IIO consumers".
+
+Example node:
+
+        ads1202: adc@0 {
+                compatible = "sd-modulator";
+                #io-channel-cells = <1>;
+        };
diff --git a/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt
new file mode 100644
index 000000000000..911492da48f3
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt
@@ -0,0 +1,128 @@
+STMicroelectronics STM32 DFSDM ADC device driver
+
+
+STM32 DFSDM ADC is a sigma delta analog-to-digital converter dedicated to
+interface external sigma delta modulators to STM32 micro controllers.
+It is mainly targeted for:
+- Sigma delta modulators (motor control, metering...)
+- PDM microphones (audio digital microphone)
+
+It features up to 8 serial digital interfaces (SPI or Manchester) and
+up to 4 filters on stm32h7.
+
+Each child node match with a filter instance.
+
+Contents of a STM32 DFSDM root node:
+------------------------------------
+Required properties:
+- compatible: Should be "st,stm32h7-dfsdm".
+- reg: Offset and length of the DFSDM block register set.
+- clocks: IP and serial interfaces clocking. Should be set according
+                to rcc clock ID and "clock-names".
+- clock-names: Input clock name "dfsdm" must be defined,
+                "audio" is optional. If defined CLKOUT is based on the audio
+                clock, else "dfsdm" is used.
+- #interrupt-cells = <1>;
+- #address-cells = <1>;
+- #size-cells = <0>;
+
+Optional properties:
+- spi-max-frequency: Requested only for SPI master mode.
+                  SPI clock OUT frequency (Hz). This clock must be set according
+                  to "clock" property. Frequency must be a multiple of the rcc
+                  clock frequency. If not, SPI CLKOUT frequency will not be
+                  accurate.
+
+Contents of a STM32 DFSDM child nodes:
+--------------------------------------
+
+Required properties:
+- compatible: Must be:
+        "st,stm32-dfsdm-adc" for sigma delta ADCs
+        "st,stm32-dfsdm-dmic" for audio digital microphone.
+- reg: Specifies the DFSDM filter instance used.
+- interrupts: IRQ lines connected to each DFSDM filter instance.
+- st,adc-channels:      List of single-ended channels muxed for this ADC.
+                        valid values:
+                                "st,stm32h7-dfsdm" compatibility: 0 to 7.
+- st,adc-channel-names: List of single-ended channel names.
+- st,filter-order:  SinC filter order from 0 to 5.
+                        0: FastSinC
+                        [1-5]: order 1 to 5.
+                        For audio purpose it is recommended to use order 3 to 5.
+- #io-channel-cells = <1>: See the IIO bindings section "IIO consumers".
+
+Required properties for "st,stm32-dfsdm-adc" compatibility:
+- io-channels: From common IIO binding. Used to pipe external sigma delta
+                modulator or internal ADC output to DFSDM channel.
+                This is not required for "st,stm32-dfsdm-pdm" compatibility as
+                PDM microphone is binded in Audio DT node.
+
+Required properties for "st,stm32-dfsdm-pdm" compatibility:
+- #sound-dai-cells: Must be set to 0.
+- dma: DMA controller phandle and DMA request line associated to the
+                filter instance (specified by the field "reg")
+- dma-names: Must be "rx"
+
+Optional properties:
+- st,adc-channel-types: Single-ended channel input type.
+                        - "SPI_R": SPI with data on rising edge (default)
+                        - "SPI_F": SPI with data on falling edge
+                        - "MANCH_R": manchester codec, rising edge = logic 0
+                        - "MANCH_F": manchester codec, falling edge = logic 1
+- st,adc-channel-clk-src: Conversion clock source.
+                          - "CLKIN": external SPI clock (CLKIN x)
+                          - "CLKOUT": internal SPI clock (CLKOUT) (default)
+                          - "CLKOUT_F": internal SPI clock divided by 2 (falling edge).
+                          - "CLKOUT_R": internal SPI clock divided by 2 (rising edge).
+
+- st,adc-alt-channel: Must be defined if two sigma delta modulator are
+                          connected on same SPI input.
+                          If not set, channel n is connected to SPI input n.
+                          If set, channel n is connected to SPI input n + 1.
+
+- st,filter0-sync: Set to 1 to synchronize with DFSDM filter instance 0.
+                   Used for multi microphones synchronization.
+
+Example of a sigma delta adc connected on DFSDM SPI port 0
+and a pdm microphone connected on DFSDM SPI port 1:
+
+        ads1202: simple_sd_adc@0 {
+                compatible = "ads1202";
+                #io-channel-cells = <1>;
+        };
+
+        dfsdm: dfsdm@40017000 {
+                compatible = "st,stm32h7-dfsdm";
+                reg = <0x40017000 0x400>;
+                clocks = <&rcc DFSDM1_CK>;
+                clock-names = "dfsdm";
+                #interrupt-cells = <1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                dfsdm_adc0: filter@0 {
+                        compatible = "st,stm32-dfsdm-adc";
+                        #io-channel-cells = <1>;
+                        reg = <0>;
+                        interrupts = <110>;
+                        st,adc-channels = <0>;
+                        st,adc-channel-names = "sd_adc0";
+                        st,adc-channel-types = "SPI_F";
+                        st,adc-channel-clk-src = "CLKOUT";
+                        io-channels = <&ads1202 0>;
+                        st,filter-order = <3>;
+                };
+                dfsdm_pdm1: filter@1 {
+                        compatible = "st,stm32-dfsdm-dmic";
+                        reg = <1>;
+                        interrupts = <111>;
+                        dmas = <&dmamux1 102 0x400 0x00>;
+                        dma-names = "rx";
+                        st,adc-channels = <1>;
+                        st,adc-channel-names = "dmic1";
+                        st,adc-channel-types = "SPI_R";
+                        st,adc-channel-clk-src = "CLKOUT";
+                        st,filter-order = <5>;
+                };
+        }
diff --git a/Documentation/devicetree/bindings/sound/dmic.txt b/Documentation/devicetree/bindings/sound/dmic.txt
index 54c8ef6498a8..f7bf65611453 100644
--- a/Documentation/devicetree/bindings/sound/dmic.txt
+++ b/Documentation/devicetree/bindings/sound/dmic.txt
@@ -7,10 +7,12 @@ Required properties:
 
 Optional properties:
         - dmicen-gpios: GPIO specifier for dmic to control start and stop
+        - num-channels: Number of microphones on this DAI
 
 Example node:
 
         dmic_codec: dmic@0 {
                 compatible = "dmic-codec";
                 dmicen-gpios = <&gpio4 3 GPIO_ACTIVE_HIGH>;
+                num-channels = <1>;
         };
diff --git a/Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt b/Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt
new file mode 100644
index 000000000000..864f5b00b031
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt
@@ -0,0 +1,63 @@
+STMicroelectronics Audio Digital Filter Sigma Delta modulators(DFSDM)
+
+The DFSDM allows PDM microphones capture through SPI interface. The Audio
+interface is seems as a sub block of the DFSDM device.
+For details on DFSDM bindings refer to ../iio/adc/st,stm32-dfsdm-adc.txt
+
+Required properties:
+  - compatible: "st,stm32h7-dfsdm-dai".
+
+  - #sound-dai-cells : Must be equal to 0
+
+  - io-channels : phandle to iio dfsdm instance node.
+
+Example of a sound card using audio DFSDM node.
+
+        sound_card {
+                compatible = "audio-graph-card";
+
+                dais = <&cpu_port>;
+        };
+
+        dfsdm: dfsdm@40017000 {
+                compatible = "st,stm32h7-dfsdm";
+                reg = <0x40017000 0x400>;
+                clocks = <&rcc DFSDM1_CK>;
+                clock-names = "dfsdm";
+                #interrupt-cells = <1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                dfsdm_adc0: filter@0 {
+                        compatible = "st,stm32-dfsdm-dmic";
+                        reg = <0>;
+                        interrupts = <110>;
+                        dmas = <&dmamux1 101 0x400 0x00>;
+                        dma-names = "rx";
+                        st,adc-channels = <1>;
+                        st,adc-channel-names = "dmic0";
+                        st,adc-channel-types = "SPI_R";
+                        st,adc-channel-clk-src = "CLKOUT";
+                        st,filter-order = <5>;
+
+                        dfsdm_dai0: dfsdm-dai {
+                                compatible = "st,stm32h7-dfsdm-dai";
+                                #sound-dai-cells = <0>;
+                                io-channels = <&dfsdm_adc0 0>;
+                                cpu_port: port {
+                                dfsdm_endpoint: endpoint {
+                                        remote-endpoint = <&dmic0_endpoint>;
+                                };
+                        };
+                };
+        };
+
+        dmic0: dmic@0 {
+                compatible = "dmic-codec";
+                #sound-dai-cells = <0>;
+                port {
+                        dmic0_endpoint: endpoint {
+                                remote-endpoint = <&dfsdm_endpoint>;
+                        };
+                };
+        };
diff --git a/Documentation/driver-api/iio/hw-consumer.rst b/Documentation/driver-api/iio/hw-consumer.rst
new file mode 100644
index 000000000000..8facce6a6733
--- /dev/null
+++ b/Documentation/driver-api/iio/hw-consumer.rst
@@ -0,0 +1,51 @@
+===========
+HW consumer
+===========
+An IIO device can be directly connected to another device in hardware. in this
+case the buffers between IIO provider and IIO consumer are handled by hardware.
+The Industrial I/O HW consumer offers a way to bond these IIO devices without
+software buffer for data. The implementation can be found under
+:file:`drivers/iio/buffer/hw-consumer.c`
+
+
+* struct :c:type:`iio_hw_consumer` — Hardware consumer structure
+* :c:func:`iio_hw_consumer_alloc` — Allocate IIO hardware consumer
+* :c:func:`iio_hw_consumer_free` — Free IIO hardware consumer
+* :c:func:`iio_hw_consumer_enable` — Enable IIO hardware consumer
+* :c:func:`iio_hw_consumer_disable` — Disable IIO hardware consumer
+
+
+HW consumer setup
+=================
+
+As standard IIO device the implementation is based on IIO provider/consumer.
+A typical IIO HW consumer setup looks like this::
+
+        static struct iio_hw_consumer *hwc;
+
+        static const struct iio_info adc_info = {
+                .read_raw = adc_read_raw,
+        };
+
+        static int adc_read_raw(struct iio_dev *indio_dev,
+                                struct iio_chan_spec const *chan, int *val,
+                                int *val2, long mask)
+        {
+                ret = iio_hw_consumer_enable(hwc);
+
+                /* Acquire data */
+
+                ret = iio_hw_consumer_disable(hwc);
+        }
+
+        static int adc_probe(struct platform_device *pdev)
+        {
+                hwc = devm_iio_hw_consumer_alloc(&iio->dev);
+        }
+
+More details
+============
+.. kernel-doc:: include/linux/iio/hw-consumer.h
+.. kernel-doc:: drivers/iio/buffer/industrialio-hw-consumer.c
+   :export:
+
diff --git a/Documentation/driver-api/iio/index.rst b/Documentation/driver-api/iio/index.rst
index e5c3922d1b6f..7fba341bd8b2 100644
--- a/Documentation/driver-api/iio/index.rst
+++ b/Documentation/driver-api/iio/index.rst
@@ -15,3 +15,4 @@ Contents:
    buffers
    triggers
    triggered-buffers
+   hw-consumer
diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index 2e7ee0313c1c..e94d3ac2bdd0 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -341,10 +341,7 @@ GuC
 GuC-specific firmware loader
 ----------------------------
 
-.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c
-   :doc: GuC-specific firmware loader
-
-.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c
+.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fw.c
    :internal:
 
 GuC-based command submission
diff --git a/Documentation/x86/x86_64/mm.txt b/Documentation/x86/x86_64/mm.txt
index ad41b3813f0a..ea91cb61a602 100644
--- a/Documentation/x86/x86_64/mm.txt
+++ b/Documentation/x86/x86_64/mm.txt
@@ -12,8 +12,9 @@ ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB)
 ... unused hole ...
 ffffec0000000000 - fffffbffffffffff (=44 bits) kasan shadow memory (16TB)
 ... unused hole ...
-fffffe0000000000 - fffffe7fffffffff (=39 bits) LDT remap for PTI
-fffffe8000000000 - fffffeffffffffff (=39 bits) cpu_entry_area mapping
+                                    vaddr_end for KASLR
+fffffe0000000000 - fffffe7fffffffff (=39 bits) cpu_entry_area mapping
+fffffe8000000000 - fffffeffffffffff (=39 bits) LDT remap for PTI
 ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks
 ... unused hole ...
 ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space
@@ -37,13 +38,15 @@ ffd4000000000000 - ffd5ffffffffffff (=49 bits) virtual memory map (512TB)
 ... unused hole ...
 ffdf000000000000 - fffffc0000000000 (=53 bits) kasan shadow memory (8PB)
 ... unused hole ...
-fffffe8000000000 - fffffeffffffffff (=39 bits) cpu_entry_area mapping
+                                    vaddr_end for KASLR
+fffffe0000000000 - fffffe7fffffffff (=39 bits) cpu_entry_area mapping
+... unused hole ...
 ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks
 ... unused hole ...
 ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space
 ... unused hole ...
 ffffffff80000000 - ffffffff9fffffff (=512 MB)  kernel text mapping, from phys 0
-ffffffffa0000000 - [fixmap start]   (~1526 MB) module mapping space
+ffffffffa0000000 - fffffffffeffffff (1520 MB) module mapping space
 [fixmap start]   - ffffffffff5fffff kernel-internal fixmap range
 ffffffffff600000 - ffffffffff600fff (=4 kB) legacy vsyscall ABI
 ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
@@ -67,9 +70,10 @@ memory window (this size is arbitrary, it can be raised later if needed).
 The mappings are not part of any other kernel PGD and are only available
 during EFI runtime calls.
 
-The module mapping space size changes based on the CONFIG requirements for the
-following fixmap section.
-
 Note that if CONFIG_RANDOMIZE_MEMORY is enabled, the direct mapping of all
 physical memory, vmalloc/ioremap space and virtual memory map are randomized.
 Their order is preserved but their base will be offset early at boot time.
+
+Be very careful vs. KASLR when changing anything here. The KASLR address
+range must not overlap with anything except the KASAN shadow area, which is
+correct as KASAN disables KASLR.
diff --git a/MAINTAINERS b/MAINTAINERS
index 7e3178c48803..f4800a4c5065 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5149,15 +5149,15 @@ F:	sound/usb/misc/ua101.c
 EFI TEST DRIVER
 L:      linux-efi@vger.kernel.org
 M:      Ivan Hu <ivan.hu@canonical.com>
-M:      Matt Fleming <matt@codeblueprint.co.uk>
+M:      Ard Biesheuvel <ard.biesheuvel@linaro.org>
 S:      Maintained
 F:      drivers/firmware/efi/test/
 
 EFI VARIABLE FILESYSTEM
 M:      Matthew Garrett <matthew.garrett@nebula.com>
 M:      Jeremy Kerr <jk@ozlabs.org>
-M:      Matt Fleming <matt@codeblueprint.co.uk>
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
+M:      Ard Biesheuvel <ard.biesheuvel@linaro.org>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
 L:      linux-efi@vger.kernel.org
 S:      Maintained
 F:      fs/efivarfs/
@@ -5318,7 +5318,6 @@ S:	Supported
 F:      security/integrity/evm/
 
 EXTENSIBLE FIRMWARE INTERFACE (EFI)
-M:      Matt Fleming <matt@codeblueprint.co.uk>
 M:      Ard Biesheuvel <ard.biesheuvel@linaro.org>
 L:      linux-efi@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
diff --git a/Makefile b/Makefile
index eb1f5973813e..eb59638035dd 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 4
 PATCHLEVEL = 15
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
 NAME = Fearless Coyote
 
 # *DOCUMENTATION*
diff --git a/arch/arc/boot/dts/axc003.dtsi b/arch/arc/boot/dts/axc003.dtsi
index 4e6e9f57e790..dc91c663bcc0 100644
--- a/arch/arc/boot/dts/axc003.dtsi
+++ b/arch/arc/boot/dts/axc003.dtsi
@@ -35,6 +35,14 @@
                         reg = <0x80 0x10>, <0x100 0x10>;
                         #clock-cells = <0>;
                         clocks = <&input_clk>;
+
+                        /*
+                         * Set initial core pll output frequency to 90MHz.
+                         * It will be applied at the core pll driver probing
+                         * on early boot.
+                         */
+                        assigned-clocks = <&core_clk>;
+                        assigned-clock-rates = <90000000>;
                 };
 
                 core_intc: archs-intc@cpu {
diff --git a/arch/arc/boot/dts/axc003_idu.dtsi b/arch/arc/boot/dts/axc003_idu.dtsi
index 63954a8b0100..69ff4895f2ba 100644
--- a/arch/arc/boot/dts/axc003_idu.dtsi
+++ b/arch/arc/boot/dts/axc003_idu.dtsi
@@ -35,6 +35,14 @@
                         reg = <0x80 0x10>, <0x100 0x10>;
                         #clock-cells = <0>;
                         clocks = <&input_clk>;
+
+                        /*
+                         * Set initial core pll output frequency to 100MHz.
+                         * It will be applied at the core pll driver probing
+                         * on early boot.
+                         */
+                        assigned-clocks = <&core_clk>;
+                        assigned-clock-rates = <100000000>;
                 };
 
                 core_intc: archs-intc@cpu {
diff --git a/arch/arc/boot/dts/hsdk.dts b/arch/arc/boot/dts/hsdk.dts
index 8f627c200d60..006aa3de5348 100644
--- a/arch/arc/boot/dts/hsdk.dts
+++ b/arch/arc/boot/dts/hsdk.dts
@@ -114,6 +114,14 @@
                         reg = <0x00 0x10>, <0x14B8 0x4>;
                         #clock-cells = <0>;
                         clocks = <&input_clk>;
+
+                        /*
+                         * Set initial core pll output frequency to 1GHz.
+                         * It will be applied at the core pll driver probing
+                         * on early boot.
+                         */
+                        assigned-clocks = <&core_clk>;
+                        assigned-clock-rates = <1000000000>;
                 };
 
                 serial: serial@5000 {
diff --git a/arch/arc/configs/hsdk_defconfig b/arch/arc/configs/hsdk_defconfig
index 7b8f8faf8a24..ac6b0ed8341e 100644
--- a/arch/arc/configs/hsdk_defconfig
+++ b/arch/arc/configs/hsdk_defconfig
@@ -49,10 +49,11 @@ CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
+CONFIG_DRM=y
+# CONFIG_DRM_FBDEV_EMULATION is not set
+CONFIG_DRM_UDL=y
 CONFIG_FB=y
-CONFIG_FB_UDL=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OHCI_HCD=y
diff --git a/arch/arc/include/asm/uaccess.h b/arch/arc/include/asm/uaccess.h
index f35974ee7264..c9173c02081c 100644
--- a/arch/arc/include/asm/uaccess.h
+++ b/arch/arc/include/asm/uaccess.h
@@ -668,6 +668,7 @@ __arc_strncpy_from_user(char *dst, const char __user *src, long count)
                 return 0;
 
         __asm__ __volatile__(
+        "       mov     lp_count, %5            \n"
         "       lp      3f                      \n"
         "1:     ldb.ab  %3, [%2, 1]             \n"
         "       breq.d  %3, 0, 3f               \n"
@@ -684,8 +685,8 @@ __arc_strncpy_from_user(char *dst, const char __user *src, long count)
         "       .word   1b, 4b                  \n"
         "       .previous                       \n"
         : "+r"(res), "+r"(dst), "+r"(src), "=r"(val)
-        : "g"(-EFAULT), "l"(count)
-        : "memory");
+        : "g"(-EFAULT), "r"(count)
+        : "lp_count", "lp_start", "lp_end", "memory");
 
         return res;
 }
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index 7ef7d9a8ff89..9d27331fe69a 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -199,7 +199,7 @@ static void read_arc_build_cfg_regs(void)
                         unsigned int exec_ctrl;
 
                         READ_BCR(AUX_EXEC_CTRL, exec_ctrl);
-                        cpu->extn.dual_enb = exec_ctrl & 1;
+                        cpu->extn.dual_enb = !(exec_ctrl & 1);
 
                         /* dual issue always present for this core */
                         cpu->extn.dual = 1;
diff --git a/arch/arc/kernel/stacktrace.c b/arch/arc/kernel/stacktrace.c
index 74315f302971..bf40e06f3fb8 100644
--- a/arch/arc/kernel/stacktrace.c
+++ b/arch/arc/kernel/stacktrace.c
@@ -163,7 +163,7 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs,
  */
 static int __print_sym(unsigned int address, void *unused)
 {
-        __print_symbol("  %s\n", address);
+        printk("  %pS\n", (void *)address);
         return 0;
 }
 
diff --git a/arch/arc/kernel/traps.c b/arch/arc/kernel/traps.c
index bcd7c9fc5d0f..133a4dae41fe 100644
--- a/arch/arc/kernel/traps.c
+++ b/arch/arc/kernel/traps.c
@@ -83,6 +83,7 @@ DO_ERROR_INFO(SIGILL, "Illegal Insn (or Seq)", insterror_is_error, ILL_ILLOPC)
 DO_ERROR_INFO(SIGBUS, "Invalid Mem Access", __weak do_memory_error, BUS_ADRERR)
 DO_ERROR_INFO(SIGTRAP, "Breakpoint Set", trap_is_brkpt, TRAP_BRKPT)
 DO_ERROR_INFO(SIGBUS, "Misaligned Access", do_misaligned_error, BUS_ADRALN)
+DO_ERROR_INFO(SIGSEGV, "gcc generated __builtin_trap", do_trap5_error, 0)
 
 /*
  * Entry Point for Misaligned Data access Exception, for emulating in software
@@ -115,6 +116,8 @@ void do_machine_check_fault(unsigned long address, struct pt_regs *regs)
  * Thus TRAP_S <n> can be used for specific purpose
  *  -1 used for software breakpointing (gdb)
  *  -2 used by kprobes
+ *  -5 __builtin_trap() generated by gcc (2018.03 onwards) for toggle such as
+ *     -fno-isolate-erroneous-paths-dereference
  */
 void do_non_swi_trap(unsigned long address, struct pt_regs *regs)
 {
@@ -134,6 +137,9 @@ void do_non_swi_trap(unsigned long address, struct pt_regs *regs)
                 kgdb_trap(regs);
                 break;
 
+        case 5:
+                do_trap5_error(address, regs);
+                break;
         default:
                 break;
         }
@@ -155,3 +161,11 @@ void do_insterror_or_kprobe(unsigned long address, struct pt_regs *regs)
 
         insterror_is_error(address, regs);
 }
+
+/*
+ * abort() call generated by older gcc for __builtin_trap()
+ */
+void abort(void)
+{
+        __asm__ __volatile__("trap_s  5\n");
+}
diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c
index 7d8c1d6c2f60..6e9a0a9a6a04 100644
--- a/arch/arc/kernel/troubleshoot.c
+++ b/arch/arc/kernel/troubleshoot.c
@@ -163,6 +163,9 @@ static void show_ecr_verbose(struct pt_regs *regs)
                 else
                         pr_cont("Bus Error, check PRM\n");
 #endif
+        } else if (vec == ECR_V_TRAP) {
+                if (regs->ecr_param == 5)
+                        pr_cont("gcc generated __builtin_trap\n");
         } else {
                 pr_cont("Check Programmer's Manual\n");
         }
diff --git a/arch/arc/plat-axs10x/axs10x.c b/arch/arc/plat-axs10x/axs10x.c
index f1ac6790da5f..46544e88492d 100644
--- a/arch/arc/plat-axs10x/axs10x.c
+++ b/arch/arc/plat-axs10x/axs10x.c
@@ -317,25 +317,23 @@ static void __init axs103_early_init(void)
          * Instead of duplicating defconfig/DT for SMP/QUAD, add a small hack
          * of fudging the freq in DT
          */
+#define AXS103_QUAD_CORE_CPU_FREQ_HZ    50000000
+
         unsigned int num_cores = (read_aux_reg(ARC_REG_MCIP_BCR) >> 16) & 0x3F;
         if (num_cores > 2) {
-                u32 freq = 50, orig;
-                /*
-                 * TODO: use cpu node "cpu-freq" param instead of platform-specific
-                 * "/cpu_card/core_clk" as it works only if we use fixed-clock for cpu.
-                 */
+                u32 freq;
                 int off = fdt_path_offset(initial_boot_params, "/cpu_card/core_clk");
                 const struct fdt_property *prop;
 
                 prop = fdt_get_property(initial_boot_params, off,
-                                        "clock-frequency", NULL);
-                orig = be32_to_cpu(*(u32*)(prop->data)) / 1000000;
+                                        "assigned-clock-rates", NULL);
+                freq = be32_to_cpu(*(u32 *)(prop->data));
 
                 /* Patching .dtb in-place with new core clock value */
-                if (freq != orig ) {
-                        freq = cpu_to_be32(freq * 1000000);
+                if (freq != AXS103_QUAD_CORE_CPU_FREQ_HZ) {
+                        freq = cpu_to_be32(AXS103_QUAD_CORE_CPU_FREQ_HZ);
                         fdt_setprop_inplace(initial_boot_params, off,
-                                            "clock-frequency", &freq, sizeof(freq));
+                                            "assigned-clock-rates", &freq, sizeof(freq));
                 }
         }
 #endif
diff --git a/arch/arc/plat-hsdk/platform.c b/arch/arc/plat-hsdk/platform.c
index fd0ae5e38639..2958aedb649a 100644
--- a/arch/arc/plat-hsdk/platform.c
+++ b/arch/arc/plat-hsdk/platform.c
@@ -38,42 +38,6 @@ static void __init hsdk_init_per_cpu(unsigned int cpu)
 #define CREG_PAE                (CREG_BASE + 0x180)
 #define CREG_PAE_UPDATE         (CREG_BASE + 0x194)
 
-#define CREG_CORE_IF_CLK_DIV    (CREG_BASE + 0x4B8)
-#define CREG_CORE_IF_CLK_DIV_2  0x1
-#define CGU_BASE                ARC_PERIPHERAL_BASE
-#define CGU_PLL_STATUS          (ARC_PERIPHERAL_BASE + 0x4)
-#define CGU_PLL_CTRL            (ARC_PERIPHERAL_BASE + 0x0)
-#define CGU_PLL_STATUS_LOCK     BIT(0)
-#define CGU_PLL_STATUS_ERR      BIT(1)
-#define CGU_PLL_CTRL_1GHZ       0x3A10
-#define HSDK_PLL_LOCK_TIMEOUT   500
-
-#define HSDK_PLL_LOCKED() \
-        !!(ioread32((void __iomem *) CGU_PLL_STATUS) & CGU_PLL_STATUS_LOCK)
-
-#define HSDK_PLL_ERR() \
-        !!(ioread32((void __iomem *) CGU_PLL_STATUS) & CGU_PLL_STATUS_ERR)
-
-static void __init hsdk_set_cpu_freq_1ghz(void)
-{
-        u32 timeout = HSDK_PLL_LOCK_TIMEOUT;
-
-        /*
-         * As we set cpu clock which exceeds 500MHz, the divider for the interface
-         * clock must be programmed to div-by-2.
-         */
-        iowrite32(CREG_CORE_IF_CLK_DIV_2, (void __iomem *) CREG_CORE_IF_CLK_DIV);
-
-        /* Set cpu clock to 1GHz */
-        iowrite32(CGU_PLL_CTRL_1GHZ, (void __iomem *) CGU_PLL_CTRL);
-
-        while (!HSDK_PLL_LOCKED() && timeout--)
-                cpu_relax();
-
-        if (!HSDK_PLL_LOCKED() || HSDK_PLL_ERR())
-                pr_err("Failed to setup CPU frequency to 1GHz!");
-}
-
 #define SDIO_BASE               (ARC_PERIPHERAL_BASE + 0xA000)
 #define SDIO_UHS_REG_EXT        (SDIO_BASE + 0x108)
 #define SDIO_UHS_REG_EXT_DIV_2  (2 << 30)
@@ -98,12 +62,6 @@ static void __init hsdk_init_early(void)
          * minimum possible div-by-2.
          */
         iowrite32(SDIO_UHS_REG_EXT_DIV_2, (void __iomem *) SDIO_UHS_REG_EXT);
-
-        /*
-         * Setup CPU frequency to 1GHz.
-         * TODO: remove it after smart hsdk pll driver will be introduced.
-         */
-        hsdk_set_cpu_freq_1ghz();
 }
 
 static const char *hsdk_compat[] __initconst = {
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 45d815a86d42..de08d9045cb8 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -219,7 +219,7 @@
                                 compatible = "aspeed,ast2400-vuart";
                                 reg = <0x1e787000 0x40>;
                                 reg-shift = <2>;
-                                interrupts = <10>;
+                                interrupts = <8>;
                                 clocks = <&clk_uart>;
                                 no-loopback-test;
                                 status = "disabled";
diff --git a/arch/arm/boot/dts/at91-tse850-3.dts b/arch/arm/boot/dts/at91-tse850-3.dts
index 5f29010cdbd8..9b82cc8843e1 100644
--- a/arch/arm/boot/dts/at91-tse850-3.dts
+++ b/arch/arm/boot/dts/at91-tse850-3.dts
@@ -221,6 +221,7 @@
         jc42@18 {
                 compatible = "nxp,se97b", "jedec,jc-42.4-temp";
                 reg = <0x18>;
+                smbus-timeout-disable;
         };
 
         dpot: mcp4651-104@28 {
diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts
index 413dbd5d9f64..81942ae83e1f 100644
--- a/arch/arm/boot/dts/da850-lego-ev3.dts
+++ b/arch/arm/boot/dts/da850-lego-ev3.dts
@@ -178,7 +178,7 @@
          */
         battery {
                 pinctrl-names = "default";
-                pintctrl-0 = <&battery_pins>;
+                pinctrl-0 = <&battery_pins>;
                 compatible = "lego,ev3-battery";
                 io-channels = <&adc 4>, <&adc 3>;
                 io-channel-names = "voltage", "current";
@@ -392,7 +392,7 @@
         batt_volt_en {
                 gpio-hog;
                 gpios = <6 GPIO_ACTIVE_HIGH>;
-                output-low;
+                output-high;
         };
 };
 
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index b2b95ff205e8..0029ec27819c 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -664,6 +664,10 @@
         status = "okay";
 };
 
+&mixer {
+        status = "okay";
+};
+
 /* eMMC flash */
 &mmc_0 {
         status = "okay";
diff --git a/arch/arm/boot/dts/ls1021a-qds.dts b/arch/arm/boot/dts/ls1021a-qds.dts
index 940875316d0f..67b4de0e3439 100644
--- a/arch/arm/boot/dts/ls1021a-qds.dts
+++ b/arch/arm/boot/dts/ls1021a-qds.dts
@@ -215,7 +215,7 @@
                                 reg = <0x2a>;
                                 VDDA-supply = <&reg_3p3v>;
                                 VDDIO-supply = <&reg_3p3v>;
-                                clocks = <&sys_mclk 1>;
+                                clocks = <&sys_mclk>;
                         };
                 };
         };
diff --git a/arch/arm/boot/dts/ls1021a-twr.dts b/arch/arm/boot/dts/ls1021a-twr.dts
index a8b148ad1dd2..44715c8ef756 100644
--- a/arch/arm/boot/dts/ls1021a-twr.dts
+++ b/arch/arm/boot/dts/ls1021a-twr.dts
@@ -187,7 +187,7 @@
                 reg = <0x0a>;
                 VDDA-supply = <&reg_3p3v>;
                 VDDIO-supply = <&reg_3p3v>;
-                clocks = <&sys_mclk 1>;
+                clocks = <&sys_mclk>;
         };
 };
 
diff --git a/arch/arm/boot/dts/rk3066a-marsboard.dts b/arch/arm/boot/dts/rk3066a-marsboard.dts
index c6d92c25df42..d23ee6d911ac 100644
--- a/arch/arm/boot/dts/rk3066a-marsboard.dts
+++ b/arch/arm/boot/dts/rk3066a-marsboard.dts
@@ -83,6 +83,10 @@
         };
 };
 
+&cpu0 {
+        cpu0-supply = <&vdd_arm>;
+};
+
 &i2c1 {
         status = "okay";
         clock-frequency = <400000>;
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index cd24894ee5c6..6102e4e7f35c 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -956,7 +956,7 @@
         iep_mmu: iommu@ff900800 {
                 compatible = "rockchip,iommu";
                 reg = <0x0 0xff900800 0x0 0x40>;
-                interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH 0>;
+                interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
                 interrupt-names = "iep_mmu";
                 #iommu-cells = <0>;
                 status = "disabled";
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index b91300d49a31..5840f5c75c3b 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -502,8 +502,8 @@
                         reg = <0x01c16000 0x1000>;
                         interrupts = <58>;
                         clocks = <&ccu CLK_AHB_HDMI0>, <&ccu CLK_HDMI>,
-                                 <&ccu 9>,
-                                 <&ccu 18>;
+                                 <&ccu CLK_PLL_VIDEO0_2X>,
+                                 <&ccu CLK_PLL_VIDEO1_2X>;
                         clock-names = "ahb", "mod", "pll-0", "pll-1";
                         dmas = <&dma SUN4I_DMA_NORMAL 16>,
                                <&dma SUN4I_DMA_NORMAL 16>,
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 6ae4d95e230e..316cb8b2945b 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -82,8 +82,8 @@
                         reg = <0x01c16000 0x1000>;
                         interrupts = <58>;
                         clocks = <&ccu CLK_AHB_HDMI>, <&ccu CLK_HDMI>,
-                                 <&ccu 9>,
-                                 <&ccu 16>;
+                                 <&ccu CLK_PLL_VIDEO0_2X>,
+                                 <&ccu CLK_PLL_VIDEO1_2X>;
                         clock-names = "ahb", "mod", "pll-0", "pll-1";
                         dmas = <&dma SUN4I_DMA_NORMAL 16>,
                                <&dma SUN4I_DMA_NORMAL 16>,
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 8bfa12b548e0..72d3fe44ecaf 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -429,8 +429,8 @@
                         interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&ccu CLK_AHB1_HDMI>, <&ccu CLK_HDMI>,
                                  <&ccu CLK_HDMI_DDC>,
-                                 <&ccu 7>,
-                                 <&ccu 13>;
+                                 <&ccu CLK_PLL_VIDEO0_2X>,
+                                 <&ccu CLK_PLL_VIDEO1_2X>;
                         clock-names = "ahb", "mod", "ddc", "pll-0", "pll-1";
                         resets = <&ccu RST_AHB1_HDMI>;
                         reset-names = "ahb";
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 68dfa82544fc..59655e42e4b0 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -581,8 +581,8 @@
                         reg = <0x01c16000 0x1000>;
                         interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&ccu CLK_AHB_HDMI0>, <&ccu CLK_HDMI>,
-                                 <&ccu 9>,
-                                 <&ccu 18>;
+                                 <&ccu CLK_PLL_VIDEO0_2X>,
+                                 <&ccu CLK_PLL_VIDEO1_2X>;
                         clock-names = "ahb", "mod", "pll-0", "pll-1";
                         dmas = <&dma SUN4I_DMA_NORMAL 16>,
                                <&dma SUN4I_DMA_NORMAL 16>,
diff --git a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
index 98715538932f..a021ee6da396 100644
--- a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
@@ -146,6 +146,7 @@
         status = "okay";
 
         axp81x: pmic@3a3 {
+                compatible = "x-powers,axp813";
                 reg = <0x3a3>;
                 interrupt-parent = <&r_intc>;
                 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
diff --git a/arch/arm/boot/dts/tango4-common.dtsi b/arch/arm/boot/dts/tango4-common.dtsi
index 0ec1b0a317b4..ff72a8efb73d 100644
--- a/arch/arm/boot/dts/tango4-common.dtsi
+++ b/arch/arm/boot/dts/tango4-common.dtsi
@@ -156,7 +156,6 @@
                         reg = <0x6e000 0x400>;
                         ranges = <0 0x6e000 0x400>;
                         interrupt-parent = <&gic>;
-                        interrupt-controller;
                         #address-cells = <1>;
                         #size-cells = <1>;
 
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 5cf04888c581..3e26c6f7a191 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -793,7 +793,6 @@ void abort(void)
         /* if that doesn't kill us, halt */
         panic("Oops failed to kill thread");
 }
-EXPORT_SYMBOL(abort);
 
 void __init trap_init(void)
 {
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 8be04ec95adf..5ace9380626a 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -868,10 +868,10 @@ static const struct dma_slave_map dm365_edma_map[] = {
         { "spi_davinci.0", "rx", EDMA_FILTER_PARAM(0, 17) },
         { "spi_davinci.3", "tx", EDMA_FILTER_PARAM(0, 18) },
         { "spi_davinci.3", "rx", EDMA_FILTER_PARAM(0, 19) },
-        { "dm6441-mmc.0", "rx", EDMA_FILTER_PARAM(0, 26) },
-        { "dm6441-mmc.0", "tx", EDMA_FILTER_PARAM(0, 27) },
-        { "dm6441-mmc.1", "rx", EDMA_FILTER_PARAM(0, 30) },
-        { "dm6441-mmc.1", "tx", EDMA_FILTER_PARAM(0, 31) },
+        { "da830-mmc.0", "rx", EDMA_FILTER_PARAM(0, 26) },
+        { "da830-mmc.0", "tx", EDMA_FILTER_PARAM(0, 27) },
+        { "da830-mmc.1", "rx", EDMA_FILTER_PARAM(0, 30) },
+        { "da830-mmc.1", "tx", EDMA_FILTER_PARAM(0, 31) },
 };
 
 static struct edma_soc_info dm365_edma_pdata = {
@@ -925,12 +925,14 @@ static struct resource edma_resources[] = {
         /* not using TC*_ERR */
 };
 
-static struct platform_device dm365_edma_device = {
-        .name                   = "edma",
-        .id                     = 0,
-        .dev.platform_data      = &dm365_edma_pdata,
-        .num_resources          = ARRAY_SIZE(edma_resources),
-        .resource               = edma_resources,
+static const struct platform_device_info dm365_edma_device __initconst = {
+        .name           = "edma",
+        .id             = 0,
+        .dma_mask       = DMA_BIT_MASK(32),
+        .res            = edma_resources,
+        .num_res        = ARRAY_SIZE(edma_resources),
+        .data           = &dm365_edma_pdata,
+        .size_data      = sizeof(dm365_edma_pdata),
 };
 
 static struct resource dm365_asp_resources[] = {
@@ -1428,13 +1430,18 @@ int __init dm365_init_video(struct vpfe_config *vpfe_cfg,
 
 static int __init dm365_init_devices(void)
 {
+        struct platform_device *edma_pdev;
         int ret = 0;
 
         if (!cpu_is_davinci_dm365())
                 return 0;
 
         davinci_cfg_reg(DM365_INT_EDMA_CC);
-        platform_device_register(&dm365_edma_device);
+        edma_pdev = platform_device_register_full(&dm365_edma_device);
+        if (IS_ERR(edma_pdev)) {
+                pr_warn("%s: Failed to register eDMA\n", __func__);
+                return PTR_ERR(edma_pdev);
+        }
 
         platform_device_register(&dm365_mdio_device);
         platform_device_register(&dm365_emac_device);
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
index 45bdbfb96126..4a8d3f83a36e 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
@@ -75,6 +75,7 @@
         pinctrl-0 = <&rgmii_pins>;
         phy-mode = "rgmii";
         phy-handle = <&ext_rgmii_phy>;
+        phy-supply = <&reg_dc1sw>;
         status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
index 806442d3e846..604cdaedac38 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
@@ -77,6 +77,7 @@
         pinctrl-0 = <&rmii_pins>;
         phy-mode = "rmii";
         phy-handle = <&ext_rmii_phy1>;
+        phy-supply = <&reg_dc1sw>;
         status = "okay";
 
 };
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
index 0eb2acedf8c3..abe179de35d7 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
@@ -82,6 +82,7 @@
         pinctrl-0 = <&rgmii_pins>;
         phy-mode = "rgmii";
         phy-handle = <&ext_rgmii_phy>;
+        phy-supply = <&reg_dc1sw>;
         status = "okay";
 };
 
@@ -95,7 +96,7 @@
 &mmc2 {
         pinctrl-names = "default";
         pinctrl-0 = <&mmc2_pins>;
-        vmmc-supply = <&reg_vcc3v3>;
+        vmmc-supply = <&reg_dcdc1>;
         vqmmc-supply = <&reg_vcc1v8>;
         bus-width = <8>;
         non-removable;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
index a5da18a6f286..43418bd881d8 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
@@ -45,19 +45,10 @@
 
 #include "sun50i-a64.dtsi"
 
-/ {
-        reg_vcc3v3: vcc3v3 {
-                compatible = "regulator-fixed";
-                regulator-name = "vcc3v3";
-                regulator-min-microvolt = <3300000>;
-                regulator-max-microvolt = <3300000>;
-        };
-};
-
 &mmc0 {
         pinctrl-names = "default";
         pinctrl-0 = <&mmc0_pins>;
-        vmmc-supply = <&reg_vcc3v3>;
+        vmmc-supply = <&reg_dcdc1>;
         non-removable;
         disable-wp;
         bus-width = <4>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
index b6b7a561df8c..a42fd79a62a3 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
@@ -71,7 +71,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
         status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
index a298df74ca6c..dbe2648649db 100644
--- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
@@ -255,7 +255,6 @@
 &avb {
         pinctrl-0 = <&avb_pins>;
         pinctrl-names = "default";
-        renesas,no-ether-link;
         phy-handle = <&phy0>;
         status = "okay";
 
diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi
index 0d85b315ce71..73439cf48659 100644
--- a/arch/arm64/boot/dts/renesas/ulcb.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi
@@ -145,7 +145,6 @@
 &avb {
         pinctrl-0 = <&avb_pins>;
         pinctrl-names = "default";
-        renesas,no-ether-link;
         phy-handle = <&phy0>;
         status = "okay";
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
index d4f80786e7c2..3890468678ce 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -132,6 +132,8 @@
         assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
         assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
         clock_in_out = "input";
+        /* shows instability at 1GBit right now */
+        max-speed = <100>;
         phy-supply = <&vcc_io>;
         phy-mode = "rgmii";
         pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 41d61840fb99..2426da631938 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -514,7 +514,7 @@
         tsadc: tsadc@ff250000 {
                 compatible = "rockchip,rk3328-tsadc";
                 reg = <0x0 0xff250000 0x0 0x100>;
-                interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH 0>;
+                interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
                 assigned-clocks = <&cru SCLK_TSADC>;
                 assigned-clock-rates = <50000>;
                 clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index 910628d18add..1fc5060d7027 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -155,17 +155,6 @@
                 regulator-min-microvolt = <5000000>;
                 regulator-max-microvolt = <5000000>;
         };
-
-        vdd_log: vdd-log {
-                compatible = "pwm-regulator";
-                pwms = <&pwm2 0 25000 0>;
-                regulator-name = "vdd_log";
-                regulator-min-microvolt = <800000>;
-                regulator-max-microvolt = <1400000>;
-                regulator-always-on;
-                regulator-boot-on;
-                status = "okay";
-        };
 };
 
 &cpu_b0 {
diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
index 48e733136db4..0ac2ace82435 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
@@ -198,8 +198,8 @@
                         gpio-controller;
                         #gpio-cells = <2>;
                         gpio-ranges = <&pinctrl 0 0 0>,
-                                      <&pinctrl 96 0 0>,
-                                      <&pinctrl 160 0 0>;
+                                      <&pinctrl 104 0 0>,
+                                      <&pinctrl 168 0 0>;
                         gpio-ranges-group-names = "gpio_range0",
                                                   "gpio_range1",
                                                   "gpio_range2";
diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c
index cb79fba79d43..b88a8dd14933 100644
--- a/arch/m32r/kernel/traps.c
+++ b/arch/m32r/kernel/traps.c
@@ -122,7 +122,6 @@ void abort(void)
         /* if that doesn't kill us, halt */
         panic("Oops failed to kill thread");
 }
-EXPORT_SYMBOL(abort);
 
 void __init trap_init(void)
 {
diff --git a/arch/parisc/include/asm/ldcw.h b/arch/parisc/include/asm/ldcw.h
index dd5a08aaa4da..3eb4bfc1fb36 100644
--- a/arch/parisc/include/asm/ldcw.h
+++ b/arch/parisc/include/asm/ldcw.h
@@ -12,6 +12,7 @@
    for the semaphore.  */
 
 #define __PA_LDCW_ALIGNMENT     16
+#define __PA_LDCW_ALIGN_ORDER   4
 #define __ldcw_align(a) ({                                      \
         unsigned long __ret = (unsigned long) &(a)->lock[0];    \
         __ret = (__ret + __PA_LDCW_ALIGNMENT - 1)               \
@@ -29,6 +30,7 @@
    ldcd). */
 
 #define __PA_LDCW_ALIGNMENT     4
+#define __PA_LDCW_ALIGN_ORDER   2
 #define __ldcw_align(a) (&(a)->slock)
 #define __LDCW  "ldcw,co"
 
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c
index d8f77358e2ba..29b99b8964aa 100644
--- a/arch/parisc/kernel/drivers.c
+++ b/arch/parisc/kernel/drivers.c
@@ -870,7 +870,7 @@ static void print_parisc_device(struct parisc_device *dev)
         static int count;
 
         print_pa_hwpath(dev, hw_path);
-        printk(KERN_INFO "%d. %s at 0x%p [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",
+        printk(KERN_INFO "%d. %s at 0x%px [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",
                 ++count, dev->name, (void*) dev->hpa.start, hw_path, dev->id.hw_type,
                 dev->id.hversion_rev, dev->id.hversion, dev->id.sversion);
 
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index f3cecf5117cf..e95207c0565e 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -35,6 +35,7 @@
 #include <asm/pgtable.h>
 #include <asm/signal.h>
 #include <asm/unistd.h>
+#include <asm/ldcw.h>
 #include <asm/thread_info.h>
 
 #include <linux/linkage.h>
@@ -46,6 +47,14 @@
 #endif
 
         .import         pa_tlb_lock,data
+        .macro  load_pa_tlb_lock reg
+#if __PA_LDCW_ALIGNMENT > 4
+        load32  PA(pa_tlb_lock) + __PA_LDCW_ALIGNMENT-1, \reg
+        depi    0,31,__PA_LDCW_ALIGN_ORDER, \reg
+#else
+        load32  PA(pa_tlb_lock), \reg
+#endif
+        .endm
 
         /* space_to_prot macro creates a prot id from a space id */
 
@@ -457,7 +466,7 @@
         .macro          tlb_lock        spc,ptp,pte,tmp,tmp1,fault
 #ifdef CONFIG_SMP
         cmpib,COND(=),n 0,\spc,2f
-        load32          PA(pa_tlb_lock),\tmp
+        load_pa_tlb_lock \tmp
 1:      LDCW            0(\tmp),\tmp1
         cmpib,COND(=)   0,\tmp1,1b
         nop
@@ -480,7 +489,7 @@
         /* Release pa_tlb_lock lock. */
         .macro          tlb_unlock1     spc,tmp
 #ifdef CONFIG_SMP
-        load32          PA(pa_tlb_lock),\tmp
+        load_pa_tlb_lock \tmp
         tlb_unlock0     \spc,\tmp
 #endif
         .endm
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
index adf7187f8951..2d40c4ff3f69 100644
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
@@ -36,6 +36,7 @@
 #include <asm/assembly.h>
 #include <asm/pgtable.h>
 #include <asm/cache.h>
+#include <asm/ldcw.h>
 #include <linux/linkage.h>
 
         .text
@@ -333,8 +334,12 @@ ENDPROC_CFI(flush_data_cache_local)
 
         .macro  tlb_lock        la,flags,tmp
 #ifdef CONFIG_SMP
-        ldil            L%pa_tlb_lock,%r1
-        ldo             R%pa_tlb_lock(%r1),\la
+#if __PA_LDCW_ALIGNMENT > 4
+        load32          pa_tlb_lock + __PA_LDCW_ALIGNMENT-1, \la
+        depi            0,31,__PA_LDCW_ALIGN_ORDER, \la
+#else
+        load32          pa_tlb_lock, \la
+#endif
         rsm             PSW_SM_I,\flags
 1:      LDCW            0(\la),\tmp
         cmpib,<>,n      0,\tmp,3f
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 30f92391a93e..cad3e8661cd6 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -39,6 +39,7 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/fs.h>
+#include <linux/cpu.h>
 #include <linux/module.h>
 #include <linux/personality.h>
 #include <linux/ptrace.h>
@@ -184,6 +185,44 @@ int dump_task_fpu (struct task_struct *tsk, elf_fpregset_t *r)
 }
 
 /*
+ * Idle thread support
+ *
+ * Detect when running on QEMU with SeaBIOS PDC Firmware and let
+ * QEMU idle the host too.
+ */
+
+int running_on_qemu __read_mostly;
+
+void __cpuidle arch_cpu_idle_dead(void)
+{
+        /* nop on real hardware, qemu will offline CPU. */
+        asm volatile("or %%r31,%%r31,%%r31\n":::);
+}
+
+void __cpuidle arch_cpu_idle(void)
+{
+        local_irq_enable();
+
+        /* nop on real hardware, qemu will idle sleep. */
+        asm volatile("or %%r10,%%r10,%%r10\n":::);
+}
+
+static int __init parisc_idle_init(void)
+{
+        const char *marker;
+
+        /* check QEMU/SeaBIOS marker in PAGE0 */
+        marker = (char *) &PAGE0->pad0;
+        running_on_qemu = (memcmp(marker, "SeaBIOS", 8) == 0);
+
+        if (!running_on_qemu)
+                cpu_idle_poll_ctrl(1);
+
+        return 0;
+}
+arch_initcall(parisc_idle_init);
+
+/*
  * Copy architecture-specific thread state
  */
 int
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 13f7854e0d49..48f41399fc0b 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -631,11 +631,11 @@ void __init mem_init(void)
         mem_init_print_info(NULL);
 #ifdef CONFIG_DEBUG_KERNEL /* double-sanity-check paranoia */
         printk("virtual kernel memory layout:\n"
-               "    vmalloc : 0x%p - 0x%p   (%4ld MB)\n"
-               "    memory  : 0x%p - 0x%p   (%4ld MB)\n"
-               "      .init : 0x%p - 0x%p   (%4ld kB)\n"
-               "      .data : 0x%p - 0x%p   (%4ld kB)\n"
-               "      .text : 0x%p - 0x%p   (%4ld kB)\n",
+               "    vmalloc : 0x%px - 0x%px   (%4ld MB)\n"
+               "    memory  : 0x%px - 0x%px   (%4ld MB)\n"
+               "      .init : 0x%px - 0x%px   (%4ld kB)\n"
+               "      .data : 0x%px - 0x%px   (%4ld kB)\n"
+               "      .text : 0x%px - 0x%px   (%4ld kB)\n",
 
                (void*)VMALLOC_START, (void*)VMALLOC_END,
                (VMALLOC_END - VMALLOC_START) >> 20,
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 4797d08581ce..6e1e39035380 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -145,6 +145,11 @@ static noinline int bad_area(struct pt_regs *regs, unsigned long address)
         return __bad_area(regs, address, SEGV_MAPERR);
 }
 
+static noinline int bad_access(struct pt_regs *regs, unsigned long address)
+{
+        return __bad_area(regs, address, SEGV_ACCERR);
+}
+
 static int do_sigbus(struct pt_regs *regs, unsigned long address,
                      unsigned int fault)
 {
@@ -490,7 +495,7 @@ retry:
 
 good_area:
         if (unlikely(access_error(is_write, is_exec, vma)))
-                return bad_area(regs, address);
+                return bad_access(regs, address);
 
         /*
          * If for any reason at all we couldn't handle the fault,
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index ec8b68e97d3c..2c93cbbcd15e 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -792,11 +792,12 @@ static int kvm_s390_vm_start_migration(struct kvm *kvm)
 
         if (kvm->arch.use_cmma) {
                 /*
-                 * Get the last slot. They should be sorted by base_gfn, so the
-                 * last slot is also the one at the end of the address space.
-                 * We have verified above that at least one slot is present.
+                 * Get the first slot. They are reverse sorted by base_gfn, so
+                 * the first slot is also the one at the end of the address
+                 * space. We have verified above that at least one slot is
+                 * present.
                  */
-                ms = slots->memslots + slots->used_slots - 1;
+                ms = slots->memslots;
                 /* round up so we only use full longs */
                 ram_pages = roundup(ms->base_gfn + ms->npages, BITS_PER_LONG);
                 /* allocate enough bytes to store all the bits */
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 572496c688cc..0714bfa56da0 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -1006,7 +1006,7 @@ static inline int do_essa(struct kvm_vcpu *vcpu, const int orc)
                 cbrlo[entries] = gfn << PAGE_SHIFT;
         }
 
-        if (orc) {
+        if (orc && gfn < ms->bitmap_size) {
                 /* increment only if we are really flipping the bit to 1 */
                 if (!test_and_set_bit(gfn, ms->pgste_bitmap))
                         atomic64_inc(&ms->dirty_pages);
diff --git a/arch/s390/lib/uaccess.c b/arch/s390/lib/uaccess.c
index cae5a1e16cbd..c4f8039a35e8 100644
--- a/arch/s390/lib/uaccess.c
+++ b/arch/s390/lib/uaccess.c
@@ -89,11 +89,11 @@ EXPORT_SYMBOL(enable_sacf_uaccess);
 
 void disable_sacf_uaccess(mm_segment_t old_fs)
 {
+        current->thread.mm_segment = old_fs;
         if (old_fs == USER_DS && test_facility(27)) {
                 __ctl_load(S390_lowcore.user_asce, 1, 1);
                 clear_cpu_flag(CIF_ASCE_PRIMARY);
         }
-        current->thread.mm_segment = old_fs;
 }
 EXPORT_SYMBOL(disable_sacf_uaccess);
 
diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index f7aa5a77827e..2d15d84c20ed 100644
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -181,6 +181,9 @@ out_unlock:
 static int __dma_purge_tlb(struct zpci_dev *zdev, dma_addr_t dma_addr,
                            size_t size, int flags)
 {
+        unsigned long irqflags;
+        int ret;
+
         /*
          * With zdev->tlb_refresh == 0, rpcit is not required to establish new
          * translations when previously invalid translation-table entries are
@@ -196,8 +199,22 @@ static int __dma_purge_tlb(struct zpci_dev *zdev, dma_addr_t dma_addr,
                         return 0;
         }
 
-        return zpci_refresh_trans((u64) zdev->fh << 32, dma_addr,
-                                  PAGE_ALIGN(size));
+        ret = zpci_refresh_trans((u64) zdev->fh << 32, dma_addr,
+                                 PAGE_ALIGN(size));
+        if (ret == -ENOMEM && !s390_iommu_strict) {
+                /* enable the hypervisor to free some resources */
+                if (zpci_refresh_global(zdev))
+                        goto out;
+
+                spin_lock_irqsave(&zdev->iommu_bitmap_lock, irqflags);
+                bitmap_andnot(zdev->iommu_bitmap, zdev->iommu_bitmap,
+                              zdev->lazy_bitmap, zdev->iommu_pages);
+                bitmap_zero(zdev->lazy_bitmap, zdev->iommu_pages);
+                spin_unlock_irqrestore(&zdev->iommu_bitmap_lock, irqflags);
+                ret = 0;
+        }
+out:
+        return ret;
 }
 
 static int dma_update_trans(struct zpci_dev *zdev, unsigned long pa,
diff --git a/arch/s390/pci/pci_insn.c b/arch/s390/pci/pci_insn.c
index 19bcb3b45a70..f069929e8211 100644
--- a/arch/s390/pci/pci_insn.c
+++ b/arch/s390/pci/pci_insn.c
@@ -89,6 +89,9 @@ int zpci_refresh_trans(u64 fn, u64 addr, u64 range)
         if (cc)
                 zpci_err_insn(cc, status, addr, range);
 
+        if (cc == 1 && (status == 4 || status == 16))
+                return -ENOMEM;
+
         return (cc) ? -EIO : 0;
 }
 
diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c
index 5f25b39f04d4..c4ac6043ebb0 100644
--- a/arch/unicore32/kernel/traps.c
+++ b/arch/unicore32/kernel/traps.c
@@ -298,7 +298,6 @@ void abort(void)
         /* if that doesn't kill us, halt */
         panic("Oops failed to kill thread");
 }
-EXPORT_SYMBOL(abort);
 
 void __init trap_init(void)
 {
diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S
index 40f17009ec20..98d5358e4041 100644
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
@@ -190,8 +190,13 @@ ENTRY(entry_SYSCALL_compat)
         /* Interrupts are off on entry. */
         swapgs
 
-        /* Stash user ESP and switch to the kernel stack. */
+        /* Stash user ESP */
         movl    %esp, %r8d
+
+        /* Use %rsp as scratch reg. User ESP is stashed in r8 */
+        SWITCH_TO_KERNEL_CR3 scratch_reg=%rsp
+
+        /* Switch to the kernel stack */
         movq    PER_CPU_VAR(cpu_current_top_of_stack), %rsp
 
         /* Construct struct pt_regs on stack */
@@ -220,12 +225,6 @@ GLOBAL(entry_SYSCALL_compat_after_hwframe)
         pushq   $0                      /* pt_regs->r15 = 0 */
 
         /*
-         * We just saved %rdi so it is safe to clobber.  It is not
-         * preserved during the C calls inside TRACE_IRQS_OFF anyway.
-         */
-        SWITCH_TO_KERNEL_CR3 scratch_reg=%rdi
-
-        /*
          * User mode is traced as though IRQs are on, and SYSENTER
          * turned them off.
          */
diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c
index 8f0aace08b87..8156e47da7ba 100644
--- a/arch/x86/events/intel/ds.c
+++ b/arch/x86/events/intel/ds.c
@@ -5,6 +5,7 @@
 
 #include <asm/cpu_entry_area.h>
 #include <asm/perf_event.h>
+#include <asm/tlbflush.h>
 #include <asm/insn.h>
 
 #include "../perf_event.h"
@@ -283,20 +284,35 @@ static DEFINE_PER_CPU(void *, insn_buffer);
 
 static void ds_update_cea(void *cea, void *addr, size_t size, pgprot_t prot)
 {
+        unsigned long start = (unsigned long)cea;
         phys_addr_t pa;
         size_t msz = 0;
 
         pa = virt_to_phys(addr);
+
+        preempt_disable();
         for (; msz < size; msz += PAGE_SIZE, pa += PAGE_SIZE, cea += PAGE_SIZE)
                 cea_set_pte(cea, pa, prot);
+
+        /*
+         * This is a cross-CPU update of the cpu_entry_area, we must shoot down
+         * all TLB entries for it.
+         */
+        flush_tlb_kernel_range(start, start + size);
+        preempt_enable();
 }
 
 static void ds_clear_cea(void *cea, size_t size)
 {
+        unsigned long start = (unsigned long)cea;
         size_t msz = 0;
 
+        preempt_disable();
         for (; msz < size; msz += PAGE_SIZE, cea += PAGE_SIZE)
                 cea_set_pte(cea, 0, PAGE_NONE);
+
+        flush_tlb_kernel_range(start, start + size);
+        preempt_enable();
 }
 
 static void *dsalloc_pages(size_t size, gfp_t flags, int cpu)
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index dbfd0854651f..cf5961ca8677 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -140,7 +140,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
         ".popsection\n"                                                 \
         ".pushsection .altinstr_replacement, \"ax\"\n"                  \
         ALTINSTR_REPLACEMENT(newinstr, feature, 1)                      \
-        ".popsection"
+        ".popsection\n"
 
 #define ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2)\
         OLDINSTR_2(oldinstr, 1, 2)                                      \
@@ -151,7 +151,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
         ".pushsection .altinstr_replacement, \"ax\"\n"                  \
         ALTINSTR_REPLACEMENT(newinstr1, feature1, 1)                    \
         ALTINSTR_REPLACEMENT(newinstr2, feature2, 2)                    \
-        ".popsection"
+        ".popsection\n"
 
 /*
  * Alternative instructions for different CPU types or capabilities.
diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
index 07cdd1715705..21ac898df2d8 100644
--- a/arch/x86/include/asm/cpufeatures.h
+++ b/arch/x86/include/asm/cpufeatures.h
@@ -341,6 +341,6 @@
 #define X86_BUG_SWAPGS_FENCE            X86_BUG(11) /* SWAPGS without input dep on GS */
 #define X86_BUG_MONITOR                 X86_BUG(12) /* IPI required to wake up remote CPU */
 #define X86_BUG_AMD_E400                X86_BUG(13) /* CPU is among the affected by Erratum 400 */
-#define X86_BUG_CPU_INSECURE            X86_BUG(14) /* CPU is insecure and needs kernel page table isolation */
+#define X86_BUG_CPU_MELTDOWN            X86_BUG(14) /* CPU is affected by meltdown attack and needs kernel page table isolation */
 
 #endif /* _ASM_X86_CPUFEATURES_H */
diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
index b97a539bcdee..6b8f73dcbc2c 100644
--- a/arch/x86/include/asm/pgtable_64_types.h
+++ b/arch/x86/include/asm/pgtable_64_types.h
@@ -75,7 +75,13 @@ typedef struct { pteval_t pte; } pte_t;
 #define PGDIR_SIZE      (_AC(1, UL) << PGDIR_SHIFT)
 #define PGDIR_MASK      (~(PGDIR_SIZE - 1))
 
-/* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
+/*
+ * See Documentation/x86/x86_64/mm.txt for a description of the memory map.
+ *
+ * Be very careful vs. KASLR when changing anything here. The KASLR address
+ * range must not overlap with anything except the KASAN shadow area, which
+ * is correct as KASAN disables KASLR.
+ */
 #define MAXMEM                  _AC(__AC(1, UL) << MAX_PHYSMEM_BITS, UL)
 
 #ifdef CONFIG_X86_5LEVEL
@@ -88,7 +94,7 @@ typedef struct { pteval_t pte; } pte_t;
 # define VMALLOC_SIZE_TB        _AC(32, UL)
 # define __VMALLOC_BASE         _AC(0xffffc90000000000, UL)
 # define __VMEMMAP_BASE         _AC(0xffffea0000000000, UL)
-# define LDT_PGD_ENTRY          _AC(-4, UL)
+# define LDT_PGD_ENTRY          _AC(-3, UL)
 # define LDT_BASE_ADDR          (LDT_PGD_ENTRY << PGDIR_SHIFT)
 #endif
 
@@ -104,13 +110,13 @@ typedef struct { pteval_t pte; } pte_t;
 
 #define MODULES_VADDR           (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
 /* The module sections ends with the start of the fixmap */
-#define MODULES_END             __fix_to_virt(__end_of_fixed_addresses + 1)
+#define MODULES_END             _AC(0xffffffffff000000, UL)
 #define MODULES_LEN             (MODULES_END - MODULES_VADDR)
 
 #define ESPFIX_PGD_ENTRY        _AC(-2, UL)
 #define ESPFIX_BASE_ADDR        (ESPFIX_PGD_ENTRY << P4D_SHIFT)
 
-#define CPU_ENTRY_AREA_PGD      _AC(-3, UL)
+#define CPU_ENTRY_AREA_PGD      _AC(-4, UL)
 #define CPU_ENTRY_AREA_BASE     (CPU_ENTRY_AREA_PGD << P4D_SHIFT)
 
 #define EFI_VA_START            ( -4 * (_AC(1, UL) << 30))
diff --git a/arch/x86/include/asm/unwind.h b/arch/x86/include/asm/unwind.h
index c1688c2d0a12..1f86e1b0a5cd 100644
--- a/arch/x86/include/asm/unwind.h
+++ b/arch/x86/include/asm/unwind.h
@@ -56,18 +56,27 @@ void unwind_start(struct unwind_state *state, struct task_struct *task,
 
 #if defined(CONFIG_UNWINDER_ORC) || defined(CONFIG_UNWINDER_FRAME_POINTER)
 /*
- * WARNING: The entire pt_regs may not be safe to dereference.  In some cases,
- * only the iret frame registers are accessible.  Use with caution!
+ * If 'partial' returns true, only the iret frame registers are valid.
  */
-static inline struct pt_regs *unwind_get_entry_regs(struct unwind_state *state)
+static inline struct pt_regs *unwind_get_entry_regs(struct unwind_state *state,
+                                                    bool *partial)
 {
         if (unwind_done(state))
                 return NULL;
 
+        if (partial) {
+#ifdef CONFIG_UNWINDER_ORC
+                *partial = !state->full_regs;
+#else
+                *partial = false;
+#endif
+        }
+
         return state->regs;
 }
 #else
-static inline struct pt_regs *unwind_get_entry_regs(struct unwind_state *state)
+static inline struct pt_regs *unwind_get_entry_regs(struct unwind_state *state,
+                                                    bool *partial)
 {
         return NULL;
 }
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index c47de4ebf63a..39d7ea865207 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -923,8 +923,8 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
 
         setup_force_cpu_cap(X86_FEATURE_ALWAYS);
 
-        /* Assume for now that ALL x86 CPUs are insecure */
-        setup_force_cpu_bug(X86_BUG_CPU_INSECURE);
+        if (c->x86_vendor != X86_VENDOR_AMD)
+                setup_force_cpu_bug(X86_BUG_CPU_MELTDOWN);
 
         fpu__init_system(c);
 
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 5fa110699ed2..afbecff161d1 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -76,12 +76,23 @@ void show_iret_regs(struct pt_regs *regs)
                 regs->sp, regs->flags);
 }
 
-static void show_regs_safe(struct stack_info *info, struct pt_regs *regs)
+static void show_regs_if_on_stack(struct stack_info *info, struct pt_regs *regs,
+                                  bool partial)
 {
-        if (on_stack(info, regs, sizeof(*regs)))
+        /*
+         * These on_stack() checks aren't strictly necessary: the unwind code
+         * has already validated the 'regs' pointer.  The checks are done for
+         * ordering reasons: if the registers are on the next stack, we don't
+         * want to print them out yet.  Otherwise they'll be shown as part of
+         * the wrong stack.  Later, when show_trace_log_lvl() switches to the
+         * next stack, this function will be called again with the same regs so
+         * they can be printed in the right context.
+         */
+        if (!partial && on_stack(info, regs, sizeof(*regs))) {
                 __show_regs(regs, 0);
-        else if (on_stack(info, (void *)regs + IRET_FRAME_OFFSET,
-                          IRET_FRAME_SIZE)) {
+
+        } else if (partial && on_stack(info, (void *)regs + IRET_FRAME_OFFSET,
+                                       IRET_FRAME_SIZE)) {
                 /*
                  * When an interrupt or exception occurs in entry code, the
                  * full pt_regs might not have been saved yet.  In that case
@@ -98,11 +109,13 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
         struct stack_info stack_info = {0};
         unsigned long visit_mask = 0;
         int graph_idx = 0;
+        bool partial;
 
         printk("%sCall Trace:\n", log_lvl);
 
         unwind_start(&state, task, regs, stack);
         stack = stack ? : get_stack_pointer(task, regs);
+        regs = unwind_get_entry_regs(&state, &partial);
 
         /*
          * Iterate through the stacks, starting with the current stack pointer.
@@ -120,7 +133,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
          * - hardirq stack
          * - entry stack
          */
-        for (regs = NULL; stack; stack = PTR_ALIGN(stack_info.next_sp, sizeof(long))) {
+        for ( ; stack; stack = PTR_ALIGN(stack_info.next_sp, sizeof(long))) {
                 const char *stack_name;
 
                 if (get_stack_info(stack, task, &stack_info, &visit_mask)) {
@@ -140,7 +153,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
                         printk("%s <%s>\n", log_lvl, stack_name);
 
                 if (regs)
-                        show_regs_safe(&stack_info, regs);
+                        show_regs_if_on_stack(&stack_info, regs, partial);
 
                 /*
                  * Scan the stack, printing any text addresses we find.  At the
@@ -164,7 +177,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
 
                         /*
                          * Don't print regs->ip again if it was already printed
-                         * by show_regs_safe() below.
+                         * by show_regs_if_on_stack().
                          */
                         if (regs && stack == &regs->ip)
                                 goto next;
@@ -199,9 +212,9 @@ next:
                         unwind_next_frame(&state);
 
                         /* if the frame has entry regs, print them */
-                        regs = unwind_get_entry_regs(&state);
+                        regs = unwind_get_entry_regs(&state, &partial);
                         if (regs)
-                                show_regs_safe(&stack_info, regs);
+                                show_regs_if_on_stack(&stack_info, regs, partial);
                 }
 
                 if (stack_name)
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index aed9d94bd46f..832a6acd730f 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -47,7 +47,7 @@
  * section. Since TSS's are completely CPU-local, we want them
  * on exact cacheline boundaries, to eliminate cacheline ping-pong.
  */
-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss_rw) = {
+__visible DEFINE_PER_CPU_PAGE_ALIGNED(struct tss_struct, cpu_tss_rw) = {
         .x86_tss = {
                 /*
                  * .sp0 is only used when entering ring 0 from a lower
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 8af2e8d0c0a1..145810b0edf6 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -906,9 +906,6 @@ void __init setup_arch(char **cmdline_p)
                 set_bit(EFI_BOOT, &efi.flags);
                 set_bit(EFI_64BIT, &efi.flags);
         }
-
-        if (efi_enabled(EFI_BOOT))
-                efi_memblock_x86_reserve_range();
 #endif
 
         x86_init.oem.arch_setup();
@@ -962,6 +959,8 @@ void __init setup_arch(char **cmdline_p)
 
         parse_early_param();
 
+        if (efi_enabled(EFI_BOOT))
+                efi_memblock_x86_reserve_range();
 #ifdef CONFIG_MEMORY_HOTPLUG
         /*
          * Memory used by the kernel cannot be hot-removed because Linux
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index 20161ef53537..093f2ea5dd56 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -102,7 +102,7 @@ __save_stack_trace_reliable(struct stack_trace *trace,
         for (unwind_start(&state, task, NULL, NULL); !unwind_done(&state);
              unwind_next_frame(&state)) {
 
-                regs = unwind_get_entry_regs(&state);
+                regs = unwind_get_entry_regs(&state, NULL);
                 if (regs) {
                         /*
                          * Kernel mode registers on the stack indicate an
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index eb714f1cdf7e..bb31c801f1fc 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -4986,6 +4986,25 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
                 "mov %%r14, %c[r14](%[svm]) \n\t"
                 "mov %%r15, %c[r15](%[svm]) \n\t"
 #endif
+                /*
+                * Clear host registers marked as clobbered to prevent
+                * speculative use.
+                */
+                "xor %%" _ASM_BX ", %%" _ASM_BX " \n\t"
+                "xor %%" _ASM_CX ", %%" _ASM_CX " \n\t"
+                "xor %%" _ASM_DX ", %%" _ASM_DX " \n\t"
+                "xor %%" _ASM_SI ", %%" _ASM_SI " \n\t"
+                "xor %%" _ASM_DI ", %%" _ASM_DI " \n\t"
+#ifdef CONFIG_X86_64
+                "xor %%r8, %%r8 \n\t"
+                "xor %%r9, %%r9 \n\t"
+                "xor %%r10, %%r10 \n\t"
+                "xor %%r11, %%r11 \n\t"
+                "xor %%r12, %%r12 \n\t"
+                "xor %%r13, %%r13 \n\t"
+                "xor %%r14, %%r14 \n\t"
+                "xor %%r15, %%r15 \n\t"
+#endif
                 "pop %%" _ASM_BP
                 :
                 : [svm]"a"(svm),
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 023afa0c8887..5c14d65f676a 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -9415,6 +9415,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
                 /* Save guest registers, load host registers, keep flags */
                 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
                 "pop %0 \n\t"
+                "setbe %c[fail](%0)\n\t"
                 "mov %%" _ASM_AX ", %c[rax](%0) \n\t"
                 "mov %%" _ASM_BX ", %c[rbx](%0) \n\t"
                 __ASM_SIZE(pop) " %c[rcx](%0) \n\t"
@@ -9431,12 +9432,23 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
                 "mov %%r13, %c[r13](%0) \n\t"
                 "mov %%r14, %c[r14](%0) \n\t"
                 "mov %%r15, %c[r15](%0) \n\t"
+                "xor %%r8d,  %%r8d \n\t"
+                "xor %%r9d,  %%r9d \n\t"
+                "xor %%r10d, %%r10d \n\t"
+                "xor %%r11d, %%r11d \n\t"
+                "xor %%r12d, %%r12d \n\t"
+                "xor %%r13d, %%r13d \n\t"
+                "xor %%r14d, %%r14d \n\t"
+                "xor %%r15d, %%r15d \n\t"
 #endif
                 "mov %%cr2, %%" _ASM_AX "   \n\t"
                 "mov %%" _ASM_AX ", %c[cr2](%0) \n\t"
 
+                "xor %%eax, %%eax \n\t"
+                "xor %%ebx, %%ebx \n\t"
+                "xor %%esi, %%esi \n\t"
+                "xor %%edi, %%edi \n\t"
                 "pop  %%" _ASM_BP "; pop  %%" _ASM_DX " \n\t"
-                "setbe %c[fail](%0) \n\t"
                 ".pushsection .rodata \n\t"
                 ".global vmx_return \n\t"
                 "vmx_return: " _ASM_PTR " 2b \n\t"
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
index f56902c1f04b..2a4849e92831 100644
--- a/arch/x86/mm/dump_pagetables.c
+++ b/arch/x86/mm/dump_pagetables.c
@@ -61,10 +61,10 @@ enum address_markers_idx {
         KASAN_SHADOW_START_NR,
         KASAN_SHADOW_END_NR,
 #endif
+        CPU_ENTRY_AREA_NR,
 #if defined(CONFIG_MODIFY_LDT_SYSCALL) && !defined(CONFIG_X86_5LEVEL)
         LDT_NR,
 #endif
-        CPU_ENTRY_AREA_NR,
 #ifdef CONFIG_X86_ESPFIX64
         ESPFIX_START_NR,
 #endif
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 8ca324d07282..82f5252c723a 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -868,7 +868,7 @@ __visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate) = {
         .next_asid = 1,
         .cr4 = ~0UL,    /* fail hard if we screw up cr4 shadow initialization */
 };
-EXPORT_SYMBOL_GPL(cpu_tlbstate);
+EXPORT_PER_CPU_SYMBOL(cpu_tlbstate);
 
 void update_cache_mode_entry(unsigned entry, enum page_cache_mode cache)
 {
diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
index 879ef930e2c2..aedebd2ebf1e 100644
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
@@ -34,25 +34,14 @@
 #define TB_SHIFT 40
 
 /*
- * Virtual address start and end range for randomization. The end changes base
- * on configuration to have the highest amount of space for randomization.
- * It increases the possible random position for each randomized region.
+ * Virtual address start and end range for randomization.
  *
- * You need to add an if/def entry if you introduce a new memory region
- * compatible with KASLR. Your entry must be in logical order with memory
- * layout. For example, ESPFIX is before EFI because its virtual address is
- * before. You also need to add a BUILD_BUG_ON() in kernel_randomize_memory() to
- * ensure that this order is correct and won't be changed.
+ * The end address could depend on more configuration options to make the
+ * highest amount of space for randomization available, but that's too hard
+ * to keep straight and caused issues already.
  */
 static const unsigned long vaddr_start = __PAGE_OFFSET_BASE;
-
-#if defined(CONFIG_X86_ESPFIX64)
-static const unsigned long vaddr_end = ESPFIX_BASE_ADDR;
-#elif defined(CONFIG_EFI)
-static const unsigned long vaddr_end = EFI_VA_END;
-#else
-static const unsigned long vaddr_end = __START_KERNEL_map;
-#endif
+static const unsigned long vaddr_end = CPU_ENTRY_AREA_BASE;
 
 /* Default values */
 unsigned long page_offset_base = __PAGE_OFFSET_BASE;
@@ -101,15 +90,12 @@ void __init kernel_randomize_memory(void)
         unsigned long remain_entropy;
 
         /*
-         * All these BUILD_BUG_ON checks ensures the memory layout is
-         * consistent with the vaddr_start/vaddr_end variables.
+         * These BUILD_BUG_ON checks ensure the memory layout is consistent
+         * with the vaddr_start/vaddr_end variables. These checks are very
+         * limited....
          */
         BUILD_BUG_ON(vaddr_start >= vaddr_end);
-        BUILD_BUG_ON(IS_ENABLED(CONFIG_X86_ESPFIX64) &&
-                     vaddr_end >= EFI_VA_END);
-        BUILD_BUG_ON((IS_ENABLED(CONFIG_X86_ESPFIX64) ||
-                      IS_ENABLED(CONFIG_EFI)) &&
-                     vaddr_end >= __START_KERNEL_map);
+        BUILD_BUG_ON(vaddr_end != CPU_ENTRY_AREA_BASE);
         BUILD_BUG_ON(vaddr_end > __START_KERNEL_map);
 
         if (!kaslr_memory_enabled())
diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c
index bce8aea65606..43d4a4a29037 100644
--- a/arch/x86/mm/pti.c
+++ b/arch/x86/mm/pti.c
@@ -56,13 +56,13 @@
 
 static void __init pti_print_if_insecure(const char *reason)
 {
-        if (boot_cpu_has_bug(X86_BUG_CPU_INSECURE))
+        if (boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
                 pr_info("%s\n", reason);
 }
 
 static void __init pti_print_if_secure(const char *reason)
 {
-        if (!boot_cpu_has_bug(X86_BUG_CPU_INSECURE))
+        if (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
                 pr_info("%s\n", reason);
 }
 
@@ -96,7 +96,7 @@ void __init pti_check_boottime_disable(void)
         }
 
 autosel:
-        if (!boot_cpu_has_bug(X86_BUG_CPU_INSECURE))
+        if (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
                 return;
 enable:
         setup_force_cpu_cap(X86_FEATURE_PTI);
@@ -367,7 +367,8 @@ static void __init pti_setup_espfix64(void)
 static void __init pti_clone_entry_text(void)
 {
         pti_clone_pmds((unsigned long) __entry_text_start,
-                        (unsigned long) __irqentry_text_end, _PAGE_RW);
+                        (unsigned long) __irqentry_text_end,
+                       _PAGE_RW | _PAGE_GLOBAL);
 }
 
 /*
diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
index 8a99a2e96537..5b513ccffde4 100644
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -592,7 +592,18 @@ static int qrk_capsule_setup_info(struct capsule_info *cap_info, void **pkbuff,
         /*
          * Update the first page pointer to skip over the CSH header.
          */
-        cap_info->pages[0] += csh->headersize;
+        cap_info->phys[0] += csh->headersize;
+
+        /*
+         * cap_info->capsule should point at a virtual mapping of the entire
+         * capsule, starting at the capsule header. Our image has the Quark
+         * security header prepended, so we cannot rely on the default vmap()
+         * mapping created by the generic capsule code.
+         * Given that the Quark firmware does not appear to care about the
+         * virtual mapping, let's just point cap_info->capsule at our copy
+         * of the capsule header.
+         */
+        cap_info->capsule = &cap_info->header;
 
         return 1;
 }
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 444a387df219..35d4dcea381f 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -664,7 +664,7 @@ void af_alg_free_areq_sgls(struct af_alg_async_req *areq)
         unsigned int i;
 
         list_for_each_entry_safe(rsgl, tmp, &areq->rsgl_list, list) {
-                ctx->rcvused -= rsgl->sg_num_bytes;
+                atomic_sub(rsgl->sg_num_bytes, &ctx->rcvused);
                 af_alg_free_sg(&rsgl->sgl);
                 list_del(&rsgl->list);
                 if (rsgl != &areq->first_rsgl)
@@ -1163,7 +1163,7 @@ int af_alg_get_rsgl(struct sock *sk, struct msghdr *msg, int flags,
 
                 areq->last_rsgl = rsgl;
                 len += err;
-                ctx->rcvused += err;
+                atomic_add(err, &ctx->rcvused);
                 rsgl->sg_num_bytes = err;
                 iov_iter_advance(&msg->msg_iter, err);
         }
diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index ddcc45f77edd..e9885a35ef6e 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -571,7 +571,7 @@ static int aead_accept_parent_nokey(void *private, struct sock *sk)
         INIT_LIST_HEAD(&ctx->tsgl_list);
         ctx->len = len;
         ctx->used = 0;
-        ctx->rcvused = 0;
+        atomic_set(&ctx->rcvused, 0);
         ctx->more = 0;
         ctx->merge = 0;
         ctx->enc = 0;
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index baef9bfccdda..c5c47b680152 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -390,7 +390,7 @@ static int skcipher_accept_parent_nokey(void *private, struct sock *sk)
         INIT_LIST_HEAD(&ctx->tsgl_list);
         ctx->len = len;
         ctx->used = 0;
-        ctx->rcvused = 0;
+        atomic_set(&ctx->rcvused, 0);
         ctx->more = 0;
         ctx->merge = 0;
         ctx->enc = 0;
diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c
index db1bc3147bc4..600afa99941f 100644
--- a/crypto/chacha20poly1305.c
+++ b/crypto/chacha20poly1305.c
@@ -610,6 +610,11 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb,
                                                     algt->mask));
         if (IS_ERR(poly))
                 return PTR_ERR(poly);
+        poly_hash = __crypto_hash_alg_common(poly);
+
+        err = -EINVAL;
+        if (poly_hash->digestsize != POLY1305_DIGEST_SIZE)
+                goto out_put_poly;
 
         err = -ENOMEM;
         inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
@@ -618,7 +623,6 @@ static int chachapoly_create(struct crypto_template *tmpl, struct rtattr **tb,
 
         ctx = aead_instance_ctx(inst);
         ctx->saltlen = CHACHAPOLY_IV_SIZE - ivsize;
-        poly_hash = __crypto_hash_alg_common(poly);
         err = crypto_init_ahash_spawn(&ctx->poly, poly_hash,
                                       aead_crypto_instance(inst));
         if (err)
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index ee9cfb99fe25..f8ec3d4ba4a8 100644
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -254,6 +254,14 @@ static void pcrypt_aead_exit_tfm(struct crypto_aead *tfm)
         crypto_free_aead(ctx->child);
 }
 
+static void pcrypt_free(struct aead_instance *inst)
+{
+        struct pcrypt_instance_ctx *ctx = aead_instance_ctx(inst);
+
+        crypto_drop_aead(&ctx->spawn);
+        kfree(inst);
+}
+
 static int pcrypt_init_instance(struct crypto_instance *inst,
                                 struct crypto_alg *alg)
 {
@@ -319,6 +327,8 @@ static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb,
         inst->alg.encrypt = pcrypt_aead_encrypt;
         inst->alg.decrypt = pcrypt_aead_decrypt;
 
+        inst->free = pcrypt_free;
+
         err = aead_register_instance(tmpl, inst);
         if (err)
                 goto out_drop_aead;
@@ -349,14 +359,6 @@ static int pcrypt_create(struct crypto_template *tmpl, struct rtattr **tb)
         return -EINVAL;
 }
 
-static void pcrypt_free(struct crypto_instance *inst)
-{
-        struct pcrypt_instance_ctx *ctx = crypto_instance_ctx(inst);
-
-        crypto_drop_aead(&ctx->spawn);
-        kfree(inst);
-}
-
 static int pcrypt_cpumask_change_notify(struct notifier_block *self,
                                         unsigned long val, void *data)
 {
@@ -469,7 +471,6 @@ static void pcrypt_fini_padata(struct padata_pcrypt *pcrypt)
 static struct crypto_template pcrypt_tmpl = {
         .name = "pcrypt",
         .create = pcrypt_create,
-        .free = pcrypt_free,
         .module = THIS_MODULE,
 };
 
diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c
index 328ca93781cf..1b76d9585902 100644
--- a/drivers/bus/sunxi-rsb.c
+++ b/drivers/bus/sunxi-rsb.c
@@ -178,6 +178,7 @@ static struct bus_type sunxi_rsb_bus = {
         .match          = sunxi_rsb_device_match,
         .probe          = sunxi_rsb_device_probe,
         .remove         = sunxi_rsb_device_remove,
+        .uevent         = of_device_uevent_modalias,
 };
 
 static void sunxi_rsb_dev_release(struct device *dev)
diff --git a/drivers/crypto/chelsio/Kconfig b/drivers/crypto/chelsio/Kconfig
index 3e104f5aa0c2..b56b3f711d94 100644
--- a/drivers/crypto/chelsio/Kconfig
+++ b/drivers/crypto/chelsio/Kconfig
@@ -5,6 +5,7 @@ config CRYPTO_DEV_CHELSIO
         select CRYPTO_SHA256
         select CRYPTO_SHA512
         select CRYPTO_AUTHENC
+        select CRYPTO_GF128MUL
         ---help---
           The Chelsio Crypto Co-processor driver for T6 adapters.
 
diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c
index 89ba9e85c0f3..4bcef78a08aa 100644
--- a/drivers/crypto/inside-secure/safexcel.c
+++ b/drivers/crypto/inside-secure/safexcel.c
@@ -607,6 +607,7 @@ static inline void safexcel_handle_result_descriptor(struct safexcel_crypto_priv
                 ndesc = ctx->handle_result(priv, ring, sreq->req,
                                            &should_complete, &ret);
                 if (ndesc < 0) {
+                        kfree(sreq);
                         dev_err(priv->dev, "failed to handle result (%d)", ndesc);
                         return;
                 }
diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c
index 5438552bc6d7..fcc0a606d748 100644
--- a/drivers/crypto/inside-secure/safexcel_cipher.c
+++ b/drivers/crypto/inside-secure/safexcel_cipher.c
@@ -14,6 +14,7 @@
 
 #include <crypto/aes.h>
 #include <crypto/skcipher.h>
+#include <crypto/internal/skcipher.h>
 
 #include "safexcel.h"
 
@@ -33,6 +34,10 @@ struct safexcel_cipher_ctx {
         unsigned int key_len;
 };
 
+struct safexcel_cipher_req {
+        bool needs_inv;
+};
+
 static void safexcel_cipher_token(struct safexcel_cipher_ctx *ctx,
                                   struct crypto_async_request *async,
                                   struct safexcel_command_desc *cdesc,
@@ -126,9 +131,9 @@ static int safexcel_context_control(struct safexcel_cipher_ctx *ctx,
         return 0;
 }
 
-static int safexcel_handle_result(struct safexcel_crypto_priv *priv, int ring,
-                                  struct crypto_async_request *async,
-                                  bool *should_complete, int *ret)
+static int safexcel_handle_req_result(struct safexcel_crypto_priv *priv, int ring,
+                                      struct crypto_async_request *async,
+                                      bool *should_complete, int *ret)
 {
         struct skcipher_request *req = skcipher_request_cast(async);
         struct safexcel_result_desc *rdesc;
@@ -265,7 +270,6 @@ static int safexcel_aes_send(struct crypto_async_request *async,
         spin_unlock_bh(&priv->ring[ring].egress_lock);
 
         request->req = &req->base;
-        ctx->base.handle_result = safexcel_handle_result;
 
         *commands = n_cdesc;
         *results = n_rdesc;
@@ -341,8 +345,6 @@ static int safexcel_handle_inv_result(struct safexcel_crypto_priv *priv,
 
         ring = safexcel_select_ring(priv);
         ctx->base.ring = ring;
-        ctx->base.needs_inv = false;
-        ctx->base.send = safexcel_aes_send;
 
         spin_lock_bh(&priv->ring[ring].queue_lock);
         enq_ret = crypto_enqueue_request(&priv->ring[ring].queue, async);
@@ -359,6 +361,26 @@ static int safexcel_handle_inv_result(struct safexcel_crypto_priv *priv,
         return ndesc;
 }
 
+static int safexcel_handle_result(struct safexcel_crypto_priv *priv, int ring,
+                                  struct crypto_async_request *async,
+                                  bool *should_complete, int *ret)
+{
+        struct skcipher_request *req = skcipher_request_cast(async);
+        struct safexcel_cipher_req *sreq = skcipher_request_ctx(req);
+        int err;
+
+        if (sreq->needs_inv) {
+                sreq->needs_inv = false;
+                err = safexcel_handle_inv_result(priv, ring, async,
+                                                 should_complete, ret);
+        } else {
+                err = safexcel_handle_req_result(priv, ring, async,
+                                                 should_complete, ret);
+        }
+
+        return err;
+}
+
 static int safexcel_cipher_send_inv(struct crypto_async_request *async,
                                     int ring, struct safexcel_request *request,
                                     int *commands, int *results)
@@ -368,8 +390,6 @@ static int safexcel_cipher_send_inv(struct crypto_async_request *async,
         struct safexcel_crypto_priv *priv = ctx->priv;
         int ret;
 
-        ctx->base.handle_result = safexcel_handle_inv_result;
-
         ret = safexcel_invalidate_cache(async, &ctx->base, priv,
                                         ctx->base.ctxr_dma, ring, request);
         if (unlikely(ret))
@@ -381,28 +401,46 @@ static int safexcel_cipher_send_inv(struct crypto_async_request *async,
         return 0;
 }
 
+static int safexcel_send(struct crypto_async_request *async,
+                         int ring, struct safexcel_request *request,
+                         int *commands, int *results)
+{
+        struct skcipher_request *req = skcipher_request_cast(async);
+        struct safexcel_cipher_req *sreq = skcipher_request_ctx(req);
+        int ret;
+
+        if (sreq->needs_inv)
+                ret = safexcel_cipher_send_inv(async, ring, request,
+                                               commands, results);
+        else
+                ret = safexcel_aes_send(async, ring, request,
+                                        commands, results);
+        return ret;
+}
+
 static int safexcel_cipher_exit_inv(struct crypto_tfm *tfm)
 {
         struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);
         struct safexcel_crypto_priv *priv = ctx->priv;
-        struct skcipher_request req;
+        SKCIPHER_REQUEST_ON_STACK(req, __crypto_skcipher_cast(tfm));
+        struct safexcel_cipher_req *sreq = skcipher_request_ctx(req);
         struct safexcel_inv_result result = {};
         int ring = ctx->base.ring;
 
-        memset(&req, 0, sizeof(struct skcipher_request));
+        memset(req, 0, sizeof(struct skcipher_request));
 
         /* create invalidation request */
         init_completion(&result.completion);
-        skcipher_request_set_callback(&req, CRYPTO_TFM_REQ_MAY_BACKLOG,
-                                        safexcel_inv_complete, &result);
+        skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
+                                      safexcel_inv_complete, &result);
 
-        skcipher_request_set_tfm(&req, __crypto_skcipher_cast(tfm));
-        ctx = crypto_tfm_ctx(req.base.tfm);
+        skcipher_request_set_tfm(req, __crypto_skcipher_cast(tfm));
+        ctx = crypto_tfm_ctx(req->base.tfm);
         ctx->base.exit_inv = true;
-        ctx->base.send = safexcel_cipher_send_inv;
+        sreq->needs_inv = true;
 
         spin_lock_bh(&priv->ring[ring].queue_lock);
-        crypto_enqueue_request(&priv->ring[ring].queue, &req.base);
+        crypto_enqueue_request(&priv->ring[ring].queue, &req->base);
         spin_unlock_bh(&priv->ring[ring].queue_lock);
 
         if (!priv->ring[ring].need_dequeue)
@@ -424,19 +462,21 @@ static int safexcel_aes(struct skcipher_request *req,
                         enum safexcel_cipher_direction dir, u32 mode)
 {
         struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(req->base.tfm);
+        struct safexcel_cipher_req *sreq = skcipher_request_ctx(req);
         struct safexcel_crypto_priv *priv = ctx->priv;
         int ret, ring;
 
+        sreq->needs_inv = false;
         ctx->direction = dir;
         ctx->mode = mode;
 
         if (ctx->base.ctxr) {
-                if (ctx->base.needs_inv)
-                        ctx->base.send = safexcel_cipher_send_inv;
+                if (ctx->base.needs_inv) {
+                        sreq->needs_inv = true;
+                        ctx->base.needs_inv = false;
+                }
         } else {
                 ctx->base.ring = safexcel_select_ring(priv);
-                ctx->base.send = safexcel_aes_send;
-
                 ctx->base.ctxr = dma_pool_zalloc(priv->context_pool,
                                                  EIP197_GFP_FLAGS(req->base),
                                                  &ctx->base.ctxr_dma);
@@ -476,6 +516,11 @@ static int safexcel_skcipher_cra_init(struct crypto_tfm *tfm)
                              alg.skcipher.base);
 
         ctx->priv = tmpl->priv;
+        ctx->base.send = safexcel_send;
+        ctx->base.handle_result = safexcel_handle_result;
+
+        crypto_skcipher_set_reqsize(__crypto_skcipher_cast(tfm),
+                                    sizeof(struct safexcel_cipher_req));
 
         return 0;
 }
diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypto/inside-secure/safexcel_hash.c
index 74feb6227101..0c5a5820b06e 100644
--- a/drivers/crypto/inside-secure/safexcel_hash.c
+++ b/drivers/crypto/inside-secure/safexcel_hash.c
@@ -32,9 +32,10 @@ struct safexcel_ahash_req {
         bool last_req;
         bool finish;
         bool hmac;
+        bool needs_inv;
 
         u8 state_sz;    /* expected sate size, only set once */
-        u32 state[SHA256_DIGEST_SIZE / sizeof(u32)];
+        u32 state[SHA256_DIGEST_SIZE / sizeof(u32)] __aligned(sizeof(u32));
 
         u64 len;
         u64 processed;
@@ -119,15 +120,15 @@ static void safexcel_context_control(struct safexcel_ahash_ctx *ctx,
         }
 }
 
-static int safexcel_handle_result(struct safexcel_crypto_priv *priv, int ring,
-                                  struct crypto_async_request *async,
-                                  bool *should_complete, int *ret)
+static int safexcel_handle_req_result(struct safexcel_crypto_priv *priv, int ring,
+                                      struct crypto_async_request *async,
+                                      bool *should_complete, int *ret)
 {
         struct safexcel_result_desc *rdesc;
         struct ahash_request *areq = ahash_request_cast(async);
         struct crypto_ahash *ahash = crypto_ahash_reqtfm(areq);
         struct safexcel_ahash_req *sreq = ahash_request_ctx(areq);
-        int cache_len, result_sz = sreq->state_sz;
+        int cache_len;
 
         *ret = 0;
 
@@ -148,8 +149,8 @@ static int safexcel_handle_result(struct safexcel_crypto_priv *priv, int ring,
         spin_unlock_bh(&priv->ring[ring].egress_lock);
 
         if (sreq->finish)
-                result_sz = crypto_ahash_digestsize(ahash);
-        memcpy(sreq->state, areq->result, result_sz);
+                memcpy(areq->result, sreq->state,
+                       crypto_ahash_digestsize(ahash));
 
         dma_unmap_sg(priv->dev, areq->src,
                      sg_nents_for_len(areq->src, areq->nbytes), DMA_TO_DEVICE);
@@ -165,9 +166,9 @@ static int safexcel_handle_result(struct safexcel_crypto_priv *priv, int ring,
         return 1;
 }
 
-static int safexcel_ahash_send(struct crypto_async_request *async, int ring,
-                               struct safexcel_request *request, int *commands,
-                               int *results)
+static int safexcel_ahash_send_req(struct crypto_async_request *async, int ring,
+                                   struct safexcel_request *request,
+                                   int *commands, int *results)
 {
         struct ahash_request *areq = ahash_request_cast(async);
         struct crypto_ahash *ahash = crypto_ahash_reqtfm(areq);
@@ -273,7 +274,7 @@ send_command:
         /* Add the token */
         safexcel_hash_token(first_cdesc, len, req->state_sz);
 
-        ctx->base.result_dma = dma_map_single(priv->dev, areq->result,
+        ctx->base.result_dma = dma_map_single(priv->dev, req->state,
                                               req->state_sz, DMA_FROM_DEVICE);
         if (dma_mapping_error(priv->dev, ctx->base.result_dma)) {
                 ret = -EINVAL;
@@ -292,7 +293,6 @@ send_command:
 
         req->processed += len;
         request->req = &areq->base;
-        ctx->base.handle_result = safexcel_handle_result;
 
         *commands = n_cdesc;
         *results = 1;
@@ -374,8 +374,6 @@ static int safexcel_handle_inv_result(struct safexcel_crypto_priv *priv,
 
         ring = safexcel_select_ring(priv);
         ctx->base.ring = ring;
-        ctx->base.needs_inv = false;
-        ctx->base.send = safexcel_ahash_send;
 
         spin_lock_bh(&priv->ring[ring].queue_lock);
         enq_ret = crypto_enqueue_request(&priv->ring[ring].queue, async);
@@ -392,6 +390,26 @@ static int safexcel_handle_inv_result(struct safexcel_crypto_priv *priv,
         return 1;
 }
 
+static int safexcel_handle_result(struct safexcel_crypto_priv *priv, int ring,
+                                  struct crypto_async_request *async,
+                                  bool *should_complete, int *ret)
+{
+        struct ahash_request *areq = ahash_request_cast(async);
+        struct safexcel_ahash_req *req = ahash_request_ctx(areq);
+        int err;
+
+        if (req->needs_inv) {
+                req->needs_inv = false;
+                err = safexcel_handle_inv_result(priv, ring, async,
+                                                 should_complete, ret);
+        } else {
+                err = safexcel_handle_req_result(priv, ring, async,
+                                                 should_complete, ret);
+        }
+
+        return err;
+}
+
 static int safexcel_ahash_send_inv(struct crypto_async_request *async,
                                    int ring, struct safexcel_request *request,
                                    int *commands, int *results)
@@ -400,7 +418,6 @@ static int safexcel_ahash_send_inv(struct crypto_async_request *async,
         struct safexcel_ahash_ctx *ctx = crypto_ahash_ctx(crypto_ahash_reqtfm(areq));
         int ret;
 
-        ctx->base.handle_result = safexcel_handle_inv_result;
         ret = safexcel_invalidate_cache(async, &ctx->base, ctx->priv,
                                         ctx->base.ctxr_dma, ring, request);
         if (unlikely(ret))
@@ -412,28 +429,46 @@ static int safexcel_ahash_send_inv(struct crypto_async_request *async,
         return 0;
 }
 
+static int safexcel_ahash_send(struct crypto_async_request *async,
+                               int ring, struct safexcel_request *request,
+                               int *commands, int *results)
+{
+        struct ahash_request *areq = ahash_request_cast(async);
+        struct safexcel_ahash_req *req = ahash_request_ctx(areq);
+        int ret;
+
+        if (req->needs_inv)
+                ret = safexcel_ahash_send_inv(async, ring, request,
+                                              commands, results);
+        else
+                ret = safexcel_ahash_send_req(async, ring, request,
+                                              commands, results);
+        return ret;
+}
+
 static int safexcel_ahash_exit_inv(struct crypto_tfm *tfm)
 {
         struct safexcel_ahash_ctx *ctx = crypto_tfm_ctx(tfm);
         struct safexcel_crypto_priv *priv = ctx->priv;
-        struct ahash_request req;
+        AHASH_REQUEST_ON_STACK(req, __crypto_ahash_cast(tfm));
+        struct safexcel_ahash_req *rctx = ahash_request_ctx(req);
         struct safexcel_inv_result result = {};
         int ring = ctx->base.ring;
 
-        memset(&req, 0, sizeof(struct ahash_request));
+        memset(req, 0, sizeof(struct ahash_request));
 
         /* create invalidation request */
         init_completion(&result.completion);
-        ahash_request_set_callback(&req, CRYPTO_TFM_REQ_MAY_BACKLOG,
+        ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
                                    safexcel_inv_complete, &result);
 
-        ahash_request_set_tfm(&req, __crypto_ahash_cast(tfm));
-        ctx = crypto_tfm_ctx(req.base.tfm);
+        ahash_request_set_tfm(req, __crypto_ahash_cast(tfm));
+        ctx = crypto_tfm_ctx(req->base.tfm);
         ctx->base.exit_inv = true;
-        ctx->base.send = safexcel_ahash_send_inv;
+        rctx->needs_inv = true;
 
         spin_lock_bh(&priv->ring[ring].queue_lock);
-        crypto_enqueue_request(&priv->ring[ring].queue, &req.base);
+        crypto_enqueue_request(&priv->ring[ring].queue, &req->base);
         spin_unlock_bh(&priv->ring[ring].queue_lock);
 
         if (!priv->ring[ring].need_dequeue)
@@ -481,14 +516,16 @@ static int safexcel_ahash_enqueue(struct ahash_request *areq)
         struct safexcel_crypto_priv *priv = ctx->priv;
         int ret, ring;
 
-        ctx->base.send = safexcel_ahash_send;
+        req->needs_inv = false;
 
         if (req->processed && ctx->digest == CONTEXT_CONTROL_DIGEST_PRECOMPUTED)
                 ctx->base.needs_inv = safexcel_ahash_needs_inv_get(areq);
 
         if (ctx->base.ctxr) {
-                if (ctx->base.needs_inv)
-                        ctx->base.send = safexcel_ahash_send_inv;
+                if (ctx->base.needs_inv) {
+                        ctx->base.needs_inv = false;
+                        req->needs_inv = true;
+                }
         } else {
                 ctx->base.ring = safexcel_select_ring(priv);
                 ctx->base.ctxr = dma_pool_zalloc(priv->context_pool,
@@ -622,6 +659,8 @@ static int safexcel_ahash_cra_init(struct crypto_tfm *tfm)
                              struct safexcel_alg_template, alg.ahash);
 
         ctx->priv = tmpl->priv;
+        ctx->base.send = safexcel_ahash_send;
+        ctx->base.handle_result = safexcel_handle_result;
 
         crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm),
                                  sizeof(struct safexcel_ahash_req));
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index 48de52cf2ecc..662e709812cc 100644
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -1625,6 +1625,7 @@ static int queue_cache_init(void)
                                           CWQ_ENTRY_SIZE, 0, NULL);
         if (!queue_cache[HV_NCS_QTYPE_CWQ - 1]) {
                 kmem_cache_destroy(queue_cache[HV_NCS_QTYPE_MAU - 1]);
+                queue_cache[HV_NCS_QTYPE_MAU - 1] = NULL;
                 return -ENOMEM;
         }
         return 0;
@@ -1634,6 +1635,8 @@ static void queue_cache_destroy(void)
 {
         kmem_cache_destroy(queue_cache[HV_NCS_QTYPE_MAU - 1]);
         kmem_cache_destroy(queue_cache[HV_NCS_QTYPE_CWQ - 1]);
+        queue_cache[HV_NCS_QTYPE_MAU - 1] = NULL;
+        queue_cache[HV_NCS_QTYPE_CWQ - 1] = NULL;
 }
 
 static long spu_queue_register_workfn(void *arg)
diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c
index ec8ac5c4dd84..055e2e8f985a 100644
--- a/drivers/firmware/efi/capsule-loader.c
+++ b/drivers/firmware/efi/capsule-loader.c
@@ -20,10 +20,6 @@
 
 #define NO_FURTHER_WRITE_ACTION -1
 
-#ifndef phys_to_page
-#define phys_to_page(x)         pfn_to_page((x) >> PAGE_SHIFT)
-#endif
-
 /**
  * efi_free_all_buff_pages - free all previous allocated buffer pages
  * @cap_info: pointer to current instance of capsule_info structure
@@ -35,7 +31,7 @@
 static void efi_free_all_buff_pages(struct capsule_info *cap_info)
 {
         while (cap_info->index > 0)
-                __free_page(phys_to_page(cap_info->pages[--cap_info->index]));
+                __free_page(cap_info->pages[--cap_info->index]);
 
         cap_info->index = NO_FURTHER_WRITE_ACTION;
 }
@@ -71,6 +67,14 @@ int __efi_capsule_setup_info(struct capsule_info *cap_info)
 
         cap_info->pages = temp_page;
 
+        temp_page = krealloc(cap_info->phys,
+                             pages_needed * sizeof(phys_addr_t *),
+                             GFP_KERNEL | __GFP_ZERO);
+        if (!temp_page)
+                return -ENOMEM;
+
+        cap_info->phys = temp_page;
+
         return 0;
 }
 
@@ -105,9 +109,24 @@ int __weak efi_capsule_setup_info(struct capsule_info *cap_info, void *kbuff,
  **/
 static ssize_t efi_capsule_submit_update(struct capsule_info *cap_info)
 {
+        bool do_vunmap = false;
         int ret;
 
-        ret = efi_capsule_update(&cap_info->header, cap_info->pages);
+        /*
+         * cap_info->capsule may have been assigned already by a quirk
+         * handler, so only overwrite it if it is NULL
+         */
+        if (!cap_info->capsule) {
+                cap_info->capsule = vmap(cap_info->pages, cap_info->index,
+                                         VM_MAP, PAGE_KERNEL);
+                if (!cap_info->capsule)
+                        return -ENOMEM;
+                do_vunmap = true;
+        }
+
+        ret = efi_capsule_update(cap_info->capsule, cap_info->phys);
+        if (do_vunmap)
+                vunmap(cap_info->capsule);
         if (ret) {
                 pr_err("capsule update failed\n");
                 return ret;
@@ -165,10 +184,12 @@ static ssize_t efi_capsule_write(struct file *file, const char __user *buff,
                         goto failed;
                 }
 
-                cap_info->pages[cap_info->index++] = page_to_phys(page);
+                cap_info->pages[cap_info->index] = page;
+                cap_info->phys[cap_info->index] = page_to_phys(page);
                 cap_info->page_bytes_remain = PAGE_SIZE;
+                cap_info->index++;
         } else {
-                page = phys_to_page(cap_info->pages[cap_info->index - 1]);
+                page = cap_info->pages[cap_info->index - 1];
         }
 
         kbuff = kmap(page);
@@ -252,6 +273,7 @@ static int efi_capsule_release(struct inode *inode, struct file *file)
         struct capsule_info *cap_info = file->private_data;
 
         kfree(cap_info->pages);
+        kfree(cap_info->phys);
         kfree(file->private_data);
         file->private_data = NULL;
         return 0;
@@ -281,6 +303,13 @@ static int efi_capsule_open(struct inode *inode, struct file *file)
                 return -ENOMEM;
         }
 
+        cap_info->phys = kzalloc(sizeof(void *), GFP_KERNEL);
+        if (!cap_info->phys) {
+                kfree(cap_info->pages);
+                kfree(cap_info);
+                return -ENOMEM;
+        }
+
         file->private_data = cap_info;
 
         return 0;
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h
index a9782b1aba47..34daf895f848 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h
@@ -1360,7 +1360,7 @@ void dpp1_cm_set_output_csc_adjustment(
 
 void dpp1_cm_set_output_csc_default(
                 struct dpp *dpp_base,
-                const struct default_adjustment *default_adjust);
+                enum dc_color_space colorspace);
 
 void dpp1_cm_set_gamut_remap(
         struct dpp *dpp,
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c
index 40627c244bf5..ed1216b53465 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c
@@ -225,14 +225,13 @@ void dpp1_cm_set_gamut_remap(
 
 void dpp1_cm_set_output_csc_default(
                 struct dpp *dpp_base,
-                const struct default_adjustment *default_adjust)
+                enum dc_color_space colorspace)
 {
 
         struct dcn10_dpp *dpp = TO_DCN10_DPP(dpp_base);
         uint32_t ocsc_mode = 0;
 
-        if (default_adjust != NULL) {
-                switch (default_adjust->out_color_space) {
+        switch (colorspace) {
                 case COLOR_SPACE_SRGB:
                 case COLOR_SPACE_2020_RGB_FULLRANGE:
                         ocsc_mode = 0;
@@ -253,7 +252,6 @@ void dpp1_cm_set_output_csc_default(
                 case COLOR_SPACE_UNKNOWN:
                 default:
                         break;
-                }
         }
 
         REG_SET(CM_OCSC_CONTROL, 0, CM_OCSC_MODE, ocsc_mode);
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index 961ad5c3b454..05dc01e54531 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -2097,6 +2097,8 @@ static void program_csc_matrix(struct pipe_ctx *pipe_ctx,
                         tbl_entry.color_space = color_space;
                         //tbl_entry.regval = matrix;
                         pipe_ctx->plane_res.dpp->funcs->opp_set_csc_adjustment(pipe_ctx->plane_res.dpp, &tbl_entry);
+        } else {
+                pipe_ctx->plane_res.dpp->funcs->opp_set_csc_default(pipe_ctx->plane_res.dpp, colorspace);
         }
 }
 static bool is_lower_pipe_tree_visible(struct pipe_ctx *pipe_ctx)
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h b/drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h
index 83a68460edcd..9420dfb94d39 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h
@@ -64,7 +64,7 @@ struct dpp_funcs {
 
         void (*opp_set_csc_default)(
                 struct dpp *dpp,
-                const struct default_adjustment *default_adjust);
+                enum dc_color_space colorspace);
 
         void (*opp_set_csc_adjustment)(
                 struct dpp *dpp,
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index 2e065facdce7..a0f4d2a2a481 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -168,16 +168,23 @@ static void armada_drm_crtc_update(struct armada_crtc *dcrtc)
 void armada_drm_plane_calc_addrs(u32 *addrs, struct drm_framebuffer *fb,
         int x, int y)
 {
+        const struct drm_format_info *format = fb->format;
+        unsigned int num_planes = format->num_planes;
         u32 addr = drm_fb_obj(fb)->dev_addr;
-        int num_planes = fb->format->num_planes;
         int i;
 
         if (num_planes > 3)
                 num_planes = 3;
 
-        for (i = 0; i < num_planes; i++)
+        addrs[0] = addr + fb->offsets[0] + y * fb->pitches[0] +
+                   x * format->cpp[0];
+
+        y /= format->vsub;
+        x /= format->hsub;
+
+        for (i = 1; i < num_planes; i++)
                 addrs[i] = addr + fb->offsets[i] + y * fb->pitches[i] +
-                             x * fb->format->cpp[i];
+                             x * format->cpp[i];
         for (; i < 3; i++)
                 addrs[i] = 0;
 }
@@ -744,15 +751,14 @@ void armada_drm_crtc_plane_disable(struct armada_crtc *dcrtc,
         if (plane->fb)
                 drm_framebuffer_put(plane->fb);
 
-        /* Power down the Y/U/V FIFOs */
-        sram_para1 = CFG_PDWN16x66 | CFG_PDWN32x66;
-
         /* Power down most RAMs and FIFOs if this is the primary plane */
         if (plane->type == DRM_PLANE_TYPE_PRIMARY) {
-                sram_para1 |= CFG_PDWN256x32 | CFG_PDWN256x24 | CFG_PDWN256x8 |
-                              CFG_PDWN32x32 | CFG_PDWN64x66;
+                sram_para1 = CFG_PDWN256x32 | CFG_PDWN256x24 | CFG_PDWN256x8 |
+                             CFG_PDWN32x32 | CFG_PDWN64x66;
                 dma_ctrl0_mask = CFG_GRA_ENA;
         } else {
+                /* Power down the Y/U/V FIFOs */
+                sram_para1 = CFG_PDWN16x66 | CFG_PDWN32x66;
                 dma_ctrl0_mask = CFG_DMA_ENA;
         }
 
@@ -1225,17 +1231,13 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
 
         ret = devm_request_irq(dev, irq, armada_drm_irq, 0, "armada_drm_crtc",
                                dcrtc);
-        if (ret < 0) {
-                kfree(dcrtc);
-                return ret;
-        }
+        if (ret < 0)
+                goto err_crtc;
 
         if (dcrtc->variant->init) {
                 ret = dcrtc->variant->init(dcrtc, dev);
-                if (ret) {
-                        kfree(dcrtc);
-                        return ret;
-                }
+                if (ret)
+                        goto err_crtc;
         }
 
         /* Ensure AXI pipeline is enabled */
@@ -1246,13 +1248,15 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
         dcrtc->crtc.port = port;
 
         primary = kzalloc(sizeof(*primary), GFP_KERNEL);
-        if (!primary)
-                return -ENOMEM;
+        if (!primary) {
+                ret = -ENOMEM;
+                goto err_crtc;
+        }
 
         ret = armada_drm_plane_init(primary);
         if (ret) {
                 kfree(primary);
-                return ret;
+                goto err_crtc;
         }
 
         ret = drm_universal_plane_init(drm, &primary->base, 0,
@@ -1263,7 +1267,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
                                        DRM_PLANE_TYPE_PRIMARY, NULL);
         if (ret) {
                 kfree(primary);
-                return ret;
+                goto err_crtc;
         }
 
         ret = drm_crtc_init_with_planes(drm, &dcrtc->crtc, &primary->base, NULL,
@@ -1282,6 +1286,9 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
 
 err_crtc_init:
         primary->base.funcs->destroy(&primary->base);
+err_crtc:
+        kfree(dcrtc);
+
         return ret;
 }
 
diff --git a/drivers/gpu/drm/armada/armada_crtc.h b/drivers/gpu/drm/armada/armada_crtc.h
index bab11f483575..bfd3514fbe9b 100644
--- a/drivers/gpu/drm/armada/armada_crtc.h
+++ b/drivers/gpu/drm/armada/armada_crtc.h
@@ -42,6 +42,8 @@ struct armada_plane_work {
 };
 
 struct armada_plane_state {
+        u16 src_x;
+        u16 src_y;
         u32 src_hw;
         u32 dst_hw;
         u32 dst_yx;
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
index b411b608821a..aba947696178 100644
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -99,6 +99,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
 {
         struct armada_ovl_plane *dplane = drm_to_armada_ovl_plane(plane);
         struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
+        const struct drm_format_info *format;
         struct drm_rect src = {
                 .x1 = src_x,
                 .y1 = src_y,
@@ -117,7 +118,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
         };
         uint32_t val, ctrl0;
         unsigned idx = 0;
-        bool visible;
+        bool visible, fb_changed;
         int ret;
 
         trace_armada_ovl_plane_update(plane, crtc, fb,
@@ -138,6 +139,18 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
         if (!visible)
                 ctrl0 &= ~CFG_DMA_ENA;
 
+        /*
+         * Shifting a YUV packed format image by one pixel causes the U/V
+         * planes to swap.  Compensate for it by also toggling the UV swap.
+         */
+        format = fb->format;
+        if (format->num_planes == 1 && src.x1 >> 16 & (format->hsub - 1))
+                ctrl0 ^= CFG_DMA_MOD(CFG_SWAPUV);
+
+        fb_changed = plane->fb != fb ||
+                     dplane->base.state.src_x != src.x1 >> 16 ||
+                     dplane->base.state.src_y != src.y1 >> 16;
+
         if (!dcrtc->plane) {
                 dcrtc->plane = plane;
                 armada_ovl_update_attr(&dplane->prop, dcrtc);
@@ -145,7 +158,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
 
         /* FIXME: overlay on an interlaced display */
         /* Just updating the position/size? */
-        if (plane->fb == fb && dplane->base.state.ctrl0 == ctrl0) {
+        if (!fb_changed && dplane->base.state.ctrl0 == ctrl0) {
                 val = (drm_rect_height(&src) & 0xffff0000) |
                       drm_rect_width(&src) >> 16;
                 dplane->base.state.src_hw = val;
@@ -169,9 +182,8 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
         if (armada_drm_plane_work_wait(&dplane->base, HZ / 25) == 0)
                 armada_drm_plane_work_cancel(dcrtc, &dplane->base);
 
-        if (plane->fb != fb) {
-                u32 addrs[3], pixel_format;
-                int num_planes, hsub;
+        if (fb_changed) {
+                u32 addrs[3];
 
                 /*
                  * Take a reference on the new framebuffer - we want to
@@ -182,23 +194,11 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
                 if (plane->fb)
                         armada_ovl_retire_fb(dplane, plane->fb);
 
-                src_y = src.y1 >> 16;
-                src_x = src.x1 >> 16;
+                dplane->base.state.src_y = src_y = src.y1 >> 16;
+                dplane->base.state.src_x = src_x = src.x1 >> 16;
 
                 armada_drm_plane_calc_addrs(addrs, fb, src_x, src_y);
 
-                pixel_format = fb->format->format;
-                hsub = drm_format_horz_chroma_subsampling(pixel_format);
-                num_planes = fb->format->num_planes;
-
-                /*
-                 * Annoyingly, shifting a YUYV-format image by one pixel
-                 * causes the U/V planes to toggle.  Toggle the UV swap.
-                 * (Unfortunately, this causes momentary colour flickering.)
-                 */
-                if (src_x & (hsub - 1) && num_planes == 1)
-                        ctrl0 ^= CFG_DMA_MOD(CFG_SWAPUV);
-
                 armada_reg_queue_set(dplane->vbl.regs, idx, addrs[0],
                                      LCD_SPU_DMA_START_ADDR_Y0);
                 armada_reg_queue_set(dplane->vbl.regs, idx, addrs[1],
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 54b5d4c582b6..e143004e66d5 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2368,6 +2368,9 @@ struct drm_i915_private {
          */
         struct workqueue_struct *wq;
 
+        /* ordered wq for modesets */
+        struct workqueue_struct *modeset_wq;
+
         /* Display functions */
         struct drm_i915_display_funcs display;
 
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 3866c49bc390..333f40bc03bb 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -6977,6 +6977,7 @@ enum {
 #define  RESET_PCH_HANDSHAKE_ENABLE     (1<<4)
 
 #define GEN8_CHICKEN_DCPR_1             _MMIO(0x46430)
+#define   SKL_SELECT_ALTERNATE_DC_EXIT  (1<<30)
 #define   MASK_WAKEMEM                  (1<<13)
 
 #define SKL_DFSM                        _MMIO(0x51000)
@@ -8522,6 +8523,7 @@ enum skl_power_gate {
 #define  BXT_CDCLK_CD2X_DIV_SEL_2       (2<<22)
 #define  BXT_CDCLK_CD2X_DIV_SEL_4       (3<<22)
 #define  BXT_CDCLK_CD2X_PIPE(pipe)      ((pipe)<<20)
+#define  CDCLK_DIVMUX_CD_OVERRIDE       (1<<19)
 #define  BXT_CDCLK_CD2X_PIPE_NONE       BXT_CDCLK_CD2X_PIPE(3)
 #define  BXT_CDCLK_SSA_PRECHARGE_ENABLE (1<<16)
 #define  CDCLK_FREQ_DECIMAL_MASK        (0x7ff)
diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c
index b2a6d62b71c0..60cf4e58389a 100644
--- a/drivers/gpu/drm/i915/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/intel_cdclk.c
@@ -860,16 +860,10 @@ static void skl_set_preferred_cdclk_vco(struct drm_i915_private *dev_priv,
 
 static void skl_dpll0_enable(struct drm_i915_private *dev_priv, int vco)
 {
-        int min_cdclk = skl_calc_cdclk(0, vco);
         u32 val;
 
         WARN_ON(vco != 8100000 && vco != 8640000);
 
-        /* select the minimum CDCLK before enabling DPLL 0 */
-        val = CDCLK_FREQ_337_308 | skl_cdclk_decimal(min_cdclk);
-        I915_WRITE(CDCLK_CTL, val);
-        POSTING_READ(CDCLK_CTL);
-
         /*
          * We always enable DPLL0 with the lowest link rate possible, but still
          * taking into account the VCO required to operate the eDP panel at the
@@ -923,7 +917,7 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv,
 {
         int cdclk = cdclk_state->cdclk;
         int vco = cdclk_state->vco;
-        u32 freq_select, pcu_ack;
+        u32 freq_select, pcu_ack, cdclk_ctl;
         int ret;
 
         WARN_ON((cdclk == 24000) != (vco == 0));
@@ -940,7 +934,7 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv,
                 return;
         }
 
-        /* set CDCLK_CTL */
+        /* Choose frequency for this cdclk */
         switch (cdclk) {
         case 450000:
         case 432000:
@@ -968,10 +962,33 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv,
             dev_priv->cdclk.hw.vco != vco)
                 skl_dpll0_disable(dev_priv);
 
+        cdclk_ctl = I915_READ(CDCLK_CTL);
+
+        if (dev_priv->cdclk.hw.vco != vco) {
+                /* Wa Display #1183: skl,kbl,cfl */
+                cdclk_ctl &= ~(CDCLK_FREQ_SEL_MASK | CDCLK_FREQ_DECIMAL_MASK);
+                cdclk_ctl |= freq_select | skl_cdclk_decimal(cdclk);
+                I915_WRITE(CDCLK_CTL, cdclk_ctl);
+        }
+
+        /* Wa Display #1183: skl,kbl,cfl */
+        cdclk_ctl |= CDCLK_DIVMUX_CD_OVERRIDE;
+        I915_WRITE(CDCLK_CTL, cdclk_ctl);
+        POSTING_READ(CDCLK_CTL);
+
         if (dev_priv->cdclk.hw.vco != vco)
                 skl_dpll0_enable(dev_priv, vco);
 
-        I915_WRITE(CDCLK_CTL, freq_select | skl_cdclk_decimal(cdclk));
+        /* Wa Display #1183: skl,kbl,cfl */
+        cdclk_ctl &= ~(CDCLK_FREQ_SEL_MASK | CDCLK_FREQ_DECIMAL_MASK);
+        I915_WRITE(CDCLK_CTL, cdclk_ctl);
+
+        cdclk_ctl |= freq_select | skl_cdclk_decimal(cdclk);
+        I915_WRITE(CDCLK_CTL, cdclk_ctl);
+
+        /* Wa Display #1183: skl,kbl,cfl */
+        cdclk_ctl &= ~CDCLK_DIVMUX_CD_OVERRIDE;
+        I915_WRITE(CDCLK_CTL, cdclk_ctl);
         POSTING_READ(CDCLK_CTL);
 
         /* inform PCU of the change */
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 30cf273d57aa..123585eeb87d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12544,11 +12544,15 @@ static int intel_atomic_commit(struct drm_device *dev,
         INIT_WORK(&state->commit_work, intel_atomic_commit_work);
 
         i915_sw_fence_commit(&intel_state->commit_ready);
-        if (nonblock)
+        if (nonblock && intel_state->modeset) {
+                queue_work(dev_priv->modeset_wq, &state->commit_work);
+        } else if (nonblock) {
                 queue_work(system_unbound_wq, &state->commit_work);
-        else
+        } else {
+                if (intel_state->modeset)
+                        flush_workqueue(dev_priv->modeset_wq);
                 intel_atomic_commit_tail(state);
-
+        }
 
         return 0;
 }
@@ -14462,6 +14466,8 @@ int intel_modeset_init(struct drm_device *dev)
         enum pipe pipe;
         struct intel_crtc *crtc;
 
+        dev_priv->modeset_wq = alloc_ordered_workqueue("i915_modeset", 0);
+
         drm_mode_config_init(dev);
 
         dev->mode_config.min_width = 0;
@@ -15270,6 +15276,8 @@ void intel_modeset_cleanup(struct drm_device *dev)
         intel_cleanup_gt_powersave(dev_priv);
 
         intel_teardown_gmbus(dev_priv);
+
+        destroy_workqueue(dev_priv->modeset_wq);
 }
 
 void intel_connector_attach_encoder(struct intel_connector *connector,
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index 6e3b430fccdc..55ea5eb3b7df 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -590,7 +590,7 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,
         struct drm_i915_private *dev_priv = to_i915(dev);
 
         if (dev_priv->psr.active) {
-                i915_reg_t psr_ctl;
+                i915_reg_t psr_status;
                 u32 psr_status_mask;
 
                 if (dev_priv->psr.aux_frame_sync)
@@ -599,24 +599,24 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,
                                         0);
 
                 if (dev_priv->psr.psr2_support) {
-                        psr_ctl = EDP_PSR2_CTL;
+                        psr_status = EDP_PSR2_STATUS_CTL;
                         psr_status_mask = EDP_PSR2_STATUS_STATE_MASK;
 
-                        I915_WRITE(psr_ctl,
-                                   I915_READ(psr_ctl) &
+                        I915_WRITE(EDP_PSR2_CTL,
+                                   I915_READ(EDP_PSR2_CTL) &
                                    ~(EDP_PSR2_ENABLE | EDP_SU_TRACK_ENABLE));
 
                 } else {
-                        psr_ctl = EDP_PSR_STATUS_CTL;
+                        psr_status = EDP_PSR_STATUS_CTL;
                         psr_status_mask = EDP_PSR_STATUS_STATE_MASK;
 
-                        I915_WRITE(psr_ctl,
-                                   I915_READ(psr_ctl) & ~EDP_PSR_ENABLE);
+                        I915_WRITE(EDP_PSR_CTL,
+                                   I915_READ(EDP_PSR_CTL) & ~EDP_PSR_ENABLE);
                 }
 
                 /* Wait till PSR is idle */
                 if (intel_wait_for_register(dev_priv,
-                                            psr_ctl, psr_status_mask, 0,
+                                            psr_status, psr_status_mask, 0,
                                             2000))
                         DRM_ERROR("Timed out waiting for PSR Idle State\n");
 
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 8af286c63d3b..7e115f3927f6 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -598,6 +598,11 @@ void gen9_enable_dc5(struct drm_i915_private *dev_priv)
 
         DRM_DEBUG_KMS("Enabling DC5\n");
 
+        /* Wa Display #1183: skl,kbl,cfl */
+        if (IS_GEN9_BC(dev_priv))
+                I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) |
+                           SKL_SELECT_ALTERNATE_DC_EXIT);
+
         gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC5);
 }
 
@@ -625,6 +630,11 @@ void skl_disable_dc6(struct drm_i915_private *dev_priv)
 {
         DRM_DEBUG_KMS("Disabling DC6\n");
 
+        /* Wa Display #1183: skl,kbl,cfl */
+        if (IS_GEN9_BC(dev_priv))
+                I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) |
+                           SKL_SELECT_ALTERNATE_DC_EXIT);
+
         gen9_set_dc_state(dev_priv, DC_STATE_DISABLE);
 }
 
@@ -1786,6 +1796,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,
         GLK_DISPLAY_POWERWELL_2_POWER_DOMAINS |         \
         BIT_ULL(POWER_DOMAIN_MODESET) |                 \
         BIT_ULL(POWER_DOMAIN_AUX_A) |                   \
+        BIT_ULL(POWER_DOMAIN_GMBUS) |                   \
         BIT_ULL(POWER_DOMAIN_INIT))
 
 #define CNL_DISPLAY_POWERWELL_2_POWER_DOMAINS (         \
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c
index e626eddf24d5..23db74ae1826 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c
@@ -78,6 +78,8 @@ static void hdmi_cec_received_msg(struct hdmi_core_data *core)
 
                         /* then read the message */
                         msg.len = cnt & 0xf;
+                        if (msg.len > CEC_MAX_MSG_SIZE - 2)
+                                msg.len = CEC_MAX_MSG_SIZE - 2;
                         msg.msg[0] = hdmi_read_reg(core->base,
                                                    HDMI_CEC_RX_CMD_HEADER);
                         msg.msg[1] = hdmi_read_reg(core->base,
@@ -104,26 +106,6 @@ static void hdmi_cec_received_msg(struct hdmi_core_data *core)
         }
 }
 
-static void hdmi_cec_transmit_fifo_empty(struct hdmi_core_data *core, u32 stat1)
-{
-        if (stat1 & 2) {
-                u32 dbg3 = hdmi_read_reg(core->base, HDMI_CEC_DBG_3);
-
-                cec_transmit_done(core->adap,
-                                  CEC_TX_STATUS_NACK |
-                                  CEC_TX_STATUS_MAX_RETRIES,
-                                  0, (dbg3 >> 4) & 7, 0, 0);
-        } else if (stat1 & 1) {
-                cec_transmit_done(core->adap,
-                                  CEC_TX_STATUS_ARB_LOST |
-                                  CEC_TX_STATUS_MAX_RETRIES,
-                                  0, 0, 0, 0);
-        } else if (stat1 == 0) {
-                cec_transmit_done(core->adap, CEC_TX_STATUS_OK,
-                                  0, 0, 0, 0);
-        }
-}
-
 void hdmi4_cec_irq(struct hdmi_core_data *core)
 {
         u32 stat0 = hdmi_read_reg(core->base, HDMI_CEC_INT_STATUS_0);
@@ -132,27 +114,21 @@ void hdmi4_cec_irq(struct hdmi_core_data *core)
         hdmi_write_reg(core->base, HDMI_CEC_INT_STATUS_0, stat0);
         hdmi_write_reg(core->base, HDMI_CEC_INT_STATUS_1, stat1);
 
-        if (stat0 & 0x40)
+        if (stat0 & 0x20) {
+                cec_transmit_done(core->adap, CEC_TX_STATUS_OK,
+                                  0, 0, 0, 0);
                 REG_FLD_MOD(core->base, HDMI_CEC_DBG_3, 0x1, 7, 7);
-        else if (stat0 & 0x24)
-                hdmi_cec_transmit_fifo_empty(core, stat1);
-        if (stat1 & 2) {
+        } else if (stat1 & 0x02) {
                 u32 dbg3 = hdmi_read_reg(core->base, HDMI_CEC_DBG_3);
 
                 cec_transmit_done(core->adap,
                                   CEC_TX_STATUS_NACK |
                                   CEC_TX_STATUS_MAX_RETRIES,
                                   0, (dbg3 >> 4) & 7, 0, 0);
-        } else if (stat1 & 1) {
-                cec_transmit_done(core->adap,
-                                  CEC_TX_STATUS_ARB_LOST |
-                                  CEC_TX_STATUS_MAX_RETRIES,
-                                  0, 0, 0, 0);
+                REG_FLD_MOD(core->base, HDMI_CEC_DBG_3, 0x1, 7, 7);
         }
         if (stat0 & 0x02)
                 hdmi_cec_received_msg(core);
-        if (stat1 & 0x3)
-                REG_FLD_MOD(core->base, HDMI_CEC_DBG_3, 0x1, 7, 7);
 }
 
 static bool hdmi_cec_clear_tx_fifo(struct cec_adapter *adap)
@@ -231,18 +207,14 @@ static int hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)
         /*
          * Enable CEC interrupts:
          * Transmit Buffer Full/Empty Change event
-         * Transmitter FIFO Empty event
          * Receiver FIFO Not Empty event
          */
-        hdmi_write_reg(core->base, HDMI_CEC_INT_ENABLE_0, 0x26);
+        hdmi_write_reg(core->base, HDMI_CEC_INT_ENABLE_0, 0x22);
         /*
          * Enable CEC interrupts:
-         * RX FIFO Overrun Error event
-         * Short Pulse Detected event
          * Frame Retransmit Count Exceeded event
-         * Start Bit Irregularity event
          */
-        hdmi_write_reg(core->base, HDMI_CEC_INT_ENABLE_1, 0x0f);
+        hdmi_write_reg(core->base, HDMI_CEC_INT_ENABLE_1, 0x02);
 
         /* cec calibration enable (self clearing) */
         hdmi_write_reg(core->base, HDMI_CEC_SETUP, 0x03);
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index b5ba6441489f..5d252fb27a82 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -1007,6 +1007,8 @@ int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)
         pr_info("Initializing pool allocator\n");
 
         _manager = kzalloc(sizeof(*_manager), GFP_KERNEL);
+        if (!_manager)
+                return -ENOMEM;
 
         ttm_page_pool_init_locked(&_manager->wc_pool, GFP_HIGHUSER, "wc", 0);
 
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index ef86296b8b0d..39e3b345a6c8 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -629,6 +629,18 @@ config SPEAR_ADC
           To compile this driver as a module, choose M here: the
           module will be called spear_adc.
 
+config SD_ADC_MODULATOR
+        tristate "Generic sigma delta modulator"
+        depends on OF
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        help
+          Select this option to enables sigma delta modulator. This driver can
+          support generic sigma delta modulators.
+
+          This driver can also be built as a module.  If so, the module
+          will be called sd_adc_modulator.
+
 config STM32_ADC_CORE
         tristate "STMicroelectronics STM32 adc core"
         depends on ARCH_STM32 || COMPILE_TEST
@@ -656,6 +668,31 @@ config STM32_ADC
           This driver can also be built as a module.  If so, the module
           will be called stm32-adc.
 
+config STM32_DFSDM_CORE
+        tristate "STMicroelectronics STM32 DFSDM core"
+        depends on (ARCH_STM32 && OF) || COMPILE_TEST
+        select REGMAP
+        select REGMAP_MMIO
+        help
+          Select this option to enable the  driver for STMicroelectronics
+          STM32 digital filter for sigma delta converter.
+
+          This driver can also be built as a module.  If so, the module
+          will be called stm32-dfsdm-core.
+
+config STM32_DFSDM_ADC
+        tristate "STMicroelectronics STM32 dfsdm adc"
+        depends on (ARCH_STM32 && OF) || COMPILE_TEST
+        select STM32_DFSDM_CORE
+        select REGMAP_MMIO
+        select IIO_BUFFER_HW_CONSUMER
+        help
+          Select this option to support ADCSigma delta modulator for
+          STMicroelectronics STM32 digital filter for sigma delta converter.
+
+          This driver can also be built as a module.  If so, the module
+          will be called stm32-dfsdm-adc.
+
 config STX104
         tristate "Apex Embedded Systems STX104 driver"
         depends on PC104 && X86 && ISA_BUS_API
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index 9572c1090f35..28a9423997f3 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -64,6 +64,8 @@ obj-$(CONFIG_STX104) += stx104.o
 obj-$(CONFIG_SUN4I_GPADC) += sun4i-gpadc-iio.o
 obj-$(CONFIG_STM32_ADC_CORE) += stm32-adc-core.o
 obj-$(CONFIG_STM32_ADC) += stm32-adc.o
+obj-$(CONFIG_STM32_DFSDM_CORE) += stm32-dfsdm-core.o
+obj-$(CONFIG_STM32_DFSDM_ADC) += stm32-dfsdm-adc.o
 obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o
 obj-$(CONFIG_TI_ADC0832) += ti-adc0832.o
 obj-$(CONFIG_TI_ADC084S021) += ti-adc084s021.o
@@ -82,3 +84,4 @@ obj-$(CONFIG_VF610_ADC) += vf610_adc.o
 obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o
 xilinx-xadc-y := xilinx-xadc-core.o xilinx-xadc-events.o
 obj-$(CONFIG_XILINX_XADC) += xilinx-xadc.o
+obj-$(CONFIG_SD_ADC_MODULATOR) += sd_adc_modulator.o
diff --git a/drivers/iio/adc/sd_adc_modulator.c b/drivers/iio/adc/sd_adc_modulator.c
new file mode 100644
index 000000000000..560d8c7d9d86
--- /dev/null
+++ b/drivers/iio/adc/sd_adc_modulator.c
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Generic sigma delta modulator driver
+ *
+ * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
+ * Author: Arnaud Pouliquen <arnaud.pouliquen@st.com>.
+ */
+
+#include <linux/iio/iio.h>
+#include <linux/iio/triggered_buffer.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+
+static const struct iio_info iio_sd_mod_iio_info;
+
+static const struct iio_chan_spec iio_sd_mod_ch = {
+        .type = IIO_VOLTAGE,
+        .indexed = 1,
+        .scan_type = {
+                .sign = 'u',
+                .realbits = 1,
+                .shift = 0,
+        },
+};
+
+static int iio_sd_mod_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct iio_dev *iio;
+
+        iio = devm_iio_device_alloc(dev, 0);
+        if (!iio)
+                return -ENOMEM;
+
+        iio->dev.parent = dev;
+        iio->dev.of_node = dev->of_node;
+        iio->name = dev_name(dev);
+        iio->info = &iio_sd_mod_iio_info;
+        iio->modes = INDIO_BUFFER_HARDWARE;
+
+        iio->num_channels = 1;
+        iio->channels = &iio_sd_mod_ch;
+
+        platform_set_drvdata(pdev, iio);
+
+        return devm_iio_device_register(&pdev->dev, iio);
+}
+
+static const struct of_device_id sd_adc_of_match[] = {
+        { .compatible = "sd-modulator" },
+        { .compatible = "ads1201" },
+        { }
+};
+MODULE_DEVICE_TABLE(of, sd_adc_of_match);
+
+static struct platform_driver iio_sd_mod_adc = {
+        .driver = {
+                .name = "iio_sd_adc_mod",
+                .of_match_table = of_match_ptr(sd_adc_of_match),
+        },
+        .probe = iio_sd_mod_probe,
+};
+
+module_platform_driver(iio_sd_mod_adc);
+
+MODULE_DESCRIPTION("Basic sigma delta modulator");
+MODULE_AUTHOR("Arnaud Pouliquen <arnaud.pouliquen@st.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c
new file mode 100644
index 000000000000..5e871404f565
--- /dev/null
+++ b/drivers/iio/adc/stm32-dfsdm-adc.c
@@ -0,0 +1,1216 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * This file is the ADC part of the STM32 DFSDM driver
+ *
+ * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
+ * Author: Arnaud Pouliquen <arnaud.pouliquen@st.com>.
+ */
+
+#include <linux/dmaengine.h>
+#include <linux/dma-mapping.h>
+#include <linux/interrupt.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/hw-consumer.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+
+#include "stm32-dfsdm.h"
+
+#define DFSDM_DMA_BUFFER_SIZE (4 * PAGE_SIZE)
+
+/* Conversion timeout */
+#define DFSDM_TIMEOUT_US 100000
+#define DFSDM_TIMEOUT (msecs_to_jiffies(DFSDM_TIMEOUT_US / 1000))
+
+/* Oversampling attribute default */
+#define DFSDM_DEFAULT_OVERSAMPLING  100
+
+/* Oversampling max values */
+#define DFSDM_MAX_INT_OVERSAMPLING 256
+#define DFSDM_MAX_FL_OVERSAMPLING 1024
+
+/* Max sample resolutions */
+#define DFSDM_MAX_RES BIT(31)
+#define DFSDM_DATA_RES BIT(23)
+
+enum sd_converter_type {
+        DFSDM_AUDIO,
+        DFSDM_IIO,
+};
+
+struct stm32_dfsdm_dev_data {
+        int type;
+        int (*init)(struct iio_dev *indio_dev);
+        unsigned int num_channels;
+        const struct regmap_config *regmap_cfg;
+};
+
+struct stm32_dfsdm_adc {
+        struct stm32_dfsdm *dfsdm;
+        const struct stm32_dfsdm_dev_data *dev_data;
+        unsigned int fl_id;
+        unsigned int ch_id;
+
+        /* ADC specific */
+        unsigned int oversamp;
+        struct iio_hw_consumer *hwc;
+        struct completion completion;
+        u32 *buffer;
+
+        /* Audio specific */
+        unsigned int spi_freq;  /* SPI bus clock frequency */
+        unsigned int sample_freq; /* Sample frequency after filter decimation */
+        int (*cb)(const void *data, size_t size, void *cb_priv);
+        void *cb_priv;
+
+        /* DMA */
+        u8 *rx_buf;
+        unsigned int bufi; /* Buffer current position */
+        unsigned int buf_sz; /* Buffer size */
+        struct dma_chan *dma_chan;
+        dma_addr_t dma_buf;
+};
+
+struct stm32_dfsdm_str2field {
+        const char      *name;
+        unsigned int    val;
+};
+
+/* DFSDM channel serial interface type */
+static const struct stm32_dfsdm_str2field stm32_dfsdm_chan_type[] = {
+        { "SPI_R", 0 }, /* SPI with data on rising edge */
+        { "SPI_F", 1 }, /* SPI with data on falling edge */
+        { "MANCH_R", 2 }, /* Manchester codec, rising edge = logic 0 */
+        { "MANCH_F", 3 }, /* Manchester codec, falling edge = logic 1 */
+        {},
+};
+
+/* DFSDM channel clock source */
+static const struct stm32_dfsdm_str2field stm32_dfsdm_chan_src[] = {
+        /* External SPI clock (CLKIN x) */
+        { "CLKIN", DFSDM_CHANNEL_SPI_CLOCK_EXTERNAL },
+        /* Internal SPI clock (CLKOUT) */
+        { "CLKOUT", DFSDM_CHANNEL_SPI_CLOCK_INTERNAL },
+        /* Internal SPI clock divided by 2 (falling edge) */
+        { "CLKOUT_F", DFSDM_CHANNEL_SPI_CLOCK_INTERNAL_DIV2_FALLING },
+        /* Internal SPI clock divided by 2 (falling edge) */
+        { "CLKOUT_R", DFSDM_CHANNEL_SPI_CLOCK_INTERNAL_DIV2_RISING },
+        {},
+};
+
+static int stm32_dfsdm_str2val(const char *str,
+                               const struct stm32_dfsdm_str2field *list)
+{
+        const struct stm32_dfsdm_str2field *p = list;
+
+        for (p = list; p && p->name; p++)
+                if (!strcmp(p->name, str))
+                        return p->val;
+
+        return -EINVAL;
+}
+
+static int stm32_dfsdm_set_osrs(struct stm32_dfsdm_filter *fl,
+                                unsigned int fast, unsigned int oversamp)
+{
+        unsigned int i, d, fosr, iosr;
+        u64 res;
+        s64 delta;
+        unsigned int m = 1;     /* multiplication factor */
+        unsigned int p = fl->ford;      /* filter order (ford) */
+
+        pr_debug("%s: Requested oversampling: %d\n",  __func__, oversamp);
+        /*
+         * This function tries to compute filter oversampling and integrator
+         * oversampling, base on oversampling ratio requested by user.
+         *
+         * Decimation d depends on the filter order and the oversampling ratios.
+         * ford: filter order
+         * fosr: filter over sampling ratio
+         * iosr: integrator over sampling ratio
+         */
+        if (fl->ford == DFSDM_FASTSINC_ORDER) {
+                m = 2;
+                p = 2;
+        }
+
+        /*
+         * Look for filter and integrator oversampling ratios which allows
+         * to reach 24 bits data output resolution.
+         * Leave as soon as if exact resolution if reached.
+         * Otherwise the higher resolution below 32 bits is kept.
+         */
+        for (fosr = 1; fosr <= DFSDM_MAX_FL_OVERSAMPLING; fosr++) {
+                for (iosr = 1; iosr <= DFSDM_MAX_INT_OVERSAMPLING; iosr++) {
+                        if (fast)
+                                d = fosr * iosr;
+                        else if (fl->ford == DFSDM_FASTSINC_ORDER)
+                                d = fosr * (iosr + 3) + 2;
+                        else
+                                d = fosr * (iosr - 1 + p) + p;
+
+                        if (d > oversamp)
+                                break;
+                        else if (d != oversamp)
+                                continue;
+                        /*
+                         * Check resolution (limited to signed 32 bits)
+                         *   res <= 2^31
+                         * Sincx filters:
+                         *   res = m * fosr^p x iosr (with m=1, p=ford)
+                         * FastSinc filter
+                         *   res = m * fosr^p x iosr (with m=2, p=2)
+                         */
+                        res = fosr;
+                        for (i = p - 1; i > 0; i--) {
+                                res = res * (u64)fosr;
+                                if (res > DFSDM_MAX_RES)
+                                        break;
+                        }
+                        if (res > DFSDM_MAX_RES)
+                                continue;
+                        res = res * (u64)m * (u64)iosr;
+                        if (res > DFSDM_MAX_RES)
+                                continue;
+
+                        delta = res - DFSDM_DATA_RES;
+
+                        if (res >= fl->res) {
+                                fl->res = res;
+                                fl->fosr = fosr;
+                                fl->iosr = iosr;
+                                fl->fast = fast;
+                                pr_debug("%s: fosr = %d, iosr = %d\n",
+                                         __func__, fl->fosr, fl->iosr);
+                        }
+
+                        if (!delta)
+                                return 0;
+                }
+        }
+
+        if (!fl->fosr)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int stm32_dfsdm_start_channel(struct stm32_dfsdm *dfsdm,
+                                     unsigned int ch_id)
+{
+        return regmap_update_bits(dfsdm->regmap, DFSDM_CHCFGR1(ch_id),
+                                  DFSDM_CHCFGR1_CHEN_MASK,
+                                  DFSDM_CHCFGR1_CHEN(1));
+}
+
+static void stm32_dfsdm_stop_channel(struct stm32_dfsdm *dfsdm,
+                                     unsigned int ch_id)
+{
+        regmap_update_bits(dfsdm->regmap, DFSDM_CHCFGR1(ch_id),
+                           DFSDM_CHCFGR1_CHEN_MASK, DFSDM_CHCFGR1_CHEN(0));
+}
+
+static int stm32_dfsdm_chan_configure(struct stm32_dfsdm *dfsdm,
+                                      struct stm32_dfsdm_channel *ch)
+{
+        unsigned int id = ch->id;
+        struct regmap *regmap = dfsdm->regmap;
+        int ret;
+
+        ret = regmap_update_bits(regmap, DFSDM_CHCFGR1(id),
+                                 DFSDM_CHCFGR1_SITP_MASK,
+                                 DFSDM_CHCFGR1_SITP(ch->type));
+        if (ret < 0)
+                return ret;
+        ret = regmap_update_bits(regmap, DFSDM_CHCFGR1(id),
+                                 DFSDM_CHCFGR1_SPICKSEL_MASK,
+                                 DFSDM_CHCFGR1_SPICKSEL(ch->src));
+        if (ret < 0)
+                return ret;
+        return regmap_update_bits(regmap, DFSDM_CHCFGR1(id),
+                                  DFSDM_CHCFGR1_CHINSEL_MASK,
+                                  DFSDM_CHCFGR1_CHINSEL(ch->alt_si));
+}
+
+static int stm32_dfsdm_start_filter(struct stm32_dfsdm *dfsdm,
+                                    unsigned int fl_id)
+{
+        int ret;
+
+        /* Enable filter */
+        ret = regmap_update_bits(dfsdm->regmap, DFSDM_CR1(fl_id),
+                                 DFSDM_CR1_DFEN_MASK, DFSDM_CR1_DFEN(1));
+        if (ret < 0)
+                return ret;
+
+        /* Start conversion */
+        return regmap_update_bits(dfsdm->regmap, DFSDM_CR1(fl_id),
+                                  DFSDM_CR1_RSWSTART_MASK,
+                                  DFSDM_CR1_RSWSTART(1));
+}
+
+static void stm32_dfsdm_stop_filter(struct stm32_dfsdm *dfsdm, unsigned int fl_id)
+{
+        /* Disable conversion */
+        regmap_update_bits(dfsdm->regmap, DFSDM_CR1(fl_id),
+                           DFSDM_CR1_DFEN_MASK, DFSDM_CR1_DFEN(0));
+}
+
+static int stm32_dfsdm_filter_configure(struct stm32_dfsdm *dfsdm,
+                                        unsigned int fl_id, unsigned int ch_id)
+{
+        struct regmap *regmap = dfsdm->regmap;
+        struct stm32_dfsdm_filter *fl = &dfsdm->fl_list[fl_id];
+        int ret;
+
+        /* Average integrator oversampling */
+        ret = regmap_update_bits(regmap, DFSDM_FCR(fl_id), DFSDM_FCR_IOSR_MASK,
+                                 DFSDM_FCR_IOSR(fl->iosr - 1));
+        if (ret)
+                return ret;
+
+        /* Filter order and Oversampling */
+        ret = regmap_update_bits(regmap, DFSDM_FCR(fl_id), DFSDM_FCR_FOSR_MASK,
+                                 DFSDM_FCR_FOSR(fl->fosr - 1));
+        if (ret)
+                return ret;
+
+        ret = regmap_update_bits(regmap, DFSDM_FCR(fl_id), DFSDM_FCR_FORD_MASK,
+                                 DFSDM_FCR_FORD(fl->ford));
+        if (ret)
+                return ret;
+
+        /* No scan mode supported for the moment */
+        ret = regmap_update_bits(regmap, DFSDM_CR1(fl_id), DFSDM_CR1_RCH_MASK,
+                                 DFSDM_CR1_RCH(ch_id));
+        if (ret)
+                return ret;
+
+        return regmap_update_bits(regmap, DFSDM_CR1(fl_id),
+                                  DFSDM_CR1_RSYNC_MASK,
+                                  DFSDM_CR1_RSYNC(fl->sync_mode));
+}
+
+static int stm32_dfsdm_channel_parse_of(struct stm32_dfsdm *dfsdm,
+                                        struct iio_dev *indio_dev,
+                                        struct iio_chan_spec *ch)
+{
+        struct stm32_dfsdm_channel *df_ch;
+        const char *of_str;
+        int chan_idx = ch->scan_index;
+        int ret, val;
+
+        ret = of_property_read_u32_index(indio_dev->dev.of_node,
+                                         "st,adc-channels", chan_idx,
+                                         &ch->channel);
+        if (ret < 0) {
+                dev_err(&indio_dev->dev,
+                        " Error parsing 'st,adc-channels' for idx %d\n",
+                        chan_idx);
+                return ret;
+        }
+        if (ch->channel >= dfsdm->num_chs) {
+                dev_err(&indio_dev->dev,
+                        " Error bad channel number %d (max = %d)\n",
+                        ch->channel, dfsdm->num_chs);
+                return -EINVAL;
+        }
+
+        ret = of_property_read_string_index(indio_dev->dev.of_node,
+                                            "st,adc-channel-names", chan_idx,
+                                            &ch->datasheet_name);
+        if (ret < 0) {
+                dev_err(&indio_dev->dev,
+                        " Error parsing 'st,adc-channel-names' for idx %d\n",
+                        chan_idx);
+                return ret;
+        }
+
+        df_ch =  &dfsdm->ch_list[ch->channel];
+        df_ch->id = ch->channel;
+
+        ret = of_property_read_string_index(indio_dev->dev.of_node,
+                                            "st,adc-channel-types", chan_idx,
+                                            &of_str);
+        if (!ret) {
+                val  = stm32_dfsdm_str2val(of_str, stm32_dfsdm_chan_type);
+                if (val < 0)
+                        return val;
+        } else {
+                val = 0;
+        }
+        df_ch->type = val;
+
+        ret = of_property_read_string_index(indio_dev->dev.of_node,
+                                            "st,adc-channel-clk-src", chan_idx,
+                                            &of_str);
+        if (!ret) {
+                val  = stm32_dfsdm_str2val(of_str, stm32_dfsdm_chan_src);
+                if (val < 0)
+                        return val;
+        } else {
+                val = 0;
+        }
+        df_ch->src = val;
+
+        ret = of_property_read_u32_index(indio_dev->dev.of_node,
+                                         "st,adc-alt-channel", chan_idx,
+                                         &df_ch->alt_si);
+        if (ret < 0)
+                df_ch->alt_si = 0;
+
+        return 0;
+}
+
+static ssize_t dfsdm_adc_audio_get_spiclk(struct iio_dev *indio_dev,
+                                          uintptr_t priv,
+                                          const struct iio_chan_spec *chan,
+                                          char *buf)
+{
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", adc->spi_freq);
+}
+
+static ssize_t dfsdm_adc_audio_set_spiclk(struct iio_dev *indio_dev,
+                                          uintptr_t priv,
+                                          const struct iio_chan_spec *chan,
+                                          const char *buf, size_t len)
+{
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+        struct stm32_dfsdm_filter *fl = &adc->dfsdm->fl_list[adc->fl_id];
+        struct stm32_dfsdm_channel *ch = &adc->dfsdm->ch_list[adc->ch_id];
+        unsigned int sample_freq = adc->sample_freq;
+        unsigned int spi_freq;
+        int ret;
+
+        dev_err(&indio_dev->dev, "enter %s\n", __func__);
+        /* If DFSDM is master on SPI, SPI freq can not be updated */
+        if (ch->src != DFSDM_CHANNEL_SPI_CLOCK_EXTERNAL)
+                return -EPERM;
+
+        ret = kstrtoint(buf, 0, &spi_freq);
+        if (ret)
+                return ret;
+
+        if (!spi_freq)
+                return -EINVAL;
+
+        if (sample_freq) {
+                if (spi_freq % sample_freq)
+                        dev_warn(&indio_dev->dev,
+                                 "Sampling rate not accurate (%d)\n",
+                                 spi_freq / (spi_freq / sample_freq));
+
+                ret = stm32_dfsdm_set_osrs(fl, 0, (spi_freq / sample_freq));
+                if (ret < 0) {
+                        dev_err(&indio_dev->dev,
+                                "No filter parameters that match!\n");
+                        return ret;
+                }
+        }
+        adc->spi_freq = spi_freq;
+
+        return len;
+}
+
+static int stm32_dfsdm_start_conv(struct stm32_dfsdm_adc *adc, bool dma)
+{
+        struct regmap *regmap = adc->dfsdm->regmap;
+        int ret;
+        unsigned int dma_en = 0, cont_en = 0;
+
+        ret = stm32_dfsdm_start_channel(adc->dfsdm, adc->ch_id);
+        if (ret < 0)
+                return ret;
+
+        ret = stm32_dfsdm_filter_configure(adc->dfsdm, adc->fl_id,
+                                           adc->ch_id);
+        if (ret < 0)
+                goto stop_channels;
+
+        if (dma) {
+                /* Enable DMA transfer*/
+                dma_en =  DFSDM_CR1_RDMAEN(1);
+                /* Enable conversion triggered by SPI clock*/
+                cont_en = DFSDM_CR1_RCONT(1);
+        }
+        /* Enable DMA transfer*/
+        ret = regmap_update_bits(regmap, DFSDM_CR1(adc->fl_id),
+                                 DFSDM_CR1_RDMAEN_MASK, dma_en);
+        if (ret < 0)
+                goto stop_channels;
+
+        /* Enable conversion triggered by SPI clock*/
+        ret = regmap_update_bits(regmap, DFSDM_CR1(adc->fl_id),
+                                 DFSDM_CR1_RCONT_MASK, cont_en);
+        if (ret < 0)
+                goto stop_channels;
+
+        ret = stm32_dfsdm_start_filter(adc->dfsdm, adc->fl_id);
+        if (ret < 0)
+                goto stop_channels;
+
+        return 0;
+
+stop_channels:
+        regmap_update_bits(regmap, DFSDM_CR1(adc->fl_id),
+                           DFSDM_CR1_RDMAEN_MASK, 0);
+
+        regmap_update_bits(regmap, DFSDM_CR1(adc->fl_id),
+                           DFSDM_CR1_RCONT_MASK, 0);
+        stm32_dfsdm_stop_channel(adc->dfsdm, adc->fl_id);
+
+        return ret;
+}
+
+static void stm32_dfsdm_stop_conv(struct stm32_dfsdm_adc *adc)
+{
+        struct regmap *regmap = adc->dfsdm->regmap;
+
+        stm32_dfsdm_stop_filter(adc->dfsdm, adc->fl_id);
+
+        /* Clean conversion options */
+        regmap_update_bits(regmap, DFSDM_CR1(adc->fl_id),
+                           DFSDM_CR1_RDMAEN_MASK, 0);
+
+        regmap_update_bits(regmap, DFSDM_CR1(adc->fl_id),
+                           DFSDM_CR1_RCONT_MASK, 0);
+
+        stm32_dfsdm_stop_channel(adc->dfsdm, adc->ch_id);
+}
+
+static int stm32_dfsdm_set_watermark(struct iio_dev *indio_dev,
+                                     unsigned int val)
+{
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+        unsigned int watermark = DFSDM_DMA_BUFFER_SIZE / 2;
+
+        /*
+         * DMA cyclic transfers are used, buffer is split into two periods.
+         * There should be :
+         * - always one buffer (period) DMA is working on
+         * - one buffer (period) driver pushed to ASoC side.
+         */
+        watermark = min(watermark, val * (unsigned int)(sizeof(u32)));
+        adc->buf_sz = watermark * 2;
+
+        return 0;
+}
+
+static unsigned int stm32_dfsdm_adc_dma_residue(struct stm32_dfsdm_adc *adc)
+{
+        struct dma_tx_state state;
+        enum dma_status status;
+
+        status = dmaengine_tx_status(adc->dma_chan,
+                                     adc->dma_chan->cookie,
+                                     &state);
+        if (status == DMA_IN_PROGRESS) {
+                /* Residue is size in bytes from end of buffer */
+                unsigned int i = adc->buf_sz - state.residue;
+                unsigned int size;
+
+                /* Return available bytes */
+                if (i >= adc->bufi)
+                        size = i - adc->bufi;
+                else
+                        size = adc->buf_sz + i - adc->bufi;
+
+                return size;
+        }
+
+        return 0;
+}
+
+static void stm32_dfsdm_audio_dma_buffer_done(void *data)
+{
+        struct iio_dev *indio_dev = data;
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+        int available = stm32_dfsdm_adc_dma_residue(adc);
+        size_t old_pos;
+
+        /*
+         * FIXME: In Kernel interface does not support cyclic DMA buffer,and
+         * offers only an interface to push data samples per samples.
+         * For this reason IIO buffer interface is not used and interface is
+         * bypassed using a private callback registered by ASoC.
+         * This should be a temporary solution waiting a cyclic DMA engine
+         * support in IIO.
+         */
+
+        dev_dbg(&indio_dev->dev, "%s: pos = %d, available = %d\n", __func__,
+                adc->bufi, available);
+        old_pos = adc->bufi;
+
+        while (available >= indio_dev->scan_bytes) {
+                u32 *buffer = (u32 *)&adc->rx_buf[adc->bufi];
+
+                /* Mask 8 LSB that contains the channel ID */
+                *buffer = (*buffer & 0xFFFFFF00) << 8;
+                available -= indio_dev->scan_bytes;
+                adc->bufi += indio_dev->scan_bytes;
+                if (adc->bufi >= adc->buf_sz) {
+                        if (adc->cb)
+                                adc->cb(&adc->rx_buf[old_pos],
+                                         adc->buf_sz - old_pos, adc->cb_priv);
+                        adc->bufi = 0;
+                        old_pos = 0;
+                }
+        }
+        if (adc->cb)
+                adc->cb(&adc->rx_buf[old_pos], adc->bufi - old_pos,
+                        adc->cb_priv);
+}
+
+static int stm32_dfsdm_adc_dma_start(struct iio_dev *indio_dev)
+{
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+        struct dma_async_tx_descriptor *desc;
+        dma_cookie_t cookie;
+        int ret;
+
+        if (!adc->dma_chan)
+                return -EINVAL;
+
+        dev_dbg(&indio_dev->dev, "%s size=%d watermark=%d\n", __func__,
+                adc->buf_sz, adc->buf_sz / 2);
+
+        /* Prepare a DMA cyclic transaction */
+        desc = dmaengine_prep_dma_cyclic(adc->dma_chan,
+                                         adc->dma_buf,
+                                         adc->buf_sz, adc->buf_sz / 2,
+                                         DMA_DEV_TO_MEM,
+                                         DMA_PREP_INTERRUPT);
+        if (!desc)
+                return -EBUSY;
+
+        desc->callback = stm32_dfsdm_audio_dma_buffer_done;
+        desc->callback_param = indio_dev;
+
+        cookie = dmaengine_submit(desc);
+        ret = dma_submit_error(cookie);
+        if (ret) {
+                dmaengine_terminate_all(adc->dma_chan);
+                return ret;
+        }
+
+        /* Issue pending DMA requests */
+        dma_async_issue_pending(adc->dma_chan);
+
+        return 0;
+}
+
+static int stm32_dfsdm_postenable(struct iio_dev *indio_dev)
+{
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+        int ret;
+
+        /* Reset adc buffer index */
+        adc->bufi = 0;
+
+        ret = stm32_dfsdm_start_dfsdm(adc->dfsdm);
+        if (ret < 0)
+                return ret;
+
+        ret = stm32_dfsdm_start_conv(adc, true);
+        if (ret) {
+                dev_err(&indio_dev->dev, "Can't start conversion\n");
+                goto stop_dfsdm;
+        }
+
+        if (adc->dma_chan) {
+                ret = stm32_dfsdm_adc_dma_start(indio_dev);
+                if (ret) {
+                        dev_err(&indio_dev->dev, "Can't start DMA\n");
+                        goto err_stop_conv;
+                }
+        }
+
+        return 0;
+
+err_stop_conv:
+        stm32_dfsdm_stop_conv(adc);
+stop_dfsdm:
+        stm32_dfsdm_stop_dfsdm(adc->dfsdm);
+
+        return ret;
+}
+
+static int stm32_dfsdm_predisable(struct iio_dev *indio_dev)
+{
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+
+        if (adc->dma_chan)
+                dmaengine_terminate_all(adc->dma_chan);
+
+        stm32_dfsdm_stop_conv(adc);
+
+        stm32_dfsdm_stop_dfsdm(adc->dfsdm);
+
+        return 0;
+}
+
+static const struct iio_buffer_setup_ops stm32_dfsdm_buffer_setup_ops = {
+        .postenable = &stm32_dfsdm_postenable,
+        .predisable = &stm32_dfsdm_predisable,
+};
+
+/**
+ * stm32_dfsdm_get_buff_cb() - register a callback that will be called when
+ *                             DMA transfer period is achieved.
+ *
+ * @iio_dev: Handle to IIO device.
+ * @cb: Pointer to callback function:
+ *      - data: pointer to data buffer
+ *      - size: size in byte of the data buffer
+ *      - private: pointer to consumer private structure.
+ * @private: Pointer to consumer private structure.
+ */
+int stm32_dfsdm_get_buff_cb(struct iio_dev *iio_dev,
+                            int (*cb)(const void *data, size_t size,
+                                      void *private),
+                            void *private)
+{
+        struct stm32_dfsdm_adc *adc;
+
+        if (!iio_dev)
+                return -EINVAL;
+        adc = iio_priv(iio_dev);
+
+        adc->cb = cb;
+        adc->cb_priv = private;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(stm32_dfsdm_get_buff_cb);
+
+/**
+ * stm32_dfsdm_release_buff_cb - unregister buffer callback
+ *
+ * @iio_dev: Handle to IIO device.
+ */
+int stm32_dfsdm_release_buff_cb(struct iio_dev *iio_dev)
+{
+        struct stm32_dfsdm_adc *adc;
+
+        if (!iio_dev)
+                return -EINVAL;
+        adc = iio_priv(iio_dev);
+
+        adc->cb = NULL;
+        adc->cb_priv = NULL;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(stm32_dfsdm_release_buff_cb);
+
+static int stm32_dfsdm_single_conv(struct iio_dev *indio_dev,
+                                   const struct iio_chan_spec *chan, int *res)
+{
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+        long timeout;
+        int ret;
+
+        reinit_completion(&adc->completion);
+
+        adc->buffer = res;
+
+        ret = stm32_dfsdm_start_dfsdm(adc->dfsdm);
+        if (ret < 0)
+                return ret;
+
+        ret = regmap_update_bits(adc->dfsdm->regmap, DFSDM_CR2(adc->fl_id),
+                                 DFSDM_CR2_REOCIE_MASK, DFSDM_CR2_REOCIE(1));
+        if (ret < 0)
+                goto stop_dfsdm;
+
+        ret = stm32_dfsdm_start_conv(adc, false);
+        if (ret < 0) {
+                regmap_update_bits(adc->dfsdm->regmap, DFSDM_CR2(adc->fl_id),
+                                   DFSDM_CR2_REOCIE_MASK, DFSDM_CR2_REOCIE(0));
+                goto stop_dfsdm;
+        }
+
+        timeout = wait_for_completion_interruptible_timeout(&adc->completion,
+                                                            DFSDM_TIMEOUT);
+
+        /* Mask IRQ for regular conversion achievement*/
+        regmap_update_bits(adc->dfsdm->regmap, DFSDM_CR2(adc->fl_id),
+                           DFSDM_CR2_REOCIE_MASK, DFSDM_CR2_REOCIE(0));
+
+        if (timeout == 0)
+                ret = -ETIMEDOUT;
+        else if (timeout < 0)
+                ret = timeout;
+        else
+                ret = IIO_VAL_INT;
+
+        stm32_dfsdm_stop_conv(adc);
+
+stop_dfsdm:
+        stm32_dfsdm_stop_dfsdm(adc->dfsdm);
+
+        return ret;
+}
+
+static int stm32_dfsdm_write_raw(struct iio_dev *indio_dev,
+                                 struct iio_chan_spec const *chan,
+                                 int val, int val2, long mask)
+{
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+        struct stm32_dfsdm_filter *fl = &adc->dfsdm->fl_list[adc->fl_id];
+        struct stm32_dfsdm_channel *ch = &adc->dfsdm->ch_list[adc->ch_id];
+        unsigned int spi_freq = adc->spi_freq;
+        int ret = -EINVAL;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
+                ret = stm32_dfsdm_set_osrs(fl, 0, val);
+                if (!ret)
+                        adc->oversamp = val;
+
+                return ret;
+
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                if (!val)
+                        return -EINVAL;
+                if (ch->src != DFSDM_CHANNEL_SPI_CLOCK_EXTERNAL)
+                        spi_freq = adc->dfsdm->spi_master_freq;
+
+                if (spi_freq % val)
+                        dev_warn(&indio_dev->dev,
+                                 "Sampling rate not accurate (%d)\n",
+                                 spi_freq / (spi_freq / val));
+
+                ret = stm32_dfsdm_set_osrs(fl, 0, (spi_freq / val));
+                if (ret < 0) {
+                        dev_err(&indio_dev->dev,
+                                "Not able to find parameter that match!\n");
+                        return ret;
+                }
+                adc->sample_freq = val;
+
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
+static int stm32_dfsdm_read_raw(struct iio_dev *indio_dev,
+                                struct iio_chan_spec const *chan, int *val,
+                                int *val2, long mask)
+{
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                ret = iio_hw_consumer_enable(adc->hwc);
+                if (ret < 0) {
+                        dev_err(&indio_dev->dev,
+                                "%s: IIO enable failed (channel %d)\n",
+                                __func__, chan->channel);
+                        return ret;
+                }
+                ret = stm32_dfsdm_single_conv(indio_dev, chan, val);
+                iio_hw_consumer_disable(adc->hwc);
+                if (ret < 0) {
+                        dev_err(&indio_dev->dev,
+                                "%s: Conversion failed (channel %d)\n",
+                                __func__, chan->channel);
+                        return ret;
+                }
+                return IIO_VAL_INT;
+
+        case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
+                *val = adc->oversamp;
+
+                return IIO_VAL_INT;
+
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                *val = adc->sample_freq;
+
+                return IIO_VAL_INT;
+        }
+
+        return -EINVAL;
+}
+
+static const struct iio_info stm32_dfsdm_info_audio = {
+        .hwfifo_set_watermark = stm32_dfsdm_set_watermark,
+        .read_raw = stm32_dfsdm_read_raw,
+        .write_raw = stm32_dfsdm_write_raw,
+};
+
+static const struct iio_info stm32_dfsdm_info_adc = {
+        .read_raw = stm32_dfsdm_read_raw,
+        .write_raw = stm32_dfsdm_write_raw,
+};
+
+static irqreturn_t stm32_dfsdm_irq(int irq, void *arg)
+{
+        struct stm32_dfsdm_adc *adc = arg;
+        struct iio_dev *indio_dev = iio_priv_to_dev(adc);
+        struct regmap *regmap = adc->dfsdm->regmap;
+        unsigned int status, int_en;
+
+        regmap_read(regmap, DFSDM_ISR(adc->fl_id), &status);
+        regmap_read(regmap, DFSDM_CR2(adc->fl_id), &int_en);
+
+        if (status & DFSDM_ISR_REOCF_MASK) {
+                /* Read the data register clean the IRQ status */
+                regmap_read(regmap, DFSDM_RDATAR(adc->fl_id), adc->buffer);
+                complete(&adc->completion);
+        }
+
+        if (status & DFSDM_ISR_ROVRF_MASK) {
+                if (int_en & DFSDM_CR2_ROVRIE_MASK)
+                        dev_warn(&indio_dev->dev, "Overrun detected\n");
+                regmap_update_bits(regmap, DFSDM_ICR(adc->fl_id),
+                                   DFSDM_ICR_CLRROVRF_MASK,
+                                   DFSDM_ICR_CLRROVRF_MASK);
+        }
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * Define external info for SPI Frequency and audio sampling rate that can be
+ * configured by ASoC driver through consumer.h API
+ */
+static const struct iio_chan_spec_ext_info dfsdm_adc_audio_ext_info[] = {
+        /* spi_clk_freq : clock freq on SPI/manchester bus used by channel */
+        {
+                .name = "spi_clk_freq",
+                .shared = IIO_SHARED_BY_TYPE,
+                .read = dfsdm_adc_audio_get_spiclk,
+                .write = dfsdm_adc_audio_set_spiclk,
+        },
+        {},
+};
+
+static void stm32_dfsdm_dma_release(struct iio_dev *indio_dev)
+{
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+
+        if (adc->dma_chan) {
+                dma_free_coherent(adc->dma_chan->device->dev,
+                                  DFSDM_DMA_BUFFER_SIZE,
+                                  adc->rx_buf, adc->dma_buf);
+                dma_release_channel(adc->dma_chan);
+        }
+}
+
+static int stm32_dfsdm_dma_request(struct iio_dev *indio_dev)
+{
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+        struct dma_slave_config config = {
+                .src_addr = (dma_addr_t)adc->dfsdm->phys_base +
+                        DFSDM_RDATAR(adc->fl_id),
+                .src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES,
+        };
+        int ret;
+
+        adc->dma_chan = dma_request_slave_channel(&indio_dev->dev, "rx");
+        if (!adc->dma_chan)
+                return -EINVAL;
+
+        adc->rx_buf = dma_alloc_coherent(adc->dma_chan->device->dev,
+                                         DFSDM_DMA_BUFFER_SIZE,
+                                         &adc->dma_buf, GFP_KERNEL);
+        if (!adc->rx_buf) {
+                ret = -ENOMEM;
+                goto err_release;
+        }
+
+        ret = dmaengine_slave_config(adc->dma_chan, &config);
+        if (ret)
+                goto err_free;
+
+        return 0;
+
+err_free:
+        dma_free_coherent(adc->dma_chan->device->dev, DFSDM_DMA_BUFFER_SIZE,
+                          adc->rx_buf, adc->dma_buf);
+err_release:
+        dma_release_channel(adc->dma_chan);
+
+        return ret;
+}
+
+static int stm32_dfsdm_adc_chan_init_one(struct iio_dev *indio_dev,
+                                         struct iio_chan_spec *ch)
+{
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+        int ret;
+
+        ret = stm32_dfsdm_channel_parse_of(adc->dfsdm, indio_dev, ch);
+        if (ret < 0)
+                return ret;
+
+        ch->type = IIO_VOLTAGE;
+        ch->indexed = 1;
+
+        /*
+         * IIO_CHAN_INFO_RAW: used to compute regular conversion
+         * IIO_CHAN_INFO_OVERSAMPLING_RATIO: used to set oversampling
+         */
+        ch->info_mask_separate = BIT(IIO_CHAN_INFO_RAW);
+        ch->info_mask_shared_by_all = BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO);
+
+        if (adc->dev_data->type == DFSDM_AUDIO) {
+                ch->scan_type.sign = 's';
+                ch->ext_info = dfsdm_adc_audio_ext_info;
+        } else {
+                ch->scan_type.sign = 'u';
+        }
+        ch->scan_type.realbits = 24;
+        ch->scan_type.storagebits = 32;
+        adc->ch_id = ch->channel;
+
+        return stm32_dfsdm_chan_configure(adc->dfsdm,
+                                          &adc->dfsdm->ch_list[ch->channel]);
+}
+
+static int stm32_dfsdm_audio_init(struct iio_dev *indio_dev)
+{
+        struct iio_chan_spec *ch;
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+        struct stm32_dfsdm_channel *d_ch;
+        int ret;
+
+        indio_dev->modes |= INDIO_BUFFER_SOFTWARE;
+        indio_dev->setup_ops = &stm32_dfsdm_buffer_setup_ops;
+
+        ch = devm_kzalloc(&indio_dev->dev, sizeof(*ch), GFP_KERNEL);
+        if (!ch)
+                return -ENOMEM;
+
+        ch->scan_index = 0;
+
+        ret = stm32_dfsdm_adc_chan_init_one(indio_dev, ch);
+        if (ret < 0) {
+                dev_err(&indio_dev->dev, "Channels init failed\n");
+                return ret;
+        }
+        ch->info_mask_separate = BIT(IIO_CHAN_INFO_SAMP_FREQ);
+
+        d_ch = &adc->dfsdm->ch_list[adc->ch_id];
+        if (d_ch->src != DFSDM_CHANNEL_SPI_CLOCK_EXTERNAL)
+                adc->spi_freq = adc->dfsdm->spi_master_freq;
+
+        indio_dev->num_channels = 1;
+        indio_dev->channels = ch;
+
+        return stm32_dfsdm_dma_request(indio_dev);
+}
+
+static int stm32_dfsdm_adc_init(struct iio_dev *indio_dev)
+{
+        struct iio_chan_spec *ch;
+        struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
+        int num_ch;
+        int ret, chan_idx;
+
+        adc->oversamp = DFSDM_DEFAULT_OVERSAMPLING;
+        ret = stm32_dfsdm_set_osrs(&adc->dfsdm->fl_list[adc->fl_id], 0,
+                                   adc->oversamp);
+        if (ret < 0)
+                return ret;
+
+        num_ch = of_property_count_u32_elems(indio_dev->dev.of_node,
+                                             "st,adc-channels");
+        if (num_ch < 0 || num_ch > adc->dfsdm->num_chs) {
+                dev_err(&indio_dev->dev, "Bad st,adc-channels\n");
+                return num_ch < 0 ? num_ch : -EINVAL;
+        }
+
+        /* Bind to SD modulator IIO device */
+        adc->hwc = devm_iio_hw_consumer_alloc(&indio_dev->dev);
+        if (IS_ERR(adc->hwc))
+                return -EPROBE_DEFER;
+
+        ch = devm_kcalloc(&indio_dev->dev, num_ch, sizeof(*ch),
+                          GFP_KERNEL);
+        if (!ch)
+                return -ENOMEM;
+
+        for (chan_idx = 0; chan_idx < num_ch; chan_idx++) {
+                ch->scan_index = chan_idx;
+                ret = stm32_dfsdm_adc_chan_init_one(indio_dev, ch);
+                if (ret < 0) {
+                        dev_err(&indio_dev->dev, "Channels init failed\n");
+                        return ret;
+                }
+        }
+
+        indio_dev->num_channels = num_ch;
+        indio_dev->channels = ch;
+
+        init_completion(&adc->completion);
+
+        return 0;
+}
+
+static const struct stm32_dfsdm_dev_data stm32h7_dfsdm_adc_data = {
+        .type = DFSDM_IIO,
+        .init = stm32_dfsdm_adc_init,
+};
+
+static const struct stm32_dfsdm_dev_data stm32h7_dfsdm_audio_data = {
+        .type = DFSDM_AUDIO,
+        .init = stm32_dfsdm_audio_init,
+};
+
+static const struct of_device_id stm32_dfsdm_adc_match[] = {
+        {
+                .compatible = "st,stm32-dfsdm-adc",
+                .data = &stm32h7_dfsdm_adc_data,
+        },
+        {
+                .compatible = "st,stm32-dfsdm-dmic",
+                .data = &stm32h7_dfsdm_audio_data,
+        },
+        {}
+};
+
+static int stm32_dfsdm_adc_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct stm32_dfsdm_adc *adc;
+        struct device_node *np = dev->of_node;
+        const struct stm32_dfsdm_dev_data *dev_data;
+        struct iio_dev *iio;
+        const struct of_device_id *of_id;
+        char *name;
+        int ret, irq, val;
+
+        of_id = of_match_node(stm32_dfsdm_adc_match, np);
+        if (!of_id->data) {
+                dev_err(&pdev->dev, "Data associated to device is missing\n");
+                return -EINVAL;
+        }
+
+        dev_data = (const struct stm32_dfsdm_dev_data *)of_id->data;
+
+        iio = devm_iio_device_alloc(dev, sizeof(*adc));
+        if (!iio) {
+                dev_err(dev, "%s: Failed to allocate IIO\n", __func__);
+                return -ENOMEM;
+        }
+
+        adc = iio_priv(iio);
+        if (IS_ERR(adc)) {
+                dev_err(dev, "%s: Failed to allocate ADC\n", __func__);
+                return PTR_ERR(adc);
+        }
+        adc->dfsdm = dev_get_drvdata(dev->parent);
+
+        iio->dev.parent = dev;
+        iio->dev.of_node = np;
+        iio->modes = INDIO_DIRECT_MODE | INDIO_BUFFER_SOFTWARE;
+
+        platform_set_drvdata(pdev, adc);
+
+        ret = of_property_read_u32(dev->of_node, "reg", &adc->fl_id);
+        if (ret != 0) {
+                dev_err(dev, "Missing reg property\n");
+                return -EINVAL;
+        }
+
+        name = devm_kzalloc(dev, sizeof("dfsdm-adc0"), GFP_KERNEL);
+        if (!name)
+                return -ENOMEM;
+        if (dev_data->type == DFSDM_AUDIO) {
+                iio->info = &stm32_dfsdm_info_audio;
+                snprintf(name, sizeof("dfsdm-pdm0"), "dfsdm-pdm%d", adc->fl_id);
+        } else {
+                iio->info = &stm32_dfsdm_info_adc;
+                snprintf(name, sizeof("dfsdm-adc0"), "dfsdm-adc%d", adc->fl_id);
+        }
+        iio->name = name;
+
+        /*
+         * In a first step IRQs generated for channels are not treated.
+         * So IRQ associated to filter instance 0 is dedicated to the Filter 0.
+         */
+        irq = platform_get_irq(pdev, 0);
+        ret = devm_request_irq(dev, irq, stm32_dfsdm_irq,
+                               0, pdev->name, adc);
+        if (ret < 0) {
+                dev_err(dev, "Failed to request IRQ\n");
+                return ret;
+        }
+
+        ret = of_property_read_u32(dev->of_node, "st,filter-order", &val);
+        if (ret < 0) {
+                dev_err(dev, "Failed to set filter order\n");
+                return ret;
+        }
+
+        adc->dfsdm->fl_list[adc->fl_id].ford = val;
+
+        ret = of_property_read_u32(dev->of_node, "st,filter0-sync", &val);
+        if (!ret)
+                adc->dfsdm->fl_list[adc->fl_id].sync_mode = val;
+
+        adc->dev_data = dev_data;
+        ret = dev_data->init(iio);
+        if (ret < 0)
+                return ret;
+
+        ret = iio_device_register(iio);
+        if (ret < 0)
+                goto err_cleanup;
+
+        dev_err(dev, "of_platform_populate\n");
+        if (dev_data->type == DFSDM_AUDIO) {
+                ret = of_platform_populate(np, NULL, NULL, dev);
+                if (ret < 0) {
+                        dev_err(dev, "Failed to find an audio DAI\n");
+                        goto err_unregister;
+                }
+        }
+
+        return 0;
+
+err_unregister:
+        iio_device_unregister(iio);
+err_cleanup:
+        stm32_dfsdm_dma_release(iio);
+
+        return ret;
+}
+
+static int stm32_dfsdm_adc_remove(struct platform_device *pdev)
+{
+        struct stm32_dfsdm_adc *adc = platform_get_drvdata(pdev);
+        struct iio_dev *indio_dev = iio_priv_to_dev(adc);
+
+        if (adc->dev_data->type == DFSDM_AUDIO)
+                of_platform_depopulate(&pdev->dev);
+        iio_device_unregister(indio_dev);
+        stm32_dfsdm_dma_release(indio_dev);
+
+        return 0;
+}
+
+static struct platform_driver stm32_dfsdm_adc_driver = {
+        .driver = {
+                .name = "stm32-dfsdm-adc",
+                .of_match_table = stm32_dfsdm_adc_match,
+        },
+        .probe = stm32_dfsdm_adc_probe,
+        .remove = stm32_dfsdm_adc_remove,
+};
+module_platform_driver(stm32_dfsdm_adc_driver);
+
+MODULE_DESCRIPTION("STM32 sigma delta ADC");
+MODULE_AUTHOR("Arnaud Pouliquen <arnaud.pouliquen@st.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c
new file mode 100644
index 000000000000..6cd655f8239b
--- /dev/null
+++ b/drivers/iio/adc/stm32-dfsdm-core.c
@@ -0,0 +1,308 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * This file is part the core part STM32 DFSDM driver
+ *
+ * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
+ * Author(s): Arnaud Pouliquen <arnaud.pouliquen@st.com> for STMicroelectronics.
+ */
+
+#include <linux/clk.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+
+#include "stm32-dfsdm.h"
+
+struct stm32_dfsdm_dev_data {
+        unsigned int num_filters;
+        unsigned int num_channels;
+        const struct regmap_config *regmap_cfg;
+};
+
+#define STM32H7_DFSDM_NUM_FILTERS       4
+#define STM32H7_DFSDM_NUM_CHANNELS      8
+
+static bool stm32_dfsdm_volatile_reg(struct device *dev, unsigned int reg)
+{
+        if (reg < DFSDM_FILTER_BASE_ADR)
+                return false;
+
+        /*
+         * Mask is done on register to avoid to list registers of all
+         * filter instances.
+         */
+        switch (reg & DFSDM_FILTER_REG_MASK) {
+        case DFSDM_CR1(0) & DFSDM_FILTER_REG_MASK:
+        case DFSDM_ISR(0) & DFSDM_FILTER_REG_MASK:
+        case DFSDM_JDATAR(0) & DFSDM_FILTER_REG_MASK:
+        case DFSDM_RDATAR(0) & DFSDM_FILTER_REG_MASK:
+                return true;
+        }
+
+        return false;
+}
+
+static const struct regmap_config stm32h7_dfsdm_regmap_cfg = {
+        .reg_bits = 32,
+        .val_bits = 32,
+        .reg_stride = sizeof(u32),
+        .max_register = 0x2B8,
+        .volatile_reg = stm32_dfsdm_volatile_reg,
+        .fast_io = true,
+};
+
+static const struct stm32_dfsdm_dev_data stm32h7_dfsdm_data = {
+        .num_filters = STM32H7_DFSDM_NUM_FILTERS,
+        .num_channels = STM32H7_DFSDM_NUM_CHANNELS,
+        .regmap_cfg = &stm32h7_dfsdm_regmap_cfg,
+};
+
+struct dfsdm_priv {
+        struct platform_device *pdev; /* platform device */
+
+        struct stm32_dfsdm dfsdm; /* common data exported for all instances */
+
+        unsigned int spi_clk_out_div; /* SPI clkout divider value */
+        atomic_t n_active_ch;   /* number of current active channels */
+
+        struct clk *clk; /* DFSDM clock */
+        struct clk *aclk; /* audio clock */
+};
+
+/**
+ * stm32_dfsdm_start_dfsdm - start global dfsdm interface.
+ *
+ * Enable interface if n_active_ch is not null.
+ * @dfsdm: Handle used to retrieve dfsdm context.
+ */
+int stm32_dfsdm_start_dfsdm(struct stm32_dfsdm *dfsdm)
+{
+        struct dfsdm_priv *priv = container_of(dfsdm, struct dfsdm_priv, dfsdm);
+        struct device *dev = &priv->pdev->dev;
+        unsigned int clk_div = priv->spi_clk_out_div;
+        int ret;
+
+        if (atomic_inc_return(&priv->n_active_ch) == 1) {
+                ret = clk_prepare_enable(priv->clk);
+                if (ret < 0) {
+                        dev_err(dev, "Failed to start clock\n");
+                        goto error_ret;
+                }
+                if (priv->aclk) {
+                        ret = clk_prepare_enable(priv->aclk);
+                        if (ret < 0) {
+                                dev_err(dev, "Failed to start audio clock\n");
+                                goto disable_clk;
+                        }
+                }
+
+                /* Output the SPI CLKOUT (if clk_div == 0 clock if OFF) */
+                ret = regmap_update_bits(dfsdm->regmap, DFSDM_CHCFGR1(0),
+                                         DFSDM_CHCFGR1_CKOUTDIV_MASK,
+                                         DFSDM_CHCFGR1_CKOUTDIV(clk_div));
+                if (ret < 0)
+                        goto disable_aclk;
+
+                /* Global enable of DFSDM interface */
+                ret = regmap_update_bits(dfsdm->regmap, DFSDM_CHCFGR1(0),
+                                         DFSDM_CHCFGR1_DFSDMEN_MASK,
+                                         DFSDM_CHCFGR1_DFSDMEN(1));
+                if (ret < 0)
+                        goto disable_aclk;
+        }
+
+        dev_dbg(dev, "%s: n_active_ch %d\n", __func__,
+                atomic_read(&priv->n_active_ch));
+
+        return 0;
+
+disable_aclk:
+        clk_disable_unprepare(priv->aclk);
+disable_clk:
+        clk_disable_unprepare(priv->clk);
+
+error_ret:
+        atomic_dec(&priv->n_active_ch);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(stm32_dfsdm_start_dfsdm);
+
+/**
+ * stm32_dfsdm_stop_dfsdm - stop global DFSDM interface.
+ *
+ * Disable interface if n_active_ch is null
+ * @dfsdm: Handle used to retrieve dfsdm context.
+ */
+int stm32_dfsdm_stop_dfsdm(struct stm32_dfsdm *dfsdm)
+{
+        struct dfsdm_priv *priv = container_of(dfsdm, struct dfsdm_priv, dfsdm);
+        int ret;
+
+        if (atomic_dec_and_test(&priv->n_active_ch)) {
+                /* Global disable of DFSDM interface */
+                ret = regmap_update_bits(dfsdm->regmap, DFSDM_CHCFGR1(0),
+                                         DFSDM_CHCFGR1_DFSDMEN_MASK,
+                                         DFSDM_CHCFGR1_DFSDMEN(0));
+                if (ret < 0)
+                        return ret;
+
+                /* Stop SPI CLKOUT */
+                ret = regmap_update_bits(dfsdm->regmap, DFSDM_CHCFGR1(0),
+                                         DFSDM_CHCFGR1_CKOUTDIV_MASK,
+                                         DFSDM_CHCFGR1_CKOUTDIV(0));
+                if (ret < 0)
+                        return ret;
+
+                clk_disable_unprepare(priv->clk);
+                if (priv->aclk)
+                        clk_disable_unprepare(priv->aclk);
+        }
+        dev_dbg(&priv->pdev->dev, "%s: n_active_ch %d\n", __func__,
+                atomic_read(&priv->n_active_ch));
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(stm32_dfsdm_stop_dfsdm);
+
+static int stm32_dfsdm_parse_of(struct platform_device *pdev,
+                                struct dfsdm_priv *priv)
+{
+        struct device_node *node = pdev->dev.of_node;
+        struct resource *res;
+        unsigned long clk_freq;
+        unsigned int spi_freq, rem;
+        int ret;
+
+        if (!node)
+                return -EINVAL;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "Failed to get memory resource\n");
+                return -ENODEV;
+        }
+        priv->dfsdm.phys_base = res->start;
+        priv->dfsdm.base = devm_ioremap_resource(&pdev->dev, res);
+
+        /*
+         * "dfsdm" clock is mandatory for DFSDM peripheral clocking.
+         * "dfsdm" or "audio" clocks can be used as source clock for
+         * the SPI clock out signal and internal processing, depending
+         * on use case.
+         */
+        priv->clk = devm_clk_get(&pdev->dev, "dfsdm");
+        if (IS_ERR(priv->clk)) {
+                dev_err(&pdev->dev, "No stm32_dfsdm_clk clock found\n");
+                return -EINVAL;
+        }
+
+        priv->aclk = devm_clk_get(&pdev->dev, "audio");
+        if (IS_ERR(priv->aclk))
+                priv->aclk = NULL;
+
+        if (priv->aclk)
+                clk_freq = clk_get_rate(priv->aclk);
+        else
+                clk_freq = clk_get_rate(priv->clk);
+
+        /* SPI clock out frequency */
+        ret = of_property_read_u32(pdev->dev.of_node, "spi-max-frequency",
+                                   &spi_freq);
+        if (ret < 0) {
+                /* No SPI master mode */
+                return 0;
+        }
+
+        priv->spi_clk_out_div = div_u64_rem(clk_freq, spi_freq, &rem) - 1;
+        priv->dfsdm.spi_master_freq = spi_freq;
+
+        if (rem) {
+                dev_warn(&pdev->dev, "SPI clock not accurate\n");
+                dev_warn(&pdev->dev, "%ld = %d * %d + %d\n",
+                         clk_freq, spi_freq, priv->spi_clk_out_div + 1, rem);
+        }
+
+        return 0;
+};
+
+static const struct of_device_id stm32_dfsdm_of_match[] = {
+        {
+                .compatible = "st,stm32h7-dfsdm",
+                .data = &stm32h7_dfsdm_data,
+        },
+        {}
+};
+MODULE_DEVICE_TABLE(of, stm32_dfsdm_of_match);
+
+static int stm32_dfsdm_probe(struct platform_device *pdev)
+{
+        struct dfsdm_priv *priv;
+        const struct of_device_id *of_id;
+        const struct stm32_dfsdm_dev_data *dev_data;
+        struct stm32_dfsdm *dfsdm;
+        int ret;
+
+        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->pdev = pdev;
+
+        of_id = of_match_node(stm32_dfsdm_of_match, pdev->dev.of_node);
+        if (!of_id->data) {
+                dev_err(&pdev->dev, "Data associated to device is missing\n");
+                return -EINVAL;
+        }
+
+        dev_data = (const struct stm32_dfsdm_dev_data *)of_id->data;
+        dfsdm = &priv->dfsdm;
+        dfsdm->fl_list = devm_kcalloc(&pdev->dev, dev_data->num_filters,
+                                      sizeof(*dfsdm->fl_list), GFP_KERNEL);
+        if (!dfsdm->fl_list)
+                return -ENOMEM;
+
+        dfsdm->num_fls = dev_data->num_filters;
+        dfsdm->ch_list = devm_kcalloc(&pdev->dev, dev_data->num_channels,
+                                      sizeof(*dfsdm->ch_list),
+                                      GFP_KERNEL);
+        if (!dfsdm->ch_list)
+                return -ENOMEM;
+        dfsdm->num_chs = dev_data->num_channels;
+
+        ret = stm32_dfsdm_parse_of(pdev, priv);
+        if (ret < 0)
+                return ret;
+
+        dfsdm->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "dfsdm",
+                                                  dfsdm->base,
+                                                  &stm32h7_dfsdm_regmap_cfg);
+        if (IS_ERR(dfsdm->regmap)) {
+                ret = PTR_ERR(dfsdm->regmap);
+                dev_err(&pdev->dev, "%s: Failed to allocate regmap: %d\n",
+                        __func__, ret);
+                return ret;
+        }
+
+        platform_set_drvdata(pdev, dfsdm);
+
+        return devm_of_platform_populate(&pdev->dev);
+}
+
+static struct platform_driver stm32_dfsdm_driver = {
+        .probe = stm32_dfsdm_probe,
+        .driver = {
+                .name = "stm32-dfsdm",
+                .of_match_table = stm32_dfsdm_of_match,
+        },
+};
+
+module_platform_driver(stm32_dfsdm_driver);
+
+MODULE_AUTHOR("Arnaud Pouliquen <arnaud.pouliquen@st.com>");
+MODULE_DESCRIPTION("STMicroelectronics STM32 dfsdm driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/adc/stm32-dfsdm.h b/drivers/iio/adc/stm32-dfsdm.h
new file mode 100644
index 000000000000..8708394b0725
--- /dev/null
+++ b/drivers/iio/adc/stm32-dfsdm.h
@@ -0,0 +1,310 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * This file is part of STM32 DFSDM driver
+ *
+ * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
+ * Author(s): Arnaud Pouliquen <arnaud.pouliquen@st.com>.
+ */
+
+#ifndef MDF_STM32_DFSDM__H
+#define MDF_STM32_DFSDM__H
+
+#include <linux/bitfield.h>
+
+/*
+ * STM32 DFSDM - global register map
+ * ________________________________________________________
+ * | Offset |                 Registers block             |
+ * --------------------------------------------------------
+ * | 0x000  |      CHANNEL 0 + COMMON CHANNEL FIELDS      |
+ * --------------------------------------------------------
+ * | 0x020  |                CHANNEL 1                    |
+ * --------------------------------------------------------
+ * | ...    |                .....                        |
+ * --------------------------------------------------------
+ * | 0x0E0  |                CHANNEL 7                    |
+ * --------------------------------------------------------
+ * | 0x100  |      FILTER  0 + COMMON  FILTER FIELDs      |
+ * --------------------------------------------------------
+ * | 0x200  |                FILTER  1                    |
+ * --------------------------------------------------------
+ * | 0x300  |                FILTER  2                    |
+ * --------------------------------------------------------
+ * | 0x400  |                FILTER  3                    |
+ * --------------------------------------------------------
+ */
+
+/*
+ * Channels register definitions
+ */
+#define DFSDM_CHCFGR1(y)  ((y) * 0x20 + 0x00)
+#define DFSDM_CHCFGR2(y)  ((y) * 0x20 + 0x04)
+#define DFSDM_AWSCDR(y)   ((y) * 0x20 + 0x08)
+#define DFSDM_CHWDATR(y)  ((y) * 0x20 + 0x0C)
+#define DFSDM_CHDATINR(y) ((y) * 0x20 + 0x10)
+
+/* CHCFGR1: Channel configuration register 1 */
+#define DFSDM_CHCFGR1_SITP_MASK     GENMASK(1, 0)
+#define DFSDM_CHCFGR1_SITP(v)       FIELD_PREP(DFSDM_CHCFGR1_SITP_MASK, v)
+#define DFSDM_CHCFGR1_SPICKSEL_MASK GENMASK(3, 2)
+#define DFSDM_CHCFGR1_SPICKSEL(v)   FIELD_PREP(DFSDM_CHCFGR1_SPICKSEL_MASK, v)
+#define DFSDM_CHCFGR1_SCDEN_MASK    BIT(5)
+#define DFSDM_CHCFGR1_SCDEN(v)      FIELD_PREP(DFSDM_CHCFGR1_SCDEN_MASK, v)
+#define DFSDM_CHCFGR1_CKABEN_MASK   BIT(6)
+#define DFSDM_CHCFGR1_CKABEN(v)     FIELD_PREP(DFSDM_CHCFGR1_CKABEN_MASK, v)
+#define DFSDM_CHCFGR1_CHEN_MASK     BIT(7)
+#define DFSDM_CHCFGR1_CHEN(v)       FIELD_PREP(DFSDM_CHCFGR1_CHEN_MASK, v)
+#define DFSDM_CHCFGR1_CHINSEL_MASK  BIT(8)
+#define DFSDM_CHCFGR1_CHINSEL(v)    FIELD_PREP(DFSDM_CHCFGR1_CHINSEL_MASK, v)
+#define DFSDM_CHCFGR1_DATMPX_MASK   GENMASK(13, 12)
+#define DFSDM_CHCFGR1_DATMPX(v)     FIELD_PREP(DFSDM_CHCFGR1_DATMPX_MASK, v)
+#define DFSDM_CHCFGR1_DATPACK_MASK  GENMASK(15, 14)
+#define DFSDM_CHCFGR1_DATPACK(v)    FIELD_PREP(DFSDM_CHCFGR1_DATPACK_MASK, v)
+#define DFSDM_CHCFGR1_CKOUTDIV_MASK GENMASK(23, 16)
+#define DFSDM_CHCFGR1_CKOUTDIV(v)   FIELD_PREP(DFSDM_CHCFGR1_CKOUTDIV_MASK, v)
+#define DFSDM_CHCFGR1_CKOUTSRC_MASK BIT(30)
+#define DFSDM_CHCFGR1_CKOUTSRC(v)   FIELD_PREP(DFSDM_CHCFGR1_CKOUTSRC_MASK, v)
+#define DFSDM_CHCFGR1_DFSDMEN_MASK  BIT(31)
+#define DFSDM_CHCFGR1_DFSDMEN(v)    FIELD_PREP(DFSDM_CHCFGR1_DFSDMEN_MASK, v)
+
+/* CHCFGR2: Channel configuration register 2 */
+#define DFSDM_CHCFGR2_DTRBS_MASK    GENMASK(7, 3)
+#define DFSDM_CHCFGR2_DTRBS(v)      FIELD_PREP(DFSDM_CHCFGR2_DTRBS_MASK, v)
+#define DFSDM_CHCFGR2_OFFSET_MASK   GENMASK(31, 8)
+#define DFSDM_CHCFGR2_OFFSET(v)     FIELD_PREP(DFSDM_CHCFGR2_OFFSET_MASK, v)
+
+/* AWSCDR: Channel analog watchdog and short circuit detector */
+#define DFSDM_AWSCDR_SCDT_MASK    GENMASK(7, 0)
+#define DFSDM_AWSCDR_SCDT(v)      FIELD_PREP(DFSDM_AWSCDR_SCDT_MASK, v)
+#define DFSDM_AWSCDR_BKSCD_MASK   GENMASK(15, 12)
+#define DFSDM_AWSCDR_BKSCD(v)     FIELD_PREP(DFSDM_AWSCDR_BKSCD_MASK, v)
+#define DFSDM_AWSCDR_AWFOSR_MASK  GENMASK(20, 16)
+#define DFSDM_AWSCDR_AWFOSR(v)    FIELD_PREP(DFSDM_AWSCDR_AWFOSR_MASK, v)
+#define DFSDM_AWSCDR_AWFORD_MASK  GENMASK(23, 22)
+#define DFSDM_AWSCDR_AWFORD(v)    FIELD_PREP(DFSDM_AWSCDR_AWFORD_MASK, v)
+
+/*
+ * Filters register definitions
+ */
+#define DFSDM_FILTER_BASE_ADR           0x100
+#define DFSDM_FILTER_REG_MASK           0x7F
+#define DFSDM_FILTER_X_BASE_ADR(x)      ((x) * 0x80 + DFSDM_FILTER_BASE_ADR)
+
+#define DFSDM_CR1(x)     (DFSDM_FILTER_X_BASE_ADR(x)  + 0x00)
+#define DFSDM_CR2(x)     (DFSDM_FILTER_X_BASE_ADR(x)  + 0x04)
+#define DFSDM_ISR(x)     (DFSDM_FILTER_X_BASE_ADR(x)  + 0x08)
+#define DFSDM_ICR(x)     (DFSDM_FILTER_X_BASE_ADR(x)  + 0x0C)
+#define DFSDM_JCHGR(x)   (DFSDM_FILTER_X_BASE_ADR(x)  + 0x10)
+#define DFSDM_FCR(x)     (DFSDM_FILTER_X_BASE_ADR(x)  + 0x14)
+#define DFSDM_JDATAR(x)  (DFSDM_FILTER_X_BASE_ADR(x)  + 0x18)
+#define DFSDM_RDATAR(x)  (DFSDM_FILTER_X_BASE_ADR(x)  + 0x1C)
+#define DFSDM_AWHTR(x)   (DFSDM_FILTER_X_BASE_ADR(x)  + 0x20)
+#define DFSDM_AWLTR(x)   (DFSDM_FILTER_X_BASE_ADR(x)  + 0x24)
+#define DFSDM_AWSR(x)    (DFSDM_FILTER_X_BASE_ADR(x)  + 0x28)
+#define DFSDM_AWCFR(x)   (DFSDM_FILTER_X_BASE_ADR(x)  + 0x2C)
+#define DFSDM_EXMAX(x)   (DFSDM_FILTER_X_BASE_ADR(x)  + 0x30)
+#define DFSDM_EXMIN(x)   (DFSDM_FILTER_X_BASE_ADR(x)  + 0x34)
+#define DFSDM_CNVTIMR(x) (DFSDM_FILTER_X_BASE_ADR(x)  + 0x38)
+
+/* CR1 Control register 1 */
+#define DFSDM_CR1_DFEN_MASK     BIT(0)
+#define DFSDM_CR1_DFEN(v)       FIELD_PREP(DFSDM_CR1_DFEN_MASK, v)
+#define DFSDM_CR1_JSWSTART_MASK BIT(1)
+#define DFSDM_CR1_JSWSTART(v)   FIELD_PREP(DFSDM_CR1_JSWSTART_MASK, v)
+#define DFSDM_CR1_JSYNC_MASK    BIT(3)
+#define DFSDM_CR1_JSYNC(v)      FIELD_PREP(DFSDM_CR1_JSYNC_MASK, v)
+#define DFSDM_CR1_JSCAN_MASK    BIT(4)
+#define DFSDM_CR1_JSCAN(v)      FIELD_PREP(DFSDM_CR1_JSCAN_MASK, v)
+#define DFSDM_CR1_JDMAEN_MASK   BIT(5)
+#define DFSDM_CR1_JDMAEN(v)     FIELD_PREP(DFSDM_CR1_JDMAEN_MASK, v)
+#define DFSDM_CR1_JEXTSEL_MASK  GENMASK(12, 8)
+#define DFSDM_CR1_JEXTSEL(v)    FIELD_PREP(DFSDM_CR1_JEXTSEL_MASK, v)
+#define DFSDM_CR1_JEXTEN_MASK   GENMASK(14, 13)
+#define DFSDM_CR1_JEXTEN(v)     FIELD_PREP(DFSDM_CR1_JEXTEN_MASK, v)
+#define DFSDM_CR1_RSWSTART_MASK BIT(17)
+#define DFSDM_CR1_RSWSTART(v)   FIELD_PREP(DFSDM_CR1_RSWSTART_MASK, v)
+#define DFSDM_CR1_RCONT_MASK    BIT(18)
+#define DFSDM_CR1_RCONT(v)      FIELD_PREP(DFSDM_CR1_RCONT_MASK, v)
+#define DFSDM_CR1_RSYNC_MASK    BIT(19)
+#define DFSDM_CR1_RSYNC(v)      FIELD_PREP(DFSDM_CR1_RSYNC_MASK, v)
+#define DFSDM_CR1_RDMAEN_MASK   BIT(21)
+#define DFSDM_CR1_RDMAEN(v)     FIELD_PREP(DFSDM_CR1_RDMAEN_MASK, v)
+#define DFSDM_CR1_RCH_MASK      GENMASK(26, 24)
+#define DFSDM_CR1_RCH(v)        FIELD_PREP(DFSDM_CR1_RCH_MASK, v)
+#define DFSDM_CR1_FAST_MASK     BIT(29)
+#define DFSDM_CR1_FAST(v)       FIELD_PREP(DFSDM_CR1_FAST_MASK, v)
+#define DFSDM_CR1_AWFSEL_MASK   BIT(30)
+#define DFSDM_CR1_AWFSEL(v)     FIELD_PREP(DFSDM_CR1_AWFSEL_MASK, v)
+
+/* CR2: Control register 2 */
+#define DFSDM_CR2_IE_MASK       GENMASK(6, 0)
+#define DFSDM_CR2_IE(v)         FIELD_PREP(DFSDM_CR2_IE_MASK, v)
+#define DFSDM_CR2_JEOCIE_MASK   BIT(0)
+#define DFSDM_CR2_JEOCIE(v)     FIELD_PREP(DFSDM_CR2_JEOCIE_MASK, v)
+#define DFSDM_CR2_REOCIE_MASK   BIT(1)
+#define DFSDM_CR2_REOCIE(v)     FIELD_PREP(DFSDM_CR2_REOCIE_MASK, v)
+#define DFSDM_CR2_JOVRIE_MASK   BIT(2)
+#define DFSDM_CR2_JOVRIE(v)     FIELD_PREP(DFSDM_CR2_JOVRIE_MASK, v)
+#define DFSDM_CR2_ROVRIE_MASK   BIT(3)
+#define DFSDM_CR2_ROVRIE(v)     FIELD_PREP(DFSDM_CR2_ROVRIE_MASK, v)
+#define DFSDM_CR2_AWDIE_MASK    BIT(4)
+#define DFSDM_CR2_AWDIE(v)      FIELD_PREP(DFSDM_CR2_AWDIE_MASK, v)
+#define DFSDM_CR2_SCDIE_MASK    BIT(5)
+#define DFSDM_CR2_SCDIE(v)      FIELD_PREP(DFSDM_CR2_SCDIE_MASK, v)
+#define DFSDM_CR2_CKABIE_MASK   BIT(6)
+#define DFSDM_CR2_CKABIE(v)     FIELD_PREP(DFSDM_CR2_CKABIE_MASK, v)
+#define DFSDM_CR2_EXCH_MASK     GENMASK(15, 8)
+#define DFSDM_CR2_EXCH(v)       FIELD_PREP(DFSDM_CR2_EXCH_MASK, v)
+#define DFSDM_CR2_AWDCH_MASK    GENMASK(23, 16)
+#define DFSDM_CR2_AWDCH(v)      FIELD_PREP(DFSDM_CR2_AWDCH_MASK, v)
+
+/* ISR: Interrupt status register */
+#define DFSDM_ISR_JEOCF_MASK    BIT(0)
+#define DFSDM_ISR_JEOCF(v)      FIELD_PREP(DFSDM_ISR_JEOCF_MASK, v)
+#define DFSDM_ISR_REOCF_MASK    BIT(1)
+#define DFSDM_ISR_REOCF(v)      FIELD_PREP(DFSDM_ISR_REOCF_MASK, v)
+#define DFSDM_ISR_JOVRF_MASK    BIT(2)
+#define DFSDM_ISR_JOVRF(v)      FIELD_PREP(DFSDM_ISR_JOVRF_MASK, v)
+#define DFSDM_ISR_ROVRF_MASK    BIT(3)
+#define DFSDM_ISR_ROVRF(v)      FIELD_PREP(DFSDM_ISR_ROVRF_MASK, v)
+#define DFSDM_ISR_AWDF_MASK     BIT(4)
+#define DFSDM_ISR_AWDF(v)       FIELD_PREP(DFSDM_ISR_AWDF_MASK, v)
+#define DFSDM_ISR_JCIP_MASK     BIT(13)
+#define DFSDM_ISR_JCIP(v)       FIELD_PREP(DFSDM_ISR_JCIP_MASK, v)
+#define DFSDM_ISR_RCIP_MASK     BIT(14)
+#define DFSDM_ISR_RCIP(v)       FIELD_PREP(DFSDM_ISR_RCIP, v)
+#define DFSDM_ISR_CKABF_MASK    GENMASK(23, 16)
+#define DFSDM_ISR_CKABF(v)      FIELD_PREP(DFSDM_ISR_CKABF_MASK, v)
+#define DFSDM_ISR_SCDF_MASK     GENMASK(31, 24)
+#define DFSDM_ISR_SCDF(v)       FIELD_PREP(DFSDM_ISR_SCDF_MASK, v)
+
+/* ICR: Interrupt flag clear register */
+#define DFSDM_ICR_CLRJOVRF_MASK       BIT(2)
+#define DFSDM_ICR_CLRJOVRF(v)         FIELD_PREP(DFSDM_ICR_CLRJOVRF_MASK, v)
+#define DFSDM_ICR_CLRROVRF_MASK       BIT(3)
+#define DFSDM_ICR_CLRROVRF(v)         FIELD_PREP(DFSDM_ICR_CLRROVRF_MASK, v)
+#define DFSDM_ICR_CLRCKABF_MASK       GENMASK(23, 16)
+#define DFSDM_ICR_CLRCKABF(v)         FIELD_PREP(DFSDM_ICR_CLRCKABF_MASK, v)
+#define DFSDM_ICR_CLRCKABF_CH_MASK(y) BIT(16 + (y))
+#define DFSDM_ICR_CLRCKABF_CH(v, y)   \
+                           (((v) << (16 + (y))) & DFSDM_ICR_CLRCKABF_CH_MASK(y))
+#define DFSDM_ICR_CLRSCDF_MASK        GENMASK(31, 24)
+#define DFSDM_ICR_CLRSCDF(v)          FIELD_PREP(DFSDM_ICR_CLRSCDF_MASK, v)
+#define DFSDM_ICR_CLRSCDF_CH_MASK(y)  BIT(24 + (y))
+#define DFSDM_ICR_CLRSCDF_CH(v, y)    \
+                               (((v) << (24 + (y))) & DFSDM_ICR_CLRSCDF_MASK(y))
+
+/* FCR: Filter control register */
+#define DFSDM_FCR_IOSR_MASK     GENMASK(7, 0)
+#define DFSDM_FCR_IOSR(v)       FIELD_PREP(DFSDM_FCR_IOSR_MASK, v)
+#define DFSDM_FCR_FOSR_MASK     GENMASK(25, 16)
+#define DFSDM_FCR_FOSR(v)       FIELD_PREP(DFSDM_FCR_FOSR_MASK, v)
+#define DFSDM_FCR_FORD_MASK     GENMASK(31, 29)
+#define DFSDM_FCR_FORD(v)       FIELD_PREP(DFSDM_FCR_FORD_MASK, v)
+
+/* RDATAR: Filter data register for regular channel */
+#define DFSDM_DATAR_CH_MASK     GENMASK(2, 0)
+#define DFSDM_DATAR_DATA_OFFSET 8
+#define DFSDM_DATAR_DATA_MASK   GENMASK(31, DFSDM_DATAR_DATA_OFFSET)
+
+/* AWLTR: Filter analog watchdog low threshold register */
+#define DFSDM_AWLTR_BKAWL_MASK  GENMASK(3, 0)
+#define DFSDM_AWLTR_BKAWL(v)    FIELD_PREP(DFSDM_AWLTR_BKAWL_MASK, v)
+#define DFSDM_AWLTR_AWLT_MASK   GENMASK(31, 8)
+#define DFSDM_AWLTR_AWLT(v)     FIELD_PREP(DFSDM_AWLTR_AWLT_MASK, v)
+
+/* AWHTR: Filter analog watchdog low threshold register */
+#define DFSDM_AWHTR_BKAWH_MASK  GENMASK(3, 0)
+#define DFSDM_AWHTR_BKAWH(v)    FIELD_PREP(DFSDM_AWHTR_BKAWH_MASK, v)
+#define DFSDM_AWHTR_AWHT_MASK   GENMASK(31, 8)
+#define DFSDM_AWHTR_AWHT(v)     FIELD_PREP(DFSDM_AWHTR_AWHT_MASK, v)
+
+/* AWSR: Filter watchdog status register */
+#define DFSDM_AWSR_AWLTF_MASK   GENMASK(7, 0)
+#define DFSDM_AWSR_AWLTF(v)     FIELD_PREP(DFSDM_AWSR_AWLTF_MASK, v)
+#define DFSDM_AWSR_AWHTF_MASK   GENMASK(15, 8)
+#define DFSDM_AWSR_AWHTF(v)     FIELD_PREP(DFSDM_AWSR_AWHTF_MASK, v)
+
+/* AWCFR: Filter watchdog status register */
+#define DFSDM_AWCFR_AWLTF_MASK  GENMASK(7, 0)
+#define DFSDM_AWCFR_AWLTF(v)    FIELD_PREP(DFSDM_AWCFR_AWLTF_MASK, v)
+#define DFSDM_AWCFR_AWHTF_MASK  GENMASK(15, 8)
+#define DFSDM_AWCFR_AWHTF(v)    FIELD_PREP(DFSDM_AWCFR_AWHTF_MASK, v)
+
+/* DFSDM filter order  */
+enum stm32_dfsdm_sinc_order {
+        DFSDM_FASTSINC_ORDER, /* FastSinc filter type */
+        DFSDM_SINC1_ORDER,    /* Sinc 1 filter type */
+        DFSDM_SINC2_ORDER,    /* Sinc 2 filter type */
+        DFSDM_SINC3_ORDER,    /* Sinc 3 filter type */
+        DFSDM_SINC4_ORDER,    /* Sinc 4 filter type (N.A. for watchdog) */
+        DFSDM_SINC5_ORDER,    /* Sinc 5 filter type (N.A. for watchdog) */
+        DFSDM_NB_SINC_ORDER,
+};
+
+/**
+ * struct stm32_dfsdm_filter - structure relative to stm32 FDSDM filter
+ * @iosr: integrator oversampling
+ * @fosr: filter oversampling
+ * @ford: filter order
+ * @res: output sample resolution
+ * @sync_mode: filter synchronized with filter 0
+ * @fast: filter fast mode
+ */
+struct stm32_dfsdm_filter {
+        unsigned int iosr;
+        unsigned int fosr;
+        enum stm32_dfsdm_sinc_order ford;
+        u64 res;
+        unsigned int sync_mode;
+        unsigned int fast;
+};
+
+/**
+ * struct stm32_dfsdm_channel - structure relative to stm32 FDSDM channel
+ * @id: id of the channel
+ * @type: interface type linked to stm32_dfsdm_chan_type
+ * @src: interface type linked to stm32_dfsdm_chan_src
+ * @alt_si: alternative serial input interface
+ */
+struct stm32_dfsdm_channel {
+        unsigned int id;
+        unsigned int type;
+        unsigned int src;
+        unsigned int alt_si;
+};
+
+/**
+ * struct stm32_dfsdm - stm32 FDSDM driver common data (for all instances)
+ * @base:       control registers base cpu addr
+ * @phys_base:  DFSDM IP register physical address
+ * @regmap:     regmap for register read/write
+ * @fl_list:    filter resources list
+ * @num_fls:    number of filter resources available
+ * @ch_list:    channel resources list
+ * @num_chs:    number of channel resources available
+ * @spi_master_freq: SPI clock out frequency
+ */
+struct stm32_dfsdm {
+        void __iomem    *base;
+        phys_addr_t     phys_base;
+        struct regmap *regmap;
+        struct stm32_dfsdm_filter *fl_list;
+        unsigned int num_fls;
+        struct stm32_dfsdm_channel *ch_list;
+        unsigned int num_chs;
+        unsigned int spi_master_freq;
+};
+
+/* DFSDM channel serial spi clock source */
+enum stm32_dfsdm_spi_clk_src {
+        DFSDM_CHANNEL_SPI_CLOCK_EXTERNAL,
+        DFSDM_CHANNEL_SPI_CLOCK_INTERNAL,
+        DFSDM_CHANNEL_SPI_CLOCK_INTERNAL_DIV2_FALLING,
+        DFSDM_CHANNEL_SPI_CLOCK_INTERNAL_DIV2_RISING
+};
+
+int stm32_dfsdm_start_dfsdm(struct stm32_dfsdm *dfsdm);
+int stm32_dfsdm_stop_dfsdm(struct stm32_dfsdm *dfsdm);
+
+#endif
diff --git a/drivers/iio/buffer/Kconfig b/drivers/iio/buffer/Kconfig
index 4ffd3db7817f..338774cba19b 100644
--- a/drivers/iio/buffer/Kconfig
+++ b/drivers/iio/buffer/Kconfig
@@ -29,6 +29,16 @@ config IIO_BUFFER_DMAENGINE
 
           Should be selected by drivers that want to use this functionality.
 
+config IIO_BUFFER_HW_CONSUMER
+        tristate "Industrial I/O HW buffering"
+        help
+          Provides a way to bonding when an IIO device has a direct connection
+          to another device in hardware. In this case buffers for data transfers
+          are handled by hardware.
+
+          Should be selected by drivers that want to use the generic Hw consumer
+          interface.
+
 config IIO_KFIFO_BUF
         tristate "Industrial I/O buffering based on kfifo"
         help
diff --git a/drivers/iio/buffer/Makefile b/drivers/iio/buffer/Makefile
index 95f9f41c58b7..1403eb2f9409 100644
--- a/drivers/iio/buffer/Makefile
+++ b/drivers/iio/buffer/Makefile
@@ -7,5 +7,6 @@
 obj-$(CONFIG_IIO_BUFFER_CB) += industrialio-buffer-cb.o
 obj-$(CONFIG_IIO_BUFFER_DMA) += industrialio-buffer-dma.o
 obj-$(CONFIG_IIO_BUFFER_DMAENGINE) += industrialio-buffer-dmaengine.o
+obj-$(CONFIG_IIO_BUFFER_HW_CONSUMER) += industrialio-hw-consumer.o
 obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o
 obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o
diff --git a/drivers/iio/buffer/industrialio-buffer-cb.c b/drivers/iio/buffer/industrialio-buffer-cb.c
index 4847534700e7..ea63c838eeae 100644
--- a/drivers/iio/buffer/industrialio-buffer-cb.c
+++ b/drivers/iio/buffer/industrialio-buffer-cb.c
@@ -104,6 +104,17 @@ error_free_cb_buff:
 }
 EXPORT_SYMBOL_GPL(iio_channel_get_all_cb);
 
+int iio_channel_cb_set_buffer_watermark(struct iio_cb_buffer *cb_buff,
+                                        size_t watermark)
+{
+        if (!watermark)
+                return -EINVAL;
+        cb_buff->buffer.watermark = watermark;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(iio_channel_cb_set_buffer_watermark);
+
 int iio_channel_start_all_cb(struct iio_cb_buffer *cb_buff)
 {
         return iio_update_buffers(cb_buff->indio_dev, &cb_buff->buffer,
diff --git a/drivers/iio/buffer/industrialio-hw-consumer.c b/drivers/iio/buffer/industrialio-hw-consumer.c
new file mode 100644
index 000000000000..95165697d8ae
--- /dev/null
+++ b/drivers/iio/buffer/industrialio-hw-consumer.c
@@ -0,0 +1,247 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright 2017 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ */
+
+#include <linux/err.h>
+#include <linux/export.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/consumer.h>
+#include <linux/iio/hw-consumer.h>
+#include <linux/iio/buffer_impl.h>
+
+/**
+ * struct iio_hw_consumer - IIO hw consumer block
+ * @buffers: hardware buffers list head.
+ * @channels: IIO provider channels.
+ */
+struct iio_hw_consumer {
+        struct list_head buffers;
+        struct iio_channel *channels;
+};
+
+struct hw_consumer_buffer {
+        struct list_head head;
+        struct iio_dev *indio_dev;
+        struct iio_buffer buffer;
+        long scan_mask[];
+};
+
+static struct hw_consumer_buffer *iio_buffer_to_hw_consumer_buffer(
+        struct iio_buffer *buffer)
+{
+        return container_of(buffer, struct hw_consumer_buffer, buffer);
+}
+
+static void iio_hw_buf_release(struct iio_buffer *buffer)
+{
+        struct hw_consumer_buffer *hw_buf =
+                iio_buffer_to_hw_consumer_buffer(buffer);
+        kfree(hw_buf);
+}
+
+static const struct iio_buffer_access_funcs iio_hw_buf_access = {
+        .release = &iio_hw_buf_release,
+        .modes = INDIO_BUFFER_HARDWARE,
+};
+
+static struct hw_consumer_buffer *iio_hw_consumer_get_buffer(
+        struct iio_hw_consumer *hwc, struct iio_dev *indio_dev)
+{
+        size_t mask_size = BITS_TO_LONGS(indio_dev->masklength) * sizeof(long);
+        struct hw_consumer_buffer *buf;
+
+        list_for_each_entry(buf, &hwc->buffers, head) {
+                if (buf->indio_dev == indio_dev)
+                        return buf;
+        }
+
+        buf = kzalloc(sizeof(*buf) + mask_size, GFP_KERNEL);
+        if (!buf)
+                return NULL;
+
+        buf->buffer.access = &iio_hw_buf_access;
+        buf->indio_dev = indio_dev;
+        buf->buffer.scan_mask = buf->scan_mask;
+
+        iio_buffer_init(&buf->buffer);
+        list_add_tail(&buf->head, &hwc->buffers);
+
+        return buf;
+}
+
+/**
+ * iio_hw_consumer_alloc() - Allocate IIO hardware consumer
+ * @dev: Pointer to consumer device.
+ *
+ * Returns a valid iio_hw_consumer on success or a ERR_PTR() on failure.
+ */
+struct iio_hw_consumer *iio_hw_consumer_alloc(struct device *dev)
+{
+        struct hw_consumer_buffer *buf;
+        struct iio_hw_consumer *hwc;
+        struct iio_channel *chan;
+        int ret;
+
+        hwc = kzalloc(sizeof(*hwc), GFP_KERNEL);
+        if (!hwc)
+                return ERR_PTR(-ENOMEM);
+
+        INIT_LIST_HEAD(&hwc->buffers);
+
+        hwc->channels = iio_channel_get_all(dev);
+        if (IS_ERR(hwc->channels)) {
+                ret = PTR_ERR(hwc->channels);
+                goto err_free_hwc;
+        }
+
+        chan = &hwc->channels[0];
+        while (chan->indio_dev) {
+                buf = iio_hw_consumer_get_buffer(hwc, chan->indio_dev);
+                if (!buf) {
+                        ret = -ENOMEM;
+                        goto err_put_buffers;
+                }
+                set_bit(chan->channel->scan_index, buf->buffer.scan_mask);
+                chan++;
+        }
+
+        return hwc;
+
+err_put_buffers:
+        list_for_each_entry(buf, &hwc->buffers, head)
+                iio_buffer_put(&buf->buffer);
+        iio_channel_release_all(hwc->channels);
+err_free_hwc:
+        kfree(hwc);
+        return ERR_PTR(ret);
+}
+EXPORT_SYMBOL_GPL(iio_hw_consumer_alloc);
+
+/**
+ * iio_hw_consumer_free() - Free IIO hardware consumer
+ * @hwc: hw consumer to free.
+ */
+void iio_hw_consumer_free(struct iio_hw_consumer *hwc)
+{
+        struct hw_consumer_buffer *buf, *n;
+
+        iio_channel_release_all(hwc->channels);
+        list_for_each_entry_safe(buf, n, &hwc->buffers, head)
+                iio_buffer_put(&buf->buffer);
+        kfree(hwc);
+}
+EXPORT_SYMBOL_GPL(iio_hw_consumer_free);
+
+static void devm_iio_hw_consumer_release(struct device *dev, void *res)
+{
+        iio_hw_consumer_free(*(struct iio_hw_consumer **)res);
+}
+
+static int devm_iio_hw_consumer_match(struct device *dev, void *res, void *data)
+{
+        struct iio_hw_consumer **r = res;
+
+        if (!r || !*r) {
+                WARN_ON(!r || !*r);
+                return 0;
+        }
+        return *r == data;
+}
+
+/**
+ * devm_iio_hw_consumer_alloc - Resource-managed iio_hw_consumer_alloc()
+ * @dev: Pointer to consumer device.
+ *
+ * Managed iio_hw_consumer_alloc. iio_hw_consumer allocated with this function
+ * is automatically freed on driver detach.
+ *
+ * If an iio_hw_consumer allocated with this function needs to be freed
+ * separately, devm_iio_hw_consumer_free() must be used.
+ *
+ * returns pointer to allocated iio_hw_consumer on success, NULL on failure.
+ */
+struct iio_hw_consumer *devm_iio_hw_consumer_alloc(struct device *dev)
+{
+        struct iio_hw_consumer **ptr, *iio_hwc;
+
+        ptr = devres_alloc(devm_iio_hw_consumer_release, sizeof(*ptr),
+                           GFP_KERNEL);
+        if (!ptr)
+                return NULL;
+
+        iio_hwc = iio_hw_consumer_alloc(dev);
+        if (IS_ERR(iio_hwc)) {
+                devres_free(ptr);
+        } else {
+                *ptr = iio_hwc;
+                devres_add(dev, ptr);
+        }
+
+        return iio_hwc;
+}
+EXPORT_SYMBOL_GPL(devm_iio_hw_consumer_alloc);
+
+/**
+ * devm_iio_hw_consumer_free - Resource-managed iio_hw_consumer_free()
+ * @dev: Pointer to consumer device.
+ * @hwc: iio_hw_consumer to free.
+ *
+ * Free iio_hw_consumer allocated with devm_iio_hw_consumer_alloc().
+ */
+void devm_iio_hw_consumer_free(struct device *dev, struct iio_hw_consumer *hwc)
+{
+        int rc;
+
+        rc = devres_release(dev, devm_iio_hw_consumer_release,
+                            devm_iio_hw_consumer_match, hwc);
+        WARN_ON(rc);
+}
+EXPORT_SYMBOL_GPL(devm_iio_hw_consumer_free);
+
+/**
+ * iio_hw_consumer_enable() - Enable IIO hardware consumer
+ * @hwc: iio_hw_consumer to enable.
+ *
+ * Returns 0 on success.
+ */
+int iio_hw_consumer_enable(struct iio_hw_consumer *hwc)
+{
+        struct hw_consumer_buffer *buf;
+        int ret;
+
+        list_for_each_entry(buf, &hwc->buffers, head) {
+                ret = iio_update_buffers(buf->indio_dev, &buf->buffer, NULL);
+                if (ret)
+                        goto err_disable_buffers;
+        }
+
+        return 0;
+
+err_disable_buffers:
+        list_for_each_entry_continue_reverse(buf, &hwc->buffers, head)
+                iio_update_buffers(buf->indio_dev, NULL, &buf->buffer);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(iio_hw_consumer_enable);
+
+/**
+ * iio_hw_consumer_disable() - Disable IIO hardware consumer
+ * @hwc: iio_hw_consumer to disable.
+ */
+void iio_hw_consumer_disable(struct iio_hw_consumer *hwc)
+{
+        struct hw_consumer_buffer *buf;
+
+        list_for_each_entry(buf, &hwc->buffers, head)
+                iio_update_buffers(buf->indio_dev, NULL, &buf->buffer);
+}
+EXPORT_SYMBOL_GPL(iio_hw_consumer_disable);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("Hardware consumer buffer the IIO framework");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index 069defcc6d9b..ec98790e2a28 100644
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -664,9 +664,8 @@ err_unlock:
 }
 EXPORT_SYMBOL_GPL(iio_convert_raw_to_processed);
 
-static int iio_read_channel_attribute(struct iio_channel *chan,
-                                      int *val, int *val2,
-                                      enum iio_chan_info_enum attribute)
+int iio_read_channel_attribute(struct iio_channel *chan, int *val, int *val2,
+                               enum iio_chan_info_enum attribute)
 {
         int ret;
 
@@ -682,6 +681,7 @@ err_unlock:
 
         return ret;
 }
+EXPORT_SYMBOL_GPL(iio_read_channel_attribute);
 
 int iio_read_channel_offset(struct iio_channel *chan, int *val, int *val2)
 {
@@ -850,7 +850,8 @@ static int iio_channel_write(struct iio_channel *chan, int val, int val2,
                                                 chan->channel, val, val2, info);
 }
 
-int iio_write_channel_raw(struct iio_channel *chan, int val)
+int iio_write_channel_attribute(struct iio_channel *chan, int val, int val2,
+                                enum iio_chan_info_enum attribute)
 {
         int ret;
 
@@ -860,12 +861,18 @@ int iio_write_channel_raw(struct iio_channel *chan, int val)
                 goto err_unlock;
         }
 
-        ret = iio_channel_write(chan, val, 0, IIO_CHAN_INFO_RAW);
+        ret = iio_channel_write(chan, val, val2, attribute);
 err_unlock:
         mutex_unlock(&chan->indio_dev->info_exist_lock);
 
         return ret;
 }
+EXPORT_SYMBOL_GPL(iio_write_channel_attribute);
+
+int iio_write_channel_raw(struct iio_channel *chan, int val)
+{
+        return iio_write_channel_attribute(chan, val, 0, IIO_CHAN_INFO_RAW);
+}
 EXPORT_SYMBOL_GPL(iio_write_channel_raw);
 
 unsigned int iio_get_channel_ext_info_count(struct iio_channel *chan)
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index 3d8ff09eba57..c868a878c84f 100644
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -163,7 +163,7 @@ static unsigned int get_time_pit(void)
 #define GET_TIME(x)     do { x = (unsigned int)rdtsc(); } while (0)
 #define DELTA(x,y)      ((y)-(x))
 #define TIME_NAME       "TSC"
-#elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_TILE)
+#elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV) || defined(CONFIG_TILE)
 #define GET_TIME(x)     do { x = get_cycles(); } while (0)
 #define DELTA(x,y)      ((y)-(x))
 #define TIME_NAME       "get_cycles"
diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
index ae473123583b..3d51175c4d72 100644
--- a/drivers/input/misc/ims-pcu.c
+++ b/drivers/input/misc/ims-pcu.c
@@ -1651,7 +1651,7 @@ ims_pcu_get_cdc_union_desc(struct usb_interface *intf)
                                 return union_desc;
 
                         dev_err(&intf->dev,
-                                "Union descriptor to short (%d vs %zd\n)",
+                                "Union descriptor too short (%d vs %zd)\n",
                                 union_desc->bLength, sizeof(*union_desc));
                         return NULL;
                 }
diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c
index 6bf56bb5f8d9..d91f3b1c5375 100644
--- a/drivers/input/misc/xen-kbdfront.c
+++ b/drivers/input/misc/xen-kbdfront.c
@@ -326,8 +326,6 @@ static int xenkbd_probe(struct xenbus_device *dev,
                                      0, width, 0, 0);
                 input_set_abs_params(mtouch, ABS_MT_POSITION_Y,
                                      0, height, 0, 0);
-                input_set_abs_params(mtouch, ABS_MT_PRESSURE,
-                                     0, 255, 0, 0);
 
                 ret = input_mt_init_slots(mtouch, num_cont, INPUT_MT_DIRECT);
                 if (ret) {
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index b84cd978fce2..a4aaa748e987 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1613,7 +1613,7 @@ static int elantech_set_properties(struct elantech_data *etd)
                 case 5:
                         etd->hw_version = 3;
                         break;
-                case 6 ... 14:
+                case 6 ... 15:
                         etd->hw_version = 4;
                         break;
                 default:
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index e102d7764bc2..a458e5ec9e41 100644
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <linux/async.h>
 #include <linux/i2c.h>
@@ -1261,10 +1262,13 @@ static int elants_i2c_probe(struct i2c_client *client,
         }
 
         /*
-         * Systems using device tree should set up interrupt via DTS,
-         * the rest will use the default falling edge interrupts.
+         * Platform code (ACPI, DTS) should normally set up interrupt
+         * for us, but in case it did not let's fall back to using falling
+         * edge to be compatible with older Chromebooks.
          */
-        irqflags = client->dev.of_node ? 0 : IRQF_TRIGGER_FALLING;
+        irqflags = irq_get_trigger_type(client->irq);
+        if (!irqflags)
+                irqflags = IRQF_TRIGGER_FALLING;
 
         error = devm_request_threaded_irq(&client->dev, client->irq,
                                           NULL, elants_i2c_irq,
diff --git a/drivers/input/touchscreen/hideep.c b/drivers/input/touchscreen/hideep.c
index fc080a7c2e1f..f1cd4dd9a4a3 100644
--- a/drivers/input/touchscreen/hideep.c
+++ b/drivers/input/touchscreen/hideep.c
@@ -10,8 +10,7 @@
 #include <linux/of.h>
 #include <linux/firmware.h>
 #include <linux/delay.h>
-#include <linux/gpio.h>
-#include <linux/gpio/machine.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/acpi.h>
 #include <linux/interrupt.h>
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index f122071688fd..744592d330ca 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -1698,13 +1698,15 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain)
         domain->pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
         domain->geometry.aperture_end = (1UL << ias) - 1;
         domain->geometry.force_aperture = true;
-        smmu_domain->pgtbl_ops = pgtbl_ops;
 
         ret = finalise_stage_fn(smmu_domain, &pgtbl_cfg);
-        if (ret < 0)
+        if (ret < 0) {
                 free_io_pgtable_ops(pgtbl_ops);
+                return ret;
+        }
 
-        return ret;
+        smmu_domain->pgtbl_ops = pgtbl_ops;
+        return 0;
 }
 
 static __le64 *arm_smmu_get_step_for_sid(struct arm_smmu_device *smmu, u32 sid)
@@ -1731,7 +1733,7 @@ static __le64 *arm_smmu_get_step_for_sid(struct arm_smmu_device *smmu, u32 sid)
 
 static void arm_smmu_install_ste_for_dev(struct iommu_fwspec *fwspec)
 {
-        int i;
+        int i, j;
         struct arm_smmu_master_data *master = fwspec->iommu_priv;
         struct arm_smmu_device *smmu = master->smmu;
 
@@ -1739,6 +1741,13 @@ static void arm_smmu_install_ste_for_dev(struct iommu_fwspec *fwspec)
                 u32 sid = fwspec->ids[i];
                 __le64 *step = arm_smmu_get_step_for_sid(smmu, sid);
 
+                /* Bridged PCI devices may end up with duplicated IDs */
+                for (j = 0; j < i; j++)
+                        if (fwspec->ids[j] == sid)
+                                break;
+                if (j < i)
+                        continue;
+
                 arm_smmu_write_strtab_ent(smmu, sid, step, &master->ste);
         }
 }
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index f3654fd2eaf3..ede4fa0ac2cc 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -186,8 +186,9 @@ void led_blink_set(struct led_classdev *led_cdev,
                    unsigned long *delay_on,
                    unsigned long *delay_off)
 {
-        led_stop_software_blink(led_cdev);
+        del_timer_sync(&led_cdev->blink_timer);
 
+        clear_bit(LED_BLINK_SW, &led_cdev->work_flags);
         clear_bit(LED_BLINK_ONESHOT, &led_cdev->work_flags);
         clear_bit(LED_BLINK_ONESHOT_STOP, &led_cdev->work_flags);
 
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
index 590fb9aad77d..c3ed885c155c 100644
--- a/drivers/mfd/rtsx_pcr.c
+++ b/drivers/mfd/rtsx_pcr.c
@@ -1543,6 +1543,9 @@ static void rtsx_pci_shutdown(struct pci_dev *pcidev)
         rtsx_pci_power_off(pcr, HOST_ENTER_S1);
 
         pci_disable_device(pcidev);
+        free_irq(pcr->irq, (void *)pcr);
+        if (pcr->msi_en)
+                pci_disable_msi(pcr->pci);
 }
 
 #else /* CONFIG_PM */
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 90b9a9ccbe60..9285f60e5783 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -963,6 +963,7 @@ static void prepare_start_command(struct pxa3xx_nand_info *info, int command)
 
         switch (command) {
         case NAND_CMD_READ0:
+        case NAND_CMD_READOOB:
         case NAND_CMD_PAGEPROG:
                 info->use_ecc = 1;
                 break;
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 0b3fb99d9b89..7390fb8ca9d1 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -303,7 +303,7 @@ static void dino_mask_irq(struct irq_data *d)
         struct dino_device *dino_dev = irq_data_get_irq_chip_data(d);
         int local_irq = gsc_find_local_irq(d->irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
 
-        DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, d->irq);
+        DBG(KERN_WARNING "%s(0x%px, %d)\n", __func__, dino_dev, d->irq);
 
         /* Clear the matching bit in the IMR register */
         dino_dev->imr &= ~(DINO_MASK_IRQ(local_irq));
@@ -316,7 +316,7 @@ static void dino_unmask_irq(struct irq_data *d)
         int local_irq = gsc_find_local_irq(d->irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
         u32 tmp;
 
-        DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, d->irq);
+        DBG(KERN_WARNING "%s(0x%px, %d)\n", __func__, dino_dev, d->irq);
 
         /*
         ** clear pending IRQ bits
@@ -396,7 +396,7 @@ ilr_again:
         if (mask) {
                 if (--ilr_loop > 0)
                         goto ilr_again;
-                printk(KERN_ERR "Dino 0x%p: stuck interrupt %d\n", 
+                printk(KERN_ERR "Dino 0x%px: stuck interrupt %d\n",
                        dino_dev->hba.base_addr, mask);
                 return IRQ_NONE;
         }
@@ -553,7 +553,7 @@ dino_fixup_bus(struct pci_bus *bus)
         struct pci_dev *dev;
         struct dino_device *dino_dev = DINO_DEV(parisc_walk_tree(bus->bridge));
 
-        DBG(KERN_WARNING "%s(0x%p) bus %d platform_data 0x%p\n",
+        DBG(KERN_WARNING "%s(0x%px) bus %d platform_data 0x%px\n",
             __func__, bus, bus->busn_res.start,
             bus->bridge->platform_data);
 
@@ -854,7 +854,7 @@ static int __init dino_common_init(struct parisc_device *dev,
         res->flags = IORESOURCE_IO; /* do not mark it busy ! */
         if (request_resource(&ioport_resource, res) < 0) {
                 printk(KERN_ERR "%s: request I/O Port region failed "
-                       "0x%lx/%lx (hpa 0x%p)\n",
+                       "0x%lx/%lx (hpa 0x%px)\n",
                        name, (unsigned long)res->start, (unsigned long)res->end,
                        dino_dev->hba.base_addr);
                 return 1;
diff --git a/drivers/parisc/eisa_eeprom.c b/drivers/parisc/eisa_eeprom.c
index 4dd9b1308128..99a80da6fd2e 100644
--- a/drivers/parisc/eisa_eeprom.c
+++ b/drivers/parisc/eisa_eeprom.c
@@ -106,7 +106,7 @@ static int __init eisa_eeprom_init(void)
                 return retval;
         }
 
-        printk(KERN_INFO "EISA EEPROM at 0x%p\n", eisa_eeprom_addr);
+        printk(KERN_INFO "EISA EEPROM at 0x%px\n", eisa_eeprom_addr);
         return 0;
 }
 
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index c94b606e0df8..ee14d8e45c97 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -2803,6 +2803,16 @@ dasd_3990_erp_action(struct dasd_ccw_req * cqr)
                 erp = dasd_3990_erp_handle_match_erp(cqr, erp);
         }
 
+
+        /*
+         * For path verification work we need to stick with the path that was
+         * originally chosen so that the per path configuration data is
+         * assigned correctly.
+         */
+        if (test_bit(DASD_CQR_VERIFY_PATH, &erp->flags) && cqr->lpm) {
+                erp->lpm = cqr->lpm;
+        }
+
         if (device->features & DASD_FEATURE_ERPLOG) {
                 /* print current erp_chain */
                 dev_err(&device->cdev->dev,
diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile
index 05ac6ba15a53..614b44e70a28 100644
--- a/drivers/s390/char/Makefile
+++ b/drivers/s390/char/Makefile
@@ -17,6 +17,8 @@ CFLAGS_REMOVE_sclp_early_core.o	+= $(CC_FLAGS_MARCH)
 CFLAGS_sclp_early_core.o                += -march=z900
 endif
 
+CFLAGS_sclp_early_core.o                += -D__NO_FORTIFY
+
 obj-y += ctrlchar.o keyboard.o defkeymap.o sclp.o sclp_rw.o sclp_quiesce.o \
          sclp_cmd.o sclp_config.o sclp_cpi_sys.o sclp_ocf.o sclp_ctl.o \
          sclp_early.o sclp_early_core.o
diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c
index d1e1d8d2b9d5..4c789e61554b 100644
--- a/drivers/xen/pvcalls-front.c
+++ b/drivers/xen/pvcalls-front.c
@@ -805,7 +805,7 @@ int pvcalls_front_accept(struct socket *sock, struct socket *newsock, int flags)
                 pvcalls_exit();
                 return ret;
         }
-        map2 = kzalloc(sizeof(*map2), GFP_KERNEL);
+        map2 = kzalloc(sizeof(*map2), GFP_ATOMIC);
         if (map2 == NULL) {
                 clear_bit(PVCALLS_FLAG_ACCEPT_INFLIGHT,
                           (void *)&map->passive.flags);
diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index ff8d5bf4354f..23c7f395d718 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -895,20 +895,38 @@ error:
  * However, if we didn't have a callback promise outstanding, or it was
  * outstanding on a different server, then it won't break it either...
  */
-static int afs_dir_remove_link(struct dentry *dentry, struct key *key)
+static int afs_dir_remove_link(struct dentry *dentry, struct key *key,
+                               unsigned long d_version_before,
+                               unsigned long d_version_after)
 {
+        bool dir_valid;
         int ret = 0;
 
+        /* There were no intervening changes on the server if the version
+         * number we got back was incremented by exactly 1.
+         */
+        dir_valid = (d_version_after == d_version_before + 1);
+
         if (d_really_is_positive(dentry)) {
                 struct afs_vnode *vnode = AFS_FS_I(d_inode(dentry));
 
-                if (test_bit(AFS_VNODE_DELETED, &vnode->flags))
-                        kdebug("AFS_VNODE_DELETED");
-                clear_bit(AFS_VNODE_CB_PROMISED, &vnode->flags);
-
-                ret = afs_validate(vnode, key);
-                if (ret == -ESTALE)
+                if (dir_valid) {
+                        drop_nlink(&vnode->vfs_inode);
+                        if (vnode->vfs_inode.i_nlink == 0) {
+                                set_bit(AFS_VNODE_DELETED, &vnode->flags);
+                                clear_bit(AFS_VNODE_CB_PROMISED, &vnode->flags);
+                        }
                         ret = 0;
+                } else {
+                        clear_bit(AFS_VNODE_CB_PROMISED, &vnode->flags);
+
+                        if (test_bit(AFS_VNODE_DELETED, &vnode->flags))
+                                kdebug("AFS_VNODE_DELETED");
+
+                        ret = afs_validate(vnode, key);
+                        if (ret == -ESTALE)
+                                ret = 0;
+                }
                 _debug("nlink %d [val %d]", vnode->vfs_inode.i_nlink, ret);
         }
 
@@ -923,6 +941,7 @@ static int afs_unlink(struct inode *dir, struct dentry *dentry)
         struct afs_fs_cursor fc;
         struct afs_vnode *dvnode = AFS_FS_I(dir), *vnode;
         struct key *key;
+        unsigned long d_version = (unsigned long)dentry->d_fsdata;
         int ret;
 
         _enter("{%x:%u},{%pd}",
@@ -955,7 +974,9 @@ static int afs_unlink(struct inode *dir, struct dentry *dentry)
                 afs_vnode_commit_status(&fc, dvnode, fc.cb_break);
                 ret = afs_end_vnode_operation(&fc);
                 if (ret == 0)
-                        ret = afs_dir_remove_link(dentry, key);
+                        ret = afs_dir_remove_link(
+                                dentry, key, d_version,
+                                (unsigned long)dvnode->status.data_version);
         }
 
 error_key:
diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index 3415eb7484f6..1e81864ef0b2 100644
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -377,6 +377,10 @@ int afs_validate(struct afs_vnode *vnode, struct key *key)
         }
 
         read_sequnlock_excl(&vnode->cb_lock);
+
+        if (test_bit(AFS_VNODE_DELETED, &vnode->flags))
+                clear_nlink(&vnode->vfs_inode);
+
         if (valid)
                 goto valid;
 
diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c
index ea1460b9b71a..e1126659f043 100644
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -885,7 +885,7 @@ int afs_extract_data(struct afs_call *call, void *buf, size_t count,
 {
         struct afs_net *net = call->net;
         enum afs_call_state state;
-        u32 remote_abort;
+        u32 remote_abort = 0;
         int ret;
 
         _enter("{%s,%zu},,%zu,%d",
diff --git a/fs/afs/write.c b/fs/afs/write.c
index cb5f8a3df577..9370e2feb999 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -198,7 +198,7 @@ int afs_write_end(struct file *file, struct address_space *mapping,
                         ret = afs_fill_page(vnode, key, pos + copied,
                                             len - copied, page);
                         if (ret < 0)
-                                return ret;
+                                goto out;
                 }
                 SetPageUptodate(page);
         }
@@ -206,10 +206,12 @@ int afs_write_end(struct file *file, struct address_space *mapping,
         set_page_dirty(page);
         if (PageDirty(page))
                 _debug("dirtied");
+        ret = copied;
+
+out:
         unlock_page(page);
         put_page(page);
-
-        return copied;
+        return ret;
 }
 
 /*
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 5d73f79ded8b..056276101c63 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -87,6 +87,7 @@ static struct btrfs_delayed_node *btrfs_get_delayed_node(
 
         spin_lock(&root->inode_lock);
         node = radix_tree_lookup(&root->delayed_nodes_tree, ino);
+
         if (node) {
                 if (btrfs_inode->delayed_node) {
                         refcount_inc(&node->refs);      /* can be accessed */
@@ -94,9 +95,30 @@ static struct btrfs_delayed_node *btrfs_get_delayed_node(
                         spin_unlock(&root->inode_lock);
                         return node;
                 }
-                btrfs_inode->delayed_node = node;
-                /* can be accessed and cached in the inode */
-                refcount_add(2, &node->refs);
+
+                /*
+                 * It's possible that we're racing into the middle of removing
+                 * this node from the radix tree.  In this case, the refcount
+                 * was zero and it should never go back to one.  Just return
+                 * NULL like it was never in the radix at all; our release
+                 * function is in the process of removing it.
+                 *
+                 * Some implementations of refcount_inc refuse to bump the
+                 * refcount once it has hit zero.  If we don't do this dance
+                 * here, refcount_inc() may decide to just WARN_ONCE() instead
+                 * of actually bumping the refcount.
+                 *
+                 * If this node is properly in the radix, we want to bump the
+                 * refcount twice, once for the inode and once for this get
+                 * operation.
+                 */
+                if (refcount_inc_not_zero(&node->refs)) {
+                        refcount_inc(&node->refs);
+                        btrfs_inode->delayed_node = node;
+                } else {
+                        node = NULL;
+                }
+
                 spin_unlock(&root->inode_lock);
                 return node;
         }
@@ -254,17 +276,18 @@ static void __btrfs_release_delayed_node(
         mutex_unlock(&delayed_node->mutex);
 
         if (refcount_dec_and_test(&delayed_node->refs)) {
-                bool free = false;
                 struct btrfs_root *root = delayed_node->root;
+
                 spin_lock(&root->inode_lock);
-                if (refcount_read(&delayed_node->refs) == 0) {
-                        radix_tree_delete(&root->delayed_nodes_tree,
-                                          delayed_node->inode_id);
-                        free = true;
-                }
+                /*
+                 * Once our refcount goes to zero, nobody is allowed to bump it
+                 * back up.  We can delete it now.
+                 */
+                ASSERT(refcount_read(&delayed_node->refs) == 0);
+                radix_tree_delete(&root->delayed_nodes_tree,
+                                  delayed_node->inode_id);
                 spin_unlock(&root->inode_lock);
-                if (free)
-                        kmem_cache_free(delayed_node_cache, delayed_node);
+                kmem_cache_free(delayed_node_cache, delayed_node);
         }
 }
 
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 49810b70afd3..a25684287501 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -237,7 +237,6 @@ static struct btrfs_device *__alloc_device(void)
                 kfree(dev);
                 return ERR_PTR(-ENOMEM);
         }
-        bio_get(dev->flush_bio);
 
         INIT_LIST_HEAD(&dev->dev_list);
         INIT_LIST_HEAD(&dev->dev_alloc_list);
diff --git a/fs/exec.c b/fs/exec.c
index 5688b5e1b937..7eb8d21bcab9 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1349,9 +1349,14 @@ void setup_new_exec(struct linux_binprm * bprm)
 
         current->sas_ss_sp = current->sas_ss_size = 0;
 
-        /* Figure out dumpability. */
+        /*
+         * Figure out dumpability. Note that this checking only of current
+         * is wrong, but userspace depends on it. This should be testing
+         * bprm->secureexec instead.
+         */
         if (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP ||
-            bprm->secureexec)
+            !(uid_eq(current_euid(), current_uid()) &&
+              gid_eq(current_egid(), current_gid())))
                 set_dumpable(current->mm, suid_dumpable);
         else
                 set_dumpable(current->mm, SUID_DUMP_USER);
diff --git a/fs/super.c b/fs/super.c
index 7ff1349609e4..06bd25d90ba5 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -517,7 +517,11 @@ retry:
         hlist_add_head(&s->s_instances, &type->fs_supers);
         spin_unlock(&sb_lock);
         get_filesystem(type);
-        register_shrinker(&s->s_shrink);
+        err = register_shrinker(&s->s_shrink);
+        if (err) {
+                deactivate_locked_super(s);
+                s = ERR_PTR(err);
+        }
         return s;
 }
 
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index ac9a4e65ca49..41a75f9f23fd 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -570,11 +570,14 @@ out:
 static void userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx,
                                               struct userfaultfd_wait_queue *ewq)
 {
+        struct userfaultfd_ctx *release_new_ctx;
+
         if (WARN_ON_ONCE(current->flags & PF_EXITING))
                 goto out;
 
         ewq->ctx = ctx;
         init_waitqueue_entry(&ewq->wq, current);
+        release_new_ctx = NULL;
 
         spin_lock(&ctx->event_wqh.lock);
         /*
@@ -601,8 +604,7 @@ static void userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx,
                                 new = (struct userfaultfd_ctx *)
                                         (unsigned long)
                                         ewq->msg.arg.reserved.reserved1;
-
-                                userfaultfd_ctx_put(new);
+                                release_new_ctx = new;
                         }
                         break;
                 }
@@ -617,6 +619,20 @@ static void userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx,
         __set_current_state(TASK_RUNNING);
         spin_unlock(&ctx->event_wqh.lock);
 
+        if (release_new_ctx) {
+                struct vm_area_struct *vma;
+                struct mm_struct *mm = release_new_ctx->mm;
+
+                /* the various vma->vm_userfaultfd_ctx still points to it */
+                down_write(&mm->mmap_sem);
+                for (vma = mm->mmap; vma; vma = vma->vm_next)
+                        if (vma->vm_userfaultfd_ctx.ctx == release_new_ctx)
+                                vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
+                up_write(&mm->mmap_sem);
+
+                userfaultfd_ctx_put(release_new_ctx);
+        }
+
         /*
          * ctx may go away after this if the userfault pseudo fd is
          * already released.
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 21e2d70884e1..4fc526a27a94 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -399,7 +399,7 @@ xfs_map_blocks(
                (ip->i_df.if_flags & XFS_IFEXTENTS));
         ASSERT(offset <= mp->m_super->s_maxbytes);
 
-        if ((xfs_ufsize_t)offset + count > mp->m_super->s_maxbytes)
+        if (offset > mp->m_super->s_maxbytes - count)
                 count = mp->m_super->s_maxbytes - offset;
         end_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + count);
         offset_fsb = XFS_B_TO_FSBT(mp, offset);
@@ -1312,7 +1312,7 @@ xfs_get_blocks(
         lockmode = xfs_ilock_data_map_shared(ip);
 
         ASSERT(offset <= mp->m_super->s_maxbytes);
-        if ((xfs_ufsize_t)offset + size > mp->m_super->s_maxbytes)
+        if (offset > mp->m_super->s_maxbytes - size)
                 size = mp->m_super->s_maxbytes - offset;
         end_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + size);
         offset_fsb = XFS_B_TO_FSBT(mp, offset);
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 7ab52a8bc0a9..66e1edbfb2b2 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -1006,7 +1006,7 @@ xfs_file_iomap_begin(
         }
 
         ASSERT(offset <= mp->m_super->s_maxbytes);
-        if ((xfs_fsize_t)offset + length > mp->m_super->s_maxbytes)
+        if (offset > mp->m_super->s_maxbytes - length)
                 length = mp->m_super->s_maxbytes - offset;
         offset_fsb = XFS_B_TO_FSBT(mp, offset);
         end_fsb = XFS_B_TO_FSB(mp, offset + length);
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index ec952dfad359..b897b11afb2c 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -48,7 +48,7 @@
 STATIC int      xfs_qm_init_quotainos(xfs_mount_t *);
 STATIC int      xfs_qm_init_quotainfo(xfs_mount_t *);
 
-
+STATIC void     xfs_qm_destroy_quotainos(xfs_quotainfo_t *qi);
 STATIC void     xfs_qm_dqfree_one(struct xfs_dquot *dqp);
 /*
  * We use the batch lookup interface to iterate over the dquots as it
@@ -695,9 +695,17 @@ xfs_qm_init_quotainfo(
         qinf->qi_shrinker.scan_objects = xfs_qm_shrink_scan;
         qinf->qi_shrinker.seeks = DEFAULT_SEEKS;
         qinf->qi_shrinker.flags = SHRINKER_NUMA_AWARE;
-        register_shrinker(&qinf->qi_shrinker);
+
+        error = register_shrinker(&qinf->qi_shrinker);
+        if (error)
+                goto out_free_inos;
+
         return 0;
 
+out_free_inos:
+        mutex_destroy(&qinf->qi_quotaofflock);
+        mutex_destroy(&qinf->qi_tree_lock);
+        xfs_qm_destroy_quotainos(qinf);
 out_free_lru:
         list_lru_destroy(&qinf->qi_lru);
 out_free_qinf:
@@ -706,7 +714,6 @@ out_free_qinf:
         return error;
 }
 
-
 /*
  * Gets called when unmounting a filesystem or when all quotas get
  * turned off.
@@ -723,19 +730,8 @@ xfs_qm_destroy_quotainfo(
 
         unregister_shrinker(&qi->qi_shrinker);
         list_lru_destroy(&qi->qi_lru);
-
-        if (qi->qi_uquotaip) {
-                IRELE(qi->qi_uquotaip);
-                qi->qi_uquotaip = NULL; /* paranoia */
-        }
-        if (qi->qi_gquotaip) {
-                IRELE(qi->qi_gquotaip);
-                qi->qi_gquotaip = NULL;
-        }
-        if (qi->qi_pquotaip) {
-                IRELE(qi->qi_pquotaip);
-                qi->qi_pquotaip = NULL;
-        }
+        xfs_qm_destroy_quotainos(qi);
+        mutex_destroy(&qi->qi_tree_lock);
         mutex_destroy(&qi->qi_quotaofflock);
         kmem_free(qi);
         mp->m_quotainfo = NULL;
@@ -1600,6 +1596,24 @@ error_rele:
 }
 
 STATIC void
+xfs_qm_destroy_quotainos(
+        xfs_quotainfo_t *qi)
+{
+        if (qi->qi_uquotaip) {
+                IRELE(qi->qi_uquotaip);
+                qi->qi_uquotaip = NULL; /* paranoia */
+        }
+        if (qi->qi_gquotaip) {
+                IRELE(qi->qi_gquotaip);
+                qi->qi_gquotaip = NULL;
+        }
+        if (qi->qi_pquotaip) {
+                IRELE(qi->qi_pquotaip);
+                qi->qi_pquotaip = NULL;
+        }
+}
+
+STATIC void
 xfs_qm_dqfree_one(
         struct xfs_dquot        *dqp)
 {
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h
index 38d9c5861ed8..f38227a78eae 100644
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@ -18,6 +18,7 @@
 #include <linux/if_alg.h>
 #include <linux/scatterlist.h>
 #include <linux/types.h>
+#include <linux/atomic.h>
 #include <net/sock.h>
 
 #include <crypto/aead.h>
@@ -150,7 +151,7 @@ struct af_alg_ctx {
         struct crypto_wait wait;
 
         size_t used;
-        size_t rcvused;
+        atomic_t rcvused;
 
         bool more;
         bool merge;
@@ -215,7 +216,7 @@ static inline int af_alg_rcvbuf(struct sock *sk)
         struct af_alg_ctx *ctx = ask->private;
 
         return max_t(int, max_t(int, sk->sk_rcvbuf & PAGE_MASK, PAGE_SIZE) -
-                          ctx->rcvused, 0);
+                     atomic_read(&ctx->rcvused), 0);
 }
 
 /**
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index e55e4255a210..b63a592ad29d 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -419,6 +419,8 @@ static inline int bpf_map_attr_numa_node(const union bpf_attr *attr)
                 attr->numa_node : NUMA_NO_NODE;
 }
 
+struct bpf_prog *bpf_prog_get_type_path(const char *name, enum bpf_prog_type type);
+
 #else /* !CONFIG_BPF_SYSCALL */
 static inline struct bpf_prog *bpf_prog_get(u32 ufd)
 {
@@ -506,6 +508,12 @@ static inline int cpu_map_enqueue(struct bpf_cpu_map_entry *rcpu,
 {
         return 0;
 }
+
+static inline struct bpf_prog *bpf_prog_get_type_path(const char *name,
+                                enum bpf_prog_type type)
+{
+        return ERR_PTR(-EOPNOTSUPP);
+}
 #endif /* CONFIG_BPF_SYSCALL */
 
 static inline struct bpf_prog *bpf_prog_get_type(u32 ufd,
@@ -514,6 +522,8 @@ static inline struct bpf_prog *bpf_prog_get_type(u32 ufd,
         return bpf_prog_get_type_dev(ufd, type, false);
 }
 
+bool bpf_prog_get_ok(struct bpf_prog *, enum bpf_prog_type *, bool);
+
 int bpf_prog_offload_compile(struct bpf_prog *prog);
 void bpf_prog_offload_destroy(struct bpf_prog *prog);
 
diff --git a/include/linux/efi.h b/include/linux/efi.h
index d813f7b04da7..29fdf8029cf6 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -140,11 +140,13 @@ struct efi_boot_memmap {
 
 struct capsule_info {
         efi_capsule_header_t    header;
+        efi_capsule_header_t    *capsule;
         int                     reset_type;
         long                    index;
         size_t                  count;
         size_t                  total_size;
-        phys_addr_t             *pages;
+        struct page             **pages;
+        phys_addr_t             *phys;
         size_t                  page_bytes_remain;
 };
 
diff --git a/include/linux/fscache.h b/include/linux/fscache.h
index f4ff47d4a893..fe0c349684fa 100644
--- a/include/linux/fscache.h
+++ b/include/linux/fscache.h
@@ -755,7 +755,7 @@ bool fscache_maybe_release_page(struct fscache_cookie *cookie,
 {
         if (fscache_cookie_valid(cookie) && PageFsCache(page))
                 return __fscache_maybe_release_page(cookie, page, gfp);
-        return false;
+        return true;
 }
 
 /**
diff --git a/include/linux/iio/adc/stm32-dfsdm-adc.h b/include/linux/iio/adc/stm32-dfsdm-adc.h
new file mode 100644
index 000000000000..e7dc7a542a4e
--- /dev/null
+++ b/include/linux/iio/adc/stm32-dfsdm-adc.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * This file discribe the STM32 DFSDM IIO driver API for audio part
+ *
+ * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
+ * Author(s): Arnaud Pouliquen <arnaud.pouliquen@st.com>.
+ */
+
+#ifndef STM32_DFSDM_ADC_H
+#define STM32_DFSDM_ADC_H
+
+int stm32_dfsdm_get_buff_cb(struct iio_dev *iio_dev,
+                            int (*cb)(const void *data, size_t size,
+                                      void *private),
+                            void *private);
+int stm32_dfsdm_release_buff_cb(struct iio_dev *iio_dev);
+
+#endif
diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h
index 5e347a9805fd..9887f4f8e2a8 100644
--- a/include/linux/iio/consumer.h
+++ b/include/linux/iio/consumer.h
@@ -134,6 +134,17 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
                                                        void *private),
                                              void *private);
 /**
+ * iio_channel_cb_set_buffer_watermark() - set the buffer watermark.
+ * @cb_buffer:          The callback buffer from whom we want the channel
+ *                      information.
+ * @watermark: buffer watermark in bytes.
+ *
+ * This function allows to configure the buffer watermark.
+ */
+int iio_channel_cb_set_buffer_watermark(struct iio_cb_buffer *cb_buffer,
+                                        size_t watermark);
+
+/**
  * iio_channel_release_all_cb() - release and unregister the callback.
  * @cb_buffer:          The callback buffer that was allocated.
  */
@@ -216,6 +227,32 @@ int iio_read_channel_average_raw(struct iio_channel *chan, int *val);
 int iio_read_channel_processed(struct iio_channel *chan, int *val);
 
 /**
+ * iio_write_channel_attribute() - Write values to the device attribute.
+ * @chan:       The channel being queried.
+ * @val:        Value being written.
+ * @val2:       Value being written.val2 use depends on attribute type.
+ * @attribute:  info attribute to be read.
+ *
+ * Returns an error code or 0.
+ */
+int iio_write_channel_attribute(struct iio_channel *chan, int val,
+                                int val2, enum iio_chan_info_enum attribute);
+
+/**
+ * iio_read_channel_attribute() - Read values from the device attribute.
+ * @chan:       The channel being queried.
+ * @val:        Value being written.
+ * @val2:       Value being written.Val2 use depends on attribute type.
+ * @attribute:  info attribute to be written.
+ *
+ * Returns an error code if failed. Else returns a description of what is in val
+ * and val2, such as IIO_VAL_INT_PLUS_MICRO telling us we have a value of val
+ * + val2/1e6
+ */
+int iio_read_channel_attribute(struct iio_channel *chan, int *val,
+                               int *val2, enum iio_chan_info_enum attribute);
+
+/**
  * iio_write_channel_raw() - write to a given channel
  * @chan:               The channel being queried.
  * @val:                Value being written.
diff --git a/include/linux/iio/hw-consumer.h b/include/linux/iio/hw-consumer.h
new file mode 100644
index 000000000000..44d48bb1d39f
--- /dev/null
+++ b/include/linux/iio/hw-consumer.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Industrial I/O in kernel hardware consumer interface
+ *
+ * Copyright 2017 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ */
+
+#ifndef LINUX_IIO_HW_CONSUMER_H
+#define LINUX_IIO_HW_CONSUMER_H
+
+struct iio_hw_consumer;
+
+struct iio_hw_consumer *iio_hw_consumer_alloc(struct device *dev);
+void iio_hw_consumer_free(struct iio_hw_consumer *hwc);
+struct iio_hw_consumer *devm_iio_hw_consumer_alloc(struct device *dev);
+void devm_iio_hw_consumer_free(struct device *dev, struct iio_hw_consumer *hwc);
+int iio_hw_consumer_enable(struct iio_hw_consumer *hwc);
+void iio_hw_consumer_disable(struct iio_hw_consumer *hwc);
+
+#endif
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 20b61347ea58..f12a61be1ede 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -20,34 +20,6 @@
  * Currently assumes nano seconds.
  */
 
-enum iio_chan_info_enum {
-        IIO_CHAN_INFO_RAW = 0,
-        IIO_CHAN_INFO_PROCESSED,
-        IIO_CHAN_INFO_SCALE,
-        IIO_CHAN_INFO_OFFSET,
-        IIO_CHAN_INFO_CALIBSCALE,
-        IIO_CHAN_INFO_CALIBBIAS,
-        IIO_CHAN_INFO_PEAK,
-        IIO_CHAN_INFO_PEAK_SCALE,
-        IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW,
-        IIO_CHAN_INFO_AVERAGE_RAW,
-        IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY,
-        IIO_CHAN_INFO_HIGH_PASS_FILTER_3DB_FREQUENCY,
-        IIO_CHAN_INFO_SAMP_FREQ,
-        IIO_CHAN_INFO_FREQUENCY,
-        IIO_CHAN_INFO_PHASE,
-        IIO_CHAN_INFO_HARDWAREGAIN,
-        IIO_CHAN_INFO_HYSTERESIS,
-        IIO_CHAN_INFO_INT_TIME,
-        IIO_CHAN_INFO_ENABLE,
-        IIO_CHAN_INFO_CALIBHEIGHT,
-        IIO_CHAN_INFO_CALIBWEIGHT,
-        IIO_CHAN_INFO_DEBOUNCE_COUNT,
-        IIO_CHAN_INFO_DEBOUNCE_TIME,
-        IIO_CHAN_INFO_CALIBEMISSIVITY,
-        IIO_CHAN_INFO_OVERSAMPLING_RATIO,
-};
-
 enum iio_shared_by {
         IIO_SEPARATE,
         IIO_SHARED_BY_TYPE,
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index 2aa7b6384d64..6eb3d683ef62 100644
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -34,4 +34,32 @@ enum iio_available_type {
         IIO_AVAIL_RANGE,
 };
 
+enum iio_chan_info_enum {
+        IIO_CHAN_INFO_RAW = 0,
+        IIO_CHAN_INFO_PROCESSED,
+        IIO_CHAN_INFO_SCALE,
+        IIO_CHAN_INFO_OFFSET,
+        IIO_CHAN_INFO_CALIBSCALE,
+        IIO_CHAN_INFO_CALIBBIAS,
+        IIO_CHAN_INFO_PEAK,
+        IIO_CHAN_INFO_PEAK_SCALE,
+        IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW,
+        IIO_CHAN_INFO_AVERAGE_RAW,
+        IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY,
+        IIO_CHAN_INFO_HIGH_PASS_FILTER_3DB_FREQUENCY,
+        IIO_CHAN_INFO_SAMP_FREQ,
+        IIO_CHAN_INFO_FREQUENCY,
+        IIO_CHAN_INFO_PHASE,
+        IIO_CHAN_INFO_HARDWAREGAIN,
+        IIO_CHAN_INFO_HYSTERESIS,
+        IIO_CHAN_INFO_INT_TIME,
+        IIO_CHAN_INFO_ENABLE,
+        IIO_CHAN_INFO_CALIBHEIGHT,
+        IIO_CHAN_INFO_CALIBWEIGHT,
+        IIO_CHAN_INFO_DEBOUNCE_COUNT,
+        IIO_CHAN_INFO_DEBOUNCE_TIME,
+        IIO_CHAN_INFO_CALIBEMISSIVITY,
+        IIO_CHAN_INFO_OVERSAMPLING_RATIO,
+};
+
 #endif /* _IIO_TYPES_H_ */
diff --git a/include/sound/soc-acpi-intel-match.h b/include/sound/soc-acpi-intel-match.h
index 1a9191cd4bb3..9da6388c20a1 100644
--- a/include/sound/soc-acpi-intel-match.h
+++ b/include/sound/soc-acpi-intel-match.h
@@ -16,6 +16,7 @@
 #ifndef __LINUX_SND_SOC_ACPI_INTEL_MATCH_H
 #define __LINUX_SND_SOC_ACPI_INTEL_MATCH_H
 
+#include <linux/module.h>
 #include <linux/stddef.h>
 #include <linux/acpi.h>
 
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h
index a7d8d335b043..d1aaf876cd26 100644
--- a/include/sound/soc-acpi.h
+++ b/include/sound/soc-acpi.h
@@ -17,6 +17,7 @@
 
 #include <linux/stddef.h>
 #include <linux/acpi.h>
+#include <linux/mod_devicetable.h>
 
 struct snd_soc_acpi_package_context {
         char *name;           /* package name */
@@ -49,9 +50,6 @@ snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN],
 struct snd_soc_acpi_mach *
 snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines);
 
-/* acpi check hid */
-bool snd_soc_acpi_check_hid(const u8 hid[ACPI_ID_LEN]);
-
 /**
  * snd_soc_acpi_mach: ACPI-based machine descriptor. Most of the fields are
  * related to the hardware, except for the firmware and topology file names.
diff --git a/kernel/acct.c b/kernel/acct.c
index d15c0ee4d955..addf7732fb56 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -102,7 +102,7 @@ static int check_free_space(struct bsd_acct_struct *acct)
 {
         struct kstatfs sbuf;
 
-        if (time_is_before_jiffies(acct->needcheck))
+        if (time_is_after_jiffies(acct->needcheck))
                 goto out;
 
         /* May block */
diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
index 01aaef1a77c5..5bb5e49ef4c3 100644
--- a/kernel/bpf/inode.c
+++ b/kernel/bpf/inode.c
@@ -368,7 +368,45 @@ out:
         putname(pname);
         return ret;
 }
-EXPORT_SYMBOL_GPL(bpf_obj_get_user);
+
+static struct bpf_prog *__get_prog_inode(struct inode *inode, enum bpf_prog_type type)
+{
+        struct bpf_prog *prog;
+        int ret = inode_permission(inode, MAY_READ | MAY_WRITE);
+        if (ret)
+                return ERR_PTR(ret);
+
+        if (inode->i_op == &bpf_map_iops)
+                return ERR_PTR(-EINVAL);
+        if (inode->i_op != &bpf_prog_iops)
+                return ERR_PTR(-EACCES);
+
+        prog = inode->i_private;
+
+        ret = security_bpf_prog(prog);
+        if (ret < 0)
+                return ERR_PTR(ret);
+
+        if (!bpf_prog_get_ok(prog, &type, false))
+                return ERR_PTR(-EINVAL);
+
+        return bpf_prog_inc(prog);
+}
+
+struct bpf_prog *bpf_prog_get_type_path(const char *name, enum bpf_prog_type type)
+{
+        struct bpf_prog *prog;
+        struct path path;
+        int ret = kern_path(name, LOOKUP_FOLLOW, &path);
+        if (ret)
+                return ERR_PTR(ret);
+        prog = __get_prog_inode(d_backing_inode(path.dentry), type);
+        if (!IS_ERR(prog))
+                touch_atime(&path);
+        path_put(&path);
+        return prog;
+}
+EXPORT_SYMBOL(bpf_prog_get_type_path);
 
 static void bpf_evict_inode(struct inode *inode)
 {
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 2c4cfeaa8d5e..5cb783fc8224 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1057,7 +1057,7 @@ struct bpf_prog *bpf_prog_inc_not_zero(struct bpf_prog *prog)
 }
 EXPORT_SYMBOL_GPL(bpf_prog_inc_not_zero);
 
-static bool bpf_prog_get_ok(struct bpf_prog *prog,
+bool bpf_prog_get_ok(struct bpf_prog *prog,
                             enum bpf_prog_type *attach_type, bool attach_drv)
 {
         /* not an attachment, just a refcount inc, always allow */
diff --git a/kernel/exit.c b/kernel/exit.c
index df0c91d5606c..995453d9fb55 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1763,3 +1763,4 @@ __weak void abort(void)
         /* if that doesn't kill us, halt */
         panic("Oops failed to kill thread");
 }
+EXPORT_SYMBOL(abort);
diff --git a/kernel/pid.c b/kernel/pid.c
index b13b624e2c49..1e8bb6550ec4 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -193,10 +193,8 @@ struct pid *alloc_pid(struct pid_namespace *ns)
         }
 
         if (unlikely(is_child_reaper(pid))) {
-                if (pid_ns_prepare_proc(ns)) {
-                        disable_pid_allocation(ns);
+                if (pid_ns_prepare_proc(ns))
                         goto out_free;
-                }
         }
 
         get_pid_ns(ns);
@@ -226,6 +224,10 @@ out_free:
         while (++i <= ns->level)
                 idr_remove(&ns->idr, (pid->numbers + i)->nr);
 
+        /* On failure to allocate the first pid, reset the state */
+        if (ns->pid_allocated == PIDNS_ADDING)
+                idr_set_cursor(&ns->idr, 0);
+
         spin_unlock_irq(&pidmap_lock);
 
         kmem_cache_free(ns->pid_cachep, pid);
diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h
index 57fd45ab7af1..08c60d10747f 100644
--- a/lib/mpi/longlong.h
+++ b/lib/mpi/longlong.h
@@ -671,7 +671,23 @@ do {						\
         **************  MIPS/64  **************
         ***************************************/
 #if (defined(__mips) && __mips >= 3) && W_TYPE_SIZE == 64
-#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
+#if defined(__mips_isa_rev) && __mips_isa_rev >= 6
+/*
+ * GCC ends up emitting a __multi3 intrinsic call for MIPS64r6 with the plain C
+ * code below, so we special case MIPS64r6 until the compiler can do better.
+ */
+#define umul_ppmm(w1, w0, u, v)                                         \
+do {                                                                    \
+        __asm__ ("dmulu %0,%1,%2"                                       \
+                 : "=d" ((UDItype)(w0))                                 \
+                 : "d" ((UDItype)(u)),                                  \
+                   "d" ((UDItype)(v)));                                 \
+        __asm__ ("dmuhu %0,%1,%2"                                       \
+                 : "=d" ((UDItype)(w1))                                 \
+                 : "d" ((UDItype)(u)),                                  \
+                   "d" ((UDItype)(v)));                                 \
+} while (0)
+#elif (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
 #define umul_ppmm(w1, w0, u, v) \
 do {                                                                    \
         typedef unsigned int __ll_UTItype __attribute__((mode(TI)));    \
diff --git a/mm/debug.c b/mm/debug.c
index d947f3e03b0d..56e2d9125ea5 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -50,7 +50,7 @@ void __dump_page(struct page *page, const char *reason)
          */
         int mapcount = PageSlab(page) ? 0 : page_mapcount(page);
 
-        pr_emerg("page:%p count:%d mapcount:%d mapping:%p index:%#lx",
+        pr_emerg("page:%px count:%d mapcount:%d mapping:%px index:%#lx",
                   page, page_ref_count(page), mapcount,
                   page->mapping, page_to_pgoff(page));
         if (PageCompound(page))
@@ -69,7 +69,7 @@ void __dump_page(struct page *page, const char *reason)
 
 #ifdef CONFIG_MEMCG
         if (page->mem_cgroup)
-                pr_alert("page->mem_cgroup:%p\n", page->mem_cgroup);
+                pr_alert("page->mem_cgroup:%px\n", page->mem_cgroup);
 #endif
 }
 
@@ -84,10 +84,10 @@ EXPORT_SYMBOL(dump_page);
 
 void dump_vma(const struct vm_area_struct *vma)
 {
-        pr_emerg("vma %p start %p end %p\n"
-                "next %p prev %p mm %p\n"
-                "prot %lx anon_vma %p vm_ops %p\n"
-                "pgoff %lx file %p private_data %p\n"
+        pr_emerg("vma %px start %px end %px\n"
+                "next %px prev %px mm %px\n"
+                "prot %lx anon_vma %px vm_ops %px\n"
+                "pgoff %lx file %px private_data %px\n"
                 "flags: %#lx(%pGv)\n",
                 vma, (void *)vma->vm_start, (void *)vma->vm_end, vma->vm_next,
                 vma->vm_prev, vma->vm_mm,
@@ -100,27 +100,27 @@ EXPORT_SYMBOL(dump_vma);
 
 void dump_mm(const struct mm_struct *mm)
 {
-        pr_emerg("mm %p mmap %p seqnum %d task_size %lu\n"
+        pr_emerg("mm %px mmap %px seqnum %d task_size %lu\n"
 #ifdef CONFIG_MMU
-                "get_unmapped_area %p\n"
+                "get_unmapped_area %px\n"
 #endif
                 "mmap_base %lu mmap_legacy_base %lu highest_vm_end %lu\n"
-                "pgd %p mm_users %d mm_count %d pgtables_bytes %lu map_count %d\n"
+                "pgd %px mm_users %d mm_count %d pgtables_bytes %lu map_count %d\n"
                 "hiwater_rss %lx hiwater_vm %lx total_vm %lx locked_vm %lx\n"
                 "pinned_vm %lx data_vm %lx exec_vm %lx stack_vm %lx\n"
                 "start_code %lx end_code %lx start_data %lx end_data %lx\n"
                 "start_brk %lx brk %lx start_stack %lx\n"
                 "arg_start %lx arg_end %lx env_start %lx env_end %lx\n"
-                "binfmt %p flags %lx core_state %p\n"
+                "binfmt %px flags %lx core_state %px\n"
 #ifdef CONFIG_AIO
-                "ioctx_table %p\n"
+                "ioctx_table %px\n"
 #endif
 #ifdef CONFIG_MEMCG
-                "owner %p "
+                "owner %px "
 #endif
-                "exe_file %p\n"
+                "exe_file %px\n"
 #ifdef CONFIG_MMU_NOTIFIER
-                "mmu_notifier_mm %p\n"
+                "mmu_notifier_mm %px\n"
 #endif
 #ifdef CONFIG_NUMA_BALANCING
                 "numa_next_scan %lu numa_scan_offset %lu numa_scan_seq %d\n"
diff --git a/mm/mprotect.c b/mm/mprotect.c
index ec39f730a0bf..58b629bb70de 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -166,7 +166,7 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma,
                 next = pmd_addr_end(addr, end);
                 if (!is_swap_pmd(*pmd) && !pmd_trans_huge(*pmd) && !pmd_devmap(*pmd)
                                 && pmd_none_or_clear_bad(pmd))
-                        continue;
+                        goto next;
 
                 /* invoke the mmu notifier if the pmd is populated */
                 if (!mni_start) {
@@ -188,7 +188,7 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma,
                                         }
 
                                         /* huge pmd was handled */
-                                        continue;
+                                        goto next;
                                 }
                         }
                         /* fall through, the trans huge pmd just split */
@@ -196,6 +196,8 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma,
                 this_pages = change_pte_range(vma, pmd, addr, next, newprot,
                                  dirty_accountable, prot_numa);
                 pages += this_pages;
+next:
+                cond_resched();
         } while (pmd++, addr = next, addr != end);
 
         if (mni_start)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 7e5e775e97f4..76c9688b6a0a 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6260,6 +6260,8 @@ void __paginginit zero_resv_unavail(void)
         pgcnt = 0;
         for_each_resv_unavail_range(i, &start, &end) {
                 for (pfn = PFN_DOWN(start); pfn < PFN_UP(end); pfn++) {
+                        if (!pfn_valid(ALIGN_DOWN(pfn, pageblock_nr_pages)))
+                                continue;
                         mm_zero_struct_page(pfn_to_page(pfn));
                         pgcnt++;
                 }
diff --git a/mm/sparse.c b/mm/sparse.c
index 7a5dacaa06e3..2609aba121e8 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -211,7 +211,7 @@ void __init memory_present(int nid, unsigned long start, unsigned long end)
         if (unlikely(!mem_section)) {
                 unsigned long size, align;
 
-                size = sizeof(struct mem_section) * NR_SECTION_ROOTS;
+                size = sizeof(struct mem_section*) * NR_SECTION_ROOTS;
                 align = 1 << (INTERNODE_CACHE_SHIFT);
                 mem_section = memblock_virt_alloc(size, align);
         }
diff --git a/mm/vmscan.c b/mm/vmscan.c
index c02c850ea349..47d5ced51f2d 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -297,10 +297,13 @@ EXPORT_SYMBOL(register_shrinker);
  */
 void unregister_shrinker(struct shrinker *shrinker)
 {
+        if (!shrinker->nr_deferred)
+                return;
         down_write(&shrinker_rwsem);
         list_del(&shrinker->list);
         up_write(&shrinker_rwsem);
         kfree(shrinker->nr_deferred);
+        shrinker->nr_deferred = NULL;
 }
 EXPORT_SYMBOL(unregister_shrinker);
 
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 685049a9048d..683c0651098c 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -53,6 +53,7 @@
 #include <linux/mount.h>
 #include <linux/migrate.h>
 #include <linux/pagemap.h>
+#include <linux/fs.h>
 
 #define ZSPAGE_MAGIC    0x58
 
diff --git a/net/netfilter/xt_bpf.c b/net/netfilter/xt_bpf.c
index 1f7fbd3c7e5a..06b090d8e901 100644
--- a/net/netfilter/xt_bpf.c
+++ b/net/netfilter/xt_bpf.c
@@ -55,21 +55,11 @@ static int __bpf_mt_check_fd(int fd, struct bpf_prog **ret)
 
 static int __bpf_mt_check_path(const char *path, struct bpf_prog **ret)
 {
-        mm_segment_t oldfs = get_fs();
-        int retval, fd;
-
         if (strnlen(path, XT_BPF_PATH_MAX) == XT_BPF_PATH_MAX)
                 return -EINVAL;
 
-        set_fs(KERNEL_DS);
-        fd = bpf_obj_get_user(path, 0);
-        set_fs(oldfs);
-        if (fd < 0)
-                return fd;
-
-        retval = __bpf_mt_check_fd(fd, ret);
-        sys_close(fd);
-        return retval;
+        *ret = bpf_prog_get_type_path(path, BPF_PROG_TYPE_SOCKET_FILTER);
+        return PTR_ERR_OR_ZERO(*ret);
 }
 
 static int bpf_mt_check(const struct xt_mtchk_param *par)
diff --git a/security/Kconfig b/security/Kconfig
index a623d13bf288..3d4debd0257e 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -56,6 +56,7 @@ config SECURITY_NETWORK
 
 config PAGE_TABLE_ISOLATION
         bool "Remove the kernel mapping in user mode"
+        default y
         depends on X86_64 && !UML
         help
           This feature reduces the number of hardware side channels by
diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
index ed9b4d0f9f7e..8c558cbce930 100644
--- a/security/apparmor/mount.c
+++ b/security/apparmor/mount.c
@@ -329,6 +329,9 @@ static int match_mnt_path_str(struct aa_profile *profile,
         AA_BUG(!mntpath);
         AA_BUG(!buffer);
 
+        if (!PROFILE_MEDIATES(profile, AA_CLASS_MOUNT))
+                return 0;
+
         error = aa_path_name(mntpath, path_flags(profile, mntpath), buffer,
                              &mntpnt, &info, profile->disconnected);
         if (error)
@@ -380,6 +383,9 @@ static int match_mnt(struct aa_profile *profile, const struct path *path,
         AA_BUG(!profile);
         AA_BUG(devpath && !devbuffer);
 
+        if (!PROFILE_MEDIATES(profile, AA_CLASS_MOUNT))
+                return 0;
+
         if (devpath) {
                 error = aa_path_name(devpath, path_flags(profile, devpath),
                                      devbuffer, &devname, &info,
@@ -558,6 +564,9 @@ static int profile_umount(struct aa_profile *profile, struct path *path,
         AA_BUG(!profile);
         AA_BUG(!path);
 
+        if (!PROFILE_MEDIATES(profile, AA_CLASS_MOUNT))
+                return 0;
+
         error = aa_path_name(path, path_flags(profile, path), buffer, &name,
                              &info, profile->disconnected);
         if (error)
@@ -613,7 +622,8 @@ static struct aa_label *build_pivotroot(struct aa_profile *profile,
         AA_BUG(!new_path);
         AA_BUG(!old_path);
 
-        if (profile_unconfined(profile))
+        if (profile_unconfined(profile) ||
+            !PROFILE_MEDIATES(profile, AA_CLASS_MOUNT))
                 return aa_get_newest_label(&profile->label);
 
         error = aa_path_name(old_path, path_flags(profile, old_path),
diff --git a/security/commoncap.c b/security/commoncap.c
index 4f8e09340956..48620c93d697 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -348,21 +348,18 @@ static __u32 sansflags(__u32 m)
         return m & ~VFS_CAP_FLAGS_EFFECTIVE;
 }
 
-static bool is_v2header(size_t size, __le32 magic)
+static bool is_v2header(size_t size, const struct vfs_cap_data *cap)
 {
-        __u32 m = le32_to_cpu(magic);
         if (size != XATTR_CAPS_SZ_2)
                 return false;
-        return sansflags(m) == VFS_CAP_REVISION_2;
+        return sansflags(le32_to_cpu(cap->magic_etc)) == VFS_CAP_REVISION_2;
 }
 
-static bool is_v3header(size_t size, __le32 magic)
+static bool is_v3header(size_t size, const struct vfs_cap_data *cap)
 {
-        __u32 m = le32_to_cpu(magic);
-
         if (size != XATTR_CAPS_SZ_3)
                 return false;
-        return sansflags(m) == VFS_CAP_REVISION_3;
+        return sansflags(le32_to_cpu(cap->magic_etc)) == VFS_CAP_REVISION_3;
 }
 
 /*
@@ -405,7 +402,7 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer,
 
         fs_ns = inode->i_sb->s_user_ns;
         cap = (struct vfs_cap_data *) tmpbuf;
-        if (is_v2header((size_t) ret, cap->magic_etc)) {
+        if (is_v2header((size_t) ret, cap)) {
                 /* If this is sizeof(vfs_cap_data) then we're ok with the
                  * on-disk value, so return that.  */
                 if (alloc)
@@ -413,7 +410,7 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer,
                 else
                         kfree(tmpbuf);
                 return ret;
-        } else if (!is_v3header((size_t) ret, cap->magic_etc)) {
+        } else if (!is_v3header((size_t) ret, cap)) {
                 kfree(tmpbuf);
                 return -EINVAL;
         }
@@ -470,9 +467,9 @@ static kuid_t rootid_from_xattr(const void *value, size_t size,
         return make_kuid(task_ns, rootid);
 }
 
-static bool validheader(size_t size, __le32 magic)
+static bool validheader(size_t size, const struct vfs_cap_data *cap)
 {
-        return is_v2header(size, magic) || is_v3header(size, magic);
+        return is_v2header(size, cap) || is_v3header(size, cap);
 }
 
 /*
@@ -495,7 +492,7 @@ int cap_convert_nscap(struct dentry *dentry, void **ivalue, size_t size)
 
         if (!*ivalue)
                 return -EINVAL;
-        if (!validheader(size, cap->magic_etc))
+        if (!validheader(size, cap))
                 return -EINVAL;
         if (!capable_wrt_inode_uidgid(inode, CAP_SETFCAP))
                 return -EPERM;
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index b228cc13191a..2b331f7266ab 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -136,7 +136,6 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_SGTL5000 if I2C
         select SND_SOC_SI476X if MFD_SI476X_CORE
         select SND_SOC_SIRF_AUDIO_CODEC
-        select SND_SOC_SN95031 if INTEL_SCU_IPC
         select SND_SOC_SPDIF
         select SND_SOC_SSM2518 if I2C
         select SND_SOC_SSM2602_SPI if SPI_MASTER
@@ -842,9 +841,6 @@ config SND_SOC_SIRF_AUDIO_CODEC
         tristate "SiRF SoC internal audio codec"
         select REGMAP_MMIO
 
-config SND_SOC_SN95031
-        tristate
-
 config SND_SOC_SPDIF
         tristate "S/PDIF CODEC"
 
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index fcc5073f6d61..da1571336f1e 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -144,7 +144,6 @@ snd-soc-sigmadsp-i2c-objs := sigmadsp-i2c.o
 snd-soc-sigmadsp-regmap-objs := sigmadsp-regmap.o
 snd-soc-si476x-objs := si476x.o
 snd-soc-sirf-audio-codec-objs := sirf-audio-codec.o
-snd-soc-sn95031-objs := sn95031.o
 snd-soc-spdif-tx-objs := spdif_transmitter.o
 snd-soc-spdif-rx-objs := spdif_receiver.o
 snd-soc-ssm2518-objs := ssm2518.o
diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c
index b88a1ee66f80..c88f974ebe3e 100644
--- a/sound/soc/codecs/dmic.c
+++ b/sound/soc/codecs/dmic.c
@@ -107,8 +107,30 @@ static const struct snd_soc_codec_driver soc_dmic = {
 
 static int dmic_dev_probe(struct platform_device *pdev)
 {
+        int err;
+        u32 chans;
+        struct snd_soc_dai_driver *dai_drv = &dmic_dai;
+
+        if (pdev->dev.of_node) {
+                err = of_property_read_u32(pdev->dev.of_node, "num-channels", &chans);
+                if (err && (err != -ENOENT))
+                        return err;
+
+                if (!err) {
+                        if (chans < 1 || chans > 8)
+                                return -EINVAL;
+
+                        dai_drv = devm_kzalloc(&pdev->dev, sizeof(*dai_drv), GFP_KERNEL);
+                        if (!dai_drv)
+                                return -ENOMEM;
+
+                        memcpy(dai_drv, &dmic_dai, sizeof(*dai_drv));
+                        dai_drv->capture.channels_max = chans;
+                }
+        }
+
         return snd_soc_register_codec(&pdev->dev,
-                        &soc_dmic, &dmic_dai, 1);
+                        &soc_dmic, dai_drv, 1);
 }
 
 static int dmic_dev_remove(struct platform_device *pdev)
diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c
index 9af0d985d6e9..31b0864583e8 100644
--- a/sound/soc/codecs/max98373.c
+++ b/sound/soc/codecs/max98373.c
@@ -176,6 +176,7 @@ static int max98373_get_bclk_sel(int bclk)
         }
         return 0;
 }
+
 static int max98373_set_clock(struct snd_soc_codec *codec,
         struct snd_pcm_hw_params *params)
 {
@@ -270,6 +271,7 @@ static int max98373_dai_hw_params(struct snd_pcm_substream *substream,
                         params_rate(params));
                 goto err;
         }
+
         /* set DAI_SR to correct LRCLK frequency */
         regmap_update_bits(max98373->regmap,
                 MAX98373_R2027_PCM_SR_SETUP_1,
@@ -309,7 +311,10 @@ static int max98373_dai_tdm_slot(struct snd_soc_dai *dai,
         unsigned int mask;
         int x, slot_found;
 
-        max98373->tdm_mode = true;
+        if (!tx_mask && !rx_mask && !slots && !slot_width)
+                max98373->tdm_mode = false;
+        else
+                max98373->tdm_mode = true;
 
         /* BCLK configuration */
         bsel = max98373_get_bclk_sel(slots * slot_width);
@@ -606,13 +611,13 @@ SOC_ENUM("Output Voltage", max98373_out_volt_enum),
 /* Dynamic Headroom Tracking */
 SOC_SINGLE("DHT Switch", MAX98373_R20D4_DHT_EN,
         MAX98373_DHT_EN_SHIFT, 1, 0),
-SOC_SINGLE_TLV("DHT Gain Min", MAX98373_R20D1_DHT_CFG,
+SOC_SINGLE_TLV("DHT Min Volume", MAX98373_R20D1_DHT_CFG,
         MAX98373_DHT_SPK_GAIN_MIN_SHIFT, 9, 0, max98373_dht_spkgain_min_tlv),
-SOC_SINGLE_TLV("DHT Rot Pnt", MAX98373_R20D1_DHT_CFG,
+SOC_SINGLE_TLV("DHT Rot Pnt Volume", MAX98373_R20D1_DHT_CFG,
         MAX98373_DHT_ROT_PNT_SHIFT, 15, 0, max98373_dht_rotation_point_tlv),
-SOC_SINGLE_TLV("DHT Attack Step", MAX98373_R20D2_DHT_ATTACK_CFG,
+SOC_SINGLE_TLV("DHT Attack Step Volume", MAX98373_R20D2_DHT_ATTACK_CFG,
         MAX98373_DHT_ATTACK_STEP_SHIFT, 4, 0, max98373_dht_step_size_tlv),
-SOC_SINGLE_TLV("DHT Release Step", MAX98373_R20D3_DHT_RELEASE_CFG,
+SOC_SINGLE_TLV("DHT Release Step Volume", MAX98373_R20D3_DHT_RELEASE_CFG,
         MAX98373_DHT_RELEASE_STEP_SHIFT, 4, 0, max98373_dht_step_size_tlv),
 SOC_ENUM("DHT Attack Rate", max98373_dht_attack_rate_enum),
 SOC_ENUM("DHT Release Rate", max98373_dht_release_rate_enum),
@@ -645,36 +650,36 @@ SOC_SINGLE("BDE Thresh Hysteresis", MAX98373_R209B_BDE_THRESH_HYST, 0, 0xFF, 0),
 SOC_SINGLE("BDE Hold Time", MAX98373_R2090_BDE_LVL_HOLD, 0, 0xFF, 0),
 SOC_SINGLE("BDE Attack Rate", MAX98373_R2091_BDE_GAIN_ATK_REL_RATE, 4, 0xF, 0),
 SOC_SINGLE("BDE Release Rate", MAX98373_R2091_BDE_GAIN_ATK_REL_RATE, 0, 0xF, 0),
-SOC_SINGLE_TLV("BDE LVL1 Clip Thresh", MAX98373_R20A9_BDE_L1_CFG_2,
+SOC_SINGLE_TLV("BDE LVL1 Clip Thresh Volume", MAX98373_R20A9_BDE_L1_CFG_2,
         0, 0x3C, 0, max98373_bde_gain_tlv),
-SOC_SINGLE_TLV("BDE LVL2 Clip Thresh", MAX98373_R20AC_BDE_L2_CFG_2,
+SOC_SINGLE_TLV("BDE LVL2 Clip Thresh Volume", MAX98373_R20AC_BDE_L2_CFG_2,
         0, 0x3C, 0, max98373_bde_gain_tlv),
-SOC_SINGLE_TLV("BDE LVL3 Clip Thresh", MAX98373_R20AF_BDE_L3_CFG_2,
+SOC_SINGLE_TLV("BDE LVL3 Clip Thresh Volume", MAX98373_R20AF_BDE_L3_CFG_2,
         0, 0x3C, 0, max98373_bde_gain_tlv),
-SOC_SINGLE_TLV("BDE LVL4 Clip Thresh", MAX98373_R20B2_BDE_L4_CFG_2,
+SOC_SINGLE_TLV("BDE LVL4 Clip Thresh Volume", MAX98373_R20B2_BDE_L4_CFG_2,
         0, 0x3C, 0, max98373_bde_gain_tlv),
-SOC_SINGLE_TLV("BDE LVL1 Clip Gain Reduct", MAX98373_R20AA_BDE_L1_CFG_3,
+SOC_SINGLE_TLV("BDE LVL1 Clip Reduction Volume", MAX98373_R20AA_BDE_L1_CFG_3,
         0, 0x3C, 0, max98373_bde_gain_tlv),
-SOC_SINGLE_TLV("BDE LVL2 Clip Gain Reduct", MAX98373_R20AD_BDE_L2_CFG_3,
+SOC_SINGLE_TLV("BDE LVL2 Clip Reduction Volume", MAX98373_R20AD_BDE_L2_CFG_3,
         0, 0x3C, 0, max98373_bde_gain_tlv),
-SOC_SINGLE_TLV("BDE LVL3 Clip Gain Reduct", MAX98373_R20B0_BDE_L3_CFG_3,
+SOC_SINGLE_TLV("BDE LVL3 Clip Reduction Volume", MAX98373_R20B0_BDE_L3_CFG_3,
         0, 0x3C, 0, max98373_bde_gain_tlv),
-SOC_SINGLE_TLV("BDE LVL4 Clip Gain Reduct", MAX98373_R20B3_BDE_L4_CFG_3,
+SOC_SINGLE_TLV("BDE LVL4 Clip Reduction Volume", MAX98373_R20B3_BDE_L4_CFG_3,
         0, 0x3C, 0, max98373_bde_gain_tlv),
-SOC_SINGLE_TLV("BDE LVL1 Limiter Thresh", MAX98373_R20A8_BDE_L1_CFG_1,
+SOC_SINGLE_TLV("BDE LVL1 Limiter Thresh Volume", MAX98373_R20A8_BDE_L1_CFG_1,
         0, 0xF, 0, max98373_limiter_thresh_tlv),
-SOC_SINGLE_TLV("BDE LVL2 Limiter Thresh", MAX98373_R20AB_BDE_L2_CFG_1,
+SOC_SINGLE_TLV("BDE LVL2 Limiter Thresh Volume", MAX98373_R20AB_BDE_L2_CFG_1,
         0, 0xF, 0, max98373_limiter_thresh_tlv),
-SOC_SINGLE_TLV("BDE LVL3 Limiter Thresh", MAX98373_R20AE_BDE_L3_CFG_1,
+SOC_SINGLE_TLV("BDE LVL3 Limiter Thresh Volume", MAX98373_R20AE_BDE_L3_CFG_1,
         0, 0xF, 0, max98373_limiter_thresh_tlv),
-SOC_SINGLE_TLV("BDE LVL4 Limiter Thresh", MAX98373_R20B1_BDE_L4_CFG_1,
+SOC_SINGLE_TLV("BDE LVL4 Limiter Thresh Volume", MAX98373_R20B1_BDE_L4_CFG_1,
         0, 0xF, 0, max98373_limiter_thresh_tlv),
 /* Limiter */
 SOC_SINGLE("Limiter Switch", MAX98373_R20E2_LIMITER_EN,
         MAX98373_LIMITER_EN_SHIFT, 1, 0),
 SOC_SINGLE("Limiter Src Switch", MAX98373_R20E0_LIMITER_THRESH_CFG,
         MAX98373_LIMITER_THRESH_SRC_SHIFT, 1, 0),
-SOC_SINGLE_TLV("Limiter Thresh", MAX98373_R20E0_LIMITER_THRESH_CFG,
+SOC_SINGLE_TLV("Limiter Thresh Volume", MAX98373_R20E0_LIMITER_THRESH_CFG,
         MAX98373_LIMITER_THRESH_SHIFT, 15, 0, max98373_limiter_thresh_tlv),
 SOC_ENUM("Limiter Attack Rate", max98373_limiter_attack_rate_enum),
 SOC_ENUM("Limiter Release Rate", max98373_limiter_release_rate_enum),
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 789346cb30b9..8f140c8b93ac 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -3739,6 +3739,17 @@ static const struct dmi_system_id dmi_platform_data[] = {
         { }
 };
 
+static bool rt5645_check_dp(struct device *dev)
+{
+        if (device_property_present(dev, "realtek,in2-differential") ||
+            device_property_present(dev, "realtek,dmic1-data-pin") ||
+            device_property_present(dev, "realtek,dmic2-data-pin") ||
+            device_property_present(dev, "realtek,jd-mode"))
+                return true;
+
+        return false;
+}
+
 static int rt5645_parse_dt(struct rt5645_priv *rt5645, struct device *dev)
 {
         rt5645->pdata.in2_diff = device_property_read_bool(dev,
@@ -3779,8 +3790,10 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
 
         if (pdata)
                 rt5645->pdata = *pdata;
-        else
+        else if (rt5645_check_dp(&i2c->dev))
                 rt5645_parse_dt(rt5645, &i2c->dev);
+        else
+                rt5645->pdata = jd_mode3_platform_data;
 
         if (quirk != -1) {
                 rt5645->pdata.in2_diff = QUIRK_IN2_DIFF(quirk);
diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
deleted file mode 100644
index 887923e68849..000000000000
--- a/sound/soc/codecs/sn95031.c
+++ /dev/null
@@ -1,936 +0,0 @@
-/*
- *  sn95031.c -  TI sn95031 Codec driver
- *
- *  Copyright (C) 2010 Intel Corp
- *  Author: Vinod Koul <vinod.koul@intel.com>
- *  Author: Harsha Priya <priya.harsha@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *
- */
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-
-#include <asm/intel_scu_ipc.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/soc.h>
-#include <sound/soc-dapm.h>
-#include <sound/initval.h>
-#include <sound/tlv.h>
-#include <sound/jack.h>
-#include "sn95031.h"
-
-#define SN95031_RATES (SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100)
-#define SN95031_FORMATS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE)
-
-/* adc helper functions */
-
-/* enables mic bias voltage */
-static void sn95031_enable_mic_bias(struct snd_soc_codec *codec)
-{
-        snd_soc_write(codec, SN95031_VAUD, BIT(2)|BIT(1)|BIT(0));
-        snd_soc_update_bits(codec, SN95031_MICBIAS, BIT(2), BIT(2));
-}
-
-/* Enable/Disable the ADC depending on the argument */
-static void configure_adc(struct snd_soc_codec *sn95031_codec, int val)
-{
-        int value = snd_soc_read(sn95031_codec, SN95031_ADC1CNTL1);
-
-        if (val) {
-                /* Enable and start the ADC */
-                value |= (SN95031_ADC_ENBL | SN95031_ADC_START);
-                value &= (~SN95031_ADC_NO_LOOP);
-        } else {
-                /* Just stop the ADC */
-                value &= (~SN95031_ADC_START);
-        }
-        snd_soc_write(sn95031_codec, SN95031_ADC1CNTL1, value);
-}
-
-/*
- * finds an empty channel for conversion
- * If the ADC is not enabled then start using 0th channel
- * itself. Otherwise find an empty channel by looking for a
- * channel in which the stopbit is set to 1. returns the index
- * of the first free channel if succeeds or an error code.
- *
- * Context: can sleep
- *
- */
-static int find_free_channel(struct snd_soc_codec *sn95031_codec)
-{
-        int i, value;
-
-        /* check whether ADC is enabled */
-        value = snd_soc_read(sn95031_codec, SN95031_ADC1CNTL1);
-
-        if ((value & SN95031_ADC_ENBL) == 0)
-                return 0;
-
-        /* ADC is already enabled; Looking for an empty channel */
-        for (i = 0; i < SN95031_ADC_CHANLS_MAX; i++) {
-                value = snd_soc_read(sn95031_codec,
-                                SN95031_ADC_CHNL_START_ADDR + i);
-                if (value & SN95031_STOPBIT_MASK)
-                        break;
-        }
-        return (i == SN95031_ADC_CHANLS_MAX) ? (-EINVAL) : i;
-}
-
-/* Initialize the ADC for reading micbias values. Can sleep. */
-static int sn95031_initialize_adc(struct snd_soc_codec *sn95031_codec)
-{
-        int base_addr, chnl_addr;
-        int value;
-        int channel_index;
-
-        /* Index of the first channel in which the stop bit is set */
-        channel_index = find_free_channel(sn95031_codec);
-        if (channel_index < 0) {
-                pr_err("No free ADC channels");
-                return channel_index;
-        }
-
-        base_addr = SN95031_ADC_CHNL_START_ADDR + channel_index;
-
-        if (!(channel_index == 0 || channel_index ==  SN95031_ADC_LOOP_MAX)) {
-                /* Reset stop bit for channels other than 0 and 12 */
-                value = snd_soc_read(sn95031_codec, base_addr);
-                /* Set the stop bit to zero */
-                snd_soc_write(sn95031_codec, base_addr, value & 0xEF);
-                /* Index of the first free channel */
-                base_addr++;
-                channel_index++;
-        }
-
-        /* Since this is the last channel, set the stop bit
-           to 1 by ORing the DIE_SENSOR_CODE with 0x10 */
-        snd_soc_write(sn95031_codec, base_addr,
-                                SN95031_AUDIO_DETECT_CODE | 0x10);
-
-        chnl_addr = SN95031_ADC_DATA_START_ADDR + 2 * channel_index;
-        pr_debug("mid_initialize : %x", chnl_addr);
-        configure_adc(sn95031_codec, 1);
-        return chnl_addr;
-}
-
-
-/* reads the ADC registers and gets the mic bias value in mV. */
-static unsigned int sn95031_get_mic_bias(struct snd_soc_codec *codec)
-{
-        u16 adc_adr = sn95031_initialize_adc(codec);
-        u16 adc_val1, adc_val2;
-        unsigned int mic_bias;
-
-        sn95031_enable_mic_bias(codec);
-
-        /* Enable the sound card for conversion before reading */
-        snd_soc_write(codec, SN95031_ADC1CNTL3, 0x05);
-        /* Re-toggle the RRDATARD bit */
-        snd_soc_write(codec, SN95031_ADC1CNTL3, 0x04);
-
-        /* Read the higher bits of data */
-        msleep(1000);
-        adc_val1 = snd_soc_read(codec, adc_adr);
-        adc_adr++;
-        adc_val2 = snd_soc_read(codec, adc_adr);
-
-        /* Adding lower two bits to the higher bits */
-        mic_bias = (adc_val1 << 2) + (adc_val2 & 3);
-        mic_bias = (mic_bias * SN95031_ADC_ONE_LSB_MULTIPLIER) / 1000;
-        pr_debug("mic bias = %dmV\n", mic_bias);
-        return mic_bias;
-}
-/*end - adc helper functions */
-
-static int sn95031_read(void *ctx, unsigned int reg, unsigned int *val)
-{
-        u8 value = 0;
-        int ret;
-
-        ret = intel_scu_ipc_ioread8(reg, &value);
-        if (ret == 0)
-                *val = value;
-
-        return ret;
-}
-
-static int sn95031_write(void *ctx, unsigned int reg, unsigned int value)
-{
-        return intel_scu_ipc_iowrite8(reg, value);
-}
-
-static const struct regmap_config sn95031_regmap = {
-        .reg_read = sn95031_read,
-        .reg_write = sn95031_write,
-};
-
-static int sn95031_set_vaud_bias(struct snd_soc_codec *codec,
-                enum snd_soc_bias_level level)
-{
-        switch (level) {
-        case SND_SOC_BIAS_ON:
-                break;
-
-        case SND_SOC_BIAS_PREPARE:
-                if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_STANDBY) {
-                        pr_debug("vaud_bias powering up pll\n");
-                        /* power up the pll */
-                        snd_soc_write(codec, SN95031_AUDPLLCTRL, BIT(5));
-                        /* enable pcm 2 */
-                        snd_soc_update_bits(codec, SN95031_PCM2C2,
-                                        BIT(0), BIT(0));
-                }
-                break;
-
-        case SND_SOC_BIAS_STANDBY:
-                switch (snd_soc_codec_get_bias_level(codec)) {
-                case SND_SOC_BIAS_OFF:
-                        pr_debug("vaud_bias power up rail\n");
-                        /* power up the rail */
-                        snd_soc_write(codec, SN95031_VAUD,
-                                        BIT(2)|BIT(1)|BIT(0));
-                        msleep(1);
-                        break;
-                case SND_SOC_BIAS_PREPARE:
-                        /* turn off pcm */
-                        pr_debug("vaud_bias power dn pcm\n");
-                        snd_soc_update_bits(codec, SN95031_PCM2C2, BIT(0), 0);
-                        snd_soc_write(codec, SN95031_AUDPLLCTRL, 0);
-                        break;
-                default:
-                        break;
-                }
-                break;
-
-
-        case SND_SOC_BIAS_OFF:
-                pr_debug("vaud_bias _OFF doing rail shutdown\n");
-                snd_soc_write(codec, SN95031_VAUD, BIT(3));
-                break;
-        }
-
-        return 0;
-}
-
-static int sn95031_vhs_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);
-
-        if (SND_SOC_DAPM_EVENT_ON(event)) {
-                pr_debug("VHS SND_SOC_DAPM_EVENT_ON doing rail startup now\n");
-                /* power up the rail */
-                snd_soc_write(codec, SN95031_VHSP, 0x3D);
-                snd_soc_write(codec, SN95031_VHSN, 0x3F);
-                msleep(1);
-        } else if (SND_SOC_DAPM_EVENT_OFF(event)) {
-                pr_debug("VHS SND_SOC_DAPM_EVENT_OFF doing rail shutdown\n");
-                snd_soc_write(codec, SN95031_VHSP, 0xC4);
-                snd_soc_write(codec, SN95031_VHSN, 0x04);
-        }
-        return 0;
-}
-
-static int sn95031_vihf_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);
-
-        if (SND_SOC_DAPM_EVENT_ON(event)) {
-                pr_debug("VIHF SND_SOC_DAPM_EVENT_ON doing rail startup now\n");
-                /* power up the rail */
-                snd_soc_write(codec, SN95031_VIHF, 0x27);
-                msleep(1);
-        } else if (SND_SOC_DAPM_EVENT_OFF(event)) {
-                pr_debug("VIHF SND_SOC_DAPM_EVENT_OFF doing rail shutdown\n");
-                snd_soc_write(codec, SN95031_VIHF, 0x24);
-        }
-        return 0;
-}
-
-static int sn95031_dmic12_event(struct snd_soc_dapm_widget *w,
-                        struct snd_kcontrol *k, int event)
-{
-        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
-        unsigned int ldo = 0, clk_dir = 0, data_dir = 0;
-
-        if (SND_SOC_DAPM_EVENT_ON(event)) {
-                ldo = BIT(5)|BIT(4);
-                clk_dir = BIT(0);
-                data_dir = BIT(7);
-        }
-        /* program DMIC LDO, clock and set clock */
-        snd_soc_update_bits(codec, SN95031_MICBIAS, BIT(5)|BIT(4), ldo);
-        snd_soc_update_bits(codec, SN95031_DMICBUF0123, BIT(0), clk_dir);
-        snd_soc_update_bits(codec, SN95031_DMICBUF0123, BIT(7), data_dir);
-        return 0;
-}
-
-static int sn95031_dmic34_event(struct snd_soc_dapm_widget *w,
-                        struct snd_kcontrol *k, int event)
-{
-        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
-        unsigned int ldo = 0, clk_dir = 0, data_dir = 0;
-
-        if (SND_SOC_DAPM_EVENT_ON(event)) {
-                ldo = BIT(5)|BIT(4);
-                clk_dir = BIT(2);
-                data_dir = BIT(1);
-        }
-        /* program DMIC LDO, clock and set clock */
-        snd_soc_update_bits(codec, SN95031_MICBIAS, BIT(5)|BIT(4), ldo);
-        snd_soc_update_bits(codec, SN95031_DMICBUF0123, BIT(2), clk_dir);
-        snd_soc_update_bits(codec, SN95031_DMICBUF45, BIT(1), data_dir);
-        return 0;
-}
-
-static int sn95031_dmic56_event(struct snd_soc_dapm_widget *w,
-                        struct snd_kcontrol *k, int event)
-{
-        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
-        unsigned int ldo = 0;
-
-        if (SND_SOC_DAPM_EVENT_ON(event))
-                ldo = BIT(7)|BIT(6);
-
-        /* program DMIC LDO */
-        snd_soc_update_bits(codec, SN95031_MICBIAS, BIT(7)|BIT(6), ldo);
-        return 0;
-}
-
-/* mux controls */
-static const char *sn95031_mic_texts[] = { "AMIC", "LineIn" };
-
-static SOC_ENUM_SINGLE_DECL(sn95031_micl_enum,
-                            SN95031_ADCCONFIG, 1, sn95031_mic_texts);
-
-static const struct snd_kcontrol_new sn95031_micl_mux_control =
-        SOC_DAPM_ENUM("Route", sn95031_micl_enum);
-
-static SOC_ENUM_SINGLE_DECL(sn95031_micr_enum,
-                            SN95031_ADCCONFIG, 3, sn95031_mic_texts);
-
-static const struct snd_kcontrol_new sn95031_micr_mux_control =
-        SOC_DAPM_ENUM("Route", sn95031_micr_enum);
-
-static const char *sn95031_input_texts[] = {    "DMIC1", "DMIC2", "DMIC3",
-                                                "DMIC4", "DMIC5", "DMIC6",
-                                                "ADC Left", "ADC Right" };
-
-static SOC_ENUM_SINGLE_DECL(sn95031_input1_enum,
-                            SN95031_AUDIOMUX12, 0, sn95031_input_texts);
-
-static const struct snd_kcontrol_new sn95031_input1_mux_control =
-        SOC_DAPM_ENUM("Route", sn95031_input1_enum);
-
-static SOC_ENUM_SINGLE_DECL(sn95031_input2_enum,
-                            SN95031_AUDIOMUX12, 4, sn95031_input_texts);
-
-static const struct snd_kcontrol_new sn95031_input2_mux_control =
-        SOC_DAPM_ENUM("Route", sn95031_input2_enum);
-
-static SOC_ENUM_SINGLE_DECL(sn95031_input3_enum,
-                            SN95031_AUDIOMUX34, 0, sn95031_input_texts);
-
-static const struct snd_kcontrol_new sn95031_input3_mux_control =
-        SOC_DAPM_ENUM("Route", sn95031_input3_enum);
-
-static SOC_ENUM_SINGLE_DECL(sn95031_input4_enum,
-                            SN95031_AUDIOMUX34, 4, sn95031_input_texts);
-
-static const struct snd_kcontrol_new sn95031_input4_mux_control =
-        SOC_DAPM_ENUM("Route", sn95031_input4_enum);
-
-/* capture path controls */
-
-static const char *sn95031_micmode_text[] = {"Single Ended", "Differential"};
-
-/* 0dB to 30dB in 10dB steps */
-static const DECLARE_TLV_DB_SCALE(mic_tlv, 0, 10, 0);
-
-static SOC_ENUM_SINGLE_DECL(sn95031_micmode1_enum,
-                            SN95031_MICAMP1, 1, sn95031_micmode_text);
-static SOC_ENUM_SINGLE_DECL(sn95031_micmode2_enum,
-                            SN95031_MICAMP2, 1, sn95031_micmode_text);
-
-static const char *sn95031_dmic_cfg_text[] = {"GPO", "DMIC"};
-
-static SOC_ENUM_SINGLE_DECL(sn95031_dmic12_cfg_enum,
-                            SN95031_DMICMUX, 0, sn95031_dmic_cfg_text);
-static SOC_ENUM_SINGLE_DECL(sn95031_dmic34_cfg_enum,
-                            SN95031_DMICMUX, 1, sn95031_dmic_cfg_text);
-static SOC_ENUM_SINGLE_DECL(sn95031_dmic56_cfg_enum,
-                            SN95031_DMICMUX, 2, sn95031_dmic_cfg_text);
-
-static const struct snd_kcontrol_new sn95031_snd_controls[] = {
-        SOC_ENUM("Mic1Mode Capture Route", sn95031_micmode1_enum),
-        SOC_ENUM("Mic2Mode Capture Route", sn95031_micmode2_enum),
-        SOC_ENUM("DMIC12 Capture Route", sn95031_dmic12_cfg_enum),
-        SOC_ENUM("DMIC34 Capture Route", sn95031_dmic34_cfg_enum),
-        SOC_ENUM("DMIC56 Capture Route", sn95031_dmic56_cfg_enum),
-        SOC_SINGLE_TLV("Mic1 Capture Volume", SN95031_MICAMP1,
-                        2, 4, 0, mic_tlv),
-        SOC_SINGLE_TLV("Mic2 Capture Volume", SN95031_MICAMP2,
-                        2, 4, 0, mic_tlv),
-};
-
-/* DAPM widgets */
-static const struct snd_soc_dapm_widget sn95031_dapm_widgets[] = {
-
-        /* all end points mic, hs etc */
-        SND_SOC_DAPM_OUTPUT("HPOUTL"),
-        SND_SOC_DAPM_OUTPUT("HPOUTR"),
-        SND_SOC_DAPM_OUTPUT("EPOUT"),
-        SND_SOC_DAPM_OUTPUT("IHFOUTL"),
-        SND_SOC_DAPM_OUTPUT("IHFOUTR"),
-        SND_SOC_DAPM_OUTPUT("LINEOUTL"),
-        SND_SOC_DAPM_OUTPUT("LINEOUTR"),
-        SND_SOC_DAPM_OUTPUT("VIB1OUT"),
-        SND_SOC_DAPM_OUTPUT("VIB2OUT"),
-
-        SND_SOC_DAPM_INPUT("AMIC1"), /* headset mic */
-        SND_SOC_DAPM_INPUT("AMIC2"),
-        SND_SOC_DAPM_INPUT("DMIC1"),
-        SND_SOC_DAPM_INPUT("DMIC2"),
-        SND_SOC_DAPM_INPUT("DMIC3"),
-        SND_SOC_DAPM_INPUT("DMIC4"),
-        SND_SOC_DAPM_INPUT("DMIC5"),
-        SND_SOC_DAPM_INPUT("DMIC6"),
-        SND_SOC_DAPM_INPUT("LINEINL"),
-        SND_SOC_DAPM_INPUT("LINEINR"),
-
-        SND_SOC_DAPM_MICBIAS("AMIC1Bias", SN95031_MICBIAS, 2, 0),
-        SND_SOC_DAPM_MICBIAS("AMIC2Bias", SN95031_MICBIAS, 3, 0),
-        SND_SOC_DAPM_MICBIAS("DMIC12Bias", SN95031_DMICMUX, 3, 0),
-        SND_SOC_DAPM_MICBIAS("DMIC34Bias", SN95031_DMICMUX, 4, 0),
-        SND_SOC_DAPM_MICBIAS("DMIC56Bias", SN95031_DMICMUX, 5, 0),
-
-        SND_SOC_DAPM_SUPPLY("DMIC12supply", SN95031_DMICLK, 0, 0,
-                                sn95031_dmic12_event,
-                                SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
-        SND_SOC_DAPM_SUPPLY("DMIC34supply", SN95031_DMICLK, 1, 0,
-                                sn95031_dmic34_event,
-                                SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
-        SND_SOC_DAPM_SUPPLY("DMIC56supply", SN95031_DMICLK, 2, 0,
-                                sn95031_dmic56_event,
-                                SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
-
-        SND_SOC_DAPM_AIF_OUT("PCM_Out", "Capture", 0,
-                        SND_SOC_NOPM, 0, 0),
-
-        SND_SOC_DAPM_SUPPLY("Headset Rail", SND_SOC_NOPM, 0, 0,
-                        sn95031_vhs_event,
-                        SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
-        SND_SOC_DAPM_SUPPLY("Speaker Rail", SND_SOC_NOPM, 0, 0,
-                        sn95031_vihf_event,
-                        SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
-
-        /* playback path driver enables */
-        SND_SOC_DAPM_PGA("Headset Left Playback",
-                        SN95031_DRIVEREN, 0, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("Headset Right Playback",
-                        SN95031_DRIVEREN, 1, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("Speaker Left Playback",
-                        SN95031_DRIVEREN, 2, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("Speaker Right Playback",
-                        SN95031_DRIVEREN, 3, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("Vibra1 Playback",
-                        SN95031_DRIVEREN, 4, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("Vibra2 Playback",
-                        SN95031_DRIVEREN, 5, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("Earpiece Playback",
-                        SN95031_DRIVEREN, 6, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("Lineout Left Playback",
-                        SN95031_LOCTL, 0, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("Lineout Right Playback",
-                        SN95031_LOCTL, 4, 0, NULL, 0),
-
-        /* playback path filter enable */
-        SND_SOC_DAPM_PGA("Headset Left Filter",
-                        SN95031_HSEPRXCTRL, 4, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("Headset Right Filter",
-                        SN95031_HSEPRXCTRL, 5, 0,  NULL, 0),
-        SND_SOC_DAPM_PGA("Speaker Left Filter",
-                        SN95031_IHFRXCTRL, 0, 0,  NULL, 0),
-        SND_SOC_DAPM_PGA("Speaker Right Filter",
-                        SN95031_IHFRXCTRL, 1, 0,  NULL, 0),
-
-        /* DACs */
-        SND_SOC_DAPM_DAC("HSDAC Left", "Headset",
-                        SN95031_DACCONFIG, 0, 0),
-        SND_SOC_DAPM_DAC("HSDAC Right", "Headset",
-                        SN95031_DACCONFIG, 1, 0),
-        SND_SOC_DAPM_DAC("IHFDAC Left", "Speaker",
-                        SN95031_DACCONFIG, 2, 0),
-        SND_SOC_DAPM_DAC("IHFDAC Right", "Speaker",
-                        SN95031_DACCONFIG, 3, 0),
-        SND_SOC_DAPM_DAC("Vibra1 DAC", "Vibra1",
-                        SN95031_VIB1C5, 1, 0),
-        SND_SOC_DAPM_DAC("Vibra2 DAC", "Vibra2",
-                        SN95031_VIB2C5, 1, 0),
-
-        /* capture widgets */
-        SND_SOC_DAPM_PGA("LineIn Enable Left", SN95031_MICAMP1,
-                                7, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("LineIn Enable Right", SN95031_MICAMP2,
-                                7, 0, NULL, 0),
-
-        SND_SOC_DAPM_PGA("MIC1 Enable", SN95031_MICAMP1, 0, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("MIC2 Enable", SN95031_MICAMP2, 0, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("TX1 Enable", SN95031_AUDIOTXEN, 2, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("TX2 Enable", SN95031_AUDIOTXEN, 3, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("TX3 Enable", SN95031_AUDIOTXEN, 4, 0, NULL, 0),
-        SND_SOC_DAPM_PGA("TX4 Enable", SN95031_AUDIOTXEN, 5, 0, NULL, 0),
-
-        /* ADC have null stream as they will be turned ON by TX path */
-        SND_SOC_DAPM_ADC("ADC Left", NULL,
-                        SN95031_ADCCONFIG, 0, 0),
-        SND_SOC_DAPM_ADC("ADC Right", NULL,
-                        SN95031_ADCCONFIG, 2, 0),
-
-        SND_SOC_DAPM_MUX("Mic_InputL Capture Route",
-                        SND_SOC_NOPM, 0, 0, &sn95031_micl_mux_control),
-        SND_SOC_DAPM_MUX("Mic_InputR Capture Route",
-                        SND_SOC_NOPM, 0, 0, &sn95031_micr_mux_control),
-
-        SND_SOC_DAPM_MUX("Txpath1 Capture Route",
-                        SND_SOC_NOPM, 0, 0, &sn95031_input1_mux_control),
-        SND_SOC_DAPM_MUX("Txpath2 Capture Route",
-                        SND_SOC_NOPM, 0, 0, &sn95031_input2_mux_control),
-        SND_SOC_DAPM_MUX("Txpath3 Capture Route",
-                        SND_SOC_NOPM, 0, 0, &sn95031_input3_mux_control),
-        SND_SOC_DAPM_MUX("Txpath4 Capture Route",
-                        SND_SOC_NOPM, 0, 0, &sn95031_input4_mux_control),
-
-};
-
-static const struct snd_soc_dapm_route sn95031_audio_map[] = {
-        /* headset and earpiece map */
-        { "HPOUTL", NULL, "Headset Rail"},
-        { "HPOUTR", NULL, "Headset Rail"},
-        { "HPOUTL", NULL, "Headset Left Playback" },
-        { "HPOUTR", NULL, "Headset Right Playback" },
-        { "EPOUT", NULL, "Earpiece Playback" },
-        { "Headset Left Playback", NULL, "Headset Left Filter"},
-        { "Headset Right Playback", NULL, "Headset Right Filter"},
-        { "Earpiece Playback", NULL, "Headset Left Filter"},
-        { "Headset Left Filter", NULL, "HSDAC Left"},
-        { "Headset Right Filter", NULL, "HSDAC Right"},
-
-        /* speaker map */
-        { "IHFOUTL", NULL, "Speaker Rail"},
-        { "IHFOUTR", NULL, "Speaker Rail"},
-        { "IHFOUTL", NULL, "Speaker Left Playback"},
-        { "IHFOUTR", NULL, "Speaker Right Playback"},
-        { "Speaker Left Playback", NULL, "Speaker Left Filter"},
-        { "Speaker Right Playback", NULL, "Speaker Right Filter"},
-        { "Speaker Left Filter", NULL, "IHFDAC Left"},
-        { "Speaker Right Filter", NULL, "IHFDAC Right"},
-
-        /* vibra map */
-        { "VIB1OUT", NULL, "Vibra1 Playback"},
-        { "Vibra1 Playback", NULL, "Vibra1 DAC"},
-
-        { "VIB2OUT", NULL, "Vibra2 Playback"},
-        { "Vibra2 Playback", NULL, "Vibra2 DAC"},
-
-        /* lineout */
-        { "LINEOUTL", NULL, "Lineout Left Playback"},
-        { "LINEOUTR", NULL, "Lineout Right Playback"},
-        { "Lineout Left Playback", NULL, "Headset Left Filter"},
-        { "Lineout Left Playback", NULL, "Speaker Left Filter"},
-        { "Lineout Left Playback", NULL, "Vibra1 DAC"},
-        { "Lineout Right Playback", NULL, "Headset Right Filter"},
-        { "Lineout Right Playback", NULL, "Speaker Right Filter"},
-        { "Lineout Right Playback", NULL, "Vibra2 DAC"},
-
-        /* Headset (AMIC1) mic */
-        { "AMIC1Bias", NULL, "AMIC1"},
-        { "MIC1 Enable", NULL, "AMIC1Bias"},
-        { "Mic_InputL Capture Route", "AMIC", "MIC1 Enable"},
-
-        /* AMIC2 */
-        { "AMIC2Bias", NULL, "AMIC2"},
-        { "MIC2 Enable", NULL, "AMIC2Bias"},
-        { "Mic_InputR Capture Route", "AMIC", "MIC2 Enable"},
-
-
-        /* Linein */
-        { "LineIn Enable Left", NULL, "LINEINL"},
-        { "LineIn Enable Right", NULL, "LINEINR"},
-        { "Mic_InputL Capture Route", "LineIn", "LineIn Enable Left"},
-        { "Mic_InputR Capture Route", "LineIn", "LineIn Enable Right"},
-
-        /* ADC connection */
-        { "ADC Left", NULL, "Mic_InputL Capture Route"},
-        { "ADC Right", NULL, "Mic_InputR Capture Route"},
-
-        /*DMIC connections */
-        { "DMIC1", NULL, "DMIC12supply"},
-        { "DMIC2", NULL, "DMIC12supply"},
-        { "DMIC3", NULL, "DMIC34supply"},
-        { "DMIC4", NULL, "DMIC34supply"},
-        { "DMIC5", NULL, "DMIC56supply"},
-        { "DMIC6", NULL, "DMIC56supply"},
-
-        { "DMIC12Bias", NULL, "DMIC1"},
-        { "DMIC12Bias", NULL, "DMIC2"},
-        { "DMIC34Bias", NULL, "DMIC3"},
-        { "DMIC34Bias", NULL, "DMIC4"},
-        { "DMIC56Bias", NULL, "DMIC5"},
-        { "DMIC56Bias", NULL, "DMIC6"},
-
-        /*TX path inputs*/
-        { "Txpath1 Capture Route", "ADC Left", "ADC Left"},
-        { "Txpath2 Capture Route", "ADC Left", "ADC Left"},
-        { "Txpath3 Capture Route", "ADC Left", "ADC Left"},
-        { "Txpath4 Capture Route", "ADC Left", "ADC Left"},
-        { "Txpath1 Capture Route", "ADC Right", "ADC Right"},
-        { "Txpath2 Capture Route", "ADC Right", "ADC Right"},
-        { "Txpath3 Capture Route", "ADC Right", "ADC Right"},
-        { "Txpath4 Capture Route", "ADC Right", "ADC Right"},
-        { "Txpath1 Capture Route", "DMIC1", "DMIC1"},
-        { "Txpath2 Capture Route", "DMIC1", "DMIC1"},
-        { "Txpath3 Capture Route", "DMIC1", "DMIC1"},
-        { "Txpath4 Capture Route", "DMIC1", "DMIC1"},
-        { "Txpath1 Capture Route", "DMIC2", "DMIC2"},
-        { "Txpath2 Capture Route", "DMIC2", "DMIC2"},
-        { "Txpath3 Capture Route", "DMIC2", "DMIC2"},
-        { "Txpath4 Capture Route", "DMIC2", "DMIC2"},
-        { "Txpath1 Capture Route", "DMIC3", "DMIC3"},
-        { "Txpath2 Capture Route", "DMIC3", "DMIC3"},
-        { "Txpath3 Capture Route", "DMIC3", "DMIC3"},
-        { "Txpath4 Capture Route", "DMIC3", "DMIC3"},
-        { "Txpath1 Capture Route", "DMIC4", "DMIC4"},
-        { "Txpath2 Capture Route", "DMIC4", "DMIC4"},
-        { "Txpath3 Capture Route", "DMIC4", "DMIC4"},
-        { "Txpath4 Capture Route", "DMIC4", "DMIC4"},
-        { "Txpath1 Capture Route", "DMIC5", "DMIC5"},
-        { "Txpath2 Capture Route", "DMIC5", "DMIC5"},
-        { "Txpath3 Capture Route", "DMIC5", "DMIC5"},
-        { "Txpath4 Capture Route", "DMIC5", "DMIC5"},
-        { "Txpath1 Capture Route", "DMIC6", "DMIC6"},
-        { "Txpath2 Capture Route", "DMIC6", "DMIC6"},
-        { "Txpath3 Capture Route", "DMIC6", "DMIC6"},
-        { "Txpath4 Capture Route", "DMIC6", "DMIC6"},
-
-        /* tx path */
-        { "TX1 Enable", NULL, "Txpath1 Capture Route"},
-        { "TX2 Enable", NULL, "Txpath2 Capture Route"},
-        { "TX3 Enable", NULL, "Txpath3 Capture Route"},
-        { "TX4 Enable", NULL, "Txpath4 Capture Route"},
-        { "PCM_Out", NULL, "TX1 Enable"},
-        { "PCM_Out", NULL, "TX2 Enable"},
-        { "PCM_Out", NULL, "TX3 Enable"},
-        { "PCM_Out", NULL, "TX4 Enable"},
-
-};
-
-/* speaker and headset mutes, for audio pops and clicks */
-static int sn95031_pcm_hs_mute(struct snd_soc_dai *dai, int mute)
-{
-        snd_soc_update_bits(dai->codec,
-                        SN95031_HSLVOLCTRL, BIT(7), (!mute << 7));
-        snd_soc_update_bits(dai->codec,
-                        SN95031_HSRVOLCTRL, BIT(7), (!mute << 7));
-        return 0;
-}
-
-static int sn95031_pcm_spkr_mute(struct snd_soc_dai *dai, int mute)
-{
-        snd_soc_update_bits(dai->codec,
-                        SN95031_IHFLVOLCTRL, BIT(7), (!mute << 7));
-        snd_soc_update_bits(dai->codec,
-                        SN95031_IHFRVOLCTRL, BIT(7), (!mute << 7));
-        return 0;
-}
-
-static int sn95031_pcm_hw_params(struct snd_pcm_substream *substream,
-                struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
-{
-        unsigned int format, rate;
-
-        switch (params_width(params)) {
-        case 16:
-                format = BIT(4)|BIT(5);
-                break;
-
-        case 24:
-                format = 0;
-                break;
-        default:
-                return -EINVAL;
-        }
-        snd_soc_update_bits(dai->codec, SN95031_PCM2C2,
-                        BIT(4)|BIT(5), format);
-
-        switch (params_rate(params)) {
-        case 48000:
-                pr_debug("RATE_48000\n");
-                rate = 0;
-                break;
-
-        case 44100:
-                pr_debug("RATE_44100\n");
-                rate = BIT(7);
-                break;
-
-        default:
-                pr_err("ERR rate %d\n", params_rate(params));
-                return -EINVAL;
-        }
-        snd_soc_update_bits(dai->codec, SN95031_PCM1C1, BIT(7), rate);
-
-        return 0;
-}
-
-/* Codec DAI section */
-static const struct snd_soc_dai_ops sn95031_headset_dai_ops = {
-        .digital_mute   = sn95031_pcm_hs_mute,
-        .hw_params      = sn95031_pcm_hw_params,
-};
-
-static const struct snd_soc_dai_ops sn95031_speaker_dai_ops = {
-        .digital_mute   = sn95031_pcm_spkr_mute,
-        .hw_params      = sn95031_pcm_hw_params,
-};
-
-static const struct snd_soc_dai_ops sn95031_vib1_dai_ops = {
-        .hw_params      = sn95031_pcm_hw_params,
-};
-
-static const struct snd_soc_dai_ops sn95031_vib2_dai_ops = {
-        .hw_params      = sn95031_pcm_hw_params,
-};
-
-static struct snd_soc_dai_driver sn95031_dais[] = {
-{
-        .name = "SN95031 Headset",
-        .playback = {
-                .stream_name = "Headset",
-                .channels_min = 2,
-                .channels_max = 2,
-                .rates = SN95031_RATES,
-                .formats = SN95031_FORMATS,
-        },
-        .capture = {
-                .stream_name = "Capture",
-                .channels_min = 1,
-                .channels_max = 5,
-                .rates = SN95031_RATES,
-                .formats = SN95031_FORMATS,
-        },
-        .ops = &sn95031_headset_dai_ops,
-},
-{       .name = "SN95031 Speaker",
-        .playback = {
-                .stream_name = "Speaker",
-                .channels_min = 2,
-                .channels_max = 2,
-                .rates = SN95031_RATES,
-                .formats = SN95031_FORMATS,
-        },
-        .ops = &sn95031_speaker_dai_ops,
-},
-{       .name = "SN95031 Vibra1",
-        .playback = {
-                .stream_name = "Vibra1",
-                .channels_min = 1,
-                .channels_max = 1,
-                .rates = SN95031_RATES,
-                .formats = SN95031_FORMATS,
-        },
-        .ops = &sn95031_vib1_dai_ops,
-},
-{       .name = "SN95031 Vibra2",
-        .playback = {
-                .stream_name = "Vibra2",
-                .channels_min = 1,
-                .channels_max = 1,
-                .rates = SN95031_RATES,
-                .formats = SN95031_FORMATS,
-        },
-        .ops = &sn95031_vib2_dai_ops,
-},
-};
-
-static inline void sn95031_disable_jack_btn(struct snd_soc_codec *codec)
-{
-        snd_soc_write(codec, SN95031_BTNCTRL2, 0x00);
-}
-
-static inline void sn95031_enable_jack_btn(struct snd_soc_codec *codec)
-{
-        snd_soc_write(codec, SN95031_BTNCTRL1, 0x77);
-        snd_soc_write(codec, SN95031_BTNCTRL2, 0x01);
-}
-
-static int sn95031_get_headset_state(struct snd_soc_codec *codec,
-        struct snd_soc_jack *mfld_jack)
-{
-        int micbias = sn95031_get_mic_bias(codec);
-
-        int jack_type = snd_soc_jack_get_type(mfld_jack, micbias);
-
-        pr_debug("jack type detected = %d\n", jack_type);
-        if (jack_type == SND_JACK_HEADSET)
-                sn95031_enable_jack_btn(codec);
-        return jack_type;
-}
-
-void sn95031_jack_detection(struct snd_soc_codec *codec,
-        struct mfld_jack_data *jack_data)
-{
-        unsigned int status;
-        unsigned int mask = SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_HEADSET;
-
-        pr_debug("interrupt id read in sram = 0x%x\n", jack_data->intr_id);
-        if (jack_data->intr_id & 0x1) {
-                pr_debug("short_push detected\n");
-                status = SND_JACK_HEADSET | SND_JACK_BTN_0;
-        } else if (jack_data->intr_id & 0x2) {
-                pr_debug("long_push detected\n");
-                status = SND_JACK_HEADSET | SND_JACK_BTN_1;
-        } else if (jack_data->intr_id & 0x4) {
-                pr_debug("headset or headphones inserted\n");
-                status = sn95031_get_headset_state(codec, jack_data->mfld_jack);
-        } else if (jack_data->intr_id & 0x8) {
-                pr_debug("headset or headphones removed\n");
-                status = 0;
-                sn95031_disable_jack_btn(codec);
-        } else {
-                pr_err("unidentified interrupt\n");
-                return;
-        }
-
-        snd_soc_jack_report(jack_data->mfld_jack, status, mask);
-        /*button pressed and released so we send explicit button release */
-        if ((status & SND_JACK_BTN_0) | (status & SND_JACK_BTN_1))
-                snd_soc_jack_report(jack_data->mfld_jack,
-                                SND_JACK_HEADSET, mask);
-}
-EXPORT_SYMBOL_GPL(sn95031_jack_detection);
-
-/* codec registration */
-static int sn95031_codec_probe(struct snd_soc_codec *codec)
-{
-        pr_debug("codec_probe called\n");
-
-        /* PCM interface config
-         * This sets the pcm rx slot conguration to max 6 slots
-         * for max 4 dais (2 stereo and 2 mono)
-         */
-        snd_soc_write(codec, SN95031_PCM2RXSLOT01, 0x10);
-        snd_soc_write(codec, SN95031_PCM2RXSLOT23, 0x32);
-        snd_soc_write(codec, SN95031_PCM2RXSLOT45, 0x54);
-        snd_soc_write(codec, SN95031_PCM2TXSLOT01, 0x10);
-        snd_soc_write(codec, SN95031_PCM2TXSLOT23, 0x32);
-        /* pcm port setting
-         * This sets the pcm port to slave and clock at 19.2Mhz which
-         * can support 6slots, sampling rate set per stream in hw-params
-         */
-        snd_soc_write(codec, SN95031_PCM1C1, 0x00);
-        snd_soc_write(codec, SN95031_PCM2C1, 0x01);
-        snd_soc_write(codec, SN95031_PCM2C2, 0x0A);
-        snd_soc_write(codec, SN95031_HSMIXER, BIT(0)|BIT(4));
-        /* vendor vibra workround, the vibras are muted by
-         * custom register so unmute them
-         */
-        snd_soc_write(codec, SN95031_SSR5, 0x80);
-        snd_soc_write(codec, SN95031_SSR6, 0x80);
-        snd_soc_write(codec, SN95031_VIB1C5, 0x00);
-        snd_soc_write(codec, SN95031_VIB2C5, 0x00);
-        /* configure vibras for pcm port */
-        snd_soc_write(codec, SN95031_VIB1C3, 0x00);
-        snd_soc_write(codec, SN95031_VIB2C3, 0x00);
-
-        /* soft mute ramp time */
-        snd_soc_write(codec, SN95031_SOFTMUTE, 0x3);
-        /* fix the initial volume at 1dB,
-         * default in +9dB,
-         * 1dB give optimal swing on DAC, amps
-         */
-        snd_soc_write(codec, SN95031_HSLVOLCTRL, 0x08);
-        snd_soc_write(codec, SN95031_HSRVOLCTRL, 0x08);
-        snd_soc_write(codec, SN95031_IHFLVOLCTRL, 0x08);
-        snd_soc_write(codec, SN95031_IHFRVOLCTRL, 0x08);
-        /* dac mode and lineout workaround */
-        snd_soc_write(codec, SN95031_SSR2, 0x10);
-        snd_soc_write(codec, SN95031_SSR3, 0x40);
-
-        return 0;
-}
-
-static const struct snd_soc_codec_driver sn95031_codec = {
-        .probe          = sn95031_codec_probe,
-        .set_bias_level = sn95031_set_vaud_bias,
-        .idle_bias_off  = true,
-
-        .component_driver = {
-                .controls               = sn95031_snd_controls,
-                .num_controls           = ARRAY_SIZE(sn95031_snd_controls),
-                .dapm_widgets           = sn95031_dapm_widgets,
-                .num_dapm_widgets       = ARRAY_SIZE(sn95031_dapm_widgets),
-                .dapm_routes            = sn95031_audio_map,
-                .num_dapm_routes        = ARRAY_SIZE(sn95031_audio_map),
-        },
-};
-
-static int sn95031_device_probe(struct platform_device *pdev)
-{
-        struct regmap *regmap;
-
-        pr_debug("codec device probe called for %s\n", dev_name(&pdev->dev));
-
-        regmap = devm_regmap_init(&pdev->dev, NULL, NULL, &sn95031_regmap);
-        if (IS_ERR(regmap))
-                return PTR_ERR(regmap);
-
-        return snd_soc_register_codec(&pdev->dev, &sn95031_codec,
-                        sn95031_dais, ARRAY_SIZE(sn95031_dais));
-}
-
-static int sn95031_device_remove(struct platform_device *pdev)
-{
-        pr_debug("codec device remove called\n");
-        snd_soc_unregister_codec(&pdev->dev);
-        return 0;
-}
-
-static struct platform_driver sn95031_codec_driver = {
-        .driver         = {
-                .name           = "sn95031",
-        },
-        .probe          = sn95031_device_probe,
-        .remove         = sn95031_device_remove,
-};
-
-module_platform_driver(sn95031_codec_driver);
-
-MODULE_DESCRIPTION("ASoC TI SN95031 codec driver");
-MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>");
-MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:sn95031");
diff --git a/sound/soc/codecs/sn95031.h b/sound/soc/codecs/sn95031.h
deleted file mode 100644
index 7651fe4e6a45..000000000000
--- a/sound/soc/codecs/sn95031.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *  sn95031.h - TI sn95031 Codec driver
- *
- *  Copyright (C) 2010 Intel Corp
- *  Author: Vinod Koul <vinod.koul@intel.com>
- *  Author: Harsha Priya <priya.harsha@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *
- */
-#ifndef _SN95031_H
-#define _SN95031_H
-
-/*register map*/
-#define SN95031_VAUD                    0xDB
-#define SN95031_VHSP                    0xDC
-#define SN95031_VHSN                    0xDD
-#define SN95031_VIHF                    0xC9
-
-#define SN95031_AUDPLLCTRL              0x240
-#define SN95031_DMICBUF0123             0x241
-#define SN95031_DMICBUF45               0x242
-#define SN95031_DMICGPO                 0x244
-#define SN95031_DMICMUX                 0x245
-#define SN95031_DMICLK                  0x246
-#define SN95031_MICBIAS                 0x247
-#define SN95031_ADCCONFIG               0x248
-#define SN95031_MICAMP1                 0x249
-#define SN95031_MICAMP2                 0x24A
-#define SN95031_NOISEMUX                0x24B
-#define SN95031_AUDIOMUX12              0x24C
-#define SN95031_AUDIOMUX34              0x24D
-#define SN95031_AUDIOSINC               0x24E
-#define SN95031_AUDIOTXEN               0x24F
-#define SN95031_HSEPRXCTRL              0x250
-#define SN95031_IHFRXCTRL               0x251
-#define SN95031_HSMIXER                 0x256
-#define SN95031_DACCONFIG               0x257
-#define SN95031_SOFTMUTE                0x258
-#define SN95031_HSLVOLCTRL              0x259
-#define SN95031_HSRVOLCTRL              0x25A
-#define SN95031_IHFLVOLCTRL             0x25B
-#define SN95031_IHFRVOLCTRL             0x25C
-#define SN95031_DRIVEREN                0x25D
-#define SN95031_LOCTL                   0x25E
-#define SN95031_VIB1C1                  0x25F
-#define SN95031_VIB1C2                  0x260
-#define SN95031_VIB1C3                  0x261
-#define SN95031_VIB1SPIPCM1             0x262
-#define SN95031_VIB1SPIPCM2             0x263
-#define SN95031_VIB1C5                  0x264
-#define SN95031_VIB2C1                  0x265
-#define SN95031_VIB2C2                  0x266
-#define SN95031_VIB2C3                  0x267
-#define SN95031_VIB2SPIPCM1             0x268
-#define SN95031_VIB2SPIPCM2             0x269
-#define SN95031_VIB2C5                  0x26A
-#define SN95031_BTNCTRL1                0x26B
-#define SN95031_BTNCTRL2                0x26C
-#define SN95031_PCM1TXSLOT01            0x26D
-#define SN95031_PCM1TXSLOT23            0x26E
-#define SN95031_PCM1TXSLOT45            0x26F
-#define SN95031_PCM1RXSLOT0_3           0x270
-#define SN95031_PCM1RXSLOT45            0x271
-#define SN95031_PCM2TXSLOT01            0x272
-#define SN95031_PCM2TXSLOT23            0x273
-#define SN95031_PCM2TXSLOT45            0x274
-#define SN95031_PCM2RXSLOT01            0x275
-#define SN95031_PCM2RXSLOT23            0x276
-#define SN95031_PCM2RXSLOT45            0x277
-#define SN95031_PCM1C1                  0x278
-#define SN95031_PCM1C2                  0x279
-#define SN95031_PCM1C3                  0x27A
-#define SN95031_PCM2C1                  0x27B
-#define SN95031_PCM2C2                  0x27C
-/*end codec register defn*/
-
-/*vendor defn these are not part of avp*/
-#define SN95031_SSR2                    0x381
-#define SN95031_SSR3                    0x382
-#define SN95031_SSR5                    0x384
-#define SN95031_SSR6                    0x385
-
-/* ADC registers */
-
-#define SN95031_ADC1CNTL1 0x1C0
-#define SN95031_ADC_ENBL 0x10
-#define SN95031_ADC_START 0x08
-#define SN95031_ADC1CNTL3 0x1C2
-#define SN95031_ADCTHERM_ENBL 0x04
-#define SN95031_ADCRRDATA_ENBL 0x05
-#define SN95031_STOPBIT_MASK 16
-#define SN95031_ADCTHERM_MASK 4
-#define SN95031_ADC_CHANLS_MAX 15 /* Number of ADC channels */
-#define SN95031_ADC_LOOP_MAX (SN95031_ADC_CHANLS_MAX - 1)
-#define SN95031_ADC_NO_LOOP 0x07
-#define SN95031_AUDIO_GPIO_CTRL 0x070
-
-/* ADC channel code values */
-#define SN95031_AUDIO_DETECT_CODE 0x06
-
-/* ADC base addresses */
-#define SN95031_ADC_CHNL_START_ADDR 0x1C5 /* increments by 1 */
-#define SN95031_ADC_DATA_START_ADDR 0x1D4  /* increments by 2 */
-/* multipier to convert to mV */
-#define SN95031_ADC_ONE_LSB_MULTIPLIER 2346
-
-
-struct mfld_jack_data {
-        int intr_id;
-        int micbias_vol;
-        struct snd_soc_jack *mfld_jack;
-};
-
-extern void sn95031_jack_detection(struct snd_soc_codec *codec,
-        struct mfld_jack_data *jack_data);
-
-#endif
diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c
index eedd600875e5..e7661d0315e6 100644
--- a/sound/soc/codecs/tscs42xx.c
+++ b/sound/soc/codecs/tscs42xx.c
@@ -355,8 +355,8 @@ static int dapm_micb_event(struct snd_soc_dapm_widget *w,
         return 0;
 }
 
-int pll_event(struct snd_soc_dapm_widget *w,
-                   struct snd_kcontrol *kcontrol, int event)
+static int pll_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);
         int ret;
@@ -369,8 +369,8 @@ int pll_event(struct snd_soc_dapm_widget *w,
         return ret;
 }
 
-int dac_event(struct snd_soc_dapm_widget *w,
-                   struct snd_kcontrol *kcontrol, int event)
+static int dac_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 tscs42xx *tscs42xx = snd_soc_codec_get_drvdata(codec);
@@ -631,7 +631,7 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = {
                         0, mic_boost_scale),
 
         /* Input Channel Map */
-        SOC_ENUM("Input Channel Map Switch", ch_map_select_enum),
+        SOC_ENUM("Input Channel Map", ch_map_select_enum),
 
         /* Coefficient Ram */
         COEFF_RAM_CTL("Cascade1L BiQuad1", BIQUAD_SIZE, 0x00),
@@ -708,13 +708,13 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = {
         /* EQ */
         SOC_SINGLE("EQ1 Switch", R_CONFIG1, FB_CONFIG1_EQ1_EN, 1, 0),
         SOC_SINGLE("EQ2 Switch", R_CONFIG1, FB_CONFIG1_EQ2_EN, 1, 0),
-        SOC_ENUM("EQ1 Band Enable Switch", eq1_band_enable_enum),
-        SOC_ENUM("EQ2 Band Enable Switch", eq2_band_enable_enum),
+        SOC_ENUM("EQ1 Band Enable", eq1_band_enable_enum),
+        SOC_ENUM("EQ2 Band Enable", eq2_band_enable_enum),
 
         /* CLE */
-        SOC_ENUM("CLE Level Detect Switch",
+        SOC_ENUM("CLE Level Detect",
                 cle_level_detection_enum),
-        SOC_ENUM("CLE Level Detect Win Switch",
+        SOC_ENUM("CLE Level Detect Win",
                 cle_level_detection_window_enum),
         SOC_SINGLE("Expander Switch",
                 R_CLECTL, FB_CLECTL_EXP_EN, 1, 0),
@@ -726,7 +726,7 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = {
                 R_MUGAIN, FB_MUGAIN_CLEMUG, 0x1f, 0, mugain_scale),
         SOC_SINGLE_TLV("Comp Thresh Playback Volume",
                 R_COMPTH, FB_COMPTH, 0xff, 0, compth_scale),
-        SOC_ENUM("Comp Ratio Switch", compressor_ratio_enum),
+        SOC_ENUM("Comp Ratio", compressor_ratio_enum),
         SND_SOC_BYTES("Comp Atk Time", R_CATKTCL, 2),
 
         /* Effects */
@@ -740,50 +740,50 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = {
         SOC_SINGLE("MBC Band1 Switch", R_DACMBCEN, FB_DACMBCEN_MBCEN1, 1, 0),
         SOC_SINGLE("MBC Band2 Switch", R_DACMBCEN, FB_DACMBCEN_MBCEN2, 1, 0),
         SOC_SINGLE("MBC Band3 Switch", R_DACMBCEN, FB_DACMBCEN_MBCEN3, 1, 0),
-        SOC_ENUM("MBC Band1 Level Detect Switch",
+        SOC_ENUM("MBC Band1 Level Detect",
                 mbc_level_detection_enums[0]),
-        SOC_ENUM("MBC Band2 Level Detect Switch",
+        SOC_ENUM("MBC Band2 Level Detect",
                 mbc_level_detection_enums[1]),
-        SOC_ENUM("MBC Band3 Level Detect Switch",
+        SOC_ENUM("MBC Band3 Level Detect",
                 mbc_level_detection_enums[2]),
-        SOC_ENUM("MBC Band1 Level Detect Win Switch",
+        SOC_ENUM("MBC Band1 Level Detect Win",
                 mbc_level_detection_window_enums[0]),
-        SOC_ENUM("MBC Band2 Level Detect Win Switch",
+        SOC_ENUM("MBC Band2 Level Detect Win",
                 mbc_level_detection_window_enums[1]),
-        SOC_ENUM("MBC Band3 Level Detect Win Switch",
+        SOC_ENUM("MBC Band3 Level Detect Win",
                 mbc_level_detection_window_enums[2]),
 
-        SOC_SINGLE("MBC1 Phase Invert", R_DACMBCMUG1, FB_DACMBCMUG1_PHASE,
-                1, 0),
+        SOC_SINGLE("MBC1 Phase Invert Switch",
+                R_DACMBCMUG1, FB_DACMBCMUG1_PHASE, 1, 0),
         SOC_SINGLE_TLV("DAC MBC1 Make-Up Gain Playback Volume",
                 R_DACMBCMUG1, FB_DACMBCMUG1_MUGAIN, 0x1f, 0, mugain_scale),
         SOC_SINGLE_TLV("DAC MBC1 Comp Thresh Playback Volume",
                 R_DACMBCTHR1, FB_DACMBCTHR1_THRESH, 0xff, 0, compth_scale),
-        SOC_ENUM("DAC MBC1 Comp Ratio Switch",
+        SOC_ENUM("DAC MBC1 Comp Ratio",
                 dac_mbc1_compressor_ratio_enum),
         SND_SOC_BYTES("DAC MBC1 Comp Atk Time", R_DACMBCATK1L, 2),
         SND_SOC_BYTES("DAC MBC1 Comp Rel Time Const",
                 R_DACMBCREL1L, 2),
 
-        SOC_SINGLE("MBC2 Phase Invert", R_DACMBCMUG2, FB_DACMBCMUG2_PHASE,
-                1, 0),
+        SOC_SINGLE("MBC2 Phase Invert Switch",
+                R_DACMBCMUG2, FB_DACMBCMUG2_PHASE, 1, 0),
         SOC_SINGLE_TLV("DAC MBC2 Make-Up Gain Playback Volume",
                 R_DACMBCMUG2, FB_DACMBCMUG2_MUGAIN, 0x1f, 0, mugain_scale),
         SOC_SINGLE_TLV("DAC MBC2 Comp Thresh Playback Volume",
                 R_DACMBCTHR2, FB_DACMBCTHR2_THRESH, 0xff, 0, compth_scale),
-        SOC_ENUM("DAC MBC2 Comp Ratio Switch",
+        SOC_ENUM("DAC MBC2 Comp Ratio",
                 dac_mbc2_compressor_ratio_enum),
         SND_SOC_BYTES("DAC MBC2 Comp Atk Time", R_DACMBCATK2L, 2),
         SND_SOC_BYTES("DAC MBC2 Comp Rel Time Const",
                 R_DACMBCREL2L, 2),
 
-        SOC_SINGLE("MBC3 Phase Invert", R_DACMBCMUG3, FB_DACMBCMUG3_PHASE,
-                1, 0),
+        SOC_SINGLE("MBC3 Phase Invert Switch",
+                R_DACMBCMUG3, FB_DACMBCMUG3_PHASE, 1, 0),
         SOC_SINGLE_TLV("DAC MBC3 Make-Up Gain Playback Volume",
                 R_DACMBCMUG3, FB_DACMBCMUG3_MUGAIN, 0x1f, 0, mugain_scale),
         SOC_SINGLE_TLV("DAC MBC3 Comp Thresh Playback Volume",
                 R_DACMBCTHR3, FB_DACMBCTHR3_THRESH, 0xff, 0, compth_scale),
-        SOC_ENUM("DAC MBC3 Comp Ratio Switch",
+        SOC_ENUM("DAC MBC3 Comp Ratio",
                 dac_mbc3_compressor_ratio_enum),
         SND_SOC_BYTES("DAC MBC3 Comp Atk Time", R_DACMBCATK3L, 2),
         SND_SOC_BYTES("DAC MBC3 Comp Rel Time Const",
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 0c11f434a374..8c2981b70f64 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -913,8 +913,8 @@ static int fsl_soc_dma_probe(struct platform_device *pdev)
         dma->dai.pcm_free = fsl_dma_free_dma_buffers;
 
         /* Store the SSI-specific information that we need */
-        dma->ssi_stx_phys = res.start + CCSR_SSI_STX0;
-        dma->ssi_srx_phys = res.start + CCSR_SSI_SRX0;
+        dma->ssi_stx_phys = res.start + REG_SSI_STX0;
+        dma->ssi_srx_phys = res.start + REG_SSI_SRX0;
 
         iprop = of_get_property(ssi_np, "fsl,fifo-depth", NULL);
         if (iprop)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 7b49d04e3c60..b0bd1938b71e 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -1,71 +1,123 @@
+config SND_SOC_INTEL_SST_TOPLEVEL
+        bool "Intel ASoC SST drivers"
+        default y
+        depends on X86 || COMPILE_TEST
+        select SND_SOC_INTEL_MACH
+        help
+          Intel ASoC SST Platform Drivers. If you have a Intel machine that
+          has an audio controller with a DSP and I2S or DMIC port, then
+          enable this option by saying Y
+
+          Note that the answer to this question doesn't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about Intel SST drivers.
+
+if SND_SOC_INTEL_SST_TOPLEVEL
+
 config SND_SST_IPC
         tristate
+        # This option controls the IPC core for HiFi2 platforms
 
 config SND_SST_IPC_PCI
         tristate
         select SND_SST_IPC
+        # This option controls the PCI-based IPC for HiFi2 platforms
+        #  (Medfield, Merrifield).
 
 config SND_SST_IPC_ACPI
         tristate
         select SND_SST_IPC
-        select SND_SOC_INTEL_SST
-        select IOSF_MBI
+        # This option controls the ACPI-based IPC for HiFi2 platforms
+        # (Baytrail, Cherrytrail)
 
-config SND_SOC_INTEL_COMMON
+config SND_SOC_INTEL_SST_ACPI
         tristate
+        # This option controls ACPI-based probing on
+        # Haswell/Broadwell/Baytrail legacy and will be set
+        # when these platforms are enabled
 
 config SND_SOC_INTEL_SST
         tristate
-        select SND_SOC_INTEL_SST_ACPI if ACPI
 
 config SND_SOC_INTEL_SST_FIRMWARE
         tristate
         select DW_DMAC_CORE
-
-config SND_SOC_INTEL_SST_ACPI
-        tristate
-
-config SND_SOC_ACPI_INTEL_MATCH
-        tristate
-        select SND_SOC_ACPI if ACPI
-
-config SND_SOC_INTEL_SST_TOPLEVEL
-        tristate "Intel ASoC SST drivers"
-        depends on X86 || COMPILE_TEST
-        select SND_SOC_INTEL_MACH
-        select SND_SOC_INTEL_COMMON
-        help
-          Intel ASoC Audio Drivers. If you have a Intel machine that
-          has audio controller with a DSP and I2S or DMIC port, then
-          enable this option by saying Y or M
-          If unsure select "N".
+        # This option controls firmware download on
+        # Haswell/Broadwell/Baytrail legacy and will be set
+        # when these platforms are enabled
 
 config SND_SOC_INTEL_HASWELL
-        tristate "Intel ASoC SST driver for Haswell/Broadwell"
-        depends on SND_SOC_INTEL_SST_TOPLEVEL && SND_DMA_SGBUF
-        depends on DMADEVICES
+        tristate "Haswell/Broadwell Platforms"
+        depends on SND_DMA_SGBUF
+        depends on DMADEVICES && ACPI
         select SND_SOC_INTEL_SST
+        select SND_SOC_INTEL_SST_ACPI
         select SND_SOC_INTEL_SST_FIRMWARE
+        select SND_SOC_ACPI_INTEL_MATCH
+        help
+          If you have a Intel Haswell or Broadwell platform connected to
+          an I2S codec, then enable this option by saying Y or m. This is
+          typically used for Chromebooks. This is a recommended option.
 
 config SND_SOC_INTEL_BAYTRAIL
-        tristate "Intel ASoC SST driver for Baytrail (legacy)"
-        depends on SND_SOC_INTEL_SST_TOPLEVEL
-        depends on DMADEVICES
+        tristate "Baytrail (legacy) Platforms"
+        depends on DMADEVICES && ACPI
         select SND_SOC_INTEL_SST
+        select SND_SOC_INTEL_SST_ACPI
         select SND_SOC_INTEL_SST_FIRMWARE
+        select SND_SOC_ACPI_INTEL_MATCH
+        help
+          If you have a Intel Baytrail platform connected to an I2S codec,
+          then enable this option by saying Y or m. This was typically used
+          for Baytrail Chromebooks but this option is now deprecated and is
+          not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.
+
+config SND_SST_ATOM_HIFI2_PLATFORM_PCI
+        tristate "PCI HiFi2 (Medfield, Merrifield) Platforms"
+        depends on X86 && PCI
+        select SND_SST_IPC_PCI
+        select SND_SOC_COMPRESS
+        select SND_SOC_INTEL_COMMON
+        help
+          If you have a Intel Medfield or Merrifield/Edison platform, then
+          enable this option by saying Y or m. Distros will typically not
+          enable this option: Medfield devices are not available to
+          developers and while Merrifield/Edison can run a mainline kernel with
+          limited functionality it will require a firmware file which
+          is not in the standard firmware tree
 
 config SND_SST_ATOM_HIFI2_PLATFORM
-        tristate "Intel ASoC SST driver for HiFi2 platforms (*field, *trail)"
-        depends on SND_SOC_INTEL_SST_TOPLEVEL && X86
+        tristate "ACPI HiFi2 (Baytrail, Cherrytrail) Platforms"
+        depends on X86 && ACPI
+        select SND_SST_IPC_ACPI
         select SND_SOC_COMPRESS
+        select SND_SOC_ACPI_INTEL_MATCH
+        select IOSF_MBI
+        help
+          If you have a Intel Baytrail or Cherrytrail platform with an I2S
+          codec, then enable this option by saying Y or m. This is a
+          recommended option
 
 config SND_SOC_INTEL_SKYLAKE
-        tristate "Intel ASoC SST driver for SKL/BXT/KBL/GLK/CNL"
-        depends on SND_SOC_INTEL_SST_TOPLEVEL && PCI && ACPI
+        tristate "SKL/BXT/KBL/GLK/CNL... Platforms"
+        depends on PCI && ACPI
         select SND_HDA_EXT_CORE
         select SND_HDA_DSP_LOADER
         select SND_SOC_TOPOLOGY
         select SND_SOC_INTEL_SST
+        select SND_SOC_ACPI_INTEL_MATCH
+        help
+          If you have a Intel Skylake/Broxton/ApolloLake/KabyLake/
+          GeminiLake or CannonLake platform with the DSP enabled in the BIOS
+          then enable this option by saying Y or m.
+
+config SND_SOC_ACPI_INTEL_MATCH
+        tristate
+        select SND_SOC_ACPI if ACPI
+        # this option controls the compilation of ACPI matching tables and
+        # helpers and is not meant to be selected by the user.
+
+endif ## SND_SOC_INTEL_SST_TOPLEVEL
 
 # ASoC codec drivers
 source "sound/soc/intel/boards/Kconfig"
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile
index b973d457e834..8160520fd74c 100644
--- a/sound/soc/intel/Makefile
+++ b/sound/soc/intel/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # Core support
-obj-$(CONFIG_SND_SOC_INTEL_COMMON) += common/
+obj-$(CONFIG_SND_SOC) += common/
 
 # Platform Support
 obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/
diff --git a/sound/soc/intel/atom/sst/sst_stream.c b/sound/soc/intel/atom/sst/sst_stream.c
index 65e257b17a7e..7ee6aeb7e0af 100644
--- a/sound/soc/intel/atom/sst/sst_stream.c
+++ b/sound/soc/intel/atom/sst/sst_stream.c
@@ -220,10 +220,10 @@ int sst_send_byte_stream_mrfld(struct intel_sst_drv *sst_drv_ctx,
                 sst_free_block(sst_drv_ctx, block);
 out:
         test_and_clear_bit(pvt_id, &sst_drv_ctx->pvt_id);
-        return 0;
+        return ret;
 }
 
-/*
+/**
  * sst_pause_stream - Send msg for a pausing stream
  * @str_id:      stream ID
  *
@@ -261,7 +261,7 @@ int sst_pause_stream(struct intel_sst_drv *sst_drv_ctx, int str_id)
                 }
         } else {
                 retval = -EBADRQC;
-                dev_dbg(sst_drv_ctx->dev, "SST DBG:BADRQC for stream\n ");
+                dev_dbg(sst_drv_ctx->dev, "SST DBG:BADRQC for stream\n");
         }
 
         return retval;
@@ -284,7 +284,7 @@ int sst_resume_stream(struct intel_sst_drv *sst_drv_ctx, int str_id)
         if (!str_info)
                 return -EINVAL;
         if (str_info->status == STREAM_RUNNING)
-                        return 0;
+                return 0;
         if (str_info->status == STREAM_PAUSED) {
                 retval = sst_prepare_and_post_msg(sst_drv_ctx, str_info->task_id,
                                 IPC_CMD, IPC_IA_RESUME_STREAM_MRFLD,
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 6f754708a48c..de598dcbef30 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -1,183 +1,182 @@
-config SND_SOC_INTEL_MACH
-        tristate "Intel Audio machine drivers"
+menuconfig SND_SOC_INTEL_MACH
+        bool "Intel Machine drivers"
         depends on SND_SOC_INTEL_SST_TOPLEVEL
-        select SND_SOC_ACPI_INTEL_MATCH if ACPI
+        help
+         Intel ASoC Machine Drivers. If you have a Intel machine that
+         has an audio controller with a DSP and I2S or DMIC port, then
+         enable this option by saying Y
+
+         Note that the answer to this question doesn't directly affect the
+         kernel: saying N will just cause the configurator to skip all
+         the questions about Intel ASoC machine drivers.
 
 if SND_SOC_INTEL_MACH
 
-config SND_MFLD_MACHINE
-        tristate "SOC Machine Audio driver for Intel Medfield MID platform"
-        depends on INTEL_SCU_IPC
-        select SND_SOC_SN95031
-        depends on SND_SST_ATOM_HIFI2_PLATFORM
-        select SND_SST_IPC_PCI
-        help
-          This adds support for ASoC machine driver for Intel(R) MID Medfield platform
-          used as alsa device in audio substem in Intel(R) MID devices
-          Say Y if you have such a device.
-          If unsure select "N".
+if SND_SOC_INTEL_HASWELL
 
 config SND_SOC_INTEL_HASWELL_MACH
-        tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
+        tristate "Haswell Lynxpoint"
         depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
-        depends on SND_SOC_INTEL_HASWELL
         select SND_SOC_RT5640
         help
           This adds support for the Lynxpoint Audio DSP on Intel(R) Haswell
-          Ultrabook platforms.
-          Say Y if you have such a device.
+          Ultrabook platforms. This is a recommended option.
+          Say Y or m if you have such a device.
           If unsure select "N".
 
 config SND_SOC_INTEL_BDW_RT5677_MACH
-        tristate "ASoC Audio driver for Intel Broadwell with RT5677 codec"
-        depends on X86_INTEL_LPSS && GPIOLIB && I2C
-        depends on SND_SOC_INTEL_HASWELL
+        tristate "Broadwell with RT5677 codec"
+        depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM && GPIOLIB
         select SND_SOC_RT5677
         help
           This adds support for Intel Broadwell platform based boards with
-          the RT5677 audio codec.
+          the RT5677 audio codec. This is a recommended option.
+          Say Y or m if you have such a device.
+          If unsure select "N".
 
 config SND_SOC_INTEL_BROADWELL_MACH
-        tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"
+        tristate "Broadwell Wildcatpoint"
         depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
-        depends on SND_SOC_INTEL_HASWELL
         select SND_SOC_RT286
         help
           This adds support for the Wilcatpoint Audio DSP on Intel(R) Broadwell
           Ultrabook platforms.
-          Say Y if you have such a device.
+          Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
+endif ## SND_SOC_INTEL_HASWELL
+
+if SND_SOC_INTEL_BAYTRAIL
 
 config SND_SOC_INTEL_BYT_MAX98090_MACH
-        tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"
+        tristate "Baytrail with MAX98090 codec"
         depends on X86_INTEL_LPSS && I2C
-        depends on SND_SST_IPC_ACPI = n
-        depends on SND_SOC_INTEL_BAYTRAIL
         select SND_SOC_MAX98090
         help
           This adds audio driver for Intel Baytrail platform based boards
-          with the MAX98090 audio codec.
+          with the MAX98090 audio codec. This driver is deprecated, use
+          SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH instead for better
+          functionality.
 
 config SND_SOC_INTEL_BYT_RT5640_MACH
-        tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"
+        tristate "Baytrail with RT5640 codec"
         depends on X86_INTEL_LPSS && I2C
-        depends on SND_SST_IPC_ACPI = n
-        depends on SND_SOC_INTEL_BAYTRAIL
         select SND_SOC_RT5640
         help
           This adds audio driver for Intel Baytrail platform based boards
           with the RT5640 audio codec. This driver is deprecated, use
           SND_SOC_INTEL_BYTCR_RT5640_MACH instead for better functionality.
 
+endif ## SND_SOC_INTEL_BAYTRAIL
+
+if SND_SST_ATOM_HIFI2_PLATFORM
+
 config SND_SOC_INTEL_BYTCR_RT5640_MACH
-        tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5640 codec"
-        depends on X86 && I2C && ACPI
+        tristate "Baytrail and Baytrail-CR with RT5640 codec"
+        depends on X86_INTEL_LPSS && I2C && ACPI
+        select SND_SOC_ACPI
         select SND_SOC_RT5640
-        depends on SND_SST_ATOM_HIFI2_PLATFORM
-        select SND_SST_IPC_ACPI
         help
-          This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
-          platforms with RT5640 audio codec.
-          Say Y if you have such a device.
-          If unsure select "N".
+          This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
+          platforms with RT5640 audio codec.
+          Say Y or m if you have such a device. This is a recommended option.
+          If unsure select "N".
 
 config SND_SOC_INTEL_BYTCR_RT5651_MACH
-        tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec"
-        depends on X86 && I2C && ACPI
+        tristate "Baytrail and Baytrail-CR with RT5651 codec"
+        depends on X86_INTEL_LPSS && I2C && ACPI
+        select SND_SOC_ACPI
         select SND_SOC_RT5651
-        depends on SND_SST_ATOM_HIFI2_PLATFORM
-        select SND_SST_IPC_ACPI
         help
-          This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
-          platforms with RT5651 audio codec.
-          Say Y if you have such a device.
-          If unsure select "N".
+          This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR
+          platforms with RT5651 audio codec.
+          Say Y or m if you have such a device. This is a recommended option.
+          If unsure select "N".
 
 config SND_SOC_INTEL_CHT_BSW_RT5672_MACH
-        tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5672 codec"
+        tristate "Cherrytrail & Braswell with RT5672 codec"
         depends on X86_INTEL_LPSS && I2C && ACPI
-        select SND_SOC_RT5670
-        depends on SND_SST_ATOM_HIFI2_PLATFORM
-        select SND_SST_IPC_ACPI
+        select SND_SOC_ACPI
+        select SND_SOC_RT5670
         help
           This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
           platforms with RT5672 audio codec.
-          Say Y if you have such a device.
+          Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
 
 config SND_SOC_INTEL_CHT_BSW_RT5645_MACH
-        tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with RT5645/5650 codec"
+        tristate "Cherrytrail & Braswell with RT5645/5650 codec"
         depends on X86_INTEL_LPSS && I2C && ACPI
+        select SND_SOC_ACPI
         select SND_SOC_RT5645
-        depends on SND_SST_ATOM_HIFI2_PLATFORM
-        select SND_SST_IPC_ACPI
         help
           This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
           platforms with RT5645/5650 audio codec.
+          Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
 
 config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
-        tristate "ASoC Audio driver for Intel Cherrytrail & Braswell with MAX98090 & TI codec"
+        tristate "Cherrytrail & Braswell with MAX98090 & TI codec"
         depends on X86_INTEL_LPSS && I2C && ACPI
         select SND_SOC_MAX98090
         select SND_SOC_TS3A227E
-        depends on SND_SST_ATOM_HIFI2_PLATFORM
-        select SND_SST_IPC_ACPI
         help
           This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell
           platforms with MAX98090 audio codec it also can support TI jack chip as aux device.
+          Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
 
 config SND_SOC_INTEL_BYT_CHT_DA7213_MACH
-        tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with DA7212/7213 codec"
+        tristate "Baytrail & Cherrytrail with DA7212/7213 codec"
         depends on X86_INTEL_LPSS && I2C && ACPI
+        select SND_SOC_ACPI
         select SND_SOC_DA7213
-        depends on SND_SST_ATOM_HIFI2_PLATFORM
-        select SND_SST_IPC_ACPI
         help
           This adds support for ASoC machine driver for Intel(R) Baytrail & CherryTrail
           platforms with DA7212/7213 audio codec.
+          Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
 
 config SND_SOC_INTEL_BYT_CHT_ES8316_MACH
-        tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail with ES8316 codec"
+        tristate "Baytrail & Cherrytrail with ES8316 codec"
         depends on X86_INTEL_LPSS && I2C && ACPI
         select SND_SOC_ES8316
-        depends on SND_SST_ATOM_HIFI2_PLATFORM
-        select SND_SST_IPC_ACPI
         help
           This adds support for ASoC machine driver for Intel(R) Baytrail &
           Cherrytrail platforms with ES8316 audio codec.
+          Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
 
 config SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
-        tristate "ASoC Audio driver for Intel Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
+        tristate "Baytrail & Cherrytrail platform with no codec (MinnowBoard MAX, Up)"
         depends on X86_INTEL_LPSS && I2C && ACPI
-        depends on SND_SST_ATOM_HIFI2_PLATFORM
-        select SND_SST_IPC_ACPI
         help
           This adds support for ASoC machine driver for the MinnowBoard Max or
           Up boards and provides access to I2S signals on the Low-Speed
-          connector
+          connector. This is not a recommended option outside of these cases.
+          It is not intended to be enabled by distros by default.
+          Say Y or m if you have such a device.
+
           If unsure select "N".
 
+endif ## SND_SST_ATOM_HIFI2_PLATFORM
+
+if SND_SOC_INTEL_SKYLAKE
+
 config SND_SOC_INTEL_SKL_RT286_MACH
-        tristate "ASoC Audio driver for SKL with RT286 I2S mode"
-        depends on X86 && ACPI && I2C
-        depends on SND_SOC_INTEL_SKYLAKE
+        tristate "SKL with RT286 I2S mode"
+        depends on MFD_INTEL_LPSS && I2C && ACPI
         select SND_SOC_RT286
         select SND_SOC_DMIC
         select SND_SOC_HDAC_HDMI
         help
            This adds support for ASoC machine driver for Skylake platforms
            with RT286 I2S audio codec.
-           Say Y if you have such a device.
+           Say Y or m if you have such a device.
            If unsure select "N".
 
 config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
-        tristate "ASoC Audio driver for SKL with NAU88L25 and SSM4567 in I2S Mode"
-        depends on X86_INTEL_LPSS && I2C
-        depends on SND_SOC_INTEL_SKYLAKE
+        tristate "SKL with NAU88L25 and SSM4567 in I2S Mode"
+        depends on MFD_INTEL_LPSS && I2C && ACPI
         select SND_SOC_NAU8825
         select SND_SOC_SSM4567
         select SND_SOC_DMIC
@@ -185,13 +184,12 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
         help
           This adds support for ASoC Onboard Codec I2S machine driver. This will
           create an alsa sound card for NAU88L25 + SSM4567.
-          Say Y if you have such a device.
+          Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
 
 config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
-        tristate "ASoC Audio driver for SKL with NAU88L25 and MAX98357A in I2S Mode"
-        depends on X86_INTEL_LPSS && I2C
-        depends on SND_SOC_INTEL_SKYLAKE
+        tristate "SKL with NAU88L25 and MAX98357A in I2S Mode"
+        depends on MFD_INTEL_LPSS && I2C && ACPI
         select SND_SOC_NAU8825
         select SND_SOC_MAX98357A
         select SND_SOC_DMIC
@@ -199,13 +197,12 @@ config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
         help
           This adds support for ASoC Onboard Codec I2S machine driver. This will
           create an alsa sound card for NAU88L25 + MAX98357A.
-          Say Y if you have such a device.
+          Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
 
 config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
-        tristate "ASoC Audio driver for Broxton with DA7219 and MAX98357A in I2S Mode"
-        depends on X86 && ACPI && I2C
-        depends on SND_SOC_INTEL_SKYLAKE
+        tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
+        depends on MFD_INTEL_LPSS && I2C && ACPI
         select SND_SOC_DA7219
         select SND_SOC_MAX98357A
         select SND_SOC_DMIC
@@ -214,13 +211,12 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
         help
            This adds support for ASoC machine driver for Broxton-P platforms
            with DA7219 + MAX98357A I2S audio codec.
-           Say Y if you have such a device.
+           Say Y or m if you have such a device. This is a recommended option.
            If unsure select "N".
 
 config SND_SOC_INTEL_BXT_RT298_MACH
-        tristate "ASoC Audio driver for Broxton with RT298 I2S mode"
-        depends on X86 && ACPI && I2C
-        depends on SND_SOC_INTEL_SKYLAKE
+        tristate "Broxton with RT298 I2S mode"
+        depends on MFD_INTEL_LPSS && I2C && ACPI
         select SND_SOC_RT298
         select SND_SOC_DMIC
         select SND_SOC_HDAC_HDMI
@@ -228,14 +224,12 @@ config SND_SOC_INTEL_BXT_RT298_MACH
         help
            This adds support for ASoC machine driver for Broxton platforms
            with RT286 I2S audio codec.
-           Say Y if you have such a device.
+           Say Y or m if you have such a device. This is a recommended option.
            If unsure select "N".
 
 config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
-        tristate "ASoC Audio driver for KBL with RT5663 and MAX98927 in I2S Mode"
-        depends on X86_INTEL_LPSS && I2C
-        select SND_SOC_INTEL_SST
-        depends on SND_SOC_INTEL_SKYLAKE
+        tristate "KBL with RT5663 and MAX98927 in I2S Mode"
+        depends on MFD_INTEL_LPSS && I2C && ACPI
         select SND_SOC_RT5663
         select SND_SOC_MAX98927
         select SND_SOC_DMIC
@@ -243,14 +237,13 @@ config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
         help
           This adds support for ASoC Onboard Codec I2S machine driver. This will
           create an alsa sound card for RT5663 + MAX98927.
-          Say Y if you have such a device.
+          Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
 
 config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
-        tristate "ASoC Audio driver for KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
-        depends on X86_INTEL_LPSS && I2C && SPI
-        select SND_SOC_INTEL_SST
-        depends on SND_SOC_INTEL_SKYLAKE
+        tristate "KBL with RT5663, RT5514 and MAX98927 in I2S Mode"
+        depends on MFD_INTEL_LPSS && I2C && ACPI
+        depends on SPI
         select SND_SOC_RT5663
         select SND_SOC_RT5514
         select SND_SOC_RT5514_SPI
@@ -259,7 +252,8 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
         help
           This adds support for ASoC Onboard Codec I2S machine driver. This will
           create an alsa sound card for RT5663 + RT5514 + MAX98927.
-          Say Y if you have such a device.
+          Say Y or m if you have such a device. This is a recommended option.
           If unsure select "N".
+endif ## SND_SOC_INTEL_SKYLAKE
 
-endif
+endif ## SND_SOC_INTEL_MACH
diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index 488ec48f296a..22c9cc5d135e 100644
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -39,6 +39,7 @@ enum {
         BYT_RT5651_IN1_MAP,
         BYT_RT5651_IN2_MAP,
         BYT_RT5651_IN1_IN2_MAP,
+        BYT_RT5651_IN3_MAP,
 };
 
 #define BYT_RT5651_MAP(quirk)   ((quirk) & GENMASK(7, 0))
@@ -63,6 +64,8 @@ static void log_quirks(struct device *dev)
                 dev_info(dev, "quirk IN1_MAP enabled");
         if (BYT_RT5651_MAP(byt_rt5651_quirk) == BYT_RT5651_IN2_MAP)
                 dev_info(dev, "quirk IN2_MAP enabled");
+        if (BYT_RT5651_MAP(byt_rt5651_quirk) == BYT_RT5651_IN3_MAP)
+                dev_info(dev, "quirk IN3_MAP enabled");
         if (byt_rt5651_quirk & BYT_RT5651_DMIC_EN)
                 dev_info(dev, "quirk DMIC enabled");
         if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN)
@@ -128,6 +131,7 @@ static const struct snd_soc_dapm_widget byt_rt5651_widgets[] = {
         SND_SOC_DAPM_MIC("Headset Mic", NULL),
         SND_SOC_DAPM_MIC("Internal Mic", NULL),
         SND_SOC_DAPM_SPK("Speaker", NULL),
+        SND_SOC_DAPM_LINE("Line In", NULL),
         SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,
                             platform_clock_control, SND_SOC_DAPM_PRE_PMU |
                             SND_SOC_DAPM_POST_PMD),
@@ -139,6 +143,7 @@ static const struct snd_soc_dapm_route byt_rt5651_audio_map[] = {
         {"Headset Mic", NULL, "Platform Clock"},
         {"Internal Mic", NULL, "Platform Clock"},
         {"Speaker", NULL, "Platform Clock"},
+        {"Line In", NULL, "Platform Clock"},
 
         {"AIF1 Playback", NULL, "ssp2 Tx"},
         {"ssp2 Tx", NULL, "codec_out0"},
@@ -152,6 +157,9 @@ static const struct snd_soc_dapm_route byt_rt5651_audio_map[] = {
         {"Headphone", NULL, "HPOR"},
         {"Speaker", NULL, "LOUTL"},
         {"Speaker", NULL, "LOUTR"},
+        {"IN2P", NULL, "Line In"},
+        {"IN2N", NULL, "Line In"},
+
 };
 
 static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic_map[] = {
@@ -179,11 +187,18 @@ static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_in2_map[] = {
         {"IN3P", NULL, "Headset Mic"},
 };
 
+static const struct snd_soc_dapm_route byt_rt5651_intmic_in3_map[] = {
+        {"Internal Mic", NULL, "micbias1"},
+        {"IN3P", NULL, "Headset Mic"},
+        {"IN1P", NULL, "Internal Mic"},
+};
+
 static const struct snd_kcontrol_new byt_rt5651_controls[] = {
         SOC_DAPM_PIN_SWITCH("Headphone"),
         SOC_DAPM_PIN_SWITCH("Headset Mic"),
         SOC_DAPM_PIN_SWITCH("Internal Mic"),
         SOC_DAPM_PIN_SWITCH("Speaker"),
+        SOC_DAPM_PIN_SWITCH("Line In"),
 };
 
 static struct snd_soc_jack_pin bytcr_jack_pins[] = {
@@ -255,8 +270,16 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Circuitco"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Max B3 PLATFORM"),
                 },
-                .driver_data = (void *)(BYT_RT5651_DMIC_MAP |
-                                        BYT_RT5651_DMIC_EN),
+                .driver_data = (void *)(BYT_RT5651_IN3_MAP),
+        },
+        {
+                .callback = byt_rt5651_quirk_cb,
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ADI"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Turbot"),
+                },
+                .driver_data = (void *)(BYT_RT5651_MCLK_EN |
+                                        BYT_RT5651_IN3_MAP),
         },
         {
                 .callback = byt_rt5651_quirk_cb,
@@ -264,7 +287,8 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
                         DMI_MATCH(DMI_SYS_VENDOR, "KIANO"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "KIANO SlimNote 14.2"),
                 },
-                .driver_data = (void *)(BYT_RT5651_IN1_IN2_MAP),
+                .driver_data = (void *)(BYT_RT5651_MCLK_EN |
+                                        BYT_RT5651_IN1_IN2_MAP),
         },
         {}
 };
@@ -293,6 +317,10 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
                 custom_map = byt_rt5651_intmic_in1_in2_map;
                 num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_in2_map);
                 break;
+        case BYT_RT5651_IN3_MAP:
+                custom_map = byt_rt5651_intmic_in3_map;
+                num_routes = ARRAY_SIZE(byt_rt5651_intmic_in3_map);
+                break;
         default:
                 custom_map = byt_rt5651_intmic_dmic_map;
                 num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic_map);
diff --git a/sound/soc/intel/boards/mfld_machine.c b/sound/soc/intel/boards/mfld_machine.c
deleted file mode 100644
index 7cb44fdde1ee..000000000000
--- a/sound/soc/intel/boards/mfld_machine.c
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- *  mfld_machine.c - ASoc Machine driver for Intel Medfield MID platform
- *
- *  Copyright (C) 2010 Intel Corp
- *  Author: Vinod Koul <vinod.koul@intel.com>
- *  Author: Harsha Priya <priya.harsha@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/slab.h>
-#include <linux/io.h>
-#include <linux/module.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/soc.h>
-#include <sound/jack.h>
-#include "../codecs/sn95031.h"
-
-#define MID_MONO 1
-#define MID_STEREO 2
-#define MID_MAX_CAP 5
-#define MFLD_JACK_INSERT 0x04
-
-enum soc_mic_bias_zones {
-        MFLD_MV_START = 0,
-        /* mic bias volutage range for Headphones*/
-        MFLD_MV_HP = 400,
-        /* mic bias volutage range for American Headset*/
-        MFLD_MV_AM_HS = 650,
-        /* mic bias volutage range for Headset*/
-        MFLD_MV_HS = 2000,
-        MFLD_MV_UNDEFINED,
-};
-
-static unsigned int     hs_switch;
-static unsigned int     lo_dac;
-static struct snd_soc_codec *mfld_codec;
-
-struct mfld_mc_private {
-        void __iomem *int_base;
-        u8 interrupt_status;
-};
-
-struct snd_soc_jack mfld_jack;
-
-/*Headset jack detection DAPM pins */
-static struct snd_soc_jack_pin mfld_jack_pins[] = {
-        {
-                .pin = "Headphones",
-                .mask = SND_JACK_HEADPHONE,
-        },
-        {
-                .pin = "AMIC1",
-                .mask = SND_JACK_MICROPHONE,
-        },
-};
-
-/* jack detection voltage zones */
-static struct snd_soc_jack_zone mfld_zones[] = {
-        {MFLD_MV_START, MFLD_MV_AM_HS, SND_JACK_HEADPHONE},
-        {MFLD_MV_AM_HS, MFLD_MV_HS, SND_JACK_HEADSET},
-};
-
-/* sound card controls */
-static const char * const headset_switch_text[] = {"Earpiece", "Headset"};
-
-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);
-
-static const struct soc_enum lo_enum =
-        SOC_ENUM_SINGLE_EXT(4, lo_text);
-
-static int headset_get_switch(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol)
-{
-        ucontrol->value.enumerated.item[0] = hs_switch;
-        return 0;
-}
-
-static int headset_set_switch(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol)
-{
-        struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-        struct snd_soc_dapm_context *dapm = &card->dapm;
-
-        if (ucontrol->value.enumerated.item[0] == hs_switch)
-                return 0;
-
-        snd_soc_dapm_mutex_lock(dapm);
-
-        if (ucontrol->value.enumerated.item[0]) {
-                pr_debug("hs_set HS path\n");
-                snd_soc_dapm_enable_pin_unlocked(dapm, "Headphones");
-                snd_soc_dapm_disable_pin_unlocked(dapm, "EPOUT");
-        } else {
-                pr_debug("hs_set EP path\n");
-                snd_soc_dapm_disable_pin_unlocked(dapm, "Headphones");
-                snd_soc_dapm_enable_pin_unlocked(dapm, "EPOUT");
-        }
-
-        snd_soc_dapm_sync_unlocked(dapm);
-
-        snd_soc_dapm_mutex_unlock(dapm);
-
-        hs_switch = ucontrol->value.enumerated.item[0];
-
-        return 0;
-}
-
-static void lo_enable_out_pins(struct snd_soc_dapm_context *dapm)
-{
-        snd_soc_dapm_enable_pin_unlocked(dapm, "IHFOUTL");
-        snd_soc_dapm_enable_pin_unlocked(dapm, "IHFOUTR");
-        snd_soc_dapm_enable_pin_unlocked(dapm, "LINEOUTL");
-        snd_soc_dapm_enable_pin_unlocked(dapm, "LINEOUTR");
-        snd_soc_dapm_enable_pin_unlocked(dapm, "VIB1OUT");
-        snd_soc_dapm_enable_pin_unlocked(dapm, "VIB2OUT");
-        if (hs_switch) {
-                snd_soc_dapm_enable_pin_unlocked(dapm, "Headphones");
-                snd_soc_dapm_disable_pin_unlocked(dapm, "EPOUT");
-        } else {
-                snd_soc_dapm_disable_pin_unlocked(dapm, "Headphones");
-                snd_soc_dapm_enable_pin_unlocked(dapm, "EPOUT");
-        }
-}
-
-static int lo_get_switch(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol)
-{
-        ucontrol->value.enumerated.item[0] = lo_dac;
-        return 0;
-}
-
-static int lo_set_switch(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol)
-{
-        struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-        struct snd_soc_dapm_context *dapm = &card->dapm;
-
-        if (ucontrol->value.enumerated.item[0] == lo_dac)
-                return 0;
-
-        snd_soc_dapm_mutex_lock(dapm);
-
-        /* we dont want to work with last state of lineout so just enable all
-         * pins and then disable pins not required
-         */
-        lo_enable_out_pins(dapm);
-
-        switch (ucontrol->value.enumerated.item[0]) {
-        case 0:
-                pr_debug("set vibra path\n");
-                snd_soc_dapm_disable_pin_unlocked(dapm, "VIB1OUT");
-                snd_soc_dapm_disable_pin_unlocked(dapm, "VIB2OUT");
-                snd_soc_update_bits(mfld_codec, SN95031_LOCTL, 0x66, 0);
-                break;
-
-        case 1:
-                pr_debug("set hs  path\n");
-                snd_soc_dapm_disable_pin_unlocked(dapm, "Headphones");
-                snd_soc_dapm_disable_pin_unlocked(dapm, "EPOUT");
-                snd_soc_update_bits(mfld_codec, SN95031_LOCTL, 0x66, 0x22);
-                break;
-
-        case 2:
-                pr_debug("set spkr path\n");
-                snd_soc_dapm_disable_pin_unlocked(dapm, "IHFOUTL");
-                snd_soc_dapm_disable_pin_unlocked(dapm, "IHFOUTR");
-                snd_soc_update_bits(mfld_codec, SN95031_LOCTL, 0x66, 0x44);
-                break;
-
-        case 3:
-                pr_debug("set null path\n");
-                snd_soc_dapm_disable_pin_unlocked(dapm, "LINEOUTL");
-                snd_soc_dapm_disable_pin_unlocked(dapm, "LINEOUTR");
-                snd_soc_update_bits(mfld_codec, SN95031_LOCTL, 0x66, 0x66);
-                break;
-        }
-
-        snd_soc_dapm_sync_unlocked(dapm);
-
-        snd_soc_dapm_mutex_unlock(dapm);
-
-        lo_dac = ucontrol->value.enumerated.item[0];
-        return 0;
-}
-
-static const struct snd_kcontrol_new mfld_snd_controls[] = {
-        SOC_ENUM_EXT("Playback Switch", headset_enum,
-                        headset_get_switch, headset_set_switch),
-        SOC_ENUM_EXT("Lineout Mux", lo_enum,
-                        lo_get_switch, lo_set_switch),
-};
-
-static const struct snd_soc_dapm_widget mfld_widgets[] = {
-        SND_SOC_DAPM_HP("Headphones", NULL),
-        SND_SOC_DAPM_MIC("Mic", NULL),
-};
-
-static const struct snd_soc_dapm_route mfld_map[] = {
-        {"Headphones", NULL, "HPOUTR"},
-        {"Headphones", NULL, "HPOUTL"},
-        {"Mic", NULL, "AMIC1"},
-};
-
-static void mfld_jack_check(unsigned int intr_status)
-{
-        struct mfld_jack_data jack_data;
-
-        if (!mfld_codec)
-                return;
-
-        jack_data.mfld_jack = &mfld_jack;
-        jack_data.intr_id = intr_status;
-
-        sn95031_jack_detection(mfld_codec, &jack_data);
-        /* TODO: add american headset detection post gpiolib support */
-}
-
-static int mfld_init(struct snd_soc_pcm_runtime *runtime)
-{
-        struct snd_soc_dapm_context *dapm = &runtime->card->dapm;
-        int ret_val;
-
-        /* default is earpiece pin, userspace sets it explcitly */
-        snd_soc_dapm_disable_pin(dapm, "Headphones");
-        /* default is lineout NC, userspace sets it explcitly */
-        snd_soc_dapm_disable_pin(dapm, "LINEOUTL");
-        snd_soc_dapm_disable_pin(dapm, "LINEOUTR");
-        lo_dac = 3;
-        hs_switch = 0;
-        /* we dont use linein in this so set to NC */
-        snd_soc_dapm_disable_pin(dapm, "LINEINL");
-        snd_soc_dapm_disable_pin(dapm, "LINEINR");
-
-        /* Headset and button jack detection */
-        ret_val = snd_soc_card_jack_new(runtime->card,
-                        "Intel(R) MID Audio Jack", SND_JACK_HEADSET |
-                        SND_JACK_BTN_0 | SND_JACK_BTN_1, &mfld_jack,
-                        mfld_jack_pins, ARRAY_SIZE(mfld_jack_pins));
-        if (ret_val) {
-                pr_err("jack creation failed\n");
-                return ret_val;
-        }
-
-        ret_val = snd_soc_jack_add_zones(&mfld_jack,
-                        ARRAY_SIZE(mfld_zones), mfld_zones);
-        if (ret_val) {
-                pr_err("adding jack zones failed\n");
-                return ret_val;
-        }
-
-        mfld_codec = runtime->codec;
-
-        /* we want to check if anything is inserted at boot,
-         * so send a fake event to codec and it will read adc
-         * to find if anything is there or not */
-        mfld_jack_check(MFLD_JACK_INSERT);
-        return ret_val;
-}
-
-static struct snd_soc_dai_link mfld_msic_dailink[] = {
-        {
-                .name = "Medfield Headset",
-                .stream_name = "Headset",
-                .cpu_dai_name = "Headset-cpu-dai",
-                .codec_dai_name = "SN95031 Headset",
-                .codec_name = "sn95031",
-                .platform_name = "sst-platform",
-                .init = mfld_init,
-        },
-        {
-                .name = "Medfield Speaker",
-                .stream_name = "Speaker",
-                .cpu_dai_name = "Speaker-cpu-dai",
-                .codec_dai_name = "SN95031 Speaker",
-                .codec_name = "sn95031",
-                .platform_name = "sst-platform",
-                .init = NULL,
-        },
-        {
-                .name = "Medfield Vibra",
-                .stream_name = "Vibra1",
-                .cpu_dai_name = "Vibra1-cpu-dai",
-                .codec_dai_name = "SN95031 Vibra1",
-                .codec_name = "sn95031",
-                .platform_name = "sst-platform",
-                .init = NULL,
-        },
-        {
-                .name = "Medfield Haptics",
-                .stream_name = "Vibra2",
-                .cpu_dai_name = "Vibra2-cpu-dai",
-                .codec_dai_name = "SN95031 Vibra2",
-                .codec_name = "sn95031",
-                .platform_name = "sst-platform",
-                .init = NULL,
-        },
-        {
-                .name = "Medfield Compress",
-                .stream_name = "Speaker",
-                .cpu_dai_name = "Compress-cpu-dai",
-                .codec_dai_name = "SN95031 Speaker",
-                .codec_name = "sn95031",
-                .platform_name = "sst-platform",
-                .init = NULL,
-        },
-};
-
-/* SoC card */
-static struct snd_soc_card snd_soc_card_mfld = {
-        .name = "medfield_audio",
-        .owner = THIS_MODULE,
-        .dai_link = mfld_msic_dailink,
-        .num_links = ARRAY_SIZE(mfld_msic_dailink),
-
-        .controls = mfld_snd_controls,
-        .num_controls = ARRAY_SIZE(mfld_snd_controls),
-        .dapm_widgets = mfld_widgets,
-        .num_dapm_widgets = ARRAY_SIZE(mfld_widgets),
-        .dapm_routes = mfld_map,
-        .num_dapm_routes = ARRAY_SIZE(mfld_map),
-};
-
-static irqreturn_t snd_mfld_jack_intr_handler(int irq, void *dev)
-{
-        struct mfld_mc_private *mc_private = (struct mfld_mc_private *) dev;
-
-        memcpy_fromio(&mc_private->interrupt_status,
-                        ((void *)(mc_private->int_base)),
-                        sizeof(u8));
-        return IRQ_WAKE_THREAD;
-}
-
-static irqreturn_t snd_mfld_jack_detection(int irq, void *data)
-{
-        struct mfld_mc_private *mc_drv_ctx = (struct mfld_mc_private *) data;
-
-        mfld_jack_check(mc_drv_ctx->interrupt_status);
-
-        return IRQ_HANDLED;
-}
-
-static int snd_mfld_mc_probe(struct platform_device *pdev)
-{
-        int ret_val = 0, irq;
-        struct mfld_mc_private *mc_drv_ctx;
-        struct resource *irq_mem;
-
-        pr_debug("snd_mfld_mc_probe called\n");
-
-        /* retrive the irq number */
-        irq = platform_get_irq(pdev, 0);
-        if (irq <= 0)
-                return irq < 0 ? irq : -ENODEV;
-
-        /* audio interrupt base of SRAM location where
-         * interrupts are stored by System FW */
-        mc_drv_ctx = devm_kzalloc(&pdev->dev, sizeof(*mc_drv_ctx), GFP_ATOMIC);
-        if (!mc_drv_ctx)
-                return -ENOMEM;
-
-        irq_mem = platform_get_resource_byname(
-                                pdev, IORESOURCE_MEM, "IRQ_BASE");
-        if (!irq_mem) {
-                pr_err("no mem resource given\n");
-                return -ENODEV;
-        }
-        mc_drv_ctx->int_base = devm_ioremap_nocache(&pdev->dev, irq_mem->start,
-                                                    resource_size(irq_mem));
-        if (!mc_drv_ctx->int_base) {
-                pr_err("Mapping of cache failed\n");
-                return -ENOMEM;
-        }
-        /* register for interrupt */
-        ret_val = devm_request_threaded_irq(&pdev->dev, irq,
-                        snd_mfld_jack_intr_handler,
-                        snd_mfld_jack_detection,
-                        IRQF_SHARED, pdev->dev.driver->name, mc_drv_ctx);
-        if (ret_val) {
-                pr_err("cannot register IRQ\n");
-                return ret_val;
-        }
-        /* register the soc card */
-        snd_soc_card_mfld.dev = &pdev->dev;
-        ret_val = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_mfld);
-        if (ret_val) {
-                pr_debug("snd_soc_register_card failed %d\n", ret_val);
-                return ret_val;
-        }
-        platform_set_drvdata(pdev, mc_drv_ctx);
-        pr_debug("successfully exited probe\n");
-        return 0;
-}
-
-static struct platform_driver snd_mfld_mc_driver = {
-        .driver = {
-                .name = "msic_audio",
-        },
-        .probe = snd_mfld_mc_probe,
-};
-
-module_platform_driver(snd_mfld_mc_driver);
-
-MODULE_DESCRIPTION("ASoC Intel(R) MID Machine driver");
-MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>");
-MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:msic-audio");
diff --git a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
index f0cd08fa5c5d..5bc4e00a4a29 100644
--- a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
+++ b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
@@ -1440,9 +1440,9 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
         }
 
         afe->regmap = syscon_node_to_regmap(dev->parent->of_node);
-        if (!afe->regmap) {
+        if (IS_ERR(afe->regmap)) {
                 dev_err(dev, "could not get regmap from parent\n");
-                return -ENODEV;
+                return PTR_ERR(afe->regmap);
         }
 
         mutex_init(&afe->irq_alloc_lock);
diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
index 99c15219dbc8..5a9a5482976e 100644
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
@@ -37,8 +37,6 @@ static const struct snd_soc_dapm_route mt8173_rt5650_rt5514_routes[] = {
         {"Sub DMIC1R", NULL, "Int Mic"},
         {"Headphone", NULL, "HPOL"},
         {"Headphone", NULL, "HPOR"},
-        {"Headset Mic", NULL, "micbias1"},
-        {"Headset Mic", NULL, "micbias2"},
         {"IN1P", NULL, "Headset Mic"},
         {"IN1N", NULL, "Headset Mic"},
 };
diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
index 42de84ca8c84..b7248085ca04 100644
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
@@ -40,8 +40,6 @@ static const struct snd_soc_dapm_route mt8173_rt5650_rt5676_routes[] = {
         {"Headphone", NULL, "HPOL"},
         {"Headphone", NULL, "HPOR"},
         {"Headphone", NULL, "Sub AIF2TX"}, /* IF2 ADC to 5650  */
-        {"Headset Mic", NULL, "micbias1"},
-        {"Headset Mic", NULL, "micbias2"},
         {"IN1P", NULL, "Headset Mic"},
         {"IN1N", NULL, "Headset Mic"},
         {"Sub AIF2RX", NULL, "Headset Mic"}, /* IF2 DAC from 5650  */
diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
index e69c141d8ed4..40ebefd625c1 100644
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
@@ -51,8 +51,6 @@ static const struct snd_soc_dapm_route mt8173_rt5650_routes[] = {
         {"DMIC R1", NULL, "Int Mic"},
         {"Headphone", NULL, "HPOL"},
         {"Headphone", NULL, "HPOR"},
-        {"Headset Mic", NULL, "micbias1"},
-        {"Headset Mic", NULL, "micbias2"},
         {"IN1P", NULL, "Headset Mic"},
         {"IN1N", NULL, "Headset Mic"},
 };
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 908211e1d6fc..950823d69e9c 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -328,6 +328,7 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,
                 val |= I2S_CHN_4;
                 break;
         case 2:
+        case 1:
                 val |= I2S_CHN_2;
                 break;
         default:
@@ -460,7 +461,7 @@ static struct snd_soc_dai_driver rockchip_i2s_dai = {
         },
         .capture = {
                 .stream_name = "Capture",
-                .channels_min = 2,
+                .channels_min = 1,
                 .channels_max = 2,
                 .rates = SNDRV_PCM_RATE_8000_192000,
                 .formats = (SNDRV_PCM_FMTBIT_S8 |
@@ -504,6 +505,7 @@ static bool rockchip_i2s_rd_reg(struct device *dev, unsigned int reg)
         case I2S_INTCR:
         case I2S_XFER:
         case I2S_CLR:
+        case I2S_TXDR:
         case I2S_RXDR:
         case I2S_FIFOLR:
         case I2S_INTSR:
@@ -518,6 +520,9 @@ static bool rockchip_i2s_volatile_reg(struct device *dev, unsigned int reg)
         switch (reg) {
         case I2S_INTSR:
         case I2S_CLR:
+        case I2S_FIFOLR:
+        case I2S_TXDR:
+        case I2S_RXDR:
                 return true;
         default:
                 return false;
@@ -527,6 +532,8 @@ static bool rockchip_i2s_volatile_reg(struct device *dev, unsigned int reg)
 static bool rockchip_i2s_precious_reg(struct device *dev, unsigned int reg)
 {
         switch (reg) {
+        case I2S_RXDR:
+                return true;
         default:
                 return false;
         }
@@ -654,7 +661,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
         }
 
         if (!of_property_read_u32(node, "rockchip,capture-channels", &val)) {
-                if (val >= 2 && val <= 8)
+                if (val >= 1 && val <= 8)
                         soc_dai->capture.channels_max = val;
         }
 
diff --git a/sound/soc/soc-acpi.c b/sound/soc/soc-acpi.c
index f21df28bc28e..7f43c9bf3d09 100644
--- a/sound/soc/soc-acpi.c
+++ b/sound/soc/soc-acpi.c
@@ -49,46 +49,16 @@ const char *snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN])
 }
 EXPORT_SYMBOL_GPL(snd_soc_acpi_find_name_from_hid);
 
-static acpi_status snd_soc_acpi_mach_match(acpi_handle handle, u32 level,
-                                       void *context, void **ret)
-{
-        unsigned long long sta;
-        acpi_status status;
-
-        *(bool *)context = true;
-        status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
-        if (ACPI_FAILURE(status) || !(sta & ACPI_STA_DEVICE_PRESENT))
-                *(bool *)context = false;
-
-        return AE_OK;
-}
-
-bool snd_soc_acpi_check_hid(const u8 hid[ACPI_ID_LEN])
-{
-        acpi_status status;
-        bool found = false;
-
-        status = acpi_get_devices(hid, snd_soc_acpi_mach_match, &found, NULL);
-
-        if (ACPI_FAILURE(status))
-                return false;
-
-        return found;
-}
-EXPORT_SYMBOL_GPL(snd_soc_acpi_check_hid);
-
 struct snd_soc_acpi_mach *
 snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines)
 {
         struct snd_soc_acpi_mach *mach;
 
         for (mach = machines; mach->id[0]; mach++) {
-                if (snd_soc_acpi_check_hid(mach->id) == true) {
-                        if (mach->machine_quirk == NULL)
-                                return mach;
-
-                        if (mach->machine_quirk(mach) != NULL)
-                                return mach;
+                if (acpi_dev_present(mach->id, NULL, -1)) {
+                        if (mach->machine_quirk)
+                                mach = mach->machine_quirk(mach);
+                        return mach;
                 }
         }
         return NULL;
@@ -163,7 +133,7 @@ struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg)
                 return mach;
 
         for (i = 0; i < codec_list->num_codecs; i++) {
-                if (snd_soc_acpi_check_hid(codec_list->codecs[i]) != true)
+                if (!acpi_dev_present(codec_list->codecs[i], NULL, -1))
                         return NULL;
         }
 
diff --git a/sound/soc/stm/Kconfig b/sound/soc/stm/Kconfig
index 3398e6c57f37..3ad881fc40a1 100644
--- a/sound/soc/stm/Kconfig
+++ b/sound/soc/stm/Kconfig
@@ -28,4 +28,16 @@ config SND_SOC_STM32_SPDIFRX
         help
           Say Y if you want to enable S/PDIF capture for STM32
 
+config SND_SOC_STM32_DFSDM
+        tristate "SoC Audio support for STM32 DFSDM"
+        depends on ARCH_STM32 || COMPILE_TEST
+        depends on SND_SOC
+        depends on STM32_DFSDM_ADC
+        select SND_SOC_GENERIC_DMAENGINE_PCM
+        select SND_SOC_DMIC
+        select IIO_BUFFER_CB
+        help
+          Select this option to enable the STM32 Digital Filter
+          for Sigma Delta Modulators (DFSDM) driver used
+          in various STM32 series for digital microphone capture.
 endmenu
diff --git a/sound/soc/stm/Makefile b/sound/soc/stm/Makefile
index 5b7f0fab0bd6..3143c0b47042 100644
--- a/sound/soc/stm/Makefile
+++ b/sound/soc/stm/Makefile
@@ -13,3 +13,6 @@ obj-$(CONFIG_SND_SOC_STM32_I2S) += snd-soc-stm32-i2s.o
 # SPDIFRX
 snd-soc-stm32-spdifrx-objs := stm32_spdifrx.o
 obj-$(CONFIG_SND_SOC_STM32_SPDIFRX) += snd-soc-stm32-spdifrx.o
+
+#DFSDM
+obj-$(CONFIG_SND_SOC_STM32_DFSDM) += stm32_adfsdm.o
diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c
new file mode 100644
index 000000000000..7306e3eca9e1
--- /dev/null
+++ b/sound/soc/stm/stm32_adfsdm.c
@@ -0,0 +1,347 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * This file is part of STM32 DFSDM ASoC DAI driver
+ *
+ * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
+ * Authors: Arnaud Pouliquen <arnaud.pouliquen@st.com>
+ *          Olivier Moysan <olivier.moysan@st.com>
+ */
+
+#include <linux/clk.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/consumer.h>
+#include <linux/iio/adc/stm32-dfsdm-adc.h>
+
+#include <sound/pcm.h>
+#include <sound/soc.h>
+
+#define STM32_ADFSDM_DRV_NAME "stm32-adfsdm"
+
+#define DFSDM_MAX_PERIOD_SIZE   (PAGE_SIZE / 2)
+#define DFSDM_MAX_PERIODS       6
+
+struct stm32_adfsdm_priv {
+        struct snd_soc_dai_driver dai_drv;
+        struct snd_pcm_substream *substream;
+        struct device *dev;
+
+        /* IIO */
+        struct iio_channel *iio_ch;
+        struct iio_cb_buffer *iio_cb;
+        bool iio_active;
+
+        /* PCM buffer */
+        unsigned char *pcm_buff;
+        unsigned int pos;
+};
+
+static const struct snd_pcm_hardware stm32_adfsdm_pcm_hw = {
+        .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
+            SNDRV_PCM_INFO_PAUSE,
+        .formats = SNDRV_PCM_FMTBIT_S32_LE,
+
+        .rate_min = 8000,
+        .rate_max = 32000,
+
+        .channels_min = 1,
+        .channels_max = 1,
+
+        .periods_min = 2,
+        .periods_max = DFSDM_MAX_PERIODS,
+
+        .period_bytes_max = DFSDM_MAX_PERIOD_SIZE,
+        .buffer_bytes_max = DFSDM_MAX_PERIODS * DFSDM_MAX_PERIOD_SIZE
+};
+
+static void stm32_adfsdm_shutdown(struct snd_pcm_substream *substream,
+                                  struct snd_soc_dai *dai)
+{
+        struct stm32_adfsdm_priv *priv = snd_soc_dai_get_drvdata(dai);
+
+        if (priv->iio_active) {
+                iio_channel_stop_all_cb(priv->iio_cb);
+                priv->iio_active = false;
+        }
+}
+
+static int stm32_adfsdm_dai_prepare(struct snd_pcm_substream *substream,
+                                    struct snd_soc_dai *dai)
+{
+        struct stm32_adfsdm_priv *priv = snd_soc_dai_get_drvdata(dai);
+        int ret;
+
+        ret = iio_write_channel_attribute(priv->iio_ch,
+                                          substream->runtime->rate, 0,
+                                          IIO_CHAN_INFO_SAMP_FREQ);
+        if (ret < 0) {
+                dev_err(dai->dev, "%s: Failed to set %d sampling rate\n",
+                        __func__, substream->runtime->rate);
+                return ret;
+        }
+
+        if (!priv->iio_active) {
+                ret = iio_channel_start_all_cb(priv->iio_cb);
+                if (!ret)
+                        priv->iio_active = true;
+                else
+                        dev_err(dai->dev, "%s: IIO channel start failed (%d)\n",
+                                __func__, ret);
+        }
+
+        return ret;
+}
+
+static int stm32_adfsdm_set_sysclk(struct snd_soc_dai *dai, int clk_id,
+                                   unsigned int freq, int dir)
+{
+        struct stm32_adfsdm_priv *priv = snd_soc_dai_get_drvdata(dai);
+        ssize_t size;
+        char str_freq[10];
+
+        dev_dbg(dai->dev, "%s: Enter for freq %d\n", __func__, freq);
+
+        /* Set IIO frequency if CODEC is master as clock comes from SPI_IN */
+
+        snprintf(str_freq, sizeof(str_freq), "%d\n", freq);
+        size = iio_write_channel_ext_info(priv->iio_ch, "spi_clk_freq",
+                                          str_freq, sizeof(str_freq));
+        if (size != sizeof(str_freq)) {
+                dev_err(dai->dev, "%s: Failed to set SPI clock\n",
+                        __func__);
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static const struct snd_soc_dai_ops stm32_adfsdm_dai_ops = {
+        .shutdown = stm32_adfsdm_shutdown,
+        .prepare = stm32_adfsdm_dai_prepare,
+        .set_sysclk = stm32_adfsdm_set_sysclk,
+};
+
+static const struct snd_soc_dai_driver stm32_adfsdm_dai = {
+        .capture = {
+                    .channels_min = 1,
+                    .channels_max = 1,
+                    .formats = SNDRV_PCM_FMTBIT_S32_LE,
+                    .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
+                              SNDRV_PCM_RATE_32000),
+                    },
+        .ops = &stm32_adfsdm_dai_ops,
+};
+
+static const struct snd_soc_component_driver stm32_adfsdm_dai_component = {
+        .name = "stm32_dfsdm_audio",
+};
+
+static int stm32_afsdm_pcm_cb(const void *data, size_t size, void *private)
+{
+        struct stm32_adfsdm_priv *priv = private;
+        struct snd_soc_pcm_runtime *rtd = priv->substream->private_data;
+        u8 *pcm_buff = priv->pcm_buff;
+        u8 *src_buff = (u8 *)data;
+        unsigned int buff_size = snd_pcm_lib_buffer_bytes(priv->substream);
+        unsigned int period_size = snd_pcm_lib_period_bytes(priv->substream);
+        unsigned int old_pos = priv->pos;
+        unsigned int cur_size = size;
+
+        dev_dbg(rtd->dev, "%s: buff_add :%p, pos = %d, size = %zu\n",
+                __func__, &pcm_buff[priv->pos], priv->pos, size);
+
+        if ((priv->pos + size) > buff_size) {
+                memcpy(&pcm_buff[priv->pos], src_buff, buff_size - priv->pos);
+                cur_size -= buff_size - priv->pos;
+                priv->pos = 0;
+        }
+
+        memcpy(&pcm_buff[priv->pos], &src_buff[size - cur_size], cur_size);
+        priv->pos = (priv->pos + cur_size) % buff_size;
+
+        if (cur_size != size || (old_pos && (old_pos % period_size < size)))
+                snd_pcm_period_elapsed(priv->substream);
+
+        return 0;
+}
+
+static int stm32_adfsdm_trigger(struct snd_pcm_substream *substream, int cmd)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct stm32_adfsdm_priv *priv =
+                snd_soc_dai_get_drvdata(rtd->cpu_dai);
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
+                priv->pos = 0;
+                return stm32_dfsdm_get_buff_cb(priv->iio_ch->indio_dev,
+                                               stm32_afsdm_pcm_cb, priv);
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+        case SNDRV_PCM_TRIGGER_STOP:
+                return stm32_dfsdm_release_buff_cb(priv->iio_ch->indio_dev);
+        }
+
+        return -EINVAL;
+}
+
+static int stm32_adfsdm_pcm_open(struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct stm32_adfsdm_priv *priv = snd_soc_dai_get_drvdata(rtd->cpu_dai);
+        int ret;
+
+        ret =  snd_soc_set_runtime_hwparams(substream, &stm32_adfsdm_pcm_hw);
+        if (!ret)
+                priv->substream = substream;
+
+        return ret;
+}
+
+static int stm32_adfsdm_pcm_close(struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct stm32_adfsdm_priv *priv =
+                snd_soc_dai_get_drvdata(rtd->cpu_dai);
+
+        snd_pcm_lib_free_pages(substream);
+        priv->substream = NULL;
+
+        return 0;
+}
+
+static snd_pcm_uframes_t stm32_adfsdm_pcm_pointer(
+                                            struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct stm32_adfsdm_priv *priv =
+                snd_soc_dai_get_drvdata(rtd->cpu_dai);
+
+        return bytes_to_frames(substream->runtime, priv->pos);
+}
+
+static int stm32_adfsdm_pcm_hw_params(struct snd_pcm_substream *substream,
+                                      struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct stm32_adfsdm_priv *priv =
+                snd_soc_dai_get_drvdata(rtd->cpu_dai);
+        int ret;
+
+        ret =  snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
+        if (ret < 0)
+                return ret;
+        priv->pcm_buff = substream->runtime->dma_area;
+
+        return iio_channel_cb_set_buffer_watermark(priv->iio_cb,
+                                                   params_period_size(params));
+}
+
+static int stm32_adfsdm_pcm_hw_free(struct snd_pcm_substream *substream)
+{
+        snd_pcm_lib_free_pages(substream);
+
+        return 0;
+}
+
+static struct snd_pcm_ops stm32_adfsdm_pcm_ops = {
+        .open           = stm32_adfsdm_pcm_open,
+        .close          = stm32_adfsdm_pcm_close,
+        .hw_params      = stm32_adfsdm_pcm_hw_params,
+        .hw_free        = stm32_adfsdm_pcm_hw_free,
+        .trigger        = stm32_adfsdm_trigger,
+        .pointer        = stm32_adfsdm_pcm_pointer,
+};
+
+static int stm32_adfsdm_pcm_new(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_pcm *pcm = rtd->pcm;
+        struct stm32_adfsdm_priv *priv =
+                snd_soc_dai_get_drvdata(rtd->cpu_dai);
+        unsigned int size = DFSDM_MAX_PERIODS * DFSDM_MAX_PERIOD_SIZE;
+
+        return snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                                     priv->dev, size, size);
+}
+
+static void stm32_adfsdm_pcm_free(struct snd_pcm *pcm)
+{
+        struct snd_pcm_substream *substream;
+        struct snd_soc_pcm_runtime *rtd;
+        struct stm32_adfsdm_priv *priv;
+
+        substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream;
+        if (substream) {
+                rtd = substream->private_data;
+                priv = snd_soc_dai_get_drvdata(rtd->cpu_dai);
+
+                snd_pcm_lib_preallocate_free_for_all(pcm);
+        }
+}
+
+static struct snd_soc_platform_driver stm32_adfsdm_soc_platform = {
+        .ops            = &stm32_adfsdm_pcm_ops,
+        .pcm_new        = stm32_adfsdm_pcm_new,
+        .pcm_free       = stm32_adfsdm_pcm_free,
+};
+
+static const struct of_device_id stm32_adfsdm_of_match[] = {
+        {.compatible = "st,stm32h7-dfsdm-dai"},
+        {}
+};
+MODULE_DEVICE_TABLE(of, stm32_adfsdm_of_match);
+
+static int stm32_adfsdm_probe(struct platform_device *pdev)
+{
+        struct stm32_adfsdm_priv *priv;
+        int ret;
+
+        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->dev = &pdev->dev;
+        priv->dai_drv = stm32_adfsdm_dai;
+
+        dev_set_drvdata(&pdev->dev, priv);
+
+        ret = devm_snd_soc_register_component(&pdev->dev,
+                                              &stm32_adfsdm_dai_component,
+                                              &priv->dai_drv, 1);
+        if (ret < 0)
+                return ret;
+
+        /* Associate iio channel */
+        priv->iio_ch  = devm_iio_channel_get_all(&pdev->dev);
+        if (IS_ERR(priv->iio_ch))
+                return PTR_ERR(priv->iio_ch);
+
+        priv->iio_cb = iio_channel_get_all_cb(&pdev->dev, NULL, NULL);
+        if (IS_ERR(priv->iio_cb))
+                return PTR_ERR(priv->iio_cb);
+
+        ret = devm_snd_soc_register_platform(&pdev->dev,
+                                             &stm32_adfsdm_soc_platform);
+        if (ret < 0)
+                dev_err(&pdev->dev, "%s: Failed to register PCM platform\n",
+                        __func__);
+
+        return ret;
+}
+
+static struct platform_driver stm32_adfsdm_driver = {
+        .driver = {
+                   .name = STM32_ADFSDM_DRV_NAME,
+                   .of_match_table = stm32_adfsdm_of_match,
+                   },
+        .probe = stm32_adfsdm_probe,
+};
+
+module_platform_driver(stm32_adfsdm_driver);
+
+MODULE_DESCRIPTION("stm32 DFSDM DAI driver");
+MODULE_AUTHOR("Arnaud Pouliquen <arnaud.pouliquen@st.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" STM32_ADFSDM_DRV_NAME);
diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c
index 070a6880980e..c60a57797640 100644
--- a/sound/soc/ux500/mop500.c
+++ b/sound/soc/ux500/mop500.c
@@ -163,3 +163,7 @@ static struct platform_driver snd_soc_mop500_driver = {
 };
 
 module_platform_driver(snd_soc_mop500_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("ASoC MOP500 board driver");
+MODULE_AUTHOR("Ola Lilja");
diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c
index f12c01dddc8d..d35ba7700f46 100644
--- a/sound/soc/ux500/ux500_pcm.c
+++ b/sound/soc/ux500/ux500_pcm.c
@@ -165,3 +165,8 @@ int ux500_pcm_unregister_platform(struct platform_device *pdev)
         return 0;
 }
 EXPORT_SYMBOL_GPL(ux500_pcm_unregister_platform);
+
+MODULE_AUTHOR("Ola Lilja");
+MODULE_AUTHOR("Roger Nilsson");
+MODULE_DESCRIPTION("ASoC UX500 driver");
+MODULE_LICENSE("GPL v2");