Merge branch 'asoc-5.3' into asoc-5.4

diff --combined MAINTAINERS
index 22b2206722766c575649ed64e05597a98ccd15f0,92829ca37459391a25195ca2acf750b9365e1549..24e29b2e53c911156fbcf7d560e80912afade4c6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -321,7 -321,7 +321,7 @@@ F: drivers/pnp/pnpacpi
  F:    include/linux/acpi.h
  F:    include/linux/fwnode.h
  F:    include/acpi/
 -F:    Documentation/acpi/
 +F:    Documentation/firmware-guide/acpi/
  F:    Documentation/ABI/testing/sysfs-bus-acpi
  F:    Documentation/ABI/testing/configfs-acpi
  F:    drivers/pci/*acpi*
@@@ -551,7 -551,6 +551,7 @@@ W: http://wiki.analog.com/ADXL34
  W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/input/misc/adxl34x.c
 +F:    Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml
  
  ADXL372 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
  M:    Stefan Popa <[email protected]>
@@@ -560,7 -559,7 +560,7 @@@ S: Supporte
  F:    drivers/iio/accel/adxl372.c
  F:    drivers/iio/accel/adxl372_spi.c
  F:    drivers/iio/accel/adxl372_i2c.c
 -F:    Documentation/devicetree/bindings/iio/accel/adxl372.txt
 +F:    Documentation/devicetree/bindings/iio/accel/adi,adxl372.yaml
  
  AF9013 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
@@@ -669,13 -668,6 +669,13 @@@ S:       Maintaine
  F:    Documentation/i2c/busses/i2c-ali1563
  F:    drivers/i2c/busses/i2c-ali1563.c
  
 +ALLEGRO DVT VIDEO IP CORE DRIVER
 +M:    Michael Tretter <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/media/allegro-dvt/
 +
  ALLWINNER SECURITY SYSTEM
  M:    Corentin Labbe <[email protected]>
  L:    [email protected]
@@@ -917,17 -909,8 +917,17 @@@ S:       Supporte
  F:    drivers/iio/adc/ad7768-1.c
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt
  
 +ANALOG DEVICES INC AD7780 DRIVER
 +M:    Michael Hennerich <[email protected]>
 +M:    Renato Lui Geh <[email protected]>
 +L:    [email protected]
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/adc/ad7780.c
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad7780.yaml
 +
  ANALOG DEVICES INC AD9389B DRIVER
 -M:    Hans Verkuil <h[email protected]>
 +M:    Hans Verkuil <h[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/ad9389b*
@@@ -938,13 -921,6 +938,13 @@@ S:       Supporte
  F:    drivers/mux/adgs1408.c
  F:    Documentation/devicetree/bindings/mux/adi,adgs1408.txt
  
 +ANALOG DEVICES INC ADIS DRIVER LIBRARY
 +M:    Alexandru Ardelean <[email protected]>
 +S:    Supported
 +L:    [email protected]
 +F:    include/linux/iio/imu/adis.h
 +F:    drivers/iio/imu/adis.c
 +
  ANALOG DEVICES INC ADP5061 DRIVER
  M:    Stefan Popa <[email protected]>
  L:    [email protected]
@@@ -966,19 -942,19 +966,19 @@@ S:      Maintaine
  F:    drivers/media/i2c/adv748x/*
  
  ANALOG DEVICES INC ADV7511 DRIVER
 -M:    Hans Verkuil <h[email protected]>
 +M:    Hans Verkuil <h[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/adv7511*
  
  ANALOG DEVICES INC ADV7604 DRIVER
 -M:    Hans Verkuil <h[email protected]>
 +M:    Hans Verkuil <h[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/adv7604*
  
  ANALOG DEVICES INC ADV7842 DRIVER
 -M:    Hans Verkuil <h[email protected]>
 +M:    Hans Verkuil <h[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/adv7842*
@@@ -1155,7 -1131,7 +1155,7 @@@ APPLIED MICRO (APM) X-GENE SOC PM
  M:    Khuong Dinh <[email protected]>
  S:    Supported
  F:    drivers/perf/xgene_pmu.c
 -F:    Documentation/perf/xgene-pmu.txt
 +F:    Documentation/admin-guide/perf/xgene-pmu.rst
  F:    Documentation/devicetree/bindings/perf/apm-xgene-pmu.txt
  
  APTINA CAMERA SENSOR PLL
@@@ -1164,15 -1140,6 +1164,15 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/aptina-pll.*
  
 +AQUANTIA ETHERNET DRIVER (atlantic)
 +M:    Igor Russkikh <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    http://www.aquantia.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +F:    drivers/net/ethernet/aquantia/atlantic/
 +F:    Documentation/networking/device_drivers/aquantia/atlantic.txt
 +
  ARC FRAMEBUFFER DRIVER
  M:    Jaya Kumar <[email protected]>
  S:    Maintained
@@@ -1236,7 -1203,7 +1236,7 @@@ M:      James (Qian) Wang <james.qian.wang@a
  M:    Liviu Dudau <[email protected]>
  L:    Mali DP Maintainers <[email protected]>
  S:    Supported
 -T:    git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/arm/display/include/
  F:    drivers/gpu/drm/arm/display/komeda/
  F:    Documentation/devicetree/bindings/display/arm,komeda.txt
@@@ -1247,7 -1214,7 +1247,7 @@@ M:      Liviu Dudau <[email protected]
  M:    Brian Starkey <[email protected]>
  L:    Mali DP Maintainers <[email protected]>
  S:    Supported
 -T:    git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/arm/
  F:    Documentation/devicetree/bindings/display/arm,malidp.txt
  F:    Documentation/gpu/afbc.rst
@@@ -1264,7 -1231,7 +1264,7 @@@ F:      include/uapi/drm/panfrost_drm.
  ARM MFM AND FLOPPY DRIVERS
  M:    Ian Molton <[email protected]>
  S:    Maintained
 -F:    arch/arm/lib/floppydma.S
 +F:    arch/arm/mach-rpc/floppydma.S
  F:    arch/arm/include/asm/floppy.h
  
  ARM PMU PROFILING AND DEBUGGING
@@@ -1339,12 -1306,6 +1339,12 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
  F:    drivers/irqchip/irq-vic.c
  
 +AMAZON ANNAPURNA LABS FIC DRIVER
 +M:    Talel Shenhar <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interrupt-controller/amazon,al-fic.txt
 +F:    drivers/irqchip/irq-al-fic.c
 +
  ARM SMMU DRIVERS
  M:    Will Deacon <[email protected]>
  R:    Robin Murphy <[email protected]>
@@@ -1863,7 -1824,6 +1863,7 @@@ F:      arch/arm/mach-orion5x
  F:    arch/arm/plat-orion/
  F:    arch/arm/boot/dts/dove*
  F:    arch/arm/boot/dts/orion5x*
 +T:    git git://git.infradead.org/linux-mvebu.git
  
  ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
  M:    Jason Cooper <[email protected]>
@@@ -1884,7 -1844,6 +1884,7 @@@ F:      drivers/irqchip/irq-armada-370-xp.
  F:    drivers/irqchip/irq-mvebu-*
  F:    drivers/pinctrl/mvebu/
  F:    drivers/rtc/rtc-armada38x.c
 +T:    git git://git.infradead.org/linux-mvebu.git
  
  ARM/Mediatek RTC DRIVER
  M:    Eddie Huang <[email protected]>
@@@ -2091,6 -2050,7 +2091,6 @@@ S:      Maintaine
  
  ARM/QUALCOMM SUPPORT
  M:    Andy Gross <[email protected]>
 -M:    David Brown <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/qcom/
@@@ -2112,7 -2072,7 +2112,7 @@@ F:      drivers/i2c/busses/i2c-qup.
  F:    drivers/i2c/busses/i2c-qcom-geni.c
  F:    drivers/mfd/ssbi.c
  F:    drivers/mmc/host/mmci_qcom*
 -F:    drivers/mmc/host/sdhci_msm.c
 +F:    drivers/mmc/host/sdhci-msm.c
  F:    drivers/pci/controller/dwc/pcie-qcom.c
  F:    drivers/phy/qualcomm/
  F:    drivers/power/*/msm*
@@@ -2141,7 -2101,7 +2141,7 @@@ F:      arch/arm/boot/dts/rda8810pl-
  F:    drivers/clocksource/timer-rda.c
  F:    drivers/irqchip/irq-rda-intc.c
  F:    drivers/tty/serial/rda-uart.c
 -F:    Documentation/devicetree/bindings/arm/rda.txt
 +F:    Documentation/devicetree/bindings/arm/rda.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
  F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt
  F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
@@@ -2219,7 -2179,7 +2219,7 @@@ F:      drivers/*/*s3c64xx
  F:    drivers/*/*s5pv210*
  F:    drivers/memory/samsung/*
  F:    drivers/soc/samsung/*
 -F:    Documentation/arm/Samsung/
 +F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
  F:    Documentation/devicetree/bindings/sram/samsung-sram.txt
  F:    Documentation/devicetree/bindings/power/pd-samsung.txt
@@@ -2384,7 -2344,7 +2384,7 @@@ L:      [email protected]
  S:    Maintained
  
  ARM/TEGRA HDMI CEC SUBSYSTEM SUPPORT
 -M:    Hans Verkuil <h[email protected]>
 +M:    Hans Verkuil <h[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -2626,15 -2586,6 +2626,15 @@@ S:    Maintaine
  F:    Documentation/hwmon/asc7621.rst
  F:    drivers/hwmon/asc7621.c
  
 +ASPEED PINCTRL DRIVERS
 +M:    Andrew Jeffery <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/pinctrl/aspeed/
 +F:    Documentation/devicetree/bindings/pinctrl/aspeed,*
 +
  ASPEED VIDEO ENGINE DRIVER
  M:    Eddie James <[email protected]>
  L:    [email protected]
@@@ -2690,7 -2641,7 +2690,7 @@@ ATA OVER ETHERNET (AOE) DRIVE
  M:    "Justin Sanders" <[email protected]>
  W:    http://www.openaoe.org/
  S:    Supported
 -F:    Documentation/aoe/
 +F:    Documentation/admin-guide/aoe/
  F:    drivers/block/aoe/
  
  ATHEROS 71XX/9XXX GPIO DRIVER
@@@ -2969,7 -2920,7 +2969,7 @@@ M:      Jens Axboe <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    block/bfq-*
 -F:    Documentation/block/bfq-iosched.txt
 +F:    Documentation/block/bfq-iosched.rst
  
  BFS FILE SYSTEM
  M:    "Tigran A. Aivazian" <[email protected]>
@@@ -3109,9 -3060,9 +3109,9 @@@ S:      Maintaine
  F:    arch/riscv/net/
  
  BPF JIT for S390
 +M:    Ilya Leoshkevich <[email protected]>
  M:    Heiko Carstens <[email protected]>
  M:    Vasily Gorbik <[email protected]>
 -M:    Christian Borntraeger <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -3171,7 -3122,6 +3171,7 @@@ F:      arch/arm/mach-bcm
  BROADCOM BCM2835 ARM ARCHITECTURE
  M:    Eric Anholt <[email protected]>
  M:    Stefan Wahren <[email protected]>
 +L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://github.com/anholt/linux
@@@ -3201,7 -3151,6 +3201,7 @@@ F:      arch/arm/boot/dts/bcm953012
  
  BROADCOM BCM53573 ARM ARCHITECTURE
  M:    Rafał Miłecki <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/arm/boot/dts/bcm53573*
@@@ -3728,7 -3677,7 +3728,7 @@@ F:      drivers/crypto/ccree
  W:    https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
  
  CEC FRAMEWORK
 -M:    Hans Verkuil <h[email protected]>
 +M:    Hans Verkuil <h[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  W:    http://linuxtv.org
@@@ -3745,7 -3694,7 +3745,7 @@@ F:      Documentation/devicetree/bindings/me
  F:    Documentation/ABI/testing/debugfs-cec-error-inj
  
  CEC GPIO DRIVER
 -M:    Hans Verkuil <h[email protected]>
 +M:    Hans Verkuil <h[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  W:    http://linuxtv.org
@@@ -3766,7 -3715,7 +3766,7 @@@ F:      arch/powerpc/platforms/cell
  
  CEPH COMMON CODE (LIBCEPH)
  M:    Ilya Dryomov <[email protected]>
 -M:    "Yan, Zheng" <[email protected]>
 +M:    Jeff Layton <[email protected]>
  M:    Sage Weil <[email protected]>
  L:    [email protected]
  W:    http://ceph.com/
@@@ -3778,7 -3727,7 +3778,7 @@@ F:      include/linux/ceph
  F:    include/linux/crush/
  
  CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
 -M:    "Yan, Zheng" <[email protected]>
 +M:    Jeff Layton <[email protected]>
  M:    Sage Weil <[email protected]>
  M:    Ilya Dryomov <[email protected]>
  L:    [email protected]
@@@ -3802,7 -3751,7 +3802,7 @@@ F:      scripts/extract-cert.
  CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
  L:    [email protected]
  S:    Orphan
 -F:    Documentation/usb/WUSB-Design-overview.txt
 +F:    Documentation/usb/wusb-design-overview.rst
  F:    Documentation/usb/wusb-cbaf
  F:    drivers/usb/host/hwa-hc.c
  F:    drivers/usb/host/whci/
@@@ -3937,7 -3886,7 +3937,7 @@@ F:      Documentation/devicetree/bindings/hw
  F:    Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt
  F:    Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
  F:    Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
 -F:    Documentation/hwmon/lochnagar
 +F:    Documentation/hwmon/lochnagar.rst
  
  CISCO FCOE HBA DRIVER
  M:    Satish Kharat <[email protected]>
@@@ -3996,14 -3945,6 +3996,14 @@@ M:    Miguel Ojeda <miguel.ojeda.sandonis@
  S:    Maintained
  F:    .clang-format
  
 +CLANG/LLVM BUILD SUPPORT
 +L:    [email protected]
 +W:    https://clangbuiltlinux.github.io/
 +B:    https://github.com/ClangBuiltLinux/linux/issues
 +C:    irc://chat.freenode.net/clangbuiltlinux
 +S:    Supported
 +K:    \b(?i:clang|llvm)\b
 +
  CLEANCACHE API
  M:    Konrad Rzeszutek Wilk <[email protected]>
  L:    [email protected]
@@@ -4034,7 -3975,7 +4034,7 @@@ S:      Supporte
  F:    drivers/platform/x86/classmate-laptop.c
  
  COBALT MEDIA DRIVER
 -M:    Hans Verkuil <h[email protected]>
 +M:    Hans Verkuil <h[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  W:    https://linuxtv.org
@@@ -4159,7 -4100,7 +4159,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
  F:    Documentation/admin-guide/cgroup-v2.rst
 -F:    Documentation/cgroup-v1/
 +F:    Documentation/admin-guide/cgroup-v1/
  F:    include/linux/cgroup*
  F:    kernel/cgroup/
  
@@@ -4170,7 -4111,7 +4170,7 @@@ W:      http://www.bullopensource.org/cpuset
  W:    http://oss.sgi.com/projects/cpusets/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
 -F:    Documentation/cgroup-v1/cpusets.txt
 +F:    Documentation/admin-guide/cgroup-v1/cpusets.rst
  F:    include/linux/cpuset.h
  F:    kernel/cgroup/cpuset.c
  
@@@ -4184,19 -4125,6 +4184,19 @@@ S:    Maintaine
  F:    mm/memcontrol.c
  F:    mm/swap_cgroup.c
  
 +CONTROL GROUP - BLOCK IO CONTROLLER (BLKIO)
 +M:    Tejun Heo <[email protected]>
 +M:    Jens Axboe <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://git.kernel.dk/linux-block
 +F:    Documentation/cgroup-v1/blkio-controller.rst
 +F:    block/blk-cgroup.c
 +F:    include/linux/blk-cgroup.h
 +F:    block/blk-throttle.c
 +F:    block/blk-iolatency.c
 +F:    block/bfq-cgroup.c
 +
  CORETEMP HARDWARE MONITORING DRIVER
  M:    Fenghua Yu <[email protected]>
  L:    [email protected]
@@@ -4318,7 -4246,6 +4318,7 @@@ F:      crypto
  F:    drivers/crypto/
  F:    include/crypto/
  F:    include/linux/crypto*
 +F:    lib/crypto/
  
  CRYPTOGRAPHIC RANDOM NUMBER GENERATOR
  M:    Neil Horman <[email protected]>
@@@ -4656,7 -4583,7 +4656,7 @@@ DELL SYSTEMS MANAGEMENT BASE DRIVER (dc
  M:    Stuart Hayes <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/dcdbas.txt
 +F:    Documentation/driver-api/dcdbas.rst
  F:    drivers/platform/x86/dcdbas.*
  
  DELL WMI NOTIFICATIONS DRIVER
@@@ -4684,13 -4611,6 +4684,13 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/mtd/nand/raw/denali*
  
 +DESIGNWARE EDMA CORE IP DRIVER
 +M:    Gustavo Pimentel <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/dma/dw-edma/
 +F:    include/linux/dma/edma.h
 +
  DESIGNWARE USB2 DRD IP DRIVER
  M:    Minas Harutyunyan <[email protected]>
  L:    [email protected]
@@@ -4756,7 -4676,7 +4756,7 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git
  T:    quilt http://people.redhat.com/agk/patches/linux/editing/
  S:    Maintained
 -F:    Documentation/device-mapper/
 +F:    Documentation/admin-guide/device-mapper/
  F:    drivers/md/Makefile
  F:    drivers/md/Kconfig
  F:    drivers/md/dm*
@@@ -4782,7 -4702,6 +4782,7 @@@ F:      Documentation/devicetree/bindings/mf
  F:    Documentation/devicetree/bindings/input/da90??-onkey.txt
  F:    Documentation/devicetree/bindings/thermal/da90??-thermal.txt
  F:    Documentation/devicetree/bindings/regulator/da92*.txt
 +F:    Documentation/devicetree/bindings/regulator/slg51000.txt
  F:    Documentation/devicetree/bindings/watchdog/da90??-wdt.txt
  F:    Documentation/devicetree/bindings/sound/da[79]*.txt
  F:    drivers/gpio/gpio-da90??.c
@@@ -4798,7 -4717,6 +4798,7 @@@ F:      drivers/power/supply/da9052-battery.
  F:    drivers/power/supply/da91??-*.c
  F:    drivers/regulator/da903x.c
  F:    drivers/regulator/da9???-regulator.[ch]
 +F:    drivers/regulator/slg51000-regulator.[ch]
  F:    drivers/thermal/da90??-thermal.c
  F:    drivers/rtc/rtc-da90??.c
  F:    drivers/video/backlight/da90??_bl.c
@@@ -4876,7 -4794,7 +4876,7 @@@ S:      Maintaine
  W:    http://plugable.com/category/projects/udlfb/
  F:    drivers/video/fbdev/udlfb.c
  F:    include/video/udlfb.h
 -F:    Documentation/fb/udlfb.txt
 +F:    Documentation/fb/udlfb.rst
  
  DISTRIBUTED LOCK MANAGER (DLM)
  M:    Christine Caulfield <[email protected]>
@@@ -4949,7 -4867,7 +4949,7 @@@ S:      Maintaine
  F:    Documentation/
  F:    scripts/kernel-doc
  X:    Documentation/ABI/
 -X:    Documentation/acpi/
 +X:    Documentation/firmware-guide/acpi/
  X:    Documentation/devicetree/
  X:    Documentation/i2c/
  X:    Documentation/media/
@@@ -5009,6 -4927,13 +5009,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/staging/fsl-dpaa2/ethsw
  
 -DPAA2 PTP CLOCK DRIVER
 -M:    Yangbo Lu <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp*
 -F:    drivers/net/ethernet/freescale/dpaa2/dprtc*
 -
  DPT_I2O SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <[email protected]>
  L:    [email protected]
@@@ -5027,7 -4952,7 +5027,7 @@@ T:      git git://git.linbit.com/drbd-8.4.gi
  S:    Supported
  F:    drivers/block/drbd/
  F:    lib/lru_cache.c
 -F:    Documentation/blockdev/drbd/
 +F:    Documentation/admin-guide/blockdev/
  
  DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -5220,13 -5145,6 +5220,13 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tinydrm/st7735r.c
  F:    Documentation/devicetree/bindings/display/sitronix,st7735r.txt
  
 +DRM DRIVER FOR ST-ERICSSON MCDE
 +M:    Linus Walleij <[email protected]>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/mcde/
 +F:    Documentation/devicetree/bindings/display/ste,mcde.txt
 +
  DRM DRIVER FOR TDFX VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
@@@ -5512,7 -5430,6 +5512,7 @@@ T:      git git://anongit.freedesktop.org/dr
  
  DRM PANEL DRIVERS
  M:    Thierry Reding <[email protected]>
 +R:    Sam Ravnborg <[email protected]>
  L:    [email protected]
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
@@@ -5541,6 -5458,7 +5541,6 @@@ F:      Documentation/gpu/xen-front.rs
  DRM TTM SUBSYSTEM
  M:    Christian Koenig <[email protected]>
  M:    Huang Rui <[email protected]>
 -M:    Junwei Zhang <[email protected]>
  T:    git git://people.freedesktop.org/~agd5f/linux
  S:    Maintained
  L:    [email protected]
@@@ -5687,8 -5605,7 +5687,8 @@@ F:      include/linux/dynamic_debug.
  DYNAMIC INTERRUPT MODERATION
  M:    Tal Gilboa <[email protected]>
  S:    Maintained
 -F:    include/linux/net_dim.h
 +F:    include/linux/dim.h
 +F:    lib/dim/
  
  DZ DECSTATION DZ11 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <[email protected]>
@@@ -5897,12 -5814,6 +5897,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/edac/sb_edac.c
  
 +EDAC-SIFIVE
 +M:    Yash Shah <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/edac/sifive_edac.c
 +
  EDAC-SKYLAKE
  M:    Tony Luck <[email protected]>
  L:    [email protected]
@@@ -6062,7 -5973,6 +6062,7 @@@ M:      Heiner Kallweit <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-mdio
 +F:    Documentation/devicetree/bindings/net/ethernet-phy.yaml
  F:    Documentation/devicetree/bindings/net/mdio*
  F:    Documentation/networking/phy.rst
  F:    drivers/net/phy/
@@@ -6108,7 -6018,7 +6108,7 @@@ M:      Ard Biesheuvel <ard.biesheuvel@linar
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
  S:    Maintained
 -F:    Documentation/efi-stub.txt
 +F:    Documentation/admin-guide/efi-stub.rst
  F:    arch/*/kernel/efi.c
  F:    arch/x86/boot/compressed/eboot.[ch]
  F:    arch/*/include/asm/efi.h
@@@ -6127,7 -6037,7 +6127,7 @@@ S:      Maintaine
  F:    drivers/extcon/
  F:    include/linux/extcon/
  F:    include/linux/extcon.h
 -F:    Documentation/extcon/
 +F:    Documentation/firmware-guide/acpi/extcon-intel-int3496.rst
  F:    Documentation/devicetree/bindings/extcon/
  
  EXYNOS DP DRIVER
@@@ -6313,17 -6223,10 +6313,17 @@@ M:   Philip Kelleher <[email protected]
  S:    Maintained
  F:    drivers/block/rsxx/
  
 +FLEXTIMER FTM-QUADDEC DRIVER
 +M:    Patrick Havelange <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-counter-ftm-quadddec
 +F:    Documentation/devicetree/bindings/counter/ftm-quaddec.txt
 +F:    drivers/counter/ftm-quaddec.c
 +
  FLOPPY DRIVER
 -M:    Jiri Kosina <[email protected]>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
 -S:    Odd fixes
 +S:    Orphan
 +L:    [email protected]
  F:    drivers/block/floppy.c
  
  FMC SUBSYSTEM
@@@ -6352,7 -6255,7 +6352,7 @@@ FPGA DFL DRIVER
  M:    Wu Hao <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/fpga/dfl.txt
 +F:    Documentation/fpga/dfl.rst
  F:    include/uapi/linux/fpga-dfl.h
  F:    drivers/fpga/dfl*
  
@@@ -6429,13 -6332,6 +6429,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-cpm.c
  
 +FREESCALE IMX DDR PMU DRIVER
 +M:    Frank Li <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/perf/fsl_imx8_ddr_perf.c
 +F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
 +
  FREESCALE IMX LPI2C DRIVER
  M:    Dong Aisheng <[email protected]>
  L:    [email protected]
@@@ -6479,8 -6375,6 +6479,8 @@@ FREESCALE QORIQ PTP CLOCK DRIVE
  M:    Yangbo Lu <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp*
 +F:    drivers/net/ethernet/freescale/dpaa2/dprtc*
  F:    drivers/net/ethernet/freescale/enetc/enetc_ptp.c
  F:    drivers/ptp/ptp_qoriq.c
  F:    drivers/ptp/ptp_qoriq_debugfs.c
@@@ -6526,7 -6420,6 +6526,7 @@@ M:      Li Yang <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/misc/fsl,dpaa2-console.txt
  F:    Documentation/devicetree/bindings/soc/fsl/
  F:    drivers/soc/fsl/
  F:    include/linux/fsl/
@@@ -6569,7 -6462,7 +6569,7 @@@ M:      "Rafael J. Wysocki" <[email protected]
  M:    Pavel Machek <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/power/freezing-of-tasks.txt
 +F:    Documentation/power/freezing-of-tasks.rst
  F:    include/linux/freezer.h
  F:    kernel/freezer.c
  
@@@ -6600,19 -6493,6 +6600,19 @@@ F:    fs/crypto
  F:    include/linux/fscrypt*.h
  F:    Documentation/filesystems/fscrypt.rst
  
 +FSI SUBSYSTEM
 +M:    Jeremy Kerr <[email protected]>
 +M:    Joel Stanley <[email protected]>
 +R:    Alistar Popple <[email protected]>
 +R:    Eddie James <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git
 +Q:    http://patchwork.ozlabs.org/project/linux-fsi/list/
 +S:    Supported
 +F:    drivers/fsi/
 +F:    include/linux/fsi*.h
 +F:    include/trace/events/fsi*.h
 +
  FSI-ATTACHED I2C DRIVER
  M:    Eddie James <[email protected]>
  L:    [email protected]
@@@ -6683,7 -6563,7 +6683,7 @@@ S:      Maintaine
  F:    scripts/gcc-plugins/
  F:    scripts/gcc-plugin.sh
  F:    scripts/Makefile.gcc-plugins
 -F:    Documentation/gcc-plugins.txt
 +F:    Documentation/core-api/gcc-plugins.rst
  
  GASKET DRIVER FRAMEWORK
  M:    Rob Springer <[email protected]>
@@@ -6789,18 -6669,6 +6789,18 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/uio/uio_pci_generic.c
  
 +GENERIC VDSO LIBRARY:
 +M:    Andy Lutomirski <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
 +M:    Vincenzo Frascino <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/vdso
 +S:    Maintained
 +F:    lib/vdso/
 +F:    kernel/time/vsyscall.c
 +F:    include/vdso/
 +F:    include/asm-generic/vdso/vsyscall.h
 +
  GENWQE (IBM Generic Workqueue Card)
  M:    Frank Haverkamp <[email protected]>
  S:    Supported
@@@ -6827,7 -6695,9 +6827,7 @@@ M:      Paul Bolle <[email protected]
  L:    [email protected]
  W:    http://gigaset307x.sourceforge.net/
  S:    Odd Fixes
 -F:    Documentation/isdn/README.gigaset
 -F:    drivers/isdn/gigaset/
 -F:    include/uapi/linux/gigaset_dev.h
 +F:    drivers/staging/isdn/gigaset/
  
  GNSS SUBSYSTEM
  M:    Johan Hovold <[email protected]>
@@@ -6839,7 -6709,7 +6839,7 @@@ F:      drivers/gnss
  F:    include/linux/gnss.h
  
  GO7007 MPEG CODEC
 -M:    Hans Verkuil <h[email protected]>
 +M:    Hans Verkuil <h[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/usb/go7007/
@@@ -6850,15 -6720,6 +6850,15 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/input/touchscreen/goodix.c
  
 +GOOGLE ETHERNET DRIVERS
 +M:    Catherine Sullivan <[email protected]>
 +R:    Sagi Shahar <[email protected]>
 +R:    Jon Olson <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/networking/device_drivers/google/gve.txt
 +F:    drivers/net/ethernet/google
 +
  GPD POCKET FAN DRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
@@@ -6895,7 -6756,7 +6895,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/
  F:    Documentation/driver-api/gpio/
 -F:    Documentation/gpio/
 +F:    Documentation/admin-guide/gpio/
  F:    Documentation/ABI/testing/gpio-cdev
  F:    Documentation/ABI/obsolete/sysfs-gpio
  F:    drivers/gpio/
@@@ -7116,7 -6977,7 +7116,7 @@@ M:      Herbert Xu <[email protected]
  L:    [email protected]
  S:    Odd fixes
  F:    Documentation/devicetree/bindings/rng/
 -F:    Documentation/hw_random.txt
 +F:    Documentation/admin-guide/hw_random.rst
  F:    drivers/char/hw_random/
  F:    include/linux/hw_random.h
  
@@@ -7152,7 -7013,7 +7152,7 @@@ F:      drivers/media/usb/hdpvr
  HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER
  M:    Jerry Hoemann <[email protected]>
  S:    Supported
 -F:    Documentation/watchdog/hpwdt.txt
 +F:    Documentation/watchdog/hpwdt.rst
  F:    drivers/watchdog/hpwdt.c
  
  HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
@@@ -7290,7 -7151,7 +7290,7 @@@ M:      Shaokun Zhang <zhangshaokun@hisilico
  W:    http://www.hisilicon.com
  S:    Supported
  F:    drivers/perf/hisilicon
 -F:    Documentation/perf/hisi-pmu.txt
 +F:    Documentation/admin-guide/perf/hisi-pmu.rst
  
  HISILICON ROCE DRIVER
  M:    Lijun Ou <[email protected]>
@@@ -7335,7 -7196,7 +7335,7 @@@ F:      drivers/net/ethernet/hp/hp100.
  HPET: High Precision Event Timers driver
  M:    Clemens Ladisch <[email protected]>
  S:    Maintained
 -F:    Documentation/timers/hpet.txt
 +F:    Documentation/timers/hpet.rst
  F:    drivers/char/hpet.c
  F:    include/linux/hpet.h
  F:    include/uapi/linux/hpet.h
@@@ -7445,7 -7306,6 +7445,7 @@@ F:      arch/x86/include/asm/trace/hyperv.
  F:    arch/x86/include/asm/hyperv-tlfs.h
  F:    arch/x86/kernel/cpu/mshyperv.c
  F:    arch/x86/hyperv
 +F:    drivers/clocksource/hyperv_timer.c
  F:    drivers/hid/hid-hyperv.c
  F:    drivers/hv/
  F:    drivers/input/serio/hyperv-keyboard.c
@@@ -7456,21 -7316,11 +7456,21 @@@ F:   drivers/uio/uio_hv_generic.
  F:    drivers/video/fbdev/hyperv_fb.c
  F:    drivers/iommu/hyperv_iommu.c
  F:    net/vmw_vsock/hyperv_transport.c
 +F:    include/clocksource/hyperv_timer.h
  F:    include/linux/hyperv.h
  F:    include/uapi/linux/hyperv.h
 +F:    include/asm-generic/mshyperv.h
  F:    tools/hv/
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  
 +HYPERBUS SUPPORT
 +M:    Vignesh Raghavendra <[email protected]>
 +S:    Supported
 +F:    drivers/mtd/hyperbus/
 +F:    include/linux/mtd/hyperbus.h
 +F:    Documentation/devicetree/bindings/mtd/cypress,hyperflash.txt
 +F:    Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt
 +
  HYPERVISOR VIRTUAL CONSOLE DRIVER
  L:    [email protected]
  S:    Odd Fixes
@@@ -7764,7 -7614,7 +7764,7 @@@ IDE/ATAPI DRIVER
  M:    Borislav Petkov <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/cdrom/ide-cd
 +F:    Documentation/cdrom/ide-cd.rst
  F:    drivers/ide/ide-cd*
  
  IDEAPAD LAPTOP EXTRAS DRIVER
@@@ -7927,12 -7777,6 +7927,12 @@@ W:    http://industrypack.sourceforge.ne
  S:    Maintained
  F:    drivers/ipack/
  
 +INFINEON DPS310 Driver
 +M:    Eddie James <[email protected]>
 +L:    [email protected]
 +F:    drivers/iio/pressure/dps310.c
 +S:    Maintained
 +
  INFINIBAND SUBSYSTEM
  M:    Doug Ledford <[email protected]>
  M:    Jason Gunthorpe <[email protected]>
@@@ -7961,34 -7805,7 +7961,34 @@@ INGENIC JZ4780 NAND DRIVE
  M:    Harvey Hunt <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/mtd/nand/raw/jz4780_*
 +F:    drivers/mtd/nand/raw/ingenic/
 +
 +INGENIC JZ47xx SoCs
 +M:    Paul Cercueil <[email protected]>
 +S:    Maintained
 +F:    arch/mips/boot/dts/ingenic/
 +F:    arch/mips/include/asm/mach-jz4740/
 +F:    arch/mips/jz4740/
 +F:    drivers/clk/ingenic/
 +F:    drivers/dma/dma-jz4780.c
 +F:    drivers/gpu/drm/ingenic/
 +F:    drivers/i2c/busses/i2c-jz4780.c
 +F:    drivers/iio/adc/ingenic-adc.c
 +F:    drivers/irqchip/irq-ingenic.c
 +F:    drivers/memory/jz4780-nemc.c
 +F:    drivers/mmc/host/jz4740_mmc.c
 +F:    drivers/mtd/nand/raw/ingenic/
 +F:    drivers/pinctrl/pinctrl-ingenic.c
 +F:    drivers/power/supply/ingenic-battery.c
 +F:    drivers/pwm/pwm-jz4740.c
 +F:    drivers/rtc/rtc-jz4740.c
 +F:    drivers/tty/serial/8250/8250_ingenic.c
 +F:    drivers/usb/musb/jz4740.c
 +F:    drivers/watchdog/jz4740_wdt.c
 +F:    include/dt-bindings/iio/adc/ingenic,adc.h
 +F:    include/linux/mfd/ingenic-tcu.h
 +F:    sound/soc/jz4740/
 +F:    sound/soc/codecs/jz47*
  
  INOTIFY
  M:    Jan Kara <[email protected]>
@@@ -8044,6 -7861,7 +8044,7 @@@ S:      Maintaine
  F:    drivers/video/fbdev/i810/
  
  INTEL ASoC DRIVERS
+ M:    Cezary Rojewski <[email protected]>
  M:    Pierre-Louis Bossart <[email protected]>
  M:    Liam Girdwood <[email protected]>
  M:    Jie Yang <[email protected]>
@@@ -8110,7 -7928,7 +8111,7 @@@ INTEL FRAMEBUFFER DRIVER (excluding 81
  M:    Maik Broemme <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/fb/intelfb.txt
 +F:    Documentation/fb/intelfb.rst
  F:    drivers/video/fbdev/intelfb/
  
  INTEL GPIO DRIVERS
@@@ -8221,7 -8039,7 +8222,7 @@@ F:      include/uapi/linux/mei.
  F:    include/linux/mei_cl_bus.h
  F:    drivers/misc/mei/*
  F:    drivers/watchdog/mei_wdt.c
 -F:    Documentation/misc-devices/mei/*
 +F:    Documentation/driver-api/mei/*
  F:    samples/mei/*
  
  INTEL MENLOW THERMAL DRIVER
@@@ -8270,7 -8088,7 +8271,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    drivers/gpio/gpio-*cove.c
  F:    drivers/gpio/gpio-msic.c
  
 -INTEL MULTIFUNCTION PMIC DEVICE DRIVERS
 +INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
  R:    Andy Shevchenko <[email protected]>
  S:    Maintained
  F:    drivers/mfd/intel_msic.c
@@@ -8301,14 -8119,6 +8302,14 @@@ S:    Supporte
  F:    drivers/infiniband/hw/i40iw/
  F:    include/uapi/rdma/i40iw-abi.h
  
 +INTEL SPEED SELECT TECHNOLOGY
 +M:    Srinivas Pandruvada <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/x86/intel_speed_select_if/
 +F:    tools/power/x86/intel-speed-select/
 +F:    include/uapi/linux/isst_if.h
 +
  INTEL TELEMETRY DRIVER
  M:    Rajneesh Bhardwaj <[email protected]>
  M:    "David E. Box" <[email protected]>
@@@ -8367,7 -8177,7 +8368,7 @@@ L:      [email protected]
  W:    http://tboot.sourceforge.net
  T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
  S:    Supported
 -F:    Documentation/intel_txt.txt
 +F:    Documentation/x86/intel_txt.rst
  F:    include/linux/tboot.h
  F:    arch/x86/kernel/tboot.c
  
@@@ -8381,7 -8191,7 +8382,7 @@@ INTERCONNECT AP
  M:    Georgi Djakov <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/interconnect/
 +F:    Documentation/driver-api/interconnect.rst
  F:    Documentation/devicetree/bindings/interconnect/
  F:    drivers/interconnect/
  F:    include/dt-bindings/interconnect/
@@@ -8417,7 -8227,6 +8418,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
  S:    Supported
  F:    fs/iomap.c
 +F:    fs/iomap/
  F:    include/linux/iomap.h
  
  IOMMU DRIVERS
@@@ -8518,7 -8327,7 +8519,7 @@@ F:      drivers/irqchip
  ISA
  M:    William Breathitt Gray <[email protected]>
  S:    Maintained
 -F:    Documentation/isa.txt
 +F:    Documentation/driver-api/isa.rst
  F:    drivers/base/isa.c
  F:    include/linux/isa.h
  
@@@ -8533,7 -8342,7 +8534,7 @@@ F:      drivers/media/radio/radio-isa
  ISAPNP
  M:    Jaroslav Kysela <[email protected]>
  S:    Maintained
 -F:    Documentation/isapnp.txt
 +F:    Documentation/driver-api/isapnp.rst
  F:    drivers/pnp/isapnp/
  F:    include/linux/isapnp.h
  
@@@ -8571,26 -8380,18 +8572,26 @@@ S:   Supporte
  W:    http://www.linux-iscsi.org
  F:    drivers/infiniband/ulp/isert
  
 -ISDN SUBSYSTEM
 +ISDN/mISDN SUBSYSTEM
  M:    Karsten Keil <[email protected]>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
  W:    http://www.isdn4linux.de
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/isdn-2.6.git
  S:    Maintained
 +F:    drivers/isdn/mISDN
 +F:    drivers/isdn/hardware
 +
 +ISDN/CAPI SUBSYSTEM
 +M:    Karsten Keil <[email protected]>
 +L:    [email protected] (subscribers-only)
 +L:    [email protected]
 +W:    http://www.isdn4linux.de
 +S:    Odd Fixes
  F:    Documentation/isdn/
 -F:    drivers/isdn/
 -F:    include/linux/isdn.h
 +F:    drivers/isdn/capi/
 +F:    drivers/staging/isdn/
 +F:    net/bluetooth/cmtp/
  F:    include/linux/isdn/
 -F:    include/uapi/linux/isdn.h
  F:    include/uapi/linux/isdn/
  
  IT87 HARDWARE MONITORING DRIVER
@@@ -8731,7 -8532,7 +8732,7 @@@ R:      Vivek Goyal <[email protected]
  L:    [email protected]
  W:    http://lse.sourceforge.net/kdump/
  S:    Maintained
 -F:    Documentation/kdump/
 +F:    Documentation/admin-guide/kdump/
  
  KEENE FM RADIO TRANSMITTER DRIVER
  M:    Hans Verkuil <[email protected]>
@@@ -8878,8 -8679,6 +8879,8 @@@ F:      arch/s390/include/asm/gmap.
  F:    arch/s390/include/asm/kvm*
  F:    arch/s390/kvm/
  F:    arch/s390/mm/gmap.c
 +F:    tools/testing/selftests/kvm/s390x/
 +F:    tools/testing/selftests/kvm/*/s390x/
  
  KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
  M:    Paolo Bonzini <[email protected]>
@@@ -9065,7 -8864,7 +9066,7 @@@ F:      include/linux/leds.
  LEGACY EEPROM DRIVER
  M:    Jean Delvare <[email protected]>
  S:    Maintained
 -F:    Documentation/misc-devices/eeprom
 +F:    Documentation/misc-devices/eeprom.rst
  F:    drivers/misc/eeprom/eeprom.c
  
  LEGO MINDSTORMS EV3
@@@ -9087,7 -8886,7 +9088,7 @@@ M:      Matan Ziv-Av <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-platform-lg-laptop
 -F:    Documentation/laptops/lg-laptop.rst
 +F:    Documentation/admin-guide/laptops/lg-laptop.rst
  F:    drivers/platform/x86/lg-laptop.c
  
  LG2160 MEDIA DRIVER
@@@ -9351,7 -9150,7 +9352,7 @@@ F:      Documentation/memory-barriers.tx
  LIS3LV02D ACCELEROMETER DRIVER
  M:    Eric Piel <[email protected]>
  S:    Maintained
 -F:    Documentation/misc-devices/lis3lv02d
 +F:    Documentation/misc-devices/lis3lv02d.rst
  F:    drivers/misc/lis3lv02d/
  F:    drivers/platform/x86/hp_accel.c
  
@@@ -9456,7 -9255,7 +9457,7 @@@ M:      "Richard Russon (FlatCap)" <ldm@flat
  L:    [email protected]
  W:    http://www.linux-ntfs.org/content/view/19/37/
  S:    Maintained
 -F:    Documentation/ldm.txt
 +F:    Documentation/admin-guide/ldm.rst
  F:    block/partitions/ldm.*
  
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
@@@ -9842,17 -9641,6 +9843,17 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/iio/dac/cio-dac.c
  
 +MEDIA CONTROLLER FRAMEWORK
 +M:    Sakari Ailus <[email protected]>
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +W:    https://www.linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    drivers/media/mc/
 +F:    include/media/media-*.h
 +F:    include/uapi/linux/media.h
 +
  MEDIA DRIVERS FOR ASCOT2E
  M:    Sergey Kozlov <[email protected]>
  M:    Abylay Ospan <[email protected]>
@@@ -10174,13 -9962,6 +10175,13 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
 +MEDIATEK MT7621/28/88 I2C DRIVER
 +M:    Stefan Roese <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-mt7621.c
 +F:    Documentation/devicetree/bindings/i2c/i2c-mt7621.txt
 +
  MEDIATEK NAND CONTROLLER DRIVER
  M:    Xiaolei Li <[email protected]>
  L:    [email protected]
@@@ -10326,7 -10107,6 +10327,7 @@@ Q:   http://patchwork.ozlabs.org/project/
  S:    Supported
  F:    drivers/net/ethernet/mellanox/mlx5/core/
  F:    include/linux/mlx5/
 +F:    Documentation/networking/device_drivers/mellanox/
  
  MELLANOX MLX5 IB driver
  M:    Leon Romanovsky <[email protected]>
@@@ -10353,7 -10133,7 +10354,7 @@@ L:   [email protected]
  S:    Supported
  F:    drivers/leds/leds-mlxcpld.c
  F:    drivers/leds/leds-mlxreg.c
 -F:    Documentation/leds/leds-mlxcpld.txt
 +F:    Documentation/leds/leds-mlxcpld.rst
  
  MELLANOX PLATFORM DRIVER
  M:    Vadim Pasternak <[email protected]>
@@@ -10418,7 -10198,7 +10419,7 @@@ M:   Johannes Thumshirn <morbidrsa@gmail.
  S:    Maintained
  F:    drivers/mcb/
  F:    include/linux/mcb.h
 -F:    Documentation/men-chameleon-bus.txt
 +F:    Documentation/driver-api/men-chameleon-bus.rst
  
  MEN F21BMC (Board Management Controller)
  M:    Andreas Werner <[email protected]>
@@@ -10437,7 -10217,7 +10438,7 @@@ F:   drivers/watchdog/menz69_wdt.
  
  MESON AO CEC DRIVER FOR AMLOGIC SOCS
  M:    Neil Armstrong <[email protected]>
 -L:    linux-media@lists.freedesktop.org
 +L:    linux-media@vger.kernel.org
  L:    [email protected]
  W:    http://linux-meson.com/
  S:    Supported
@@@ -10453,14 -10233,6 +10454,14 @@@ S: Maintaine
  F:    drivers/mtd/nand/raw/meson_*
  F:    Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
  
 +MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
 +M:    Maxime Jourdan <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/staging/media/meson/vdec/
 +T:    git git://linuxtv.org/media_tree.git
 +
  METHODE UDPU SUPPORT
  M:    Vladimir Vid <[email protected]>
  S:    Maintained
@@@ -10514,9 -10286,7 +10515,9 @@@ MICROCHIP ISC DRIVE
  M:    Eugen Hristev <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/media/platform/atmel/atmel-isc.c
 +F:    drivers/media/platform/atmel/atmel-sama5d2-isc.c
 +F:    drivers/media/platform/atmel/atmel-isc.h
 +F:    drivers/media/platform/atmel/atmel-isc-base.c
  F:    drivers/media/platform/atmel/atmel-isc-regs.h
  F:    Documentation/devicetree/bindings/media/atmel-isc.txt
  
@@@ -10832,7 -10602,7 +10833,7 @@@ F:   include/uapi/linux/meye.
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  M:    Jiri Slaby <[email protected]>
  S:    Maintained
 -F:    Documentation/serial/moxa-smartio.rst
 +F:    Documentation/driver-api/serial/moxa-smartio.rst
  F:    drivers/tty/mxser.*
  
  MR800 AVERMEDIA USB FM RADIO DRIVER
@@@ -11076,6 -10846,14 +11077,6 @@@ F:  driver/net/net_failover.
  F:    include/net/net_failover.h
  F:    Documentation/networking/net_failover.rst
  
 -NETEFFECT IWARP RNIC DRIVER (IW_NES)
 -M:    Faisal Latif <[email protected]>
 -L:    [email protected]
 -W:    http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm
 -S:    Supported
 -F:    drivers/infiniband/hw/nes/
 -F:    include/uapi/rdma/nes-abi.h
 -
  NETEM NETWORK EMULATOR
  M:    Stephen Hemminger <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -11092,7 -10870,7 +11093,7 @@@ F:   drivers/net/ethernet/neterion
  
  NETFILTER
  M:    Pablo Neira Ayuso <[email protected]>
 -M:    Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 +M:    Jozsef Kadlecsik <kadlec@netfilter.org>
  M:    Florian Westphal <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -11133,7 -10911,7 +11134,7 @@@ M:   Josef Bacik <[email protected]
  S:    Maintained
  L:    [email protected]
  L:    [email protected]
 -F:    Documentation/blockdev/nbd.txt
 +F:    Documentation/admin-guide/blockdev/nbd.rst
  F:    drivers/block/nbd.c
  F:    include/trace/events/nbd.h
  F:    include/uapi/linux/nbd.h
@@@ -11305,15 -11083,6 +11306,15 @@@ L: [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/netxen/
  
 +NEXTHOP
 +M:    David Ahern <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    include/net/nexthop.h
 +F:    include/uapi/linux/nexthop.h
 +F:    include/net/netns/nexthop.h
 +F:    net/ipv4/nexthop.c
 +
  NFC SUBSYSTEM
  L:    [email protected]
  S:    Orphan
@@@ -11343,7 -11112,7 +11344,7 @@@ F:   include/uapi/linux/nfs
  F:    include/uapi/linux/sunrpc/
  
  NILFS2 FILESYSTEM
 -M:    Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
 +M:    Ryusuke Konishi <konishi.ryusuke@gmail.com>
  L:    [email protected]
  W:    https://nilfs.sourceforge.io/
  W:    https://nilfs.osdn.jp/
@@@ -11517,7 -11286,7 +11518,7 @@@ NXP FXAS21002C DRIVE
  M:    Rui Miguel Silva <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/gyroscope/fxas21002c.txt
 +F:    Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt
  F:    drivers/iio/gyro/fxas21002c_core.c
  F:    drivers/iio/gyro/fxas21002c.h
  F:    drivers/iio/gyro/fxas21002c_i2c.c
@@@ -11592,7 -11361,7 +11593,7 @@@ F:   arch/powerpc/include/asm/pnv-ocxl.
  F:    drivers/misc/ocxl/
  F:    include/misc/ocxl*
  F:    include/uapi/misc/ocxl.h
 -F:    Documentation/accelerators/ocxl.rst
 +F:    Documentation/userspace-api/accelerators/ocxl.rst
  
  OMAP AUDIO SUPPORT
  M:    Peter Ujfalusi <[email protected]>
@@@ -11628,7 -11397,7 +11629,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Orphan
  F:    drivers/video/fbdev/omap2/
 -F:    Documentation/arm/OMAP/DSS
 +F:    Documentation/arm/omap/dss.rst
  
  OMAP FRAMEBUFFER SUPPORT
  L:    [email protected]
@@@ -11907,15 -11676,23 +11908,15 @@@ S:        Maintaine
  F:    drivers/mtd/nand/onenand/
  F:    include/linux/mtd/onenand*.h
  
 -ONSTREAM SCSI TAPE DRIVER
 -M:    Willem Riede <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/scsi/osst.txt
 -F:    drivers/scsi/osst.*
 -F:    drivers/scsi/osst_*.h
 -F:    drivers/scsi/st.h
 -
  OP-TEE DRIVER
  M:    Jens Wiklander <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    drivers/tee/optee/
  
  OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER
  M:    Sumit Garg <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    drivers/char/hw_random/optee-rng.c
  
@@@ -12002,7 -11779,7 +12003,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
  F:    drivers/opp/
  F:    include/linux/pm_opp.h
 -F:    Documentation/power/opp.txt
 +F:    Documentation/power/opp.rst
  F:    Documentation/devicetree/bindings/opp/
  
  OPL4 DRIVER
@@@ -12099,14 -11876,6 +12100,14 @@@ F: kernel/padata.
  F:    include/linux/padata.h
  F:    Documentation/padata.txt
  
 +PAGE POOL
 +M:    Jesper Dangaard Brouer <[email protected]>
 +M:    Ilias Apalodimas <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    net/core/page_pool.c
 +F:    include/net/page_pool.h
 +
  PANASONIC LAPTOP ACPI EXTRAS DRIVER
  M:    Harald Welte <[email protected]>
  L:    [email protected]
@@@ -12117,7 -11886,7 +12118,7 @@@ PARALLEL LCD/KEYPAD PANEL DRIVE
  M:    Willy Tarreau <[email protected]>
  M:    Ksenija Stanojevic <[email protected]>
  S:    Odd Fixes
 -F:    Documentation/auxdisplay/lcd-panel-cgram.txt
 +F:    Documentation/admin-guide/lcd-panel-cgram.rst
  F:    drivers/auxdisplay/panel.c
  
  PARALLEL PORT SUBSYSTEM
@@@ -12129,12 -11898,11 +12130,12 @@@ F:        drivers/parport
  F:    include/linux/parport*.h
  F:    drivers/char/ppdev.c
  F:    include/uapi/linux/ppdev.h
 -F:    Documentation/parport*.txt
 +F:    Documentation/driver-api/parport*.rst
  
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <[email protected]>
 -M:    Alok Kataria <[email protected]>
 +M:    Thomas Hellstrom <[email protected]>
 +M:    "VMware, Inc." <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/virtual/paravirt_ops.txt
@@@ -12146,7 -11914,7 +12147,7 @@@ PARIDE DRIVERS FOR PARALLEL PORT IDE DE
  M:    Tim Waugh <[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
 -F:    Documentation/blockdev/paride.txt
 +F:    Documentation/admin-guide/blockdev/paride.rst
  F:    drivers/block/paride/
  
  PARISC ARCHITECTURE
@@@ -12305,7 -12073,7 +12306,7 @@@ M:   Kurt Schwemmer <kurt.schwemmer@micro
  M:    Logan Gunthorpe <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/switchtec.txt
 +F:    Documentation/driver-api/switchtec.rst
  F:    Documentation/ABI/testing/sysfs-class-switchtec
  F:    drivers/pci/switch/switchtec*
  F:    include/uapi/linux/switchtec_ioctl.h
@@@ -12390,7 -12158,7 +12391,7 @@@ M:   Sam Bobroff <[email protected]
  M:    Oliver O'Halloran <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/PCI/pci-error-recovery.txt
 +F:    Documentation/PCI/pci-error-recovery.rst
  F:    drivers/pci/pcie/aer.c
  F:    drivers/pci/pcie/dpc.c
  F:    drivers/pci/pcie/err.c
@@@ -12403,7 -12171,7 +12404,7 @@@ PCI ERROR RECOVER
  M:    Linas Vepstas <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/PCI/pci-error-recovery.txt
 +F:    Documentation/PCI/pci-error-recovery.rst
  
  PCI MSI DRIVER FOR ALTERA MSI IP
  M:    Ley Foon Tan <[email protected]>
@@@ -12652,17 -12420,6 +12653,17 @@@ F: arch/arm/boot/dts/picoxcell
  F:    arch/arm/mach-picoxcell/
  F:    drivers/crypto/picoxcell*
  
 +PIDFD API
 +M:    Christian Brauner <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
 +F:    samples/pidfd/
 +F:    tools/testing/selftests/pidfd/
 +K:    (?i)pidfd
 +K:    (?i)clone3
 +K:    \b(clone_args|kernel_clone_args)\b
 +
  PIN CONTROL SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
@@@ -12812,7 -12569,8 +12813,7 @@@ S:   Orpha
  F:    drivers/scsi/pmcraid.*
  
  PMC SIERRA PM8001 DRIVER
 -M:    Jack Wang <[email protected]>
 -M:    [email protected]
 +M:    Jack Wang <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/pm8001/
@@@ -12848,7 -12606,6 +12849,7 @@@ F:   drivers/base/power
  F:    include/linux/pm.h
  F:    include/linux/pm_*
  F:    include/linux/powercap.h
 +F:    include/linux/intel_rapl.h
  F:    drivers/powercap/
  F:    kernel/configs/nopm.config
  
@@@ -12907,7 -12664,7 +12908,7 @@@ M:   Rodolfo Giometti <giometti@enneenne.
  W:    http://wiki.enneenne.com/index.php/LinuxPPS_support
  L:    [email protected] (subscribers-only)
  S:    Maintained
 -F:    Documentation/pps/
 +F:    Documentation/driver-api/pps.rst
  F:    Documentation/devicetree/bindings/pps/pps-gpio.txt
  F:    Documentation/ABI/testing/sysfs-pps
  F:    drivers/pps/
@@@ -13013,7 -12770,7 +13014,7 @@@ L:   [email protected]
  S:    Maintained
  W:    http://linuxptp.sourceforge.net/
  F:    Documentation/ABI/testing/sysfs-ptp
 -F:    Documentation/ptp/*
 +F:    Documentation/driver-api/ptp.rst
  F:    drivers/net/phy/dp83640*
  F:    drivers/ptp/*
  F:    include/linux/ptp_cl*
@@@ -13027,6 -12784,7 +13028,6 @@@ F:   include/linux/regset.
  F:    include/linux/tracehook.h
  F:    include/uapi/linux/ptrace.h
  F:    include/uapi/linux/ptrace.h
 -F:    include/asm-generic/ptrace.h
  F:    kernel/ptrace.c
  F:    arch/*/ptrace*.c
  F:    arch/*/*/ptrace*.c
@@@ -13078,7 -12836,7 +13079,7 @@@ M:   Thierry Reding <thierry.reding@gmail
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git
 -F:    Documentation/pwm.txt
 +F:    Documentation/driver-api/pwm.rst
  F:    Documentation/devicetree/bindings/pwm/
  F:    include/linux/pwm.h
  F:    drivers/pwm/
@@@ -13300,7 -13058,7 +13301,7 @@@ M:   Niklas Cassel <niklas.cassel@linaro.
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
 -F:    Documentation/devicetree/bindings/net/qcom,dwmac.txt
 +F:    Documentation/devicetree/bindings/net/qcom,ethqos.txt
  
  QUALCOMM GENERIC INTERFACE I2C DRIVER
  M:    Alok Chauhan <[email protected]>
@@@ -13439,7 -13197,7 +13440,7 @@@ F:   drivers/net/wireless/ralink/rt2x00
  RAMDISK RAM BLOCK DEVICE DRIVER
  M:    Jens Axboe <[email protected]>
  S:    Maintained
 -F:    Documentation/blockdev/ramdisk.txt
 +F:    Documentation/admin-guide/blockdev/ramdisk.rst
  F:    drivers/block/brd.c
  
  RANCHU VIRTUAL BOARD FOR MIPS
@@@ -13548,7 -13306,7 +13549,7 @@@ Q:   http://patchwork.ozlabs.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/rtc/
 -F:    Documentation/rtc.txt
 +F:    Documentation/admin-guide/rtc.rst
  F:    drivers/rtc/
  F:    include/linux/rtc.h
  F:    include/uapi/linux/rtc.h
@@@ -13598,11 -13356,9 +13599,11 @@@ L: [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/remoteproc/
 +F:    Documentation/ABI/testing/sysfs-class-remoteproc
  F:    Documentation/remoteproc.txt
  F:    drivers/remoteproc/
  F:    include/linux/remoteproc.h
 +F:    include/linux/remoteproc/
  
  REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
  M:    Ohad Ben-Cohen <[email protected]>
@@@ -13612,11 -13368,8 +13613,11 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/rpmsg/
  F:    Documentation/rpmsg.txt
 +F:    Documentation/ABI/testing/sysfs-bus-rpmsg
  F:    include/linux/rpmsg.h
  F:    include/linux/rpmsg/
 +F:    include/uapi/linux/rpmsg.h
 +F:    samples/rpmsg/
  
  RENESAS CLOCK DRIVERS
  M:    Geert Uytterhoeven <[email protected]>
@@@ -13697,7 -13450,7 +13698,7 @@@ W:   http://wireless.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
  S:    Maintained
 -F:    Documentation/rfkill.txt
 +F:    Documentation/driver-api/rfkill.rst
  F:    Documentation/ABI/stable/sysfs-class-rfkill
  F:    net/rfkill/
  F:    include/linux/rfkill.h
@@@ -13728,7 -13481,7 +13729,7 @@@ RISC-V ARCHITECTUR
  M:    Palmer Dabbelt <[email protected]>
  M:    Albert Ou <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
  S:    Supported
  F:    arch/riscv/
  K:    riscv
@@@ -13749,11 -13502,11 +13750,11 @@@ S:        Maintaine
  F:    drivers/media/platform/rockchip/rga/
  F:    Documentation/devicetree/bindings/media/rockchip-rga.txt
  
 -ROCKCHIP VPU CODEC DRIVER
 +HANTRO VPU CODEC DRIVER
  M:    Ezequiel Garcia <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/staging/media/platform/rockchip/vpu/
 +F:    drivers/staging/media/platform/hantro/
  F:    Documentation/devicetree/bindings/media/rockchip-vpu.txt
  
  ROCKER DRIVER
@@@ -13766,7 -13519,7 +13767,7 @@@ ROCKETPORT DRIVE
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
  S:    Maintained
 -F:    Documentation/serial/rocket.rst
 +F:    Documentation/driver-api/serial/rocket.rst
  F:    drivers/tty/rocket*
  
  ROCKETPORT EXPRESS/INFINITY DRIVER
@@@ -13954,7 -13707,7 +13955,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/s390/cio/vfio_ccw*
 -F:    Documentation/s390/vfio-ccw.txt
 +F:    Documentation/s390/vfio-ccw.rst
  F:    include/uapi/linux/vfio_ccw.h
  
  S390 ZCRYPT DRIVER
@@@ -13974,7 -13727,7 +13975,7 @@@ S:   Supporte
  F:    drivers/s390/crypto/vfio_ap_drv.c
  F:    drivers/s390/crypto/vfio_ap_private.h
  F:    drivers/s390/crypto/vfio_ap_ops.c
 -F:    Documentation/s390/vfio-ap.txt
 +F:    Documentation/s390/vfio-ap.rst
  
  S390 ZFCP DRIVER
  M:    Steffen Maier <[email protected]>
@@@ -14160,7 -13913,7 +14161,7 @@@ M:   Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/phy/samsung-phy.txt
 -F:    Documentation/phy/samsung-usb2.txt
 +F:    Documentation/driver-api/phy/samsung-usb2.rst
  F:    drivers/phy/samsung/phy-exynos4210-usb2.c
  F:    drivers/phy/samsung/phy-exynos4x12-usb2.c
  F:    drivers/phy/samsung/phy-exynos5250-usb2.c
@@@ -14413,12 -14166,6 +14414,12 @@@ S: Maintaine
  F:    drivers/misc/phantom.c
  F:    include/uapi/linux/phantom.h
  
 +SENSIRION SPS30 AIR POLLUTION SENSOR DRIVER
 +M:    Tomasz Duszynski <[email protected]>
 +S:    Maintained
 +F:    drivers/iio/chemical/sps30.c
 +F:    Documentation/devicetree/bindings/iio/chemical/sensirion,sps30.yaml
 +
  SERIAL DEVICE BUS
  M:    Rob Herring <[email protected]>
  L:    [email protected]
@@@ -14466,7 -14213,7 +14467,7 @@@ SGI SN-IA64 (Altix) SERIAL CONSOLE DRIV
  M:    Pat Gefre <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/ia64/serial.txt
 +F:    Documentation/ia64/serial.rst
  F:    drivers/tty/serial/ioc?_serial.c
  F:    include/linux/ioc?.h
  
@@@ -14590,7 -14337,7 +14591,7 @@@ M:   Paul Walmsley <paul.walmsley@sifive.
  L:    [email protected]
  T:    git git://github.com/sifive/riscv-linux.git
  S:    Supported
 -K:    sifive
 +K:    [^@]sifive
  N:    sifive
  
  SIFIVE FU540 SYSTEM-ON-CHIP
@@@ -14617,7 -14364,7 +14618,7 @@@ M:   Sudip Mukherjee <sudip.mukherjee@cod
  L:    [email protected]
  S:    Maintained
  F:    drivers/video/fbdev/sm712*
 -F:    Documentation/fb/sm712fb.txt
 +F:    Documentation/fb/sm712fb.rst
  
  SIMPLE FIRMWARE INTERFACE (SFI)
  M:    Len Brown <[email protected]>
@@@ -14687,7 -14434,7 +14688,7 @@@ SIS FRAMEBUFFER DRIVE
  M:    Thomas Winischhofer <[email protected]>
  W:    http://www.winischhofer.net/linuxsisvga.shtml
  S:    Maintained
 -F:    Documentation/fb/sisfb.txt
 +F:    Documentation/fb/sisfb.rst
  F:    drivers/video/fbdev/sis/
  F:    include/video/sisfb.h
  
@@@ -14825,13 -14572,6 +14826,13 @@@ M: Chris Boot <[email protected]
  S:    Maintained
  F:    drivers/leds/leds-net48xx.c
  
 +SOFT-IWARP DRIVER (siw)
 +M:    Bernard Metzler <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/infiniband/sw/siw/
 +F:    include/uapi/rdma/siw-abi.h
 +
  SOFT-ROCE DRIVER (rxe)
  M:    Moni Shoua <[email protected]>
  L:    [email protected]
@@@ -14881,20 -14621,11 +14882,20 @@@ F:        Documentation/devicetree/bindings/ne
  
  SOCIONEXT (SNI) NETSEC NETWORK DRIVER
  M:    Jassi Brar <[email protected]>
 +M:    Ilias Apalodimas <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/socionext/netsec.c
  F:    Documentation/devicetree/bindings/net/socionext-netsec.txt
  
 +SOCIONEXT (SNI) Synquacer SPI DRIVER
 +M:    Masahisa Kojima <[email protected]>
 +M:    Jassi Brar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/spi/spi-synquacer.c
 +F:    Documentation/devicetree/bindings/spi/spi-synquacer.txt
 +
  SOLIDRUN CLEARFOG SUPPORT
  M:    Russell King <[email protected]>
  S:    Maintained
@@@ -14973,7 -14704,7 +14974,7 @@@ M:   Mattia Dongili <[email protected]
  L:    [email protected]
  W:    http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
  S:    Maintained
 -F:    Documentation/laptops/sony-laptop.txt
 +F:    Documentation/admin-guide/laptops/sony-laptop.rst
  F:    drivers/char/sonypi.c
  F:    drivers/platform/x86/sony-laptop.c
  F:    include/linux/sony-laptop.h
@@@ -15201,17 -14932,6 +15202,17 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/staging/erofs/
  
 +STAGING - FIELDBUS SUBSYSTEM
 +M:    Sven Van Asbroeck <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/fieldbus/*
 +F:    drivers/staging/fieldbus/Documentation/
 +
 +STAGING - HMS ANYBUS-S BUS
 +M:    Sven Van Asbroeck <[email protected]>
 +S:    Maintained
 +F:    drivers/staging/fieldbus/anybuss/
 +
  STAGING - INDUSTRIAL IO
  M:    Jonathan Cameron <[email protected]>
  L:    [email protected]
@@@ -15391,7 -15111,7 +15392,7 @@@ SVGA HANDLIN
  M:    Martin Mares <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/svga.txt
 +F:    Documentation/admin-guide/svga.rst
  F:    arch/x86/boot/video*
  
  SWIOTLB SUBSYSTEM
@@@ -15428,7 -15148,7 +15429,7 @@@ F:   drivers/dma-buf/dma-fence
  F:    drivers/dma-buf/sw_sync.c
  F:    include/linux/sync_file.h
  F:    include/uapi/linux/sync_file.h
 -F:    Documentation/sync_file.txt
 +F:    Documentation/driver-api/sync_file.rst
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  SYNOPSYS ARC ARCHITECTURE
@@@ -15750,7 -15470,6 +15751,7 @@@ F:   include/media/i2c/tw9910.
  
  TEE SUBSYSTEM
  M:    Jens Wiklander <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    include/linux/tee_drv.h
  F:    include/uapi/linux/tee.h
@@@ -15780,7 -15499,6 +15781,7 @@@ F:   drivers/dma/tegra
  
  TEGRA I2C DRIVER
  M:    Laxman Dewangan <[email protected]>
 +R:    Dmitry Osipenko <[email protected]>
  S:    Supported
  F:    drivers/i2c/busses/i2c-tegra.c
  
@@@ -15906,7 -15624,7 +15907,7 @@@ M:   Viresh Kumar <[email protected]
  M:    Javi Merino <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/thermal/cpu-cooling-api.txt
 +F:    Documentation/thermal/cpu-cooling-api.rst
  F:    drivers/thermal/cpu_cooling.c
  F:    include/linux/cpu_cooling.h
  
@@@ -16050,7 -15768,7 +16051,7 @@@ F:   sound/soc/codecs/isabelle
  TI LP855x BACKLIGHT DRIVER
  M:    Milo Kim <[email protected]>
  S:    Maintained
 -F:    Documentation/backlight/lp855x-driver.txt
 +F:    Documentation/driver-api/backlight/lp855x-driver.rst
  F:    drivers/video/backlight/lp855x_bl.c
  F:    include/linux/platform_data/lp855x.h
  
@@@ -16314,7 -16032,7 +16315,7 @@@ M:   Greg Kroah-Hartman <gregkh@linuxfoun
  M:    Jiri Slaby <[email protected]>
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
 -F:    Documentation/serial/
 +F:    Documentation/driver-api/serial/
  F:    drivers/tty/
  F:    drivers/tty/serial/serial_core.c
  F:    include/linux/serial_core.h
@@@ -16534,7 -16252,7 +16535,7 @@@ USB ACM DRIVE
  M:    Oliver Neukum <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/usb/acm.txt
 +F:    Documentation/usb/acm.rst
  F:    drivers/usb/class/cdc-acm.*
  
  USB AR5523 WIRELESS DRIVER
@@@ -16587,7 -16305,7 +16588,7 @@@ USB EHCI DRIVE
  M:    Alan Stern <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/usb/ehci.txt
 +F:    Documentation/usb/ehci.rst
  F:    drivers/usb/host/ehci*
  
  USB GADGET/PERIPHERAL SUBSYSTEM
@@@ -16605,7 -16323,7 +16606,7 @@@ M:   Benjamin Tissoires <benjamin.tissoir
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
  S:    Maintained
 -F:    Documentation/hid/hiddev.txt
 +F:    Documentation/hid/hiddev.rst
  F:    drivers/hid/usbhid/
  
  USB INTEL XHCI ROLE MUX DRIVER
@@@ -16661,7 -16379,7 +16662,7 @@@ USB OHCI DRIVE
  M:    Alan Stern <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/usb/ohci.txt
 +F:    Documentation/usb/ohci.rst
  F:    drivers/usb/host/ohci*
  
  USB OTG FSM (Finite State Machine)
@@@ -16677,7 -16395,7 +16678,7 @@@ M:   Shuah Khan <[email protected]
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/usb/usbip_protocol.txt
 +F:    Documentation/usb/usbip_protocol.rst
  F:    drivers/usb/usbip/
  F:    tools/usb/usbip/
  F:    tools/testing/selftests/drivers/usb/usbip/
@@@ -16725,7 -16443,7 +16726,7 @@@ M:   Johan Hovold <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
  S:    Maintained
 -F:    Documentation/usb/usb-serial.txt
 +F:    Documentation/usb/usb-serial.rst
  F:    drivers/usb/serial/
  F:    include/linux/usb/serial.h
  
@@@ -16904,7 -16622,7 +16905,7 @@@ M:   Michal Januszewski <[email protected]
  L:    [email protected]
  W:    https://github.com/mjanusz/v86d
  S:    Maintained
 -F:    Documentation/fb/uvesafb.txt
 +F:    Documentation/fb/uvesafb.rst
  F:    drivers/video/fbdev/uvesafb.*
  
  VF610 NAND DRIVER
@@@ -16925,7 -16643,7 +16926,7 @@@ R:   Cornelia Huck <[email protected]
  L:    [email protected]
  T:    git git://github.com/awilliam/linux-vfio.git
  S:    Maintained
 -F:    Documentation/vfio.txt
 +F:    Documentation/driver-api/vfio.rst
  F:    drivers/vfio/
  F:    include/linux/vfio.h
  F:    include/uapi/linux/vfio.h
@@@ -16934,7 -16652,7 +16935,7 @@@ VFIO MEDIATED DEVICE DRIVER
  M:    Kirti Wankhede <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/vfio-mediated-device.txt
 +F:    Documentation/driver-api/vfio-mediated-device.rst
  F:    drivers/vfio/mdev/
  F:    include/linux/mdev.h
  F:    samples/vfio-mdev/
@@@ -16979,7 -16697,7 +16980,7 @@@ S:   Maintaine
  F:    drivers/net/ethernet/via/via-velocity.*
  
  VICODEC VIRTUAL CODEC DRIVER
 -M:    Hans Verkuil <h[email protected]>
 +M:    Hans Verkuil <h[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  W:    https://linuxtv.org
@@@ -17002,7 -16720,6 +17003,7 @@@ VIDEOBUF2 FRAMEWOR
  M:    Pawel Osciak <[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/*
@@@ -17122,13 -16839,6 +17123,13 @@@ S: Maintaine
  F:    drivers/virtio/virtio_input.c
  F:    include/uapi/linux/virtio_input.h
  
 +VIRTIO IOMMU DRIVER
 +M:    Jean-Philippe Brucker <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iommu/virtio-iommu.c
 +F:    include/uapi/linux/virtio_iommu.h
 +
  VIRTUAL BOX GUEST DEVICE DRIVER
  M:    Hans de Goede <[email protected]>
  M:    Arnd Bergmann <[email protected]>
@@@ -17180,8 -16890,7 +17181,8 @@@ S:   Maintaine
  F:    drivers/misc/vmw_balloon.c
  
  VMWARE HYPERVISOR INTERFACE
 -M:    Alok Kataria <[email protected]>
 +M:    Thomas Hellstrom <[email protected]>
 +M:    "VMware, Inc." <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    arch/x86/kernel/cpu/vmware.c
@@@ -17569,7 -17278,6 +17570,7 @@@ N:   xd
  XDP SOCKETS (AF_XDP)
  M:    Björn Töpel <[email protected]>
  M:    Magnus Karlsson <[email protected]>
 +R:    Jonathan Lemon <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -17662,13 -17370,8 +17663,13 @@@ L: [email protected]
  W:    http://xfs.org/
  T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
  S:    Supported
 -F:    Documentation/filesystems/xfs.txt
 +F:    Documentation/admin-guide/xfs.rst
 +F:    Documentation/ABI/testing/sysfs-fs-xfs
 +F:    Documentation/filesystems/xfs-delayed-logging-design.txt
 +F:    Documentation/filesystems/xfs-self-describing-metadata.txt
  F:    fs/xfs/
 +F:    include/uapi/linux/dqblk_xfs.h
 +F:    include/uapi/linux/fsmap.h
  
  XILINX AXI ETHERNET DRIVER
  M:    Anirudha Sarangi <[email protected]>
@@@ -17788,12 -17491,6 +17789,12 @@@ Q: https://patchwork.linuxtv.org/projec
  S:    Maintained
  F:    drivers/media/dvb-frontends/zd1301_demod*
  
 +ZHAOXIN PROCESSOR SUPPORT
 +M:    Tony W Wang-oc <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/x86/kernel/cpu/zhaoxin.c
 +
  ZPOOL COMPRESSED PAGE STORAGE API
  M:    Dan Streetman <[email protected]>
  L:    [email protected]
@@@ -17816,7 -17513,7 +17817,7 @@@ R:   Sergey Senozhatsky <sergey.senozhats
  L:    [email protected]
  S:    Maintained
  F:    drivers/block/zram/
 -F:    Documentation/blockdev/zram.txt
 +F:    Documentation/admin-guide/blockdev/zram.rst
  
  ZS DECSTATION Z85C30 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <[email protected]>

diff --combined sound/soc/codecs/hdac_hdmi.c
index 29918954e74078bd8a14ffbe63017a99ae9e38b6,11ec031ad7494e9487db34e5f0e885561c2c16e2..18c173e6a13b2867b2bb922a16e98a5680c07512
--- 1/sound/soc/codecs/hdac_hdmi.c
--- 2/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@@ -88,8 -88,10 +88,10 @@@ struct hdac_hdmi_port 
        hda_nid_t mux_nids[HDA_MAX_CONNECTIONS];
        struct hdac_hdmi_eld eld;
        const char *jack_pin;
+       bool is_connect;
        struct snd_soc_dapm_context *dapm;
        const char *output_pin;
+       struct work_struct dapm_work;
  };
  
  struct hdac_hdmi_pcm {
@@@ -163,11 -165,7 +165,7 @@@ static void hdac_hdmi_jack_report(struc
  {
        struct hdac_device *hdev = port->pin->hdev;
  
-       if (is_connect)
-               snd_soc_dapm_enable_pin(port->dapm, port->jack_pin);
-       else
-               snd_soc_dapm_disable_pin(port->dapm, port->jack_pin);
- 
+       port->is_connect = is_connect;
        if (is_connect) {
                /*
                 * Report Jack connect event when a device is connected
@@@ -193,10 -191,32 +191,32 @@@
                if (pcm->jack_event > 0)
                        pcm->jack_event--;
        }
+ }
  
+ static void hdac_hdmi_port_dapm_update(struct hdac_hdmi_port *port)
+ {
+       if (port->is_connect)
+               snd_soc_dapm_enable_pin(port->dapm, port->jack_pin);
+       else
+               snd_soc_dapm_disable_pin(port->dapm, port->jack_pin);
        snd_soc_dapm_sync(port->dapm);
  }
  
+ static void hdac_hdmi_jack_dapm_work(struct work_struct *work)
+ {
+       struct hdac_hdmi_port *port;
+ 
+       port = container_of(work, struct hdac_hdmi_port, dapm_work);
+       hdac_hdmi_port_dapm_update(port);
+ }
+ 
+ static void hdac_hdmi_jack_report_sync(struct hdac_hdmi_pcm *pcm,
+               struct hdac_hdmi_port *port, bool is_connect)
+ {
+       hdac_hdmi_jack_report(pcm, port, is_connect);
+       hdac_hdmi_port_dapm_update(port);
+ }
+ 
  /* MST supported verbs */
  /*
   * Get the no devices that can be connected to a port on the Pin widget.
@@@ -538,29 -558,6 +558,29 @@@ static struct hdac_hdmi_port *hdac_hdmi
        return NULL;
  }
  
 +/*
 + * Go through all converters and ensure connection is set to
 + * the correct pin as set via kcontrols.
 + */
 +static void hdac_hdmi_verify_connect_sel_all_pins(struct hdac_device *hdev)
 +{
 +      struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
 +      struct hdac_hdmi_port *port;
 +      struct hdac_hdmi_cvt *cvt;
 +      int cvt_idx = 0;
 +
 +      list_for_each_entry(cvt, &hdmi->cvt_list, head) {
 +              port = hdac_hdmi_get_port_from_cvt(hdev, hdmi, cvt);
 +              if (port && port->pin) {
 +                      snd_hdac_codec_write(hdev, port->pin->nid, 0,
 +                                           AC_VERB_SET_CONNECT_SEL, cvt_idx);
 +                      dev_dbg(&hdev->dev, "%s: %s set connect %d -> %d\n",
 +                              __func__, cvt->name, port->pin->nid, cvt_idx);
 +              }
 +              ++cvt_idx;
 +      }
 +}
 +
  /*
   * This tries to get a valid pin and set the HW constraints based on the
   * ELD. Even if a valid pin is not found return success so that device open
@@@ -821,14 -818,6 +841,14 @@@ static int hdac_hdmi_cvt_output_widget_
                                AC_VERB_SET_CHANNEL_STREAMID, pcm->stream_tag);
                snd_hdac_codec_write(hdev, cvt->nid, 0,
                                AC_VERB_SET_STREAM_FORMAT, pcm->format);
 +
 +              /*
 +               * The connection indices are shared by all converters and
 +               * may interfere with each other. Ensure correct
 +               * routing for all converters at stream start.
 +               */
 +              hdac_hdmi_verify_connect_sel_all_pins(hdev);
 +
                break;
  
        case SND_SOC_DAPM_POST_PMD:
@@@ -904,7 -893,7 +924,7 @@@ static int hdac_hdmi_set_pin_port_mux(s
                list_for_each_entry_safe(p, p_next, &pcm->port_list, head) {
                        if (p == port && p->id == port->id &&
                                        p->pin == port->pin) {
-                               hdac_hdmi_jack_report(pcm, port, false);
+                               hdac_hdmi_jack_report_sync(pcm, port, false);
                                list_del(&p->head);
                        }
                }
@@@ -918,7 -907,7 +938,7 @@@
                if (!strcmp(cvt_name, pcm->cvt->name)) {
                        list_add_tail(&port->head, &pcm->port_list);
                        if (port->eld.monitor_present && port->eld.eld_valid) {
-                               hdac_hdmi_jack_report(pcm, port, true);
+                               hdac_hdmi_jack_report_sync(pcm, port, true);
                                mutex_unlock(&hdmi->pin_mutex);
                                return ret;
                        }
@@@ -1281,16 -1270,20 +1301,20 @@@ static void hdac_hdmi_present_sense(str
                 * report jack here. It will be done in usermode mux
                 * control select.
                 */
-               if (pcm)
+               if (pcm) {
                        hdac_hdmi_jack_report(pcm, port, false);
+                       schedule_work(&port->dapm_work);
+               }
  
                mutex_unlock(&hdmi->pin_mutex);
                return;
        }
  
        if (port->eld.monitor_present && port->eld.eld_valid) {
-               if (pcm)
+               if (pcm) {
                        hdac_hdmi_jack_report(pcm, port, true);
+                       schedule_work(&port->dapm_work);
+               }
  
                print_hex_dump_debug("ELD: ", DUMP_PREFIX_OFFSET, 16, 1,
                          port->eld.eld_buffer, port->eld.eld_size, false);
@@@ -1319,6 -1312,7 +1343,7 @@@ static int hdac_hdmi_add_ports(struct h
        for (i = 0; i < max_ports; i++) {
                ports[i].id = i;
                ports[i].pin = pin;
+               INIT_WORK(&ports[i].dapm_work, hdac_hdmi_jack_dapm_work);
        }
        pin->ports = ports;
        pin->num_ports = max_ports;
@@@ -2072,7 -2066,7 +2097,7 @@@ static int hdac_hdmi_dev_probe(struct h
                        "Failed in parse and map nid with err: %d\n", ret);
                return ret;
        }
 -      snd_hdac_refresh_widgets(hdev, true);
 +      snd_hdac_refresh_widgets(hdev);
  
        /* ASoC specific initialization */
        ret = devm_snd_soc_register_component(&hdev->dev, &hdmi_hda_codec,
@@@ -2083,8 -2077,20 +2108,20 @@@
        return ret;
  }
  
+ static void clear_dapm_works(struct hdac_device *hdev)
+ {
+       struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
+       struct hdac_hdmi_pin *pin;
+       int i;
+ 
+       list_for_each_entry(pin, &hdmi->pin_list, head)
+               for (i = 0; i < pin->num_ports; i++)
+                       cancel_work_sync(&pin->ports[i].dapm_work);
+ }
+ 
  static int hdac_hdmi_dev_remove(struct hdac_device *hdev)
  {
+       clear_dapm_works(hdev);
        snd_hdac_display_power(hdev->bus, hdev->addr, false);
  
        return 0;
@@@ -2103,6 -2109,8 +2140,8 @@@ static int hdac_hdmi_runtime_suspend(st
        if (!bus)
                return 0;
  
+       clear_dapm_works(hdev);
+ 
        /*
         * Power down afg.
         * codec_read is preferred over codec_write to set the power state.

diff --combined sound/soc/codecs/max98373.c
index 9a1eb7222357d2b8d38a2d81b3c9a121b2b23f55,8c601a3ebc27e123693dff0a3bf682cf0ce47be2..e609abcf3220e71f9c600cec0aebf71067fb2003
--- 1/sound/soc/codecs/max98373.c
--- 2/sound/soc/codecs/max98373.c
+++ b/sound/soc/codecs/max98373.c
@@@ -12,7 -12,6 +12,7 @@@
  #include <sound/pcm_params.h>
  #include <sound/soc.h>
  #include <linux/gpio.h>
 +#include <linux/of.h>
  #include <linux/of_gpio.h>
  #include <sound/tlv.h>
  #include "max98373.h"
@@@ -268,6 -267,12 +268,12 @@@ static int max98373_dai_hw_params(struc
        case 48000:
                sampling_rate = MAX98373_PCM_SR_SET1_SR_48000;
                break;
+       case 88200:
+               sampling_rate = MAX98373_PCM_SR_SET1_SR_88200;
+               break;
+       case 96000:
+               sampling_rate = MAX98373_PCM_SR_SET1_SR_96000;
+               break;
        default:
                dev_err(component->dev, "rate %d not supported\n",
                        params_rate(params));
@@@ -896,17 -901,6 +902,17 @@@ static void max98373_slot_config(struc
        else
                max98373->i_slot = 1;
  
 +      max98373->reset_gpio = of_get_named_gpio(dev->of_node,
 +                                              "maxim,reset-gpio", 0);
 +      if (!gpio_is_valid(max98373->reset_gpio)) {
 +              dev_err(dev, "Looking up %s property in node %s failed %d\n",
 +                      "maxim,reset-gpio", dev->of_node->full_name,
 +                      max98373->reset_gpio);
 +      } else {
 +              dev_dbg(dev, "maxim,reset-gpio=%d",
 +                      max98373->reset_gpio);
 +      }
 +
        if (!device_property_read_u32(dev, "maxim,spkfb-slot-no", &value))
                max98373->spkfb_slot = value & 0xF;
        else
@@@ -935,6 -929,7 +941,6 @@@ static int max98373_i2c_probe(struct i2
        else
                max98373->interleave_mode = false;
  
 -
        /* regmap initialization */
        max98373->regmap
                = devm_regmap_init_i2c(i2c, &max98373_regmap);
@@@ -945,24 -940,6 +951,24 @@@
                return ret;
        }
  
 +      /* voltage/current slot & gpio configuration */
 +      max98373_slot_config(i2c, max98373);
 +
 +      /* Power on device */
 +      if (gpio_is_valid(max98373->reset_gpio)) {
 +              ret = gpio_request(max98373->reset_gpio, "MAX98373_RESET");
 +              if (ret) {
 +                      dev_err(&i2c->dev, "%s: Failed to request gpio %d\n",
 +                              __func__, max98373->reset_gpio);
 +                      gpio_free(max98373->reset_gpio);
 +                      return -EINVAL;
 +              }
 +              gpio_direction_output(max98373->reset_gpio, 0);
 +              msleep(50);
 +              gpio_direction_output(max98373->reset_gpio, 1);
 +              msleep(20);
 +      }
 +
        /* Check Revision ID */
        ret = regmap_read(max98373->regmap,
                MAX98373_R21FF_REV_ID, &reg);
@@@ -973,6 -950,9 +979,6 @@@
        }
        dev_info(&i2c->dev, "MAX98373 revisionID: 0x%02X\n", reg);
  
 -      /* voltage/current slot configuration */
 -      max98373_slot_config(i2c, max98373);
 -
        /* codec registeration */
        ret = devm_snd_soc_register_component(&i2c->dev, &soc_codec_dev_max98373,
                max98373_dai, ARRAY_SIZE(max98373_dai));

diff --combined sound/soc/codecs/max98373.h
index 533d2053f6087d95a7707a30a31088b43861456e,a59e51355a84ddba7ef8fc24695f4401459d56d3..63dae8be7105b2aa5c61c509f16c5dd9bd1b402b
--- 1/sound/soc/codecs/max98373.h
--- 2/sound/soc/codecs/max98373.h
+++ b/sound/soc/codecs/max98373.h
@@@ -130,6 -130,8 +130,8 @@@
  #define MAX98373_PCM_SR_SET1_SR_32000 (0x6 << 0)
  #define MAX98373_PCM_SR_SET1_SR_44100 (0x7 << 0)
  #define MAX98373_PCM_SR_SET1_SR_48000 (0x8 << 0)
+ #define MAX98373_PCM_SR_SET1_SR_88200 (0x9 << 0)
+ #define MAX98373_PCM_SR_SET1_SR_96000 (0xA << 0)
  
  /* MAX98373_R2028_PCM_SR_SETUP_2 */
  #define MAX98373_PCM_SR_SET2_SR_MASK (0xF << 4)
@@@ -203,7 -205,6 +205,7 @@@
  
  struct max98373_priv {
        struct regmap *regmap;
 +      int reset_gpio;
        unsigned int v_slot;
        unsigned int i_slot;
        unsigned int spkfb_slot;

diff --combined sound/soc/fsl/imx-audmux.c
index 7595f24a006e544d515f4cee1f29ba408e7c1f19,16ede3b5cb3221b491e9d139e3a684431621f7d8..3ce85a43e08f23a0a5eae2fd833d54edab9eb247
--- 1/sound/soc/fsl/imx-audmux.c
--- 2/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@@ -23,6 -23,8 +23,8 @@@
  
  static struct clk *audmux_clk;
  static void __iomem *audmux_base;
+ static u32 *regcache;
+ static u32 reg_max;
  
  #define IMX_AUDMUX_V2_PTCR(x)         ((x) * 8)
  #define IMX_AUDMUX_V2_PDCR(x)         ((x) * 8 + 4)
@@@ -298,10 -300,12 +300,10 @@@ static int imx_audmux_parse_dt_defaults
  
  static int imx_audmux_probe(struct platform_device *pdev)
  {
 -      struct resource *res;
        const struct of_device_id *of_id =
                        of_match_device(imx_audmux_dt_ids, &pdev->dev);
  
 -      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 -      audmux_base = devm_ioremap_resource(&pdev->dev, res);
 +      audmux_base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(audmux_base))
                return PTR_ERR(audmux_base);
  
@@@ -315,8 -319,23 +317,23 @@@
        if (of_id)
                pdev->id_entry = of_id->data;
        audmux_type = pdev->id_entry->driver_data;
-       if (audmux_type == IMX31_AUDMUX)
+ 
+       switch (audmux_type) {
+       case IMX31_AUDMUX:
                audmux_debugfs_init();
+               reg_max = 14;
+               break;
+       case IMX21_AUDMUX:
+               reg_max = 6;
+               break;
+       default:
+               dev_err(&pdev->dev, "unsupported version!\n");
+               return -EINVAL;
+       }
+ 
+       regcache = devm_kzalloc(&pdev->dev, sizeof(u32) * reg_max, GFP_KERNEL);
+       if (!regcache)
+               return -ENOMEM;
  
        if (of_id)
                imx_audmux_parse_dt_defaults(pdev, pdev->dev.of_node);
@@@ -332,12 -351,47 +349,47 @@@ static int imx_audmux_remove(struct pla
        return 0;
  }
  
+ #ifdef CONFIG_PM_SLEEP
+ static int imx_audmux_suspend(struct device *dev)
+ {
+       int i;
+ 
+       clk_prepare_enable(audmux_clk);
+ 
+       for (i = 0; i < reg_max; i++)
+               regcache[i] = readl(audmux_base + i * 4);
+ 
+       clk_disable_unprepare(audmux_clk);
+ 
+       return 0;
+ }
+ 
+ static int imx_audmux_resume(struct device *dev)
+ {
+       int i;
+ 
+       clk_prepare_enable(audmux_clk);
+ 
+       for (i = 0; i < reg_max; i++)
+               writel(regcache[i], audmux_base + i * 4);
+ 
+       clk_disable_unprepare(audmux_clk);
+ 
+       return 0;
+ }
+ #endif /* CONFIG_PM_SLEEP */
+ 
+ static const struct dev_pm_ops imx_audmux_pm = {
+       SET_SYSTEM_SLEEP_PM_OPS(imx_audmux_suspend, imx_audmux_resume)
+ };
+ 
  static struct platform_driver imx_audmux_driver = {
        .probe          = imx_audmux_probe,
        .remove         = imx_audmux_remove,
        .id_table       = imx_audmux_ids,
        .driver = {
                .name   = DRIVER_NAME,
+               .pm = &imx_audmux_pm,
                .of_match_table = imx_audmux_dt_ids,
        }
  };

diff --combined sound/soc/intel/boards/sof_rt5682.c
index c1181bc0119e823492b66cfc95e60d30b6e01757,7285474f7d654b0fa4199b4d9def03bdb5d5932c..a437567b8cee233a0dbebd52dfe1c70fe952dcce
--- 1/sound/soc/intel/boards/sof_rt5682.c
--- 2/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@@ -91,7 -91,8 +91,7 @@@ static const struct dmi_system_id sof_r
        {
                .callback = sof_rt5682_quirk_cb,
                .matches = {
 -                      DMI_MATCH(DMI_SYS_VENDOR, "Google"),
 -                      DMI_MATCH(DMI_PRODUCT_NAME, "Hatch"),
 +                      DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Hatch"),
                },
                .driver_data = (void *)(SOF_RT5682_MCLK_EN |
                                        SOF_RT5682_MCLK_24MHZ |
@@@ -308,6 -309,7 +308,7 @@@ static const struct snd_soc_dapm_widge
        SND_SOC_DAPM_HP("Headphone Jack", NULL),
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
        SND_SOC_DAPM_SPK("Spk", NULL),
+       SND_SOC_DAPM_MIC("SoC DMIC", NULL),
  };
  
  static const struct snd_soc_dapm_route sof_map[] = {
@@@ -318,6 -320,9 +319,9 @@@
        /* other jacks */
        { "IN1P", NULL, "Headset Mic" },
  
+       /* digital mics */
+       {"DMic", NULL, "SoC DMIC"},
+ 
  };
  
  static const struct snd_soc_dapm_route speaker_map[] = {
@@@ -550,7 -555,7 +554,7 @@@ static int sof_audio_probe(struct platf
        int dmic_be_num, hdmi_num;
        int ret, ssp_amp, ssp_codec;
  
 -      ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_ATOMIC);
 +      ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
        if (!ctx)
                return -ENOMEM;
  

diff --combined sound/soc/meson/axg-tdm-formatter.c
index 21c735afab35448cfcaeaa14c74a7f599079a743,1a0bf9d3836d45060b0949a64d222066c022b038..358c8c0d861cd79dc3af06a8f89d972cd8d8c93f
--- 1/sound/soc/meson/axg-tdm-formatter.c
--- 2/sound/soc/meson/axg-tdm-formatter.c
+++ b/sound/soc/meson/axg-tdm-formatter.c
@@@ -253,6 -253,7 +253,6 @@@ int axg_tdm_formatter_probe(struct plat
        struct device *dev = &pdev->dev;
        const struct axg_tdm_formatter_driver *drv;
        struct axg_tdm_formatter *formatter;
 -      struct resource *res;
        void __iomem *regs;
        int ret;
  
@@@ -268,7 -269,8 +268,7 @@@
        platform_set_drvdata(pdev, formatter);
        formatter->drv = drv;
  
 -      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 -      regs = devm_ioremap_resource(dev, res);
 +      regs = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(regs))
                return PTR_ERR(regs);
  
@@@ -325,7 -327,7 +325,7 @@@
        }
  
        /* Formatter dedicated reset line */
-       formatter->reset = reset_control_get_optional_exclusive(dev, NULL);
+       formatter->reset = devm_reset_control_get_optional_exclusive(dev, NULL);
        if (IS_ERR(formatter->reset)) {
                ret = PTR_ERR(formatter->reset);
                if (ret != -EPROBE_DEFER)

diff --combined sound/soc/rockchip/rockchip_max98090.c
index 7b0c21fa6dca0dea67054e4a61d59ff6bb25a81d,d54f672d38d8ccb2598528992a7f8452d5eecb0e..0097df1fae662f1d5a25af1daf36ddfc5bfb20cc
--- 1/sound/soc/rockchip/rockchip_max98090.c
--- 2/sound/soc/rockchip/rockchip_max98090.c
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@@ -45,6 -45,7 +45,6 @@@ static const struct snd_soc_dapm_widge
  
  static const struct snd_soc_dapm_route rk_audio_map[] = {
        {"IN34", NULL, "Headset Mic"},
 -      {"IN34", NULL, "MICBIAS"},
        {"Headset Mic", NULL, "MICBIAS"},
        {"DMICL", NULL, "Int Mic"},
        {"Headphone", NULL, "HPL"},
@@@ -137,8 -138,19 +137,19 @@@ static int rk_aif1_hw_params(struct snd
        return ret;
  }
  
+ static int rk_aif1_startup(struct snd_pcm_substream *substream)
+ {
+       /*
+        * Set period size to 240 because pl330 has issue
+        * dealing with larger period in stress testing.
+        */
+       return snd_pcm_hw_constraint_minmax(substream->runtime,
+                       SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 240, 240);
+ }
+ 
  static const struct snd_soc_ops rk_aif1_ops = {
        .hw_params = rk_aif1_hw_params,
+       .startup = rk_aif1_startup,
  };
  
  SND_SOC_DAILINK_DEFS(hifi,
@@@ -160,7 -172,7 +171,7 @@@ static struct snd_soc_dai_link rk_daili
  static int rk_98090_headset_init(struct snd_soc_component *component);
  
  static struct snd_soc_aux_dev rk_98090_headset_dev = {
 -      .name = "Headset Chip",
 +      .dlc = COMP_EMPTY(),
        .init = rk_98090_headset_init,
  };
  
@@@ -226,9 -238,9 +237,9 @@@ static int snd_rk_mc_probe(struct platf
  
        rk_dailink.platforms->of_node = rk_dailink.cpus->of_node;
  
 -      rk_98090_headset_dev.codec_of_node = of_parse_phandle(np,
 +      rk_98090_headset_dev.dlc.of_node = of_parse_phandle(np,
                        "rockchip,headset-codec", 0);
 -      if (!rk_98090_headset_dev.codec_of_node) {
 +      if (!rk_98090_headset_dev.dlc.of_node) {
                dev_err(&pdev->dev,
                        "Property 'rockchip,headset-codec' missing/invalid\n");
                return -EINVAL;

diff --combined sound/soc/sof/intel/hda.c
index c97c004afa4322334d61e2381b695d7b5bd10e56,82f61c4e74bd95e0909778962519ad9accc37ee4..c72e9a09eee16a03da41267f127fdf0dbfc1b95d
--- 1/sound/soc/sof/intel/hda.c
--- 2/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@@ -19,11 -19,13 +19,11 @@@
  #include <sound/hda_register.h>
  
  #include <linux/module.h>
 +#include <sound/intel-nhlt.h>
  #include <sound/sof.h>
  #include <sound/sof/xtensa.h>
  #include "../ops.h"
  #include "hda.h"
 -#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
 -#include "../../codecs/hdac_hda.h"
 -#endif
  
  #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
  #include <sound/soc-acpi-intel-match.h>
@@@ -32,9 -34,6 +32,9 @@@
  /* platform specific devices */
  #include "shim.h"
  
 +#define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348)
 +#define IS_CNL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9dc8)
 +
  /*
   * Debug
   */
@@@ -44,18 -43,6 +44,18 @@@ struct hda_dsp_msg_code 
        const char *msg;
  };
  
 +static bool hda_use_msi = IS_ENABLED(CONFIG_PCI);
 +#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG)
 +module_param_named(use_msi, hda_use_msi, bool, 0444);
 +MODULE_PARM_DESC(use_msi, "SOF HDA use PCI MSI mode");
 +#endif
 +
 +#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
 +static int hda_dmic_num = -1;
 +module_param_named(dmic_num, hda_dmic_num, int, 0444);
 +MODULE_PARM_DESC(dmic_num, "SOF HDA DMIC number");
 +#endif
 +
  static const struct hda_dsp_msg_code hda_dsp_rom_msg[] = {
        {HDA_DSP_ROM_FW_MANIFEST_LOADED, "status: manifest loaded"},
        {HDA_DSP_ROM_FW_FW_LOADED, "status: fw loaded"},
@@@ -246,6 -233,7 +246,6 @@@ static int hda_init(struct snd_sof_dev 
  {
        struct hda_bus *hbus;
        struct hdac_bus *bus;
 -      struct hdac_ext_bus_ops *ext_ops = NULL;
        struct pci_dev *pci = to_pci_dev(sdev->dev);
        int ret;
  
@@@ -253,12 -241,10 +253,12 @@@
        bus = sof_to_bus(sdev);
  
        /* HDA bus init */
 -#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
 -      ext_ops = snd_soc_hdac_hda_get_ops();
 -#endif
 -      sof_hda_bus_init(bus, &pci->dev, ext_ops);
 +      sof_hda_bus_init(bus, &pci->dev);
 +
 +      /* Workaround for a communication error on CFL (bko#199007) and CNL */
 +      if (IS_CFL(pci) || IS_CNL(pci))
 +              bus->polling_mode = 1;
 +
        bus->use_posbuf = 1;
        bus->bdl_pos_adj = 0;
  
@@@ -290,26 -276,8 +290,26 @@@
  
  #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
  
 +static int check_nhlt_dmic(struct snd_sof_dev *sdev)
 +{
 +      struct nhlt_acpi_table *nhlt;
 +      int dmic_num;
 +
 +      nhlt = intel_nhlt_init(sdev->dev);
 +      if (nhlt) {
 +              dmic_num = intel_nhlt_get_dmic_geo(sdev->dev, nhlt);
 +              intel_nhlt_free(nhlt);
 +              if (dmic_num == 2 || dmic_num == 4)
 +                      return dmic_num;
 +      }
 +
 +      return 0;
 +}
 +
  static const char *fixup_tplg_name(struct snd_sof_dev *sdev,
 -                                 const char *sof_tplg_filename)
 +                                 const char *sof_tplg_filename,
 +                                 const char *idisp_str,
 +                                 const char *dmic_str)
  {
        const char *tplg_filename = NULL;
        char *filename;
@@@ -323,8 -291,7 +323,8 @@@
        split_ext = strsep(&filename, ".");
        if (split_ext) {
                tplg_filename = devm_kasprintf(sdev->dev, GFP_KERNEL,
 -                                             "%s-idisp.tplg", split_ext);
 +                                             "%s%s%s.tplg",
 +                                             split_ext, idisp_str, dmic_str);
                if (!tplg_filename)
                        return NULL;
        }
@@@ -343,9 -310,6 +343,9 @@@ static int hda_init_caps(struct snd_sof
        struct snd_sof_pdata *pdata = sdev->pdata;
        struct snd_soc_acpi_mach *mach;
        const char *tplg_filename;
 +      const char *idisp_str;
 +      const char *dmic_str;
 +      int dmic_num;
        int codec_num = 0;
        int i;
  #endif
@@@ -357,10 -321,23 +357,23 @@@
        if (bus->ppcap)
                dev_dbg(sdev->dev, "PP capability, will probe DSP later.\n");
  
+ #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
+       /* init i915 and HDMI codecs */
+       ret = hda_codec_i915_init(sdev);
+       if (ret < 0) {
+               dev_err(sdev->dev, "error: init i915 and HDMI codec failed\n");
+               return ret;
+       }
+ #endif
+ 
+       /* Init HDA controller after i915 init */
        ret = hda_dsp_ctrl_init_chip(sdev, true);
        if (ret < 0) {
                dev_err(bus->dev, "error: init chip failed with ret: %d\n",
                        ret);
+ #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
+               hda_codec_i915_exit(sdev);
+ #endif
                return ret;
        }
  
@@@ -368,13 -345,6 +381,6 @@@
        if (bus->mlcap)
                snd_hdac_ext_bus_get_ml_capabilities(bus);
  
-       /* init i915 and HDMI codecs */
-       ret = hda_codec_i915_init(sdev);
-       if (ret < 0) {
-               dev_err(sdev->dev, "error: no HDMI audio devices found\n");
-               return ret;
-       }
- 
        /* codec detection */
        if (!bus->codec_mask) {
                dev_info(bus->dev, "no hda codecs found!\n");
@@@ -410,39 -380,17 +416,39 @@@
                        dev_info(bus->dev, "using HDA machine driver %s now\n",
                                 hda_mach->drv_name);
  
 -                      /* fixup topology file for HDMI only platforms */
 -                      if (codec_num == 1) {
 -                              /* use local variable for readability */
 -                              tplg_filename = pdata->tplg_filename;
 -                              tplg_filename = fixup_tplg_name(sdev, tplg_filename);
 -                              if (!tplg_filename) {
 -                                      hda_codec_i915_exit(sdev);
 -                                      return ret;
 -                              }
 -                              pdata->tplg_filename = tplg_filename;
 +                      if (codec_num == 1)
 +                              idisp_str = "-idisp";
 +                      else
 +                              idisp_str = "";
 +
 +                      /* first check NHLT for DMICs */
 +                      dmic_num = check_nhlt_dmic(sdev);
 +
 +                      /* allow for module parameter override */
 +                      if (hda_dmic_num != -1)
 +                              dmic_num = hda_dmic_num;
 +
 +                      switch (dmic_num) {
 +                      case 2:
 +                              dmic_str = "-2ch";
 +                              break;
 +                      case 4:
 +                              dmic_str = "-4ch";
 +                              break;
 +                      default:
 +                              dmic_num = 0;
 +                              dmic_str = "";
 +                              break;
 +                      }
 +
 +                      tplg_filename = pdata->tplg_filename;
 +                      tplg_filename = fixup_tplg_name(sdev, tplg_filename,
 +                                                      idisp_str, dmic_str);
 +                      if (!tplg_filename) {
 +                              hda_codec_i915_exit(sdev);
 +                              return ret;
                        }
 +                      pdata->tplg_filename = tplg_filename;
                }
        }
  
@@@ -579,18 -527,11 +585,18 @@@ int hda_dsp_probe(struct snd_sof_dev *s
         * register our IRQ
         * let's try to enable msi firstly
         * if it fails, use legacy interrupt mode
 -       * TODO: support interrupt mode selection with kernel parameter
 -       *       support msi multiple vectors
 +       * TODO: support msi multiple vectors
         */
 -      ret = pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI);
 -      if (ret < 0) {
 +      if (hda_use_msi && pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI) > 0) {
 +              dev_info(sdev->dev, "use msi interrupt mode\n");
 +              hdev->irq = pci_irq_vector(pci, 0);
 +              /* ipc irq number is the same of hda irq */
 +              sdev->ipc_irq = hdev->irq;
 +              /* initialised to "false" by kzalloc() */
 +              sdev->msi_enabled = true;
 +      }
 +
 +      if (!sdev->msi_enabled) {
                dev_info(sdev->dev, "use legacy interrupt mode\n");
                /*
                 * in IO-APIC mode, hda->irq and ipc_irq are using the same
@@@ -598,6 -539,13 +604,6 @@@
                 */
                hdev->irq = pci->irq;
                sdev->ipc_irq = pci->irq;
 -              sdev->msi_enabled = 0;
 -      } else {
 -              dev_info(sdev->dev, "use msi interrupt mode\n");
 -              hdev->irq = pci_irq_vector(pci, 0);
 -              /* ipc irq number is the same of hda irq */
 -              sdev->ipc_irq = hdev->irq;
 -              sdev->msi_enabled = 1;
        }
  
        dev_dbg(sdev->dev, "using HDA IRQ %d\n", hdev->irq);

diff --combined sound/soc/sunxi/sun4i-i2s.c
index 0a5fb9d4b2890fc400799b59a438f5bcfa9b587f,85c3b2c8cd77498951eb27f1999c2dfb6110977d..2c909c6cafa9059ca6eaeaf62d0b6b51d85a70da
--- 1/sound/soc/sunxi/sun4i-i2s.c
--- 2/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@@ -222,11 -222,10 +222,11 @@@ static const struct sun4i_i2s_clk_div s
  };
  
  static int sun4i_i2s_get_bclk_div(struct sun4i_i2s *i2s,
 -                                unsigned int oversample_rate,
 +                                unsigned long parent_rate,
 +                                unsigned int sampling_rate,
                                  unsigned int word_size)
  {
 -      int div = oversample_rate / word_size / 2;
 +      int div = parent_rate / sampling_rate / word_size / 2;
        int i;
  
        for (i = 0; i < ARRAY_SIZE(sun4i_i2s_bclk_div); i++) {
@@@ -240,10 -239,11 +240,10 @@@
  }
  
  static int sun4i_i2s_get_mclk_div(struct sun4i_i2s *i2s,
 -                                unsigned int oversample_rate,
 -                                unsigned int module_rate,
 -                                unsigned int sampling_rate)
 +                                unsigned long parent_rate,
 +                                unsigned long mclk_rate)
  {
 -      int div = module_rate / sampling_rate / oversample_rate;
 +      int div = parent_rate / mclk_rate;
        int i;
  
        for (i = 0; i < ARRAY_SIZE(sun4i_i2s_mclk_div); i++) {
@@@ -315,14 -315,15 +315,14 @@@ static int sun4i_i2s_set_clk_rate(struc
                return -EINVAL;
        }
  
 -      bclk_div = sun4i_i2s_get_bclk_div(i2s, oversample_rate,
 -                                        word_size);
 +      bclk_div = sun4i_i2s_get_bclk_div(i2s, i2s->mclk_freq,
 +                                        rate, word_size);
        if (bclk_div < 0) {
                dev_err(dai->dev, "Unsupported BCLK divider: %d\n", bclk_div);
                return -EINVAL;
        }
  
 -      mclk_div = sun4i_i2s_get_mclk_div(i2s, oversample_rate,
 -                                        clk_rate, rate);
 +      mclk_div = sun4i_i2s_get_mclk_div(i2s, clk_rate, i2s->mclk_freq);
        if (mclk_div < 0) {
                dev_err(dai->dev, "Unsupported MCLK divider: %d\n", mclk_div);
                return -EINVAL;
@@@ -410,9 -411,10 +410,9 @@@ static int sun4i_i2s_hw_params(struct s
  
        /* Configure the channels */
        regmap_field_write(i2s->field_txchansel,
 -                         SUN4I_I2S_CHAN_SEL(params_channels(params)));
 -
 +                         SUN4I_I2S_CHAN_SEL(channels));
        regmap_field_write(i2s->field_rxchansel,
 -                         SUN4I_I2S_CHAN_SEL(params_channels(params)));
 +                         SUN4I_I2S_CHAN_SEL(channels));
  
        if (i2s->variant->has_chsel_tx_chen)
                regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG,
@@@ -1000,8 -1002,8 +1000,8 @@@ static const struct sun4i_i2s_quirks su
        .field_rxchanmap        = REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31),
        .field_txchansel        = REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2),
        .field_rxchansel        = REG_FIELD(SUN4I_I2S_RX_CHAN_SEL_REG, 0, 2),
-       .get_sr                 = sun8i_i2s_get_sr_wss,
-       .get_wss                = sun8i_i2s_get_sr_wss,
+       .get_sr                 = sun4i_i2s_get_sr,
+       .get_wss                = sun4i_i2s_get_wss,
  };
  
  static int sun4i_i2s_init_regmap_fields(struct device *dev,
@@@ -1085,8 -1087,10 +1085,8 @@@ static int sun4i_i2s_probe(struct platf
                return PTR_ERR(regs);
  
        irq = platform_get_irq(pdev, 0);
 -      if (irq < 0) {
 -              dev_err(&pdev->dev, "Can't retrieve our interrupt\n");
 +      if (irq < 0)
                return irq;
 -      }
  
        i2s->variant = of_device_get_match_data(&pdev->dev);
        if (!i2s->variant) {
@@@ -1144,23 -1148,23 +1144,23 @@@
                        goto err_pm_disable;
        }
  
-       ret = devm_snd_soc_register_component(&pdev->dev,
-                                             &sun4i_i2s_component,
-                                             &sun4i_i2s_dai, 1);
+       ret = sun4i_i2s_init_regmap_fields(&pdev->dev, i2s);
        if (ret) {
-               dev_err(&pdev->dev, "Could not register DAI\n");
+               dev_err(&pdev->dev, "Could not initialise regmap fields\n");
                goto err_suspend;
        }
  
 -      ret = snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
 +      ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
        if (ret) {
                dev_err(&pdev->dev, "Could not register PCM\n");
                goto err_suspend;
        }
  
-       ret = sun4i_i2s_init_regmap_fields(&pdev->dev, i2s);
+       ret = devm_snd_soc_register_component(&pdev->dev,
+                                             &sun4i_i2s_component,
+                                             &sun4i_i2s_dai, 1);
        if (ret) {
-               dev_err(&pdev->dev, "Could not initialise regmap fields\n");
+               dev_err(&pdev->dev, "Could not register DAI\n");
                goto err_suspend;
        }
  
@@@ -1181,6 -1185,8 +1181,6 @@@ static int sun4i_i2s_remove(struct plat
  {
        struct sun4i_i2s *i2s = dev_get_drvdata(&pdev->dev);
  
 -      snd_dmaengine_pcm_unregister(&pdev->dev);
 -
        pm_runtime_disable(&pdev->dev);
        if (!pm_runtime_status_suspended(&pdev->dev))
                sun4i_i2s_runtime_suspend(&pdev->dev);