Merge tag 'sound-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

Pull sound updates from Takashi Iwai:
 "The amount of changes is smaller at this round (what a surprise), but
  lots of activity is seen. Most of changes are about ASoC driver
  development, especially Intel platforms. Here are some highlights:

  General:
   - Replace all tasklet usages with other alternatives
   - Cleanup of the ASoC error unwinding code
   - Fixes for trivial issues caught by static checker
   - Spell fixes allover the places

  ALSA Core:
   - Lockdep fix for control devices
   - Fix for potential OSS sequencer mutex stalls

  HD-audio and USB-audio:
   - SoundBlaster AE-7 support
   - Changes in quirk table for the rename handling
   - Quirks for HP and ASUS machines, Pioneer DJ DJM-250MK2.

  ASoC:
   - Lots of updates for Intel SOF and SoundWire enablement
   - Replacement of the DSP driver for some older x86 systems; the new
     code was written from scratch, better maintenance expected
   - Helpers for parsing auxiluary devices from the device tree
   - New support for AllWinner A64, Cirrus Logic CS4234, Mediatek MT6359
     Microchip S/PDIF TX and RX controllers, Realtek RT1015P, and Texas
     Instruments J721E, TAS2110, TAS2564 and TAS2764"

* tag 'sound-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (498 commits)
  ALSA: hda/hdmi: fix incorrect locking in hdmi_pcm_close
  ALSA: hda: fix jack detection with Realtek codecs when in D3
  ALSA: fireworks: use semicolons rather than commas to separate statements
  ALSA: hda: use semicolons rather than commas to separate statements
  ALSA: hda/i915 - fix list corruption with concurrent probes
  ASoC: dmaengine: Document support for TX only or RX only streams
  ASoC: mchp-spdiftx: remove 'TX' from playback stream name
  ASoC: ti: davinci-mcasp: Use &pdev->dev for early dev_warn
  ASoC: tas2764: Add the driver for the TAS2764
  dt-bindings: tas2764: Add the TAS2764 binding doc
  ASoC: Intel: catpt: Add explicit DMADEVICES kconfig dependency
  ASoC: Intel: catpt: Fix compilation when CONFIG_MODULES is disabled
  ASoC: stm32: dfsdm: add actual resolution trace
  ASoC: stm32: dfsdm: change rate limits
  ASoC: qcom: sc7180: Add support for audio over DP
  Asoc: qcom: lpass-platform : Increase buffer size
  ASoC: qcom: Add support for lpass hdmi driver
  Asoc: qcom: lpass:Update lpaif_dmactl members order
  Asoc:qcom:lpass-cpu:Update dts property read API
  ASoC: dt-bindings: Add dt binding for lpass hdmi
  ...

diff --combined Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml
index 6cbdd8857ea21fc303175fad0757105afac0d49a,bf4632c0a9b613ef12674ab52621c2b9473bdc44..d346e61ab708550f7ca136b8d9689fb4116e04db
--- 1/Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml
--- 2/Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml
+++ b/Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml
@@@ -17,6 -17,7 +17,7 @@@ properties
    compatible:
      enum:
        - intel,keembay-i2s
+       - intel,keembay-tdm
  
    "#sound-dai-cells":
      const: 0
@@@ -52,8 -53,6 +53,8 @@@ required
    - clock-names
    - interrupts
  
 +additionalProperties: false
 +
  examples:
    - |
       #include <dt-bindings/interrupt-controller/arm-gic.h>

diff --combined Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
index 1bff53d3711878596acdfbbc12952a91029bf912,798b366fe6d1add50b68d2da0194cdbcc91d656f..df18be9d7b15f289b0e1ab2d7a0a372d182cd127
--- 1/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
--- 2/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
+++ b/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
@@@ -108,6 -108,12 +108,12 @@@ properties
        maximum: 7
      default: [0, 0, 0, 0]
  
+   ti,asi-tx-drive:
+     type: boolean
+     description: |
+       When set the device will set the Tx ASI output to a Hi-Z state for unused
+       data cycles. Default is to drive the output low on unused ASI cycles.
+ 
  patternProperties:
    '^ti,gpo-config-[1-4]$':
      $ref: /schemas/types.yaml#/definitions/uint32-array
@@@ -134,12 -140,53 +140,55 @@@
         4d - Drive weak low and active high
         5d - Drive Hi-Z and active high
  
+   ti,gpio-config:
+     description: |
+        Defines the configuration and output drive for the General Purpose
+        Input and Output pin (GPIO1). Its value is a pair, the first value is for
+        the configuration type and the second value is for the output drive
+        type. The array is defined as <GPIO1_CFG GPIO1_DRV>
+ 
+        configuration for the GPIO pin can be one of the following:
+        0 - disabled
+        1 - GPIO1 is configured as a general-purpose output (GPO)
+        2 - (default) GPIO1 is configured as a device interrupt output (IRQ)
+        3 - GPIO1 is configured as a secondary ASI output (SDOUT2)
+        4 - GPIO1 is configured as a PDM clock output (PDMCLK)
+        8 - GPIO1 is configured as an input to control when MICBIAS turns on or
+            off (MICBIAS_EN)
+        9 - GPIO1 is configured as a general-purpose input (GPI)
+        10 - GPIO1 is configured as a master clock input (MCLK)
+        11 - GPIO1 is configured as an ASI input for daisy-chain (SDIN)
+        12 - GPIO1 is configured as a PDM data input for channel 1 and channel 2
+             (PDMDIN1)
+        13 - GPIO1 is configured as a PDM data input for channel 3 and channel 4
+             (PDMDIN2)
+        14 - GPIO1 is configured as a PDM data input for channel 5 and channel 6
+             (PDMDIN3)
+        15 - GPIO1 is configured as a PDM data input for channel 7 and channel 8
+             (PDMDIN4)
+ 
+        output drive type for the GPIO pin can be one of the following:
+        0 - Hi-Z output
+        1 - Drive active low and active high
+        2 - (default) Drive active low and weak high
+        3 - Drive active low and Hi-Z
+        4 - Drive weak low and active high
+        5 - Drive Hi-Z and active high
+ 
+     allOf:
+       - $ref: /schemas/types.yaml#/definitions/uint32-array
+       - minItems: 2
+         maxItems: 2
+         items:
+           maximum: 15
+         default: [2, 2]
+ 
  required:
    - compatible
    - reg
  
 +additionalProperties: false
 +
  examples:
    - |
      #include <dt-bindings/gpio/gpio.h>
@@@ -152,6 -199,7 +201,7 @@@
          ti,mic-bias-source = <6>;
          ti,pdm-edge-select = <0 1 0 1>;
          ti,gpi-config = <4 5 6 7>;
+         ti,gpio-config = <10 2>;
          ti,gpo-config-1 = <0 0>;
          ti,gpo-config-2 = <0 0>;
          reset-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;

diff --combined MAINTAINERS
index c6f99cfcb2ee7db007eceb741c090505fa2a3f72,9c3528ba7b78a68b19d1ba5c151fa5e2818b47b9..42fd3e3a252c28a3c9a95cee657e0723bd76a6eb
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -405,7 -405,7 +405,7 @@@ F: drivers/platform/x86/i2c-multi-insta
  ACPI PMIC DRIVERS
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Len Brown <[email protected]>
 -R:    Andy Shevchenko <and[email protected]>
 +R:    Andy Shevchenko <and[email protected]>
  R:    Mika Westerberg <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -802,13 -802,6 +802,13 @@@ S:       Maintaine
  F:    Documentation/devicetree/bindings/interrupt-controller/amazon,al-fic.txt
  F:    drivers/irqchip/irq-al-fic.c
  
 +AMAZON ANNAPURNA LABS MEMORY CONTROLLER EDAC
 +M:    Talel Shenhar <[email protected]>
 +M:    Talel Shenhar <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/edac/amazon,al-mc-edac.yaml
 +F:    drivers/edac/al_mc_edac.c
 +
  AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
  M:    Talel Shenhar <[email protected]>
  S:    Maintained
@@@ -950,12 -943,37 +950,12 @@@ S:      Supporte
  F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
  F:    drivers/net/ethernet/amd/xgbe/
  
 -ANALOG DEVICES INC AD5686 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    drivers/iio/dac/ad5686*
 -F:    drivers/iio/dac/ad5696*
 -
 -ANALOG DEVICES INC AD5758 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
 -F:    drivers/iio/dac/ad5758.c
 -
 -ANALOG DEVICES INC AD7091R5 DRIVER
 -M:    Beniamin Bia <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml
 -F:    drivers/iio/adc/ad7091r5.c
 -
 -ANALOG DEVICES INC AD7124 DRIVER
 -M:    Michael Hennerich <[email protected]>
 +AMS AS73211 DRIVER
 +M:    Christian Eggers <[email protected]>
  L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
 -F:    drivers/iio/adc/ad7124.c
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
 +F:    drivers/iio/light/as73211.c
  
  ANALOG DEVICES INC AD7192 DRIVER
  M:    Alexandru Tachici <[email protected]>
@@@ -973,6 -991,15 +973,6 @@@ W:        http://ez.analog.com/community/linux
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
  F:    drivers/iio/adc/ad7292.c
  
 -ANALOG DEVICES INC AD7606 DRIVER
 -M:    Michael Hennerich <[email protected]>
 -M:    Beniamin Bia <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
 -F:    drivers/iio/adc/ad7606.c
 -
  ANALOG DEVICES INC AD7768-1 DRIVER
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
@@@ -1034,6 -1061,7 +1034,6 @@@ F:      drivers/iio/imu/adis16475.
  F:    Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
  
  ANALOG DEVICES INC ADM1177 DRIVER
 -M:    Beniamin Bia <[email protected]>
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -1080,13 -1108,6 +1080,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/adv7842*
  
 +ANALOG DEVICES INC ADXRS290 DRIVER
 +M:    Nishant Malpani <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/iio/gyro/adxrs290.c
 +F:    Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml
 +
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  M:    Nuno Sá <[email protected]>
@@@ -1107,6 -1128,15 +1107,6 @@@ S:     Supporte
  W:    http://ez.analog.com/community/linux-device-drivers
  F:    drivers/dma/dma-axi-dmac.c
  
 -ANALOG DEVICES INC HMC425A DRIVER
 -M:    Beniamin Bia <[email protected]>
 -M:    Michael Hennerich <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 -F:    Documentation/devicetree/bindings/iio/amplifiers/adi,hmc425a.yaml
 -F:    drivers/iio/amplifiers/hmc425a.c
 -
  ANALOG DEVICES INC IIO DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  M:    Michael Hennerich <[email protected]>
@@@ -1115,11 -1145,8 +1115,11 @@@ W:    http://wiki.analog.com
  W:    http://ez.analog.com/community/linux-device-drivers
  F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
  F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
 +F:    Documentation/devicetree/bindings/iio/*/adi,*
 +F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
  F:    drivers/iio/*/ad*
  F:    drivers/iio/adc/ltc249*
 +F:    drivers/iio/amplifiers/hmc425a.c
  F:    drivers/staging/iio/*/ad*
  X:    drivers/iio/*/adjd*
  
@@@ -1433,11 -1460,6 +1433,11 @@@ S:    Odd Fixe
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
 +ARM PRIMECELL CLCD PL110 DRIVER
 +M:    Russell King <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/video/fbdev/amba-clcd.*
 +
  ARM PRIMECELL KMI PL050 DRIVER
  M:    Russell King <[email protected]>
  S:    Odd Fixes
@@@ -1484,7 -1506,8 +1484,7 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/iommu/arm,smmu*
  F:    drivers/iommu/arm/
 -F:    drivers/iommu/io-pgtable-arm-v7s.c
 -F:    drivers/iommu/io-pgtable-arm.c
 +F:    drivers/iommu/io-pgtable-arm*
  
  ARM SUB-ARCHITECTURES
  L:    [email protected] (moderated for non-subscribers)
@@@ -1502,9 -1525,8 +1502,9 @@@ F:      Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
  F:    Documentation/devicetree/bindings/dma/owl-dma.txt
  F:    Documentation/devicetree/bindings/i2c/i2c-owl.txt
 +F:    Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml
  F:    Documentation/devicetree/bindings/mmc/owl-mmc.yaml
 -F:    Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt
 +F:    Documentation/devicetree/bindings/pinctrl/actions,*
  F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
  F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
  F:    arch/arm/boot/dts/owl-*
@@@ -1514,7 -1536,6 +1514,7 @@@ F:      drivers/clk/actions
  F:    drivers/clocksource/timer-owl*
  F:    drivers/dma/owl-dma.c
  F:    drivers/i2c/busses/i2c-owl.c
 +F:    drivers/irqchip/irq-owl-sirq.c
  F:    drivers/mmc/host/owl-mmc.c
  F:    drivers/pinctrl/actions/*
  F:    drivers/soc/actions/
@@@ -1602,7 -1623,7 +1602,7 @@@ N:      meso
  
  ARM/Annapurna Labs ALPINE ARCHITECTURE
  M:    Tsahee Zidenberg <[email protected]>
 -M:    Antoine Tenart <a[email protected]>
 +M:    Antoine Tenart <a[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/alpine*
@@@ -1725,7 -1746,6 +1725,7 @@@ ARM/CORESIGHT FRAMEWORK AND DRIVER
  M:    Mathieu Poirier <[email protected]>
  R:    Suzuki K Poulose <[email protected]>
  R:    Mike Leach <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
@@@ -2425,7 -2445,7 +2425,7 @@@ L:      [email protected] (m
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/s5p-cec.txt
 -F:    drivers/media/platform/s5p-cec/
 +F:    drivers/media/cec/platform/s5p/
  
  ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
  M:    Andrzej Pietrasiewicz <[email protected]>
@@@ -2484,7 -2504,7 +2484,7 @@@ S:      Maintaine
  F:    drivers/clk/socfpga/
  
  ARM/SOCFPGA EDAC SUPPORT
 -M:    Thor Thayer <[email protected]>
 +M:    Dinh Nguyen <[email protected]>
  S:    Maintained
  F:    drivers/edac/altera_edac.
  
@@@ -2570,7 -2590,7 +2570,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/tegra-cec.txt
 -F:    drivers/media/platform/tegra-cec/
 +F:    drivers/media/cec/platform/tegra/
  
  ARM/TETON BGA MACHINE SUPPORT
  M:    "Mark F. Brown" <[email protected]>
@@@ -3455,14 -3475,6 +3455,14 @@@ F:    drivers/bus/brcmstb_gisb.
  F:    drivers/pci/controller/pcie-brcmstb.c
  N:    brcmstb
  
 +BROADCOM BDC DRIVER
 +M:    Al Cooper <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/brcm,bdc.txt
 +F:    drivers/usb/gadget/udc/bdc/
 +
  BROADCOM BMIPS CPUFREQ DRIVER
  M:    Markus Mayer <[email protected]>
  M:    [email protected]
@@@ -3495,17 -3507,13 +3495,17 @@@ F:   drivers/net/ethernet/broadcom/bnx2.
  F:    drivers/net/ethernet/broadcom/bnx2_*
  
  BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 -M:    [email protected]
 +M:    Saurav Kashyap <[email protected]>
 +M:    Javed Hasan <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2fc/
  
  BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
 -M:    [email protected]
 +M:    Nilesh Javali <[email protected]>
 +M:    Manish Rangankar <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2i/
@@@ -3840,16 -3848,6 +3840,16 @@@ S:    Orpha
  F:    Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt
  F:    drivers/mtd/nand/raw/cadence-nand-controller.c
  
 +CADENCE USB3 DRD IP DRIVER
 +M:    Peter Chen <[email protected]>
 +M:    Pawel Laszczak <[email protected]>
 +M:    Roger Quadros <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 +F:    Documentation/devicetree/bindings/usb/cdns-usb3.txt
 +F:    drivers/usb/cdns3/
 +
  CADET FM/AM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -4032,7 -4030,7 +4032,7 @@@ S:      Supporte
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/cec-gpio.txt
 -F:    drivers/media/platform/cec-gpio/
 +F:    drivers/media/cec/platform/cec-gpio/
  
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <[email protected]>
@@@ -4102,11 -4100,6 +4102,11 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    drivers/char/
  F:    drivers/misc/
  F:    include/linux/miscdevice.h
 +X:    drivers/char/agp/
 +X:    drivers/char/hw_random/
 +X:    drivers/char/ipmi/
 +X:    drivers/char/random.c
 +X:    drivers/char/tpm/
  
  CHECKPATCH
  M:    Andy Whitcroft <[email protected]>
@@@ -4177,6 -4170,7 +4177,7 @@@ CIRRUS LOGIC AUDIO CODEC DRIVER
  M:    James Schulman <[email protected]>
  M:    David Rhodes <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
+ L:    [email protected]
  S:    Maintained
  F:    sound/soc/codecs/cs*
  
@@@ -5013,12 -5007,6 +5014,12 @@@ S:    Maintaine
  F:    drivers/base/devcoredump.c
  F:    include/linux/devcoredump.h
  
 +DEVICE DEPENDENCY HELPER SCRIPT
 +M:    Saravana Kannan <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    scripts/dev-needs.sh
 +
  DEVICE DIRECT ACCESS (DAX)
  M:    Dan Williams <[email protected]>
  M:    Vishal Verma <[email protected]>
@@@ -5387,6 -5375,7 +5388,6 @@@ F:      include/linux/kobj
  F:    lib/kobj*
  
  DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
 -M:    Kevin Hilman <[email protected]>
  M:    Nishanth Menon <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5417,7 -5406,7 +5418,7 @@@ F:      drivers/gpu/drm/panel/panel-arm-vers
  
  DRM DRIVER FOR ASPEED BMC GFX
  M:    Joel Stanley <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
@@@ -5425,10 -5414,7 +5426,10 @@@ F:    drivers/gpu/drm/aspeed
  
  DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
 -S:    Odd Fixes
 +R:    Thomas Zimmermann <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/ast/
  
  DRM DRIVER FOR BOCHS VIRTUAL GPU
@@@ -5502,24 -5488,14 +5503,24 @@@ S:   Maintaine
  F:    drivers/gpu/drm/panel/panel-lvds.c
  F:    Documentation/devicetree/bindings/display/panel/lvds.yaml
  
 +DRM DRIVER FOR MANTIX MLAF057WE51 PANELS
 +M:    Guido Günther <[email protected]>
 +R:    Purism Kernel Team <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml
 +F:    drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
 +
  DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/mga/
  F:    include/uapi/drm/mga_drm.h
  
 -DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
 +DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
 -S:    Odd Fixes
 +R:    Thomas Zimmermann <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/mgag200/
  
  DRM DRIVER FOR MI0283QT
@@@ -5600,13 -5576,12 +5601,13 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml
  F:    drivers/gpu/drm/panel/panel-raydium-rm67191.c
  
 -DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
 +DRM DRIVER FOR SITRONIX ST7703 PANELS
  M:    Guido Günther <[email protected]>
  R:    Purism Kernel Team <[email protected]>
 +R:    Ondrej Jirman <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
 -F:    drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
 +F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
 +F:    drivers/gpu/drm/panel/panel-sitronix-st7703.c
  
  DRM DRIVER FOR SAVAGE VIDEO CARDS
  S:    Orphan / Obsolete
@@@ -5665,15 -5640,13 +5666,15 @@@ F:   drivers/gpu/drm/panel/panel-tpo-tpg1
  DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
  M:    Dave Airlie <[email protected]>
  R:    Sean Paul <[email protected]>
 +R:    Thomas Zimmermann <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 +S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/udl/
  
  DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
  M:    Rodrigo Siqueira <[email protected]>
 +M:    Melissa Wen <[email protected]>
  R:    Haneen Mohammed <[email protected]>
  R:    Daniel Vetter <[email protected]>
  L:    [email protected]
@@@ -5808,7 -5781,7 +5809,7 @@@ F:      drivers/gpu/drm/gma500
  
  DRM DRIVERS FOR HISILICON
  M:    Xinliang Liu <[email protected]>
 -M:    Rongrong Zou <zourongrong@gmail.com>
 +M:    Tian Tao  <tiantao6@hisilicon.com>
  R:    John Stultz <[email protected]>
  R:    Xinwei Kong <[email protected]>
  R:    Chen Feng <[email protected]>
@@@ -5834,7 -5807,6 +5835,7 @@@ L:      [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/display/mediatek/
  F:    drivers/gpu/drm/mediatek/
 +F:    drivers/phy/mediatek/phy-mtk-hdmi*
  
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <[email protected]>
@@@ -6208,7 -6180,7 +6209,7 @@@ S:      Supporte
  F:    drivers/edac/bluefield_edac.c
  
  EDAC-CALXEDA
 -M:    Robert Richter <[email protected]>
 +M:    Andre Przywara <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/highbank*
@@@ -6851,17 -6823,14 +6852,17 @@@ F:   drivers/net/ethernet/nvidia/
  
  FPGA DFL DRIVERS
  M:    Wu Hao <[email protected]>
 +R:    Tom Rix <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-dfl
  F:    Documentation/fpga/dfl.rst
  F:    drivers/fpga/dfl*
  F:    include/uapi/linux/fpga-dfl.h
  
  FPGA MANAGER FRAMEWORK
  M:    Moritz Fischer <[email protected]>
 +R:    Tom Rix <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://www.rocketboards.org
@@@ -7267,7 -7236,7 +7268,7 @@@ F:      drivers/staging/gasket
  GCC PLUGINS
  M:    Kees Cook <[email protected]>
  R:    Emese Revfy <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/kbuild/gcc-plugins.rst
  F:    scripts/Makefile.gcc-plugins
@@@ -7767,8 -7736,8 +7768,8 @@@ F:      Documentation/watchdog/hpwdt.rs
  F:    drivers/watchdog/hpwdt.c
  
  HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
 -M:    Don Brace <don.brace@microsemi.com>
 -L:    esc.storagedev@microsemi.com
 +M:    Don Brace <don.brace@microchip.com>
 +L:    storagedev@microchip.com
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/hpsa.rst
@@@ -7911,13 -7880,6 +7912,13 @@@ W:    http://www.hisilicon.co
  F:    Documentation/devicetree/bindings/net/hisilicon*.txt
  F:    drivers/net/ethernet/hisilicon/
  
 +HIKEY960 ONBOARD USB GPIO HUB DRIVER
 +M:    John Stultz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/misc/hisi_hikey_usb.c
 +F:    Documentation/devicetree/bindings/misc/hisilicon-hikey-usb.yaml
 +
  HISILICON PMU DRIVER
  M:    Shaokun Zhang <[email protected]>
  S:    Supported
@@@ -7961,12 -7923,6 +7962,12 @@@ F:    drivers/crypto/hisilicon/sec2/sec_cr
  F:    drivers/crypto/hisilicon/sec2/sec_crypto.h
  F:    drivers/crypto/hisilicon/sec2/sec_main.c
  
 +HISILICON STAGING DRIVERS FOR HIKEY 960/970
 +M:    Mauro Carvalho Chehab <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/hikey9xx/
 +
  HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
  M:    Zaibo Xu <[email protected]>
  S:    Maintained
@@@ -8544,6 -8500,7 +8545,6 @@@ F:      drivers/iio/multiplexer/iio-mux.
  
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <[email protected]>
 -R:    Hartmut Knaack <[email protected]>
  R:    Lars-Peter Clausen <[email protected]>
  R:    Peter Meerwald-Stadler <[email protected]>
  L:    [email protected]
@@@ -8717,7 -8674,7 +8718,7 @@@ F:      drivers/input/input-mt.
  K:    \b(ABS|SYN)_MT_
  
  INSIDE SECURE CRYPTO DRIVER
 -M:    Antoine Tenart <a[email protected]>
 +M:    Antoine Tenart <a[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/crypto/inside-secure/
@@@ -8796,8 -8753,7 +8797,8 @@@ F:      include/drm/i915
  F:    include/uapi/drm/i915_drm.h
  
  INTEL ETHERNET DRIVERS
 -M:    Jeff Kirsher <[email protected]>
 +M:    Jesse Brandeburg <[email protected]>
 +M:    Tony Nguyen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    http://www.intel.com/support/feedback.htm
@@@ -8896,7 -8852,7 +8897,7 @@@ INTEL IPU3 CSI-2 CIO2 DRIVE
  M:    Yong Zhi <[email protected]>
  M:    Sakari Ailus <[email protected]>
  M:    Bingbu Cao <[email protected]>
 -R:    Tian Shu Qiu <[email protected]>
 +R:    Tianshu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
@@@ -8905,7 -8861,7 +8906,7 @@@ F:      drivers/media/pci/intel/ipu3
  INTEL IPU3 CSI-2 IMGU DRIVER
  M:    Sakari Ailus <[email protected]>
  R:    Bingbu Cao <[email protected]>
 -R:    Tian Shu Qiu <[email protected]>
 +R:    Tianshu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/media/ipu3.rst
@@@ -8970,8 -8926,8 +8971,8 @@@ F:      arch/x86/include/asm/intel_punit_ipc
  F:    drivers/platform/x86/intel_punit_ipc.c
  
  INTEL PMC CORE DRIVER
 -M:    Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
 -M:    Vishwanath Somayaji <vishwanath.somayaji@intel.com>
 +M:    Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
 +M:    David E Box <david.e.box@intel.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/intel_pmc_core*
@@@ -8984,7 -8940,7 +8985,7 @@@ F:      drivers/gpio/gpio-*cove.
  F:    drivers/gpio/gpio-msic.c
  
  INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
 -R:    Andy Shevchenko <[email protected]>
 +M:    Andy Shevchenko <[email protected]>
  S:    Maintained
  F:    drivers/mfd/intel_msic.c
  F:    drivers/mfd/intel_soc_pmic*
@@@ -9165,7 -9121,6 +9166,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  F:    Documentation/devicetree/bindings/iommu/
 +F:    Documentation/userspace-api/iommu.rst
  F:    drivers/iommu/
  F:    include/linux/iommu.h
  F:    include/linux/iova.h
@@@ -9758,8 -9713,8 +9759,8 @@@ M:      Catalin Marinas <catalin.marinas@arm
  S:    Maintained
  F:    Documentation/dev-tools/kmemleak.rst
  F:    include/linux/kmemleak.h
 -F:    mm/kmemleak-test.c
  F:    mm/kmemleak.c
 +F:    samples/kmemleak/kmemleak-test.c
  
  KMOD KERNEL MODULE LOADER - USERMODE HELPER
  M:    Luis Chamberlain <[email protected]>
@@@ -9788,12 -9743,6 +9789,12 @@@ F:    Documentation/admin-guide/auxdisplay
  F:    drivers/auxdisplay/ks0108.c
  F:    include/linux/ks0108.h
  
 +KTD253 BACKLIGHT DRIVER
 +M:    Linus Walleij <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/leds/backlight/kinetic,ktd253.yaml
 +F:    drivers/video/backlight/ktd253-backlight.c
 +
  L3MDEV
  M:    David Ahern <[email protected]>
  L:    [email protected]
@@@ -9848,7 -9797,7 +9849,7 @@@ F:      drivers/scsi/53c700
  LEAKING_ADDRESSES
  M:    Tobin C. Harding <[email protected]>
  M:    Tycho Andersen <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
  F:    scripts/leaking_addresses.pl
@@@ -9919,6 -9868,15 +9920,6 @@@ T:     git git://git.kernel.org/pub/scm/lin
  F:    drivers/ata/pata_arasan_cf.c
  F:    include/linux/pata_arasan_cf_data.h
  
 -LIBATA PATA DRIVERS
 -M:    Bartlomiej Zolnierkiewicz <[email protected]>
 -M:    Jens Axboe <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 -F:    drivers/ata/ata_generic.c
 -F:    drivers/ata/pata_*.c
 -
  LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
@@@ -11088,7 -11046,7 +11089,7 @@@ F:   net/dsa/tag_mtk.
  
  MEDIATEK USB3 DRD IP DRIVER
  M:    Chunfeng Yun <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -11356,8 -11314,8 +11357,8 @@@ S:   Supporte
  W:    http://linux-meson.com/
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
 -F:    drivers/media/platform/meson/ao-cec-g12a.c
 -F:    drivers/media/platform/meson/ao-cec.c
 +F:    drivers/media/cec/platform/meson/ao-cec-g12a.c
 +F:    drivers/media/cec/platform/meson/ao-cec.c
  
  MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
  M:    Liang Yang <[email protected]>
@@@ -11367,6 -11325,7 +11368,6 @@@ F:   Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/meson_*
  
  MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
 -M:    Maxime Jourdan <[email protected]>
  M:    Neil Armstrong <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -11386,7 -11345,6 +11387,7 @@@ M:   Hemant Kumar <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
 +F:    Documentation/ABI/stable/sysfs-bus-mhi
  F:    Documentation/mhi/
  F:    drivers/bus/mhi/
  F:    include/linux/mhi.h
@@@ -11585,8 -11543,8 +11586,8 @@@ F:   arch/mips/configs/generic/board-ocel
  F:    arch/mips/generic/board-ocelot.c
  
  MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
 -M:    Don Brace <don.brace@microsemi.com>
 -L:    esc.storagedev@microsemi.com
 +M:    Don Brace <don.brace@microchip.com>
 +L:    storagedev@microchip.com
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/smartpqi.rst
@@@ -11818,13 -11776,6 +11819,13 @@@ Q: http://patchwork.linuxtv.org/project
  T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/msi2500/
  
 +MSTAR INTERRUPT CONTROLLER DRIVER
 +M:    Mark-PK Tsai <[email protected]>
 +M:    Daniel Palmer <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interrupt-controller/mstar,mst-intc.yaml
 +F:    drivers/irqchip/irq-mst-intc.c
 +
  MSYSTEMS DISKONCHIP G3 MTD DRIVER
  M:    Robert Jarzmik <[email protected]>
  L:    [email protected]
@@@ -12127,7 -12078,6 +12128,7 @@@ NETWORKING [DSA
  M:    Andrew Lunn <[email protected]>
  M:    Vivien Didelot <[email protected]>
  M:    Florian Fainelli <[email protected]>
 +M:    Vladimir Oltean <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/
  F:    drivers/net/dsa/
@@@ -12341,19 -12291,6 +12342,19 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
  F:    arch/nios2/
  
 +NITRO ENCLAVES (NE)
 +M:    Andra Paraschiv <[email protected]>
 +M:    Alexandru Vasile <[email protected]>
 +M:    Alexandru Ciobotaru <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://aws.amazon.com/ec2/nitro/nitro-enclaves/
 +F:    Documentation/virt/ne_overview.rst
 +F:    drivers/virt/nitro_enclaves/
 +F:    include/linux/nitro_enclaves.h
 +F:    include/uapi/linux/nitro_enclaves.h
 +F:    samples/nitro_enclaves/
 +
  NOHZ, DYNTICKS SUPPORT
  M:    Frederic Weisbecker <[email protected]>
  M:    Thomas Gleixner <[email protected]>
@@@ -12516,21 -12453,6 +12517,21 @@@ F: drivers/iio/gyro/fxas21002c_core.
  F:    drivers/iio/gyro/fxas21002c_i2c.c
  F:    drivers/iio/gyro/fxas21002c_spi.c
  
 +NXP i.MX 8MQ DCSS DRIVER
 +M:    Laurentiu Palcu <[email protected]>
 +R:    Lucas Stach <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
 +F:    drivers/gpu/drm/imx/dcss/
 +
 +NXP PTN5150A CC LOGIC AND EXTCON DRIVER
 +M:    Krzysztof Kozlowski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
 +F:    drivers/extcon/extcon-ptn5150.c
 +
  NXP SGTL5000 DRIVER
  M:    Fabio Estevam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -12581,7 -12503,6 +12582,7 @@@ M:   Josh Poimboeuf <[email protected]
  M:    Peter Zijlstra <[email protected]>
  S:    Supported
  F:    tools/objtool/
 +F:    include/linux/objtool.h
  
  OCELOT ETHERNET SWITCH DRIVER
  M:    Microchip Linux Driver Support <[email protected]>
@@@ -12843,7 -12764,7 +12844,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/i2c/ov2685.c
  
  OMNIVISION OV2740 SENSOR DRIVER
 -M:    Tianshu Qiu <tian.shu.qiua@intel.com>
 +M:    Tianshu Qiu <[email protected]>
  R:    Shawn Tu <[email protected]>
  R:    Bingbu Cao <[email protected]>
  L:    [email protected]
@@@ -12859,12 -12780,10 +12860,12 @@@ T:        git git://linuxtv.org/media_tree.gi
  F:    drivers/media/i2c/ov5640.c
  
  OMNIVISION OV5647 SENSOR DRIVER
 -M:    Luis Oliveira <[email protected]>
 +M:    Dave Stevenson <[email protected]>
 +M:    Jacopo Mondi <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/ov5647.yaml
  F:    drivers/media/i2c/ov5647.c
  
  OMNIVISION OV5670 SENSOR DRIVER
@@@ -13127,9 -13046,7 +13128,9 @@@ F:   lib/packing.
  
  PADATA PARALLEL EXECUTION MECHANISM
  M:    Steffen Klassert <[email protected]>
 +M:    Daniel Jordan <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/core-api/padata.rst
  F:    include/linux/padata.h
@@@ -13801,9 -13718,10 +13802,9 @@@ PIN CONTROLLER - RENESA
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git renesas-pinctrl
  F:    Documentation/devicetree/bindings/pinctrl/renesas,*
 -F:    drivers/pinctrl/pinctrl-rz*
 -F:    drivers/pinctrl/sh-pfc/
 +F:    drivers/pinctrl/renesas/
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
@@@ -14036,7 -13954,6 +14037,7 @@@ PRINT
  M:    Petr Mladek <[email protected]>
  M:    Sergey Senozhatsky <[email protected]>
  R:    Steven Rostedt <[email protected]>
 +R:    John Ogness <[email protected]>
  S:    Maintained
  F:    include/linux/printk.h
  F:    kernel/printk/
@@@ -14274,17 -14191,13 +14275,17 @@@ S:        Supporte
  F:    drivers/infiniband/hw/qib/
  
  QLOGIC QL41xxx FCOE DRIVER
 -M:    [email protected]
 +M:    Saurav Kashyap <[email protected]>
 +M:    Javed Hasan <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/qedf/
  
  QLOGIC QL41xxx ISCSI DRIVER
 -M:    [email protected]
 +M:    Nilesh Javali <[email protected]>
 +M:    Manish Rangankar <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/qedi/
@@@ -14317,20 -14230,21 +14318,20 @@@ M:        Nilesh Javali <[email protected]
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/scsi/LICENSE.qla2xxx
  F:    drivers/scsi/qla2xxx/
  
  QLOGIC QLA3XXX NETWORK DRIVER
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/networking/device_drivers/ethernet/qlogic/LICENSE.qla3xxx
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLA4XXX iSCSI DRIVER
 -M:    [email protected]
 +M:    Nilesh Javali <[email protected]>
 +M:    Manish Rangankar <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/scsi/LICENSE.qla4xxx
  F:    drivers/scsi/qla4xxx/
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
@@@ -14678,9 -14592,9 +14679,9 @@@ M:   Niklas Söderlund <niklas.soderlund+
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml
 -F:    drivers/media/i2c/rdacm20.c
  F:    drivers/media/i2c/max9271.c
  F:    drivers/media/i2c/max9271.h
 +F:    drivers/media/i2c/rdacm20.c
  
  RDC R-321X SoC
  M:    Florian Fainelli <[email protected]>
@@@ -14974,11 -14888,8 +14975,11 @@@ F: include/linux/hid-roccat
  
  ROCKCHIP ISP V1 DRIVER
  M:    Helen Koike <[email protected]>
 +M:    Dafna Hirschfeld <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/admin-guide/media/rkisp1.rst
 +F:    Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
  F:    drivers/staging/media/rkisp1/
  
  ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
@@@ -15474,7 -15385,6 +15475,7 @@@ R:   Dietmar Eggemann <dietmar.eggemann@a
  R:    Steven Rostedt <[email protected]> (SCHED_FIFO/SCHED_RR)
  R:    Ben Segall <[email protected]> (CONFIG_CFS_BANDWIDTH)
  R:    Mel Gorman <[email protected]> (CONFIG_NUMA_BALANCING)
 +R:    Daniel Bristot de Oliveira <[email protected]> (SCHED_DEADLINE)
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
@@@ -15596,8 -15506,8 +15597,8 @@@ F:   drivers/mmc/host/sdricoh_cs.
  SECO BOARDS CEC DRIVER
  M:    Ettore Chimenti <[email protected]>
  S:    Maintained
 -F:    drivers/media/platform/seco-cec/seco-cec.c
 -F:    drivers/media/platform/seco-cec/seco-cec.h
 +F:    drivers/media/cec/platform/seco/seco-cec.c
 +F:    drivers/media/cec/platform/seco/seco-cec.h
  
  SECURE COMPUTING
  M:    Kees Cook <[email protected]>
@@@ -15690,7 -15600,6 +15691,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
  F:    Documentation/ABI/obsolete/sysfs-selinux-disable
  F:    Documentation/admin-guide/LSM/SELinux.rst
 +F:    include/trace/events/avc.h
  F:    include/uapi/linux/selinux_netlink.h
  F:    scripts/selinux/
  F:    security/selinux/
@@@ -16165,6 -16074,7 +16166,6 @@@ F:   include/uapi/rdma/rdma_user_rxe.
  SOFTLOGIC 6x10 MPEG CODEC
  M:    Bluecherry Maintainers <[email protected]>
  M:    Anton Sviridenko <[email protected]>
 -M:    Andrey Utkin <[email protected]>
  M:    Andrey Utkin <[email protected]>
  M:    Ismael Luceno <[email protected]>
  L:    [email protected]
@@@ -16584,6 -16494,7 +16585,6 @@@ F:   drivers/staging/rtl8712
  
  STAGING - SEPS525 LCD CONTROLLER DRIVERS
  M:    Michael Hennerich <[email protected]>
 -M:    Beniamin Bia <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
@@@ -16631,7 -16542,7 +16632,7 @@@ STI CEC DRIVE
  M:    Benjamin Gaignard <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/stih-cec.txt
 -F:    drivers/media/platform/sti/cec/
 +F:    drivers/media/cec/platform/sti/
  
  STK1160 USB VIDEO CAPTURE DRIVER
  M:    Ezequiel Garcia <[email protected]>
@@@ -16815,13 -16726,6 +16816,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
  F:    drivers/gpio/gpio-dwapb.c
  
 +SYNOPSYS DESIGNWARE APB SSI DRIVER
 +M:    Serge Semin <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
 +F:    drivers/spi/spi-dw*
 +
  SYNOPSYS DESIGNWARE AXI DMAC DRIVER
  M:    Eugeniy Paltsev <[email protected]>
  S:    Maintained
@@@ -17688,7 -17592,7 +17689,7 @@@ L:   [email protected]
  S:    Maintained
  W:    https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity
  Q:    https://patchwork.kernel.org/project/linux-integrity/list/
 -T:    git git://git.infradead.org/users/jjs/linux-tpmdd.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
  F:    drivers/char/tpm/
  
  TRACING
@@@ -17825,7 -17729,6 +17826,7 @@@ S:   Supporte
  W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git fixes
 +F:    Documentation/filesystems/ubifs-authentication.rst
  F:    Documentation/filesystems/ubifs.rst
  F:    fs/ubifs/
  
@@@ -18219,6 -18122,14 +18220,6 @@@ T:  git git://linuxtv.org/media_tree.gi
  F:    drivers/media/usb/uvc/
  F:    include/uapi/linux/uvcvideo.h
  
 -USB VISION DRIVER
 -M:    Hans Verkuil <[email protected]>
 -L:    [email protected]
 -S:    Odd Fixes
 -W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/staging/media/usbvision/
 -
  USB WEBCAM GADGET
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -18372,8 -18283,7 +18373,8 @@@ F:   drivers/gpu/vga/vga_switcheroo.
  F:    include/linux/vga_switcheroo.h
  
  VIA RHINE NETWORK DRIVER
 -S:    Orphan
 +S:    Maintained
 +M:    Kevin Brace <[email protected]>
  F:    drivers/net/ethernet/via/via-rhine.c
  
  VIA SD/MMC CARD CONTROLLER DRIVER
@@@ -18418,8 -18328,10 +18419,8 @@@ S:  Maintaine
  F:    drivers/media/platform/video-mux.c
  
  VIDEOBUF2 FRAMEWORK
 -M:    Pawel Osciak <[email protected]>
 +M:    Tomasz Figa <[email protected]>
  M:    Marek Szyprowski <[email protected]>
 -M:    Kyungmin Park <[email protected]>
 -R:    Tomasz Figa <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/common/videobuf2/*
@@@ -18609,14 -18521,6 +18610,14 @@@ W: https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/test-drivers/vivid/*
  
 +VIDTV VIRTUAL DIGITAL TV DRIVER
 +M:    Daniel W. S. Almeida <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +W:    https://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/test-drivers/vidtv/*
 +
  VLYNQ BUS
  M:    Florian Fainelli <[email protected]>
  L:    [email protected] (subscribers-only)
@@@ -18984,11 -18888,11 +18985,11 @@@ T:        git git://git.kernel.org/pub/scm/lin
  F:    arch/x86/mm/
  
  X86 PLATFORM DRIVERS
 -M:    Darren Hart <[email protected]>
 -M:    Andy Shevchenko <[email protected]>
 +M:    Hans de Goede <[email protected]>
 +M:    Mark Gross <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 -T:    git git://git.infradead.org/linux-platform-drivers-x86.git
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/olpc/
  F:    drivers/platform/x86/
  
@@@ -19337,16 -19241,6 +19338,16 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    Documentation/filesystems/zonefs.rst
  F:    fs/zonefs/
  
 +ZR36067 VIDEO FOR LINUX DRIVER
 +M:    Corentin Labbe <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +W:    http://mjpeg.sourceforge.net/driver-zoran/
 +Q:    https://patchwork.linuxtv.org/project/linux-media/list/
 +F:    Documentation/driver-api/media/drivers/zoran.rst
 +F:    drivers/staging/media/zoran/
 +
  ZPOOL COMPRESSED PAGE STORAGE API
  M:    Dan Streetman <[email protected]>
  L:    [email protected]

diff --combined drivers/iio/adc/stm32-dfsdm-adc.c
index c7e0109315f8675885ae0c3380d1aaeaec3fe306,b7e9ef1a6eecd8e3d71aa35f1e4f521fdad44e75..9234f14167b7a2fb33635eb7f2802b8bbfa711fd
--- 1/drivers/iio/adc/stm32-dfsdm-adc.c
--- 2/drivers/iio/adc/stm32-dfsdm-adc.c
+++ b/drivers/iio/adc/stm32-dfsdm-adc.c
@@@ -293,6 -293,7 +293,7 @@@ static int stm32_dfsdm_compute_osrs(str
                                        max >>= flo->rshift;
                                }
                                flo->max = (s32)max;
+                               flo->bits = bits;
  
                                pr_debug("%s: fast %d, fosr %d, iosr %d, res 0x%llx/%d bits, rshift %d, lshift %d\n",
                                         __func__, fast, flo->fosr, flo->iosr,
@@@ -476,6 -477,9 +477,9 @@@ static int stm32_dfsdm_channels_configu
        if (!flo->res)
                return -EINVAL;
  
+       dev_dbg(&indio_dev->dev, "Samples actual resolution: %d bits",
+               min(flo->bits, (u32)DFSDM_DATA_RES - 1));
+ 
        for_each_set_bit(bit, &adc->smask,
                         sizeof(adc->smask) * BITS_PER_BYTE) {
                chan = indio_dev->channels + bit;
@@@ -1473,9 -1477,13 +1477,9 @@@ static int stm32_dfsdm_adc_init(struct 
        /* Optionally request DMA */
        ret = stm32_dfsdm_dma_request(dev, indio_dev);
        if (ret) {
 -              if (ret != -ENODEV) {
 -                      if (ret != -EPROBE_DEFER)
 -                              dev_err(dev,
 -                                      "DMA channel request failed with %d\n",
 -                                      ret);
 -                      return ret;
 -              }
 +              if (ret != -ENODEV)
 +                      return dev_err_probe(dev, ret,
 +                                           "DMA channel request failed with\n");
  
                dev_dbg(dev, "No DMA support\n");
                return 0;

diff --combined drivers/spi/spi-atmel.c
index ce5bd06d49b7f4b643432c00d72011f001aeb54c,e527b5fc9cb975d54fb1b0ef6478932842d2542c..0e5e64a80848d45551778e3d083c2681a82c0794
--- 1/drivers/spi/spi-atmel.c
--- 2/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@@ -16,7 -16,6 +16,6 @@@
  #include <linux/interrupt.h>
  #include <linux/spi/spi.h>
  #include <linux/slab.h>
- #include <linux/platform_data/dma-atmel.h>
  #include <linux/of.h>
  
  #include <linux/io.h>
@@@ -513,8 -512,9 +512,8 @@@ static int atmel_spi_configure_dma(stru
  
        master->dma_tx = dma_request_chan(dev, "tx");
        if (IS_ERR(master->dma_tx)) {
 -              err = PTR_ERR(master->dma_tx);
 -              if (err != -EPROBE_DEFER)
 -                      dev_err(dev, "No TX DMA channel, DMA is disabled\n");
 +              err = dev_err_probe(dev, PTR_ERR(master->dma_tx),
 +                                  "No TX DMA channel, DMA is disabled\n");
                goto error_clear;
        }
  
@@@ -858,7 -858,6 +857,7 @@@ static int atmel_spi_set_xfer_speed(str
        csr = spi_readl(as, CSR0 + 4 * chip_select);
        csr = SPI_BFINS(SCBR, scbr, csr);
        spi_writel(as, CSR0 + 4 * chip_select, csr);
 +      xfer->effective_speed_hz = bus_hz / scbr;
  
        return 0;
  }

diff --combined sound/soc/codecs/max98373-sdw.c
index 13f74499e46e71592fc8b594a7e021c5fb090199,c1bd320633ad163a018e4c3a9adfb52ecbd76b1f..fa589d834f9aa9d8173bd5683c5c18737506e741
--- 1/sound/soc/codecs/max98373-sdw.c
--- 2/sound/soc/codecs/max98373-sdw.c
+++ b/sound/soc/codecs/max98373-sdw.c
@@@ -15,7 -15,6 +15,7 @@@
  #include <linux/of.h>
  #include <linux/soundwire/sdw.h>
  #include <linux/soundwire/sdw_type.h>
 +#include <linux/soundwire/sdw_registers.h>
  #include "max98373.h"
  #include "max98373-sdw.h"
  
@@@ -257,6 -256,9 +257,9 @@@ static __maybe_unused int max98373_resu
        struct max98373_priv *max98373 = dev_get_drvdata(dev);
        unsigned long time;
  
+       if (!max98373->hw_init)
+               return 0;
+ 
        if (!slave->unattach_request)
                goto regmap_sync;
  
@@@ -283,13 -285,11 +286,13 @@@ static const struct dev_pm_ops max98373
  static int max98373_read_prop(struct sdw_slave *slave)
  {
        struct sdw_slave_prop *prop = &slave->prop;
 -      int nval, i, num_of_ports;
 +      int nval, i;
        u32 bit;
        unsigned long addr;
        struct sdw_dpn_prop *dpn;
  
 +      prop->scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY;
 +
        /* BITMAP: 00001000  Dataport 3 is active */
        prop->source_ports = BIT(3);
        /* BITMAP: 00000010  Dataport 1 is active */
@@@ -298,6 -298,7 +301,6 @@@
        prop->clk_stop_timeout = 20;
  
        nval = hweight32(prop->source_ports);
 -      num_of_ports = nval;
        prop->src_dpn_prop = devm_kcalloc(&slave->dev, nval,
                                          sizeof(*prop->src_dpn_prop),
                                          GFP_KERNEL);
@@@ -317,6 -318,7 +320,6 @@@
  
        /* do this again for sink now */
        nval = hweight32(prop->sink_ports);
 -      num_of_ports += nval;
        prop->sink_dpn_prop = devm_kcalloc(&slave->dev, nval,
                                           sizeof(*prop->sink_dpn_prop),
                                           GFP_KERNEL);
@@@ -334,6 -336,17 +337,6 @@@
                i++;
        }
  
 -      /* Allocate port_ready based on num_of_ports */
 -      slave->port_ready = devm_kcalloc(&slave->dev, num_of_ports,
 -                                       sizeof(*slave->port_ready),
 -                                       GFP_KERNEL);
 -      if (!slave->port_ready)
 -              return -ENOMEM;
 -
 -      /* Initialize completion */
 -      for (i = 0; i < num_of_ports; i++)
 -              init_completion(&slave->port_ready[i]);
 -
        /* set the timeout values */
        prop->clk_stop_timeout = 20;
  

diff --combined sound/soc/codecs/rt1308-sdw.c
index 977be6f2b817404cd926709429c695af2fefd260,b288e1a7d95672b39e0c3cb82acdf4480f311736..c2621b0afe6c1d4e4934ca8e24a9b0ab5bf1b6fb
--- 1/sound/soc/codecs/rt1308-sdw.c
--- 2/sound/soc/codecs/rt1308-sdw.c
+++ b/sound/soc/codecs/rt1308-sdw.c
@@@ -118,14 -118,11 +118,14 @@@ static int rt1308_clock_config(struct d
  static int rt1308_read_prop(struct sdw_slave *slave)
  {
        struct sdw_slave_prop *prop = &slave->prop;
 -      int nval, i, num_of_ports = 1;
 +      int nval, i;
        u32 bit;
        unsigned long addr;
        struct sdw_dpn_prop *dpn;
  
 +      prop->scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY;
 +      prop->quirks = SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY;
 +
        prop->paging_support = true;
  
        /* first we need to allocate memory for set bits in port lists */
@@@ -134,6 -131,7 +134,6 @@@
  
        /* for sink */
        nval = hweight32(prop->sink_ports);
 -      num_of_ports += nval;
        prop->sink_dpn_prop = devm_kcalloc(&slave->dev, nval,
                                                sizeof(*prop->sink_dpn_prop),
                                                GFP_KERNEL);
@@@ -151,6 -149,17 +151,6 @@@
                i++;
        }
  
 -      /* Allocate port_ready based on num_of_ports */
 -      slave->port_ready = devm_kcalloc(&slave->dev, num_of_ports,
 -                                      sizeof(*slave->port_ready),
 -                                      GFP_KERNEL);
 -      if (!slave->port_ready)
 -              return -ENOMEM;
 -
 -      /* Initialize completion */
 -      for (i = 0; i < num_of_ports; i++)
 -              init_completion(&slave->port_ready[i]);
 -
        /* set the timeout values */
        prop->clk_stop_timeout = 20;
  
@@@ -684,7 -693,7 +684,7 @@@ static int rt1308_sdw_probe(struct sdw_
  }
  
  static const struct sdw_device_id rt1308_id[] = {
-       SDW_SLAVE_ENTRY(0x025d, 0x1308, 0),
+       SDW_SLAVE_ENTRY_EXT(0x025d, 0x1308, 0x2, 0, 0),
        {},
  };
  MODULE_DEVICE_TABLE(sdw, rt1308_id);

diff --combined sound/soc/codecs/rt5682-sdw.c
index feb2db95829e10dc92c266f081047fd89f2ba178,b0386f5922906a45620668bd9355aee99b439f6b..58fb13132602c3717bb6d8056e64ea1a68411771
--- 1/sound/soc/codecs/rt5682-sdw.c
--- 2/sound/soc/codecs/rt5682-sdw.c
+++ b/sound/soc/codecs/rt5682-sdw.c
@@@ -19,7 -19,6 +19,7 @@@
  #include <linux/mutex.h>
  #include <linux/soundwire/sdw.h>
  #include <linux/soundwire/sdw_type.h>
 +#include <linux/soundwire/sdw_registers.h>
  #include <sound/core.h>
  #include <sound/pcm.h>
  #include <sound/pcm_params.h>
@@@ -538,15 -537,11 +538,15 @@@ static int rt5682_update_status(struct 
  static int rt5682_read_prop(struct sdw_slave *slave)
  {
        struct sdw_slave_prop *prop = &slave->prop;
 -      int nval, i, num_of_ports = 1;
 +      int nval, i;
        u32 bit;
        unsigned long addr;
        struct sdw_dpn_prop *dpn;
  
 +      prop->scp_int1_mask = SDW_SCP_INT1_IMPL_DEF | SDW_SCP_INT1_BUS_CLASH |
 +              SDW_SCP_INT1_PARITY;
 +      prop->quirks = SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY;
 +
        prop->paging_support = false;
  
        /* first we need to allocate memory for set bits in port lists */
@@@ -554,6 -549,7 +554,6 @@@
        prop->sink_ports = 0x2;         /* BITMAP: 00000010 */
  
        nval = hweight32(prop->source_ports);
 -      num_of_ports += nval;
        prop->src_dpn_prop = devm_kcalloc(&slave->dev, nval,
                                          sizeof(*prop->src_dpn_prop),
                                          GFP_KERNEL);
@@@ -573,6 -569,7 +573,6 @@@
  
        /* do this again for sink now */
        nval = hweight32(prop->sink_ports);
 -      num_of_ports += nval;
        prop->sink_dpn_prop = devm_kcalloc(&slave->dev, nval,
                                           sizeof(*prop->sink_dpn_prop),
                                           GFP_KERNEL);
@@@ -590,6 -587,17 +590,6 @@@
                i++;
        }
  
 -      /* Allocate port_ready based on num_of_ports */
 -      slave->port_ready = devm_kcalloc(&slave->dev, num_of_ports,
 -                                       sizeof(*slave->port_ready),
 -                                       GFP_KERNEL);
 -      if (!slave->port_ready)
 -              return -ENOMEM;
 -
 -      /* Initialize completion */
 -      for (i = 0; i < num_of_ports; i++)
 -              init_completion(&slave->port_ready[i]);
 -
        /* set the timeout values */
        prop->clk_stop_timeout = 20;
  
@@@ -709,7 -717,7 +709,7 @@@ static int rt5682_sdw_remove(struct sdw
  }
  
  static const struct sdw_device_id rt5682_id[] = {
-       SDW_SLAVE_ENTRY(0x025d, 0x5682, 0),
+       SDW_SLAVE_ENTRY_EXT(0x025d, 0x5682, 0x2, 0, 0),
        {},
  };
  MODULE_DEVICE_TABLE(sdw, rt5682_id);

diff --combined sound/soc/codecs/rt700-sdw.c
index 77deda9fd9693f09ff82d7a5800e6645ee8372d9,c7deb4e4fcf10f4f0e6f374118a87d602039666a..fb77e77a4ebd5a621be72e1d6a672cf44300db95
--- 1/sound/soc/codecs/rt700-sdw.c
--- 2/sound/soc/codecs/rt700-sdw.c
+++ b/sound/soc/codecs/rt700-sdw.c
@@@ -11,7 -11,6 +11,7 @@@
  #include <linux/mod_devicetable.h>
  #include <linux/soundwire/sdw.h>
  #include <linux/soundwire/sdw_type.h>
 +#include <linux/soundwire/sdw_registers.h>
  #include <linux/module.h>
  #include <linux/regmap.h>
  #include <sound/soc.h>
@@@ -334,15 -333,11 +334,15 @@@ static int rt700_update_status(struct s
  static int rt700_read_prop(struct sdw_slave *slave)
  {
        struct sdw_slave_prop *prop = &slave->prop;
 -      int nval, i, num_of_ports = 1;
 +      int nval, i;
        u32 bit;
        unsigned long addr;
        struct sdw_dpn_prop *dpn;
  
 +      prop->scp_int1_mask = SDW_SCP_INT1_IMPL_DEF | SDW_SCP_INT1_BUS_CLASH |
 +              SDW_SCP_INT1_PARITY;
 +      prop->quirks = SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY;
 +
        prop->paging_support = false;
  
        /* first we need to allocate memory for set bits in port lists */
@@@ -350,6 -345,7 +350,6 @@@
        prop->sink_ports = 0xA; /* BITMAP:  00001010 */
  
        nval = hweight32(prop->source_ports);
 -      num_of_ports += nval;
        prop->src_dpn_prop = devm_kcalloc(&slave->dev, nval,
                                                sizeof(*prop->src_dpn_prop),
                                                GFP_KERNEL);
@@@ -369,6 -365,7 +369,6 @@@
  
        /* do this again for sink now */
        nval = hweight32(prop->sink_ports);
 -      num_of_ports += nval;
        prop->sink_dpn_prop = devm_kcalloc(&slave->dev, nval,
                                                sizeof(*prop->sink_dpn_prop),
                                                GFP_KERNEL);
@@@ -386,6 -383,17 +386,6 @@@
                i++;
        }
  
 -      /* Allocate port_ready based on num_of_ports */
 -      slave->port_ready = devm_kcalloc(&slave->dev, num_of_ports,
 -                                      sizeof(*slave->port_ready),
 -                                      GFP_KERNEL);
 -      if (!slave->port_ready)
 -              return -ENOMEM;
 -
 -      /* Initialize completion */
 -      for (i = 0; i < num_of_ports; i++)
 -              init_completion(&slave->port_ready[i]);
 -
        /* set the timeout values */
        prop->clk_stop_timeout = 20;
  
@@@ -470,7 -478,7 +470,7 @@@ static int rt700_sdw_remove(struct sdw_
  }
  
  static const struct sdw_device_id rt700_id[] = {
-       SDW_SLAVE_ENTRY(0x025d, 0x700, 0),
+       SDW_SLAVE_ENTRY_EXT(0x025d, 0x700, 0x1, 0, 0),
        {},
  };
  MODULE_DEVICE_TABLE(sdw, rt700_id);
@@@ -482,6 -490,9 +482,9 @@@ static int __maybe_unused rt700_dev_sus
        if (!rt700->hw_init)
                return 0;
  
+       cancel_delayed_work_sync(&rt700->jack_detect_work);
+       cancel_delayed_work_sync(&rt700->jack_btn_check_work);
+ 
        regcache_cache_only(rt700->regmap, true);
  
        return 0;

diff --combined sound/soc/codecs/rt711-sdw.c
index 2eb115cf9d41a68b5cddab5f391c5f10d8e68674,3a8ca600d1cf84579206babec506fdc179eba074..f0a0691bd31ccaf03247e954cece6cea686b2dca
--- 1/sound/soc/codecs/rt711-sdw.c
--- 2/sound/soc/codecs/rt711-sdw.c
+++ b/sound/soc/codecs/rt711-sdw.c
@@@ -11,7 -11,6 +11,7 @@@
  #include <linux/mod_devicetable.h>
  #include <linux/soundwire/sdw.h>
  #include <linux/soundwire/sdw_type.h>
 +#include <linux/soundwire/sdw_registers.h>
  #include <linux/module.h>
  #include <linux/regmap.h>
  #include <sound/soc.h>
@@@ -338,15 -337,11 +338,15 @@@ static int rt711_update_status(struct s
  static int rt711_read_prop(struct sdw_slave *slave)
  {
        struct sdw_slave_prop *prop = &slave->prop;
 -      int nval, i, num_of_ports = 1;
 +      int nval, i;
        u32 bit;
        unsigned long addr;
        struct sdw_dpn_prop *dpn;
  
 +      prop->scp_int1_mask = SDW_SCP_INT1_IMPL_DEF | SDW_SCP_INT1_BUS_CLASH |
 +              SDW_SCP_INT1_PARITY;
 +      prop->quirks = SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY;
 +
        prop->paging_support = false;
  
        /* first we need to allocate memory for set bits in port lists */
@@@ -354,6 -349,7 +354,6 @@@
        prop->sink_ports = 0x8; /* BITMAP:  00001000 */
  
        nval = hweight32(prop->source_ports);
 -      num_of_ports += nval;
        prop->src_dpn_prop = devm_kcalloc(&slave->dev, nval,
                                                sizeof(*prop->src_dpn_prop),
                                                GFP_KERNEL);
@@@ -373,6 -369,7 +373,6 @@@
  
        /* do this again for sink now */
        nval = hweight32(prop->sink_ports);
 -      num_of_ports += nval;
        prop->sink_dpn_prop = devm_kcalloc(&slave->dev, nval,
                                                sizeof(*prop->sink_dpn_prop),
                                                GFP_KERNEL);
@@@ -390,6 -387,17 +390,6 @@@
                i++;
        }
  
 -      /* Allocate port_ready based on num_of_ports */
 -      slave->port_ready = devm_kcalloc(&slave->dev, num_of_ports,
 -                                      sizeof(*slave->port_ready),
 -                                      GFP_KERNEL);
 -      if (!slave->port_ready)
 -              return -ENOMEM;
 -
 -      /* Initialize completion */
 -      for (i = 0; i < num_of_ports; i++)
 -              init_completion(&slave->port_ready[i]);
 -
        /* set the timeout values */
        prop->clk_stop_timeout = 20;
  
@@@ -471,7 -479,7 +471,7 @@@ static int rt711_sdw_remove(struct sdw_
  }
  
  static const struct sdw_device_id rt711_id[] = {
-       SDW_SLAVE_ENTRY(0x025d, 0x711, 0),
+       SDW_SLAVE_ENTRY_EXT(0x025d, 0x711, 0x2, 0, 0),
        {},
  };
  MODULE_DEVICE_TABLE(sdw, rt711_id);
@@@ -483,6 -491,10 +483,10 @@@ static int __maybe_unused rt711_dev_sus
        if (!rt711->hw_init)
                return 0;
  
+       cancel_delayed_work_sync(&rt711->jack_detect_work);
+       cancel_delayed_work_sync(&rt711->jack_btn_check_work);
+       cancel_work_sync(&rt711->calibration_work);
+ 
        regcache_cache_only(rt711->regmap, true);
  
        return 0;

diff --combined sound/soc/codecs/rt715-sdw.c
index 6b8ea62d5178829cfd96e6ae5adaba0806e9b1bc,a5fd31c98221f0e5c8fabc7e9240d2be91a304a3..8f0aa1e8a27371312cdbd7843cd375f3dcaa49f0
--- 1/sound/soc/codecs/rt715-sdw.c
--- 2/sound/soc/codecs/rt715-sdw.c
+++ b/sound/soc/codecs/rt715-sdw.c
@@@ -12,7 -12,6 +12,7 @@@
  #include <linux/mod_devicetable.h>
  #include <linux/soundwire/sdw.h>
  #include <linux/soundwire/sdw_type.h>
 +#include <linux/soundwire/sdw_registers.h>
  #include <linux/module.h>
  #include <linux/of.h>
  #include <linux/regmap.h>
@@@ -432,15 -431,11 +432,15 @@@ static int rt715_update_status(struct s
  static int rt715_read_prop(struct sdw_slave *slave)
  {
        struct sdw_slave_prop *prop = &slave->prop;
 -      int nval, i, num_of_ports = 1;
 +      int nval, i;
        u32 bit;
        unsigned long addr;
        struct sdw_dpn_prop *dpn;
  
 +      prop->scp_int1_mask = SDW_SCP_INT1_IMPL_DEF | SDW_SCP_INT1_BUS_CLASH |
 +              SDW_SCP_INT1_PARITY;
 +      prop->quirks = SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY;
 +
        prop->paging_support = false;
  
        /* first we need to allocate memory for set bits in port lists */
@@@ -448,6 -443,7 +448,6 @@@
        prop->sink_ports = 0x0; /* BITMAP:  00000000 */
  
        nval = hweight32(prop->source_ports);
 -      num_of_ports += nval;
        prop->src_dpn_prop = devm_kcalloc(&slave->dev, nval,
                                        sizeof(*prop->src_dpn_prop),
                                        GFP_KERNEL);
@@@ -464,6 -460,36 +464,6 @@@
                i++;
        }
  
 -      /* do this again for sink now */
 -      nval = hweight32(prop->sink_ports);
 -      num_of_ports += nval;
 -      prop->sink_dpn_prop = devm_kcalloc(&slave->dev, nval,
 -                                      sizeof(*prop->sink_dpn_prop),
 -                                      GFP_KERNEL);
 -      if (!prop->sink_dpn_prop)
 -              return -ENOMEM;
 -
 -      dpn = prop->sink_dpn_prop;
 -      i = 0;
 -      addr = prop->sink_ports;
 -      for_each_set_bit(bit, &addr, 32) {
 -              dpn[i].num = bit;
 -              dpn[i].simple_ch_prep_sm = true;
 -              dpn[i].ch_prep_timeout = 10;
 -              i++;
 -      }
 -
 -      /* Allocate port_ready based on num_of_ports */
 -      slave->port_ready = devm_kcalloc(&slave->dev, num_of_ports,
 -                                      sizeof(*slave->port_ready),
 -                                      GFP_KERNEL);
 -      if (!slave->port_ready)
 -              return -ENOMEM;
 -
 -      /* Initialize completion */
 -      for (i = 0; i < num_of_ports; i++)
 -              init_completion(&slave->port_ready[i]);
 -
        /* set the timeout values */
        prop->clk_stop_timeout = 20;
  
@@@ -515,7 -541,8 +515,8 @@@ static int rt715_sdw_probe(struct sdw_s
  }
  
  static const struct sdw_device_id rt715_id[] = {
-       SDW_SLAVE_ENTRY(0x025d, 0x715, 0),
+       SDW_SLAVE_ENTRY_EXT(0x025d, 0x714, 0x2, 0, 0),
+       SDW_SLAVE_ENTRY_EXT(0x025d, 0x715, 0x2, 0, 0),
        {},
  };
  MODULE_DEVICE_TABLE(sdw, rt715_id);

diff --combined sound/usb/mixer_scarlett_gen2.c
index 9609c6d9655c39a08d91be5a5195ed14a9979b4a,d33df146d6cebc991273cf7e43118051309a904d..4bbec56c7df343bbd78f226ffecd7ac8ef5bbb10
--- 1/sound/usb/mixer_scarlett_gen2.c
--- 2/sound/usb/mixer_scarlett_gen2.c
+++ b/sound/usb/mixer_scarlett_gen2.c
@@@ -1946,7 -1946,7 +1946,7 @@@ static void scarlett2_mixer_interrupt(s
                goto requeue;
  
        if (len == 8) {
-               data = le32_to_cpu(*(u32 *)urb->transfer_buffer);
+               data = le32_to_cpu(*(__le32 *)urb->transfer_buffer);
                if (data & SCARLETT2_USB_INTERRUPT_VOL_CHANGE)
                        scarlett2_mixer_interrupt_vol_change(mixer);
                if (data & SCARLETT2_USB_INTERRUPT_BUTTON_CHANGE)
@@@ -1978,7 -1978,7 +1978,7 @@@ static int scarlett2_mixer_status_creat
                return 0;
        }
  
 -      if (snd_usb_pipe_sanity_check(dev, pipe))
 +      if (usb_pipe_type_check(dev, pipe))
                return -EINVAL;
  
        mixer->urb = usb_alloc_urb(0, GFP_KERNEL);