]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge branch 'asoc-4.19' into asoc-4.20 Cirrus conflict
authorMark Brown <broonie@kernel.org>
Mon, 10 Sep 2018 17:55:12 +0000 (18:55 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 10 Sep 2018 17:55:12 +0000 (18:55 +0100)
1  2 
MAINTAINERS
sound/soc/amd/acp-pcm-dma.c
sound/soc/sh/rcar/adg.c
sound/soc/sh/rcar/core.c
sound/soc/sh/rcar/dma.c

diff --combined MAINTAINERS
index 161b26e05732113f466798280f1a75851492eb01,5ee6b45248e5dae8316db250d1a1eb6976dfa59e..d3814c46d60a65d6943be6fa497659583bdd382f
@@@ -199,13 -199,12 +199,13 @@@ F:      drivers/net/ethernet/8390
  
  9P FILE SYSTEM
  M:    Eric Van Hensbergen <ericvh@gmail.com>
 -M:    Ron Minnich <rminnich@sandia.gov>
  M:    Latchesar Ionkov <lucho@ionkov.net>
 +M:    Dominique Martinet <asmadeus@codewreck.org>
  L:    v9fs-developer@lists.sourceforge.net
  W:    http://swik.net/v9fs
  Q:    http://patchwork.kernel.org/project/v9fs-devel/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
 +T:    git git://github.com/martinetd/linux.git
  S:    Maintained
  F:    Documentation/filesystems/9p.txt
  F:    fs/9p/
@@@ -368,12 -367,6 +368,12 @@@ L:       linux-acpi@vger.kernel.or
  S:    Maintained
  F:    drivers/acpi/arm64
  
 +ACPI I2C MULTI INSTANTIATE DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/i2c-multi-instantiate.c
 +
  ACPI PMIC DRIVERS
  M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
  M:    Len Brown <lenb@kernel.org>
@@@ -588,7 -581,7 +588,7 @@@ W: https://www.infradead.org/~dhowells/
  
  AGPGART DRIVER
  M:    David Airlie <airlied@linux.ie>
 -T:    git git://people.freedesktop.org/~airlied/linux (part of drm maint)
 +T:    git git://anongit.freedesktop.org/drm/drm
  S:    Maintained
  F:    drivers/char/agp/
  F:    include/linux/agp*
@@@ -735,14 -728,6 +735,14 @@@ S:       Supporte
  F:    drivers/crypto/ccp/
  F:    include/linux/ccp.h
  
 +AMD DISPLAY CORE
 +M:    Harry Wentland <harry.wentland@amd.com>
 +M:    Leo Li <sunpeng.li@amd.com>
 +L:    amd-gfx@lists.freedesktop.org
 +T:    git git://people.freedesktop.org/~agd5f/linux
 +S:    Supported
 +F:    drivers/gpu/drm/amd/display/
 +
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
  M:    Huang Rui <ray.huang@amd.com>
  L:    linux-hwmon@vger.kernel.org
@@@ -792,14 -777,6 +792,14 @@@ F:       drivers/gpu/drm/amd/include/vi_struc
  F:    drivers/gpu/drm/amd/include/v9_structs.h
  F:    include/uapi/linux/kfd_ioctl.h
  
 +AMD POWERPLAY
 +M:    Rex Zhu <rex.zhu@amd.com>
 +M:    Evan Quan <evan.quan@amd.com>
 +L:    amd-gfx@lists.freedesktop.org
 +S:    Supported
 +F:    drivers/gpu/drm/amd/powerplay/
 +T:    git git://people.freedesktop.org/~agd5f/linux
 +
  AMD SEATTLE DEVICE TREE SUPPORT
  M:    Brijesh Singh <brijeshkumar.singh@amd.com>
  M:    Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
@@@ -814,6 -791,11 +814,6 @@@ S:        Supporte
  F:    drivers/net/ethernet/amd/xgbe/
  F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
  
 -AMS (Apple Motion Sensor) DRIVER
 -M:    Michael Hanselmann <linux-kernel@hansmi.ch>
 -S:    Supported
 -F:    drivers/macintosh/ams/
 -
  ANALOG DEVICES INC AD5686 DRIVER
  M:    Stefan Popa <stefan.popa@analog.com>
  L:    linux-pm@vger.kernel.org
@@@ -822,33 -804,12 +822,33 @@@ S:      Supporte
  F:    drivers/iio/dac/ad5686*
  F:    drivers/iio/dac/ad5696*
  
 +ANALOG DEVICES INC AD5758 DRIVER
 +M:    Stefan Popa <stefan.popa@analog.com>
 +L:    linux-iio@vger.kernel.org
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/dac/ad5758.c
 +F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
 +
  ANALOG DEVICES INC AD9389B DRIVER
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/i2c/ad9389b*
  
 +ANALOG DEVICES INC ADGS1408 DRIVER
 +M:    Mircea Caprioru <mircea.caprioru@analog.com>
 +S:    Supported
 +F:    drivers/mux/adgs1408.c
 +F:    Documentation/devicetree/bindings/mux/adgs1408.txt
 +
 +ANALOG DEVICES INC ADP5061 DRIVER
 +M:    Stefan Popa <stefan.popa@analog.com>
 +L:    linux-pm@vger.kernel.org
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/power/supply/adp5061.c
 +
  ANALOG DEVICES INC ADV7180 DRIVER
  M:    Lars-Peter Clausen <lars@metafoo.de>
  L:    linux-media@vger.kernel.org
@@@ -1295,6 -1256,11 +1295,6 @@@ F:     arch/arm/mach-aspeed
  F:    arch/arm/boot/dts/aspeed-*
  N:    aspeed
  
 -ARM/ATMEL AT91 Clock Support
 -M:    Boris Brezillon <boris.brezillon@bootlin.com>
 -S:    Maintained
 -F:    drivers/clk/at91
 -
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <robh@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1476,16 -1442,6 +1476,16 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    arch/arm/mach-imx/*vf610*
  F:    arch/arm/boot/dts/vf*
  
 +ARM/FREESCALE LAYERSCAPE ARM ARCHITECTURE
 +M:    Shawn Guo <shawnguo@kernel.org>
 +M:    Li Yang <leoyang.li@nxp.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
 +F:    arch/arm/boot/dts/ls1021a*
 +F:    arch/arm64/boot/dts/freescale/fsl-*
 +F:    arch/arm64/boot/dts/freescale/qoriq-*
 +
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1691,8 -1647,7 +1691,8 @@@ M:      Chunfeng Yun <chunfeng.yun@mediatek.
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/phy/mediatek/phy-mtk-tphy.c
 +F:    drivers/phy/mediatek/
 +F:    Documentation/devicetree/bindings/phy/phy-mtk-*
  
  ARM/MICREL KS8695 ARCHITECTURE
  M:    Greg Ungerer <gerg@uclinux.org>
@@@ -2014,7 -1969,6 +2014,7 @@@ S:      Supporte
  F:    arch/arm/boot/dts/emev2*
  F:    arch/arm/boot/dts/r7s*
  F:    arch/arm/boot/dts/r8a*
 +F:    arch/arm/boot/dts/r9a*
  F:    arch/arm/boot/dts/sh*
  F:    arch/arm/configs/shmobile_defconfig
  F:    arch/arm/include/debug/renesas-scif.S
@@@ -2133,15 -2087,6 +2133,15 @@@ L:    linux-kernel@vger.kernel.or
  S:    Maintained
  F:    drivers/memory/*emif*
  
 +ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
 +M:    Tero Kristo <t-kristo@ti.com>
 +M:    Nishanth Menon <nm@ti.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/arm/ti/k3.txt
 +F:    arch/arm64/boot/dts/ti/Makefile
 +F:    arch/arm64/boot/dts/ti/k3-*
 +
  ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
  M:    Santosh Shilimkar <ssantosh@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2319,7 -2264,6 +2319,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
  S:    Maintained
  F:    arch/arm64/
 +X:    arch/arm64/boot/dts/
  F:    Documentation/arm64/
  
  AS3645A LED FLASH CONTROLLER DRIVER
@@@ -2328,14 -2272,6 +2328,14 @@@ L:    linux-leds@vger.kernel.or
  S:    Maintained
  F:    drivers/leds/leds-as3645a.c
  
 +ASAHI KASEI AK7375 LENS VOICE COIL DRIVER
 +M:    Tianshu Qiu <tian.shu.qiu@intel.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ak7375.c
 +F:    Documentation/devicetree/bindings/media/i2c/ak7375.txt
 +
  ASAHI KASEI AK8974 DRIVER
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-iio@vger.kernel.org
@@@ -2587,7 -2523,7 +2587,7 @@@ S:      Supporte
  F:    drivers/scsi/esas2r
  
  ATUSB IEEE 802.15.4 RADIO DRIVER
 -M:    Stefan Schmidt <stefan@osg.samsung.com>
 +M:    Stefan Schmidt <stefan@datenfreihafen.org>
  L:    linux-wpan@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ieee802154/atusb.c
@@@ -2611,13 -2547,6 +2611,13 @@@ S:    Maintaine
  F:    drivers/auxdisplay/
  F:    include/linux/cfag12864b.h
  
 +AVIA HX711 ANALOG DIGITAL CONVERTER IIO DRIVER
 +M:    Andreas Klinger <ak@it-klinger.de>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/adc/avia-hx711.txt
 +F:    drivers/iio/adc/hx711.c
 +
  AX.25 NETWORK LAYER
  M:    Ralf Baechle <ralf@linux-mips.org>
  L:    linux-hams@vger.kernel.org
@@@ -3042,13 -2971,9 +3042,13 @@@ N:    bcm585
  N:    bcm586*
  N:    bcm88312
  N:    hr2
 -F:    arch/arm64/boot/dts/broadcom/ns2*
 +N:    stingray
 +F:    arch/arm64/boot/dts/broadcom/northstar2/*
 +F:    arch/arm64/boot/dts/broadcom/stingray/*
  F:    drivers/clk/bcm/clk-ns*
 +F:    drivers/clk/bcm/clk-sr*
  F:    drivers/pinctrl/bcm/pinctrl-ns*
 +F:    include/dt-bindings/clock/bcm-sr*
  
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <rjui@broadcom.com>
@@@ -3581,30 -3506,10 +3581,30 @@@ F:   drivers/net/ethernet/cisco/enic
  
  CISCO VIC LOW LATENCY NIC DRIVER
  M:    Christian Benvenuti <benve@cisco.com>
 -M:    Dave Goodell <dgoodell@cisco.com>
  S:    Supported
  F:    drivers/infiniband/hw/usnic/
  
 +CIRRUS LOGIC MADERA CODEC DRIVERS
 +M:    Charles Keepax <ckeepax@opensource.cirrus.com>
 +M:    Richard Fitzgerald <rf@opensource.cirrus.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +L:    patches@opensource.cirrus.com
 +T:    git https://github.com/CirrusLogic/linux-drivers.git
 +W:    https://github.com/CirrusLogic/linux-drivers/wiki
 +S:    Supported
 +F:    Documentation/devicetree/bindings/mfd/madera.txt
 +F:    Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
 +F:    include/linux/mfd/madera/*
 +F:    drivers/gpio/gpio-madera*
 +F:    drivers/mfd/madera*
 +F:    drivers/mfd/cs47l*
 +F:    drivers/pinctrl/cirrus/*
 +
 +CLANG-FORMAT FILE
 +M:    Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
 +S:    Maintained
 +F:    .clang-format
 +
  CLEANCACHE API
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  L:    linux-kernel@vger.kernel.org
@@@ -4364,8 -4269,7 +4364,8 @@@ F:      drivers/i2c/busses/i2c-diolan-u2c.
  
  FILESYSTEM DIRECT ACCESS (DAX)
  M:    Matthew Wilcox <mawilcox@microsoft.com>
 -M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +M:    Ross Zwisler <zwisler@kernel.org>
 +M:    Jan Kara <jack@suse.cz>
  L:    linux-fsdevel@vger.kernel.org
  S:    Supported
  F:    fs/dax.c
@@@ -4375,7 -4279,7 +4375,7 @@@ F:      include/trace/events/fs_dax.
  DEVICE DIRECT ACCESS (DAX)
  M:    Dan Williams <dan.j.williams@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
 -M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +M:    Ross Zwisler <zwisler@kernel.org>
  M:    Vishal Verma <vishal.l.verma@intel.com>
  L:    linux-nvdimm@lists.01.org
  S:    Supported
@@@ -4456,7 -4360,12 +4456,7 @@@ L:     iommu@lists.linux-foundation.or
  T:    git git://git.infradead.org/users/hch/dma-mapping.git
  W:    http://git.infradead.org/users/hch/dma-mapping.git
  S:    Supported
 -F:    lib/dma-debug.c
 -F:    lib/dma-direct.c
 -F:    lib/dma-noncoherent.c
 -F:    lib/dma-virt.c
 -F:    drivers/base/dma-mapping.c
 -F:    drivers/base/dma-coherent.c
 +F:    kernel/dma/
  F:    include/asm-generic/dma-mapping.h
  F:    include/linux/dma-direct.h
  F:    include/linux/dma-mapping.h
@@@ -4492,12 -4401,6 +4492,12 @@@ X:    Documentation/sp
  X:    Documentation/media
  T:    git git://git.lwn.net/linux.git docs-next
  
 +DOCUMENTATION/ITALIAN
 +M:    Federico Vaga <federico.vaga@vaga.pv.it>
 +L:    linux-doc@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/translations/it_IT
 +
  DONGWOON DW9714 LENS VOICE COIL DRIVER
  M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
@@@ -4505,13 -4408,6 +4505,13 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/i2c/dw9714.c
  
 +DONGWOON DW9807 LENS VOICE COIL DRIVER
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/dw9807.c
 +
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <jrv@vanzandt.mv.com>
  L:    blinux-list@redhat.com
@@@ -4523,7 -4419,7 +4523,7 @@@ DPAA2 DATAPATH I/O (DPIO) DRIVE
  M:    Roy Pledge <Roy.Pledge@nxp.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
 -F:    drivers/staging/fsl-mc/bus/dpio
 +F:    drivers/soc/fsl/dpio
  
  DPAA2 ETHERNET DRIVER
  M:    Ioana Radulescu <ruxandra.radulescu@nxp.com>
@@@ -4532,8 -4428,7 +4532,8 @@@ S:      Maintaine
  F:    drivers/staging/fsl-dpaa2/ethernet
  
  DPAA2 ETHERNET SWITCH DRIVER
 -M:    Razvan Stefanescu <razvan.stefanescu@nxp.com>
 +M:    Ioana Radulescu <ruxandra.radulescu@nxp.com>
 +M:    Ioana Ciornei <ioana.ciornei@nxp.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/staging/fsl-dpaa2/ethsw
@@@ -4566,7 -4461,6 +4566,7 @@@ F:      Documentation/blockdev/drbd
  
  DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +R:    "Rafael J. Wysocki" <rafael@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
  S:    Supported
  F:    Documentation/kobject.txt
@@@ -4737,7 -4631,7 +4737,7 @@@ F:      include/uapi/drm/vmwgfx_drm.
  DRM DRIVERS
  M:    David Airlie <airlied@linux.ie>
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://people.freedesktop.org/~airlied/linux
 +T:    git git://anongit.freedesktop.org/drm/drm
  B:    https://bugs.freedesktop.org/
  C:    irc://chat.freenode.net/dri-devel
  S:    Maintained
@@@ -4753,7 -4647,7 +4753,7 @@@ F:      include/linux/vga
  DRM DRIVERS AND MISC GPU PATCHES
  M:    Gustavo Padovan <gustavo@padovan.org>
  M:    Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
 -M:    Sean Paul <seanpaul@chromium.org>
 +M:    Sean Paul <sean@poorly.run>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -4990,8 -4884,7 +4990,8 @@@ F:      Documentation/gpu/xen-front.rs
  
  DRM TTM SUBSYSTEM
  M:    Christian Koenig <christian.koenig@amd.com>
 -M:    Roger He <Hongbo.He@amd.com>
 +M:    Huang Rui <ray.huang@amd.com>
 +M:    Junwei Zhang <Jerry.Zhang@amd.com>
  T:    git git://people.freedesktop.org/~agd5f/linux
  S:    Maintained
  L:    dri-devel@lists.freedesktop.org
@@@ -5163,18 -5056,6 +5163,18 @@@ T:    git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/e4000*
  
 +EARTH_PT1 MEDIA DRIVER
 +M:    Akihiro Tsukada <tskd08@gmail.com>
 +L:    linux-media@vger.kernel.org
 +S:    Odd Fixes
 +F:    drivers/media/pci/pt1/
 +
 +EARTH_PT3 MEDIA DRIVER
 +M:    Akihiro Tsukada <tskd08@gmail.com>
 +L:    linux-media@vger.kernel.org
 +S:    Odd Fixes
 +F:    drivers/media/pci/pt3/
 +
  EC100 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -5563,7 -5444,6 +5563,7 @@@ F:      drivers/iommu/exynos-iommu.
  
  EZchip NPS platform support
  M:    Vineet Gupta <vgupta@synopsys.com>
 +M:    Ofer Levi <oferle@mellanox.com>
  S:    Supported
  F:    arch/arc/plat-eznps
  F:    arch/arc/boot/dts/eznps.dts
@@@ -5759,14 -5639,6 +5759,14 @@@ F:    drivers/fpga
  F:    include/linux/fpga/
  W:    http://www.rocketboards.org
  
 +FPGA DFL DRIVERS
 +M:    Wu Hao <hao.wu@intel.com>
 +L:    linux-fpga@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/fpga/dfl.txt
 +F:    include/uapi/linux/fpga-dfl.h
 +F:    drivers/fpga/dfl*
 +
  FPU EMULATOR
  M:    Bill Metzenthen <billm@melbpc.org.au>
  W:    http://floatingpoint.sourceforge.net/emulator/index.html
@@@ -5802,7 -5674,7 +5802,7 @@@ F:      drivers/crypto/caam
  F:    Documentation/devicetree/bindings/crypto/fsl-sec4.txt
  
  FREESCALE DIU FRAMEBUFFER DRIVER
 -M:    Timur Tabi <timur@tabi.org>
 +M:    Timur Tabi <timur@kernel.org>
  L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/fbdev/fsl-diu-fb.*
@@@ -5902,7 -5774,7 +5902,7 @@@ S:      Maintaine
  F:    drivers/net/wan/fsl_ucc_hdlc*
  
  FREESCALE QUICC ENGINE UCC UART DRIVER
 -M:    Timur Tabi <timur@tabi.org>
 +M:    Timur Tabi <timur@kernel.org>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/tty/serial/ucc_uart.c
@@@ -5918,6 -5790,7 +5918,6 @@@ F:      include/linux/fsl
  
  FREESCALE SOC FS_ENET DRIVER
  M:    Pantelis Antoniou <pantelis.antoniou@gmail.com>
 -M:    Vitaly Bordug <vbordug@ru.mvista.com>
  L:    linuxppc-dev@lists.ozlabs.org
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -5925,7 -5798,7 +5925,7 @@@ F:      drivers/net/ethernet/freescale/fs_en
  F:    include/linux/fs_enet_pd.h
  
  FREESCALE SOC SOUND DRIVERS
 -M:    Timur Tabi <timur@tabi.org>
 +M:    Timur Tabi <timur@kernel.org>
  M:    Nicolin Chen <nicoleotsuka@gmail.com>
  M:    Xiubo Li <Xiubo.Lee@gmail.com>
  R:    Fabio Estevam <fabio.estevam@nxp.com>
@@@ -5984,14 -5857,6 +5984,14 @@@ F:    fs/crypto
  F:    include/linux/fscrypt*.h
  F:    Documentation/filesystems/fscrypt.rst
  
 +FSI-ATTACHED I2C DRIVER
 +M:    Eddie James <eajames@linux.vnet.ibm.com>
 +L:    linux-i2c@vger.kernel.org
 +L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-fsi.c
 +F:    Documentation/devicetree/bindings/i2c/i2c-fsi.txt
 +
  FSNOTIFY: FILESYSTEM NOTIFICATION INFRASTRUCTURE
  M:    Jan Kara <jack@suse.cz>
  R:    Amir Goldstein <amir73il@gmail.com>
@@@ -6057,13 -5922,6 +6057,13 @@@ F:    scripts/gcc-plugin.s
  F:    scripts/Makefile.gcc-plugins
  F:    Documentation/gcc-plugins.txt
  
 +GASKET DRIVER FRAMEWORK
 +M:    Rob Springer <rspringer@google.com>
 +M:    John Joseph <jnjoseph@google.com>
 +M:    Ben Chan <benchan@chromium.org>
 +S:    Maintained
 +F:    drivers/staging/gasket/
 +
  GCOV BASED KERNEL PROFILING
  M:    Peter Oberparleiter <oberpar@linux.ibm.com>
  S:    Maintained
@@@ -6072,7 -5930,7 +6072,7 @@@ F:      Documentation/dev-tools/gcov.rs
  
  GDB KERNEL DEBUGGING HELPER SCRIPTS
  M:    Jan Kiszka <jan.kiszka@siemens.com>
 -M:    Kieran Bingham <kieran@bingham.xyz>
 +M:    Kieran Bingham <kbingham@kernel.org>
  S:    Supported
  F:    scripts/gdb/
  
@@@ -6148,12 -6006,6 +6148,12 @@@ F:    drivers/base/power/domain*.
  F:    include/linux/pm_domain.h
  F:    Documentation/devicetree/bindings/power/power_domain.txt
  
 +GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER
 +M:    Eugen Hristev <eugen.hristev@microchip.com>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/input/touchscreen/resistive-adc-touch.c
 +
  GENERIC UIO DRIVER FOR PCI DEVICES
  M:    "Michael S. Tsirkin" <mst@redhat.com>
  L:    kvm@vger.kernel.org
@@@ -6191,14 -6043,6 +6191,14 @@@ F:    Documentation/isdn/README.gigase
  F:    drivers/isdn/gigaset/
  F:    include/uapi/linux/gigaset_dev.h
  
 +GNSS SUBSYSTEM
 +M:    Johan Hovold <johan@kernel.org>
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-class-gnss
 +F:    Documentation/devicetree/bindings/gnss/
 +F:    drivers/gnss/
 +F:    include/linux/gnss.h
 +
  GO7007 MPEG CODEC
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
@@@ -6297,7 -6141,7 +6297,7 @@@ F:      drivers/staging/greybus/bootrom.
  F:    drivers/staging/greybus/firmware.h
  F:    drivers/staging/greybus/fw-core.c
  F:    drivers/staging/greybus/fw-download.c
 -F:    drivers/staging/greybus/fw-managament.c
 +F:    drivers/staging/greybus/fw-management.c
  F:    drivers/staging/greybus/greybus_authentication.h
  F:    drivers/staging/greybus/greybus_firmware.h
  F:    drivers/staging/greybus/hid.c
@@@ -6306,10 -6150,12 +6306,10 @@@ F:   drivers/staging/greybus/spi.
  F:    drivers/staging/greybus/spilib.c
  F:    drivers/staging/greybus/spilib.h
  
 -GREYBUS LOOPBACK/TIME PROTOCOLS DRIVERS
 +GREYBUS LOOPBACK DRIVER
  M:    Bryan O'Donoghue <pure.logic@nexus-software.ie>
  S:    Maintained
  F:    drivers/staging/greybus/loopback.c
 -F:    drivers/staging/greybus/timesync.c
 -F:    drivers/staging/greybus/timesync_platform.c
  
  GREYBUS PLATFORM DRIVERS
  M:    Vaibhav Hiremath <hvaibhav.linux@gmail.com>
@@@ -7063,7 -6909,7 +7063,7 @@@ F:      drivers/clk/clk-versaclock5.
  
  IEEE 802.15.4 SUBSYSTEM
  M:    Alexander Aring <alex.aring@gmail.com>
 -M:    Stefan Schmidt <stefan@osg.samsung.com>
 +M:    Stefan Schmidt <stefan@datenfreihafen.org>
  L:    linux-wpan@vger.kernel.org
  W:    http://wpan.cakelab.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git
@@@ -7182,7 -7028,7 +7182,7 @@@ M:      Guenter Roeck <linux@roeck-us.net
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
  F:    Documentation/hwmon/ina209
 -F:    Documentation/devicetree/bindings/i2c/ina209.txt
 +F:    Documentation/devicetree/bindings/hwmon/ina2xx.txt
  F:    drivers/hwmon/ina209.c
  
  INA2XX HARDWARE MONITOR DRIVER
@@@ -7250,7 -7096,6 +7250,7 @@@ F:      include/uapi/linux/input.
  F:    include/uapi/linux/input-event-codes.h
  F:    include/linux/input/
  F:    Documentation/devicetree/bindings/input/
 +F:    Documentation/devicetree/bindings/serio/
  F:    Documentation/input/
  
  INPUT MULTITOUCH (MT) PROTOCOL
@@@ -7400,9 -7245,6 +7400,9 @@@ F:      drivers/dma/iop-adma.
  INTEL IPU3 CSI-2 CIO2 DRIVER
  M:    Yong Zhi <yong.zhi@intel.com>
  M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +M:    Bingbu Cao <bingbu.cao@intel.com>
 +R:    Tian Shu Qiu <tian.shu.qiu@intel.com>
 +R:    Jian Xu Zheng <jian.xu.zheng@intel.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/pci/intel/ipu3/
@@@ -7508,7 -7350,7 +7508,7 @@@ M:      Megha Dey <megha.dey@linux.intel.com
  R:    Tim Chen <tim.c.chen@linux.intel.com>
  L:    linux-crypto@vger.kernel.org
  S:    Supported
 -F:    arch/x86/crypto/sha*-mb
 +F:    arch/x86/crypto/sha*-mb/
  F:    crypto/mcryptd.c
  
  INTEL TELEMETRY DRIVER
@@@ -7720,8 -7562,9 +7720,8 @@@ S:      Maintaine
  F:    drivers/firmware/iscsi_ibft*
  
  ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
 -M:    Or Gerlitz <ogerlitz@mellanox.com>
  M:    Sagi Grimberg <sagi@grimberg.me>
 -M:    Roi Dayan <roid@mellanox.com>
 +M:    Max Gurtovoy <maxg@mellanox.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  W:    http://www.openfabrics.org
@@@ -8142,7 -7985,7 +8142,7 @@@ F:      lib/test_kmod.
  F:    tools/testing/selftests/kmod/
  
  KPROBES
 -M:    Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
 +M:    Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
  M:    Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  M:    "David S. Miller" <davem@davemloft.net>
  M:    Masami Hiramatsu <mhiramat@kernel.org>
@@@ -8255,7 -8098,7 +8255,7 @@@ F:      drivers/ata/pata_arasan_cf.
  
  LIBATA PATA DRIVERS
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 -M:    Tejun Heo <tj@kernel.org>
 +M:    Jens Axboe <kernel.dk>
  L:    linux-ide@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
  S:    Maintained
@@@ -8273,7 -8116,7 +8273,7 @@@ F:      drivers/ata/sata_gemini.
  
  LIBATA SATA AHCI PLATFORM devices support
  M:    Hans de Goede <hdegoede@redhat.com>
 -M:    Tejun Heo <tj@kernel.org>
 +M:    Jens Axboe <axboe@kernel.dk>
  L:    linux-ide@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
  S:    Maintained
@@@ -8289,7 -8132,7 +8289,7 @@@ S:      Maintaine
  F:    drivers/ata/sata_promise.*
  
  LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
 -M:    Tejun Heo <tj@kernel.org>
 +M:    Jens Axboe <axboe@kernel.dk>
  L:    linux-ide@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
  S:    Maintained
@@@ -8304,7 -8147,7 +8304,7 @@@ S:      Maintaine
  F:    tools/lib/lockdep/
  
  LIBNVDIMM BLK: MMIO-APERTURE DRIVER
 -M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +M:    Ross Zwisler <zwisler@kernel.org>
  M:    Dan Williams <dan.j.williams@intel.com>
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
@@@ -8317,7 -8160,7 +8317,7 @@@ F:      drivers/nvdimm/region_devs.
  LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Dan Williams <dan.j.williams@intel.com>
 -M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +M:    Ross Zwisler <zwisler@kernel.org>
  M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-nvdimm@lists.01.org
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
@@@ -8325,7 -8168,7 +8325,7 @@@ S:      Supporte
  F:    drivers/nvdimm/btt*
  
  LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVER
 -M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +M:    Ross Zwisler <zwisler@kernel.org>
  M:    Dan Williams <dan.j.williams@intel.com>
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
@@@ -8344,7 -8187,7 +8344,7 @@@ F:      Documentation/devicetree/bindings/pm
  
  LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
  M:    Dan Williams <dan.j.williams@intel.com>
 -M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +M:    Ross Zwisler <zwisler@kernel.org>
  M:    Vishal Verma <vishal.l.verma@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-nvdimm@lists.01.org
@@@ -8473,18 -8316,17 +8473,18 @@@ M:   Jade Alglave <j.alglave@ucl.ac.uk
  M:    Luc Maranget <luc.maranget@inria.fr>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  R:    Akira Yokosawa <akiyks@gmail.com>
 +R:    Daniel Lustig <dlustig@nvidia.com>
  L:    linux-kernel@vger.kernel.org
 +L:    linux-arch@vger.kernel.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    tools/memory-model/
 +F:    Documentation/atomic_bitops.txt
 +F:    Documentation/atomic_t.txt
 +F:    Documentation/core-api/atomic_ops.rst
 +F:    Documentation/core-api/refcount-vs-atomic.rst
  F:    Documentation/memory-barriers.txt
  
 -LINUX SECURITY MODULE (LSM) FRAMEWORK
 -M:    Chris Wright <chrisw@sous-sol.org>
 -L:    linux-security-module@vger.kernel.org
 -S:    Supported
 -
  LIS3LV02D ACCELEROMETER DRIVER
  M:    Eric Piel <eric.piel@tremplin-utc.net>
  S:    Maintained
@@@ -8787,7 -8629,7 +8787,7 @@@ MARVELL MWIFIEX WIRELESS DRIVE
  M:    Amitkumar Karwar <amitkarwar@gmail.com>
  M:    Nishant Sarmukadam <nishants@marvell.com>
  M:    Ganapathi Bhat <gbhat@marvell.com>
 -M:    Xinming Hu <huxm@marvell.com>
 +M:    Xinming Hu <huxinming820@gmail.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wireless/marvell/mwifiex/
@@@ -9114,14 -8956,6 +9114,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/dvb-frontends/stv6111*
  
 +MEDIA DRIVERS FOR STM32 - DCMI
 +M:    Hugues Fruchet <hugues.fruchet@st.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.txt
 +F:    drivers/media/platform/stm32/stm32-dcmi.c
 +
  MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
  M:    Dmitry Osipenko <digetx@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -9153,14 -8987,6 +9153,14 @@@ F:    include/uapi/linux/meye.
  F:    include/uapi/linux/ivtv*
  F:    include/uapi/linux/uvcvideo.h
  
 +MEDIATEK BLUETOOTH DRIVER
 +M:    Sean Wang <sean.wang@mediatek.com>
 +L:    linux-bluetooth@vger.kernel.org
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/mediatek-bluetooth.txt
 +F:    drivers/bluetooth/btmtkuart.c
 +
  MEDIATEK CIR DRIVER
  M:    Sean Wang <sean.wang@mediatek.com>
  S:    Maintained
@@@ -9249,7 -9075,7 +9249,7 @@@ S:      Maintaine
  F:    drivers/usb/mtu3/
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
 -M:    Peter Senna Tschudin <peter.senna@collabora.com>
 +M:    Peter Senna Tschudin <peter.senna@gmail.com>
  M:    Martin Donnelly <martin.donnelly@ge.com>
  M:    Martyn Welch <martyn.welch@collabora.co.uk>
  S:    Maintained
@@@ -9333,7 -9159,6 +9333,7 @@@ S:      Supporte
  W:    http://www.mellanox.com
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlxsw/
 +F:    tools/testing/selftests/drivers/net/mlxsw/
  
  MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
  M:    mlxsw@mellanox.com
@@@ -9474,12 -9299,6 +9474,12 @@@ F:    drivers/leds/leds-menf21bmc.
  F:    drivers/hwmon/menf21bmc_hwmon.c
  F:    Documentation/hwmon/menf21bmc
  
 +MEN Z069 WATCHDOG DRIVER
 +M:    Johannes Thumshirn <jth@kernel.org>
 +L:    linux-watchdog@vger.kernel.org
 +S:    Maintained
 +F:    drivers/watchdog/menz069_wdt.c
 +
  MESON AO CEC DRIVER FOR AMLOGIC SOCS
  M:    Neil Armstrong <narmstrong@baylibre.com>
  L:    linux-media@lists.freedesktop.org
@@@ -9527,6 -9346,7 +9527,6 @@@ F:      drivers/media/platform/atmel/atmel-i
  F:    devicetree/bindings/media/atmel-isc.txt
  
  MICROCHIP / ATMEL NAND DRIVER
 -M:    Wenyou Yang <wenyou.yang@microchip.com>
  M:    Josh Wu <rainyfeeling@outlook.com>
  L:    linux-mtd@lists.infradead.org
  S:    Supported
@@@ -9818,14 -9638,6 +9818,14 @@@ F:    Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/mt9v032.c
  F:    include/media/i2c/mt9v032.h
  
 +MT9V111 APTINA CAMERA SENSOR
 +M:    Jacopo Mondi <jacopo@jmondi.org>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt
 +F:    drivers/media/i2c/mt9v111.c
 +
  MULTIFUNCTION DEVICES (MFD)
  M:    Lee Jones <lee.jones@linaro.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
@@@ -9870,12 -9682,6 +9870,12 @@@ L:    linux-usb@vger.kernel.or
  S:    Maintained
  F:    drivers/usb/musb/
  
 +MXL301RF MEDIA DRIVER
 +M:    Akihiro Tsukada <tskd08@gmail.com>
 +L:    linux-media@vger.kernel.org
 +S:    Odd Fixes
 +F:    drivers/media/tuners/mxl301rf*
 +
  MXL5007T MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
@@@ -9944,10 -9750,11 +9944,10 @@@ F:   drivers/scsi/mac_scsi.
  F:    drivers/scsi/sun3_scsi.*
  F:    drivers/scsi/sun3_scsi_vme.c
  
 -NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
 -M:    "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 -L:    linux-scsi@vger.kernel.org
 +NCSI LIBRARY:
 +M:    Samuel Mendoza-Jonas <sam@mendozajonas.com>
  S:    Maintained
 -F:    drivers/scsi/NCR_D700.*
 +F:    net/ncsi/
  
  NCT6775 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
@@@ -10075,7 -9882,6 +10075,7 @@@ M:    Andrew Lunn <andrew@lunn.ch
  M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
  S:    Maintained
 +F:    Documentation/devicetree/bindings/net/dsa/
  F:    net/dsa/
  F:    include/net/dsa.h
  F:    include/linux/dsa/
@@@ -10402,13 -10208,11 +10402,13 @@@ F:        sound/soc/codecs/sgtl5000
  
  NXP TDA998X DRM DRIVER
  M:    Russell King <linux@armlinux.org.uk>
 -S:    Supported
 +S:    Maintained
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes
  F:    drivers/gpu/drm/i2c/tda998x_drv.c
  F:    include/drm/i2c/tda998x.h
 +F:    include/dt-bindings/display/tda998x.h
 +K:    "nxp,tda998x"
  
  NXP TFA9879 DRIVER
  M:    Peter Rosin <peda@axentia.se>
@@@ -10587,7 -10391,6 +10587,7 @@@ F:   arch/arm/plat-omap
  F:    arch/arm/configs/omap1_defconfig
  F:    drivers/i2c/busses/i2c-omap.c
  F:    include/linux/platform_data/i2c-omap.h
 +F:    include/linux/platform_data/ams-delta-fiq.h
  
  OMAP2+ SUPPORT
  M:    Tony Lindgren <tony@atomide.com>
@@@ -10653,14 -10456,6 +10653,14 @@@ T: git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/i2c/ov13858.c
  
 +OMNIVISION OV2680 SENSOR DRIVER
 +M:    Rui Miguel Silva <rmfrfs@gmail.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov2680.c
 +F:    Documentation/devicetree/bindings/media/i2c/ov2680.txt
 +
  OMNIVISION OV2685 SENSOR DRIVER
  M:    Shunqian Zheng <zhengsq@rock-chips.com>
  L:    linux-media@vger.kernel.org
@@@ -10788,7 -10583,7 +10788,7 @@@ F:   arch/*/boot/dts
  F:    include/dt-bindings/
  
  OPENCORES I2C BUS DRIVER
 -M:    Peter Korsgaard <jacmet@sunsite.dk>
 +M:    Peter Korsgaard <peter@korsgaard.com>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    Documentation/i2c/busses/i2c-ocores
@@@ -11388,13 -11183,6 +11388,13 @@@ S: Maintaine
  F:    include/linux/personality.h
  F:    include/uapi/linux/personality.h
  
 +PHOENIX RC FLIGHT CONTROLLER ADAPTER
 +M:    Marcus Folkesson <marcus.folkesson@gmail.com>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/input/devices/pxrc.rst
 +F:    drivers/input/joystick/pxrc.c
 +
  PHONET PROTOCOL
  M:    Remi Denis-Courmont <courmisch@gmail.com>
  S:    Supported
@@@ -11461,7 -11249,7 +11461,7 @@@ F:   Documentation/devicetree/bindings/pi
  
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 -M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
 +M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  S:    Maintained
  F:    drivers/pinctrl/intel/
  
@@@ -11688,15 -11476,6 +11688,15 @@@ W: http://wireless.kernel.org/en/users/
  S:    Obsolete
  F:    drivers/net/wireless/intersil/prism54/
  
 +PROC FILESYSTEM
 +R:    Alexey Dobriyan <adobriyan@gmail.com>
 +L:    linux-kernel@vger.kernel.org
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Maintained
 +F:    fs/proc/
 +F:    include/linux/proc_fs.h
 +F:    tools/testing/selftests/proc/
 +
  PROC SYSCTL
  M:    "Luis R. Rodriguez" <mcgrof@kernel.org>
  M:    Kees Cook <keescook@chromium.org>
@@@ -11971,18 -11750,6 +11971,18 @@@ L: netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlge/
  
 +QM1D1B0004 MEDIA DRIVER
 +M:    Akihiro Tsukada <tskd08@gmail.com>
 +L:    linux-media@vger.kernel.org
 +S:    Odd Fixes
 +F:    drivers/media/tuners/qm1d1b0004*
 +
 +QM1D1C0042 MEDIA DRIVER
 +M:    Akihiro Tsukada <tskd08@gmail.com>
 +L:    linux-media@vger.kernel.org
 +S:    Odd Fixes
 +F:    drivers/media/tuners/qm1d1c0042*
 +
  QNX4 FILESYSTEM
  M:    Anders Larsen <al@alarsen.net>
  W:    http://www.alarsen.net/linux/qnx4fs/
@@@ -12031,7 -11798,7 +12031,7 @@@ L:   linux-media@vger.kernel.or
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/qcom,camss.txt
  F:    Documentation/media/v4l-drivers/qcom_camss.rst
 -F:    drivers/media/platform/qcom/camss-8x16/
 +F:    drivers/media/platform/qcom/camss/
  
  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
  M:  Ilia Lin <ilia.lin@gmail.com>
@@@ -12041,19 -11808,11 +12041,19 @@@ F:  Documentation/devicetree/bindings/o
  F:  drivers/cpufreq/qcom-cpufreq-kryo.c
  
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
 -M:    Timur Tabi <timur@codeaurora.org>
 +M:    Timur Tabi <timur@kernel.org>
  L:    netdev@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/qualcomm/emac/
  
 +QUALCOMM GENERIC INTERFACE I2C DRIVER
 +M:    Alok Chauhan <alokc@codeaurora.org>
 +M:    Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
 +L:    linux-i2c@vger.kernel.org
 +L:    linux-arm-msm@vger.kernel.org
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-qcom-geni.c
 +
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Richard Kuo <rkuo@codeaurora.org>
  L:    linux-hexagon@vger.kernel.org
@@@ -12062,7 -11821,7 +12062,7 @@@ S:   Supporte
  F:    arch/hexagon/
  
  QUALCOMM HIDMA DRIVER
 -M:    Sinan Kaya <okaya@codeaurora.org>
 +M:    Sinan Kaya <okaya@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org
  L:    linux-arm-msm@vger.kernel.org
  L:    dmaengine@vger.kernel.org
@@@ -12262,9 -12021,9 +12262,9 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/RCU/
  X:    Documentation/RCU/torture.txt
  F:    include/linux/rcu*
 -X:    include/linux/srcu.h
 +X:    include/linux/srcu*.h
  F:    kernel/rcu/
 -X:    kernel/torture.c
 +X:    kernel/rcu/srcu*.c
  
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <a.zummo@towertech.it>
@@@ -12289,13 -12048,6 +12289,13 @@@ S: Maintaine
  F:    sound/soc/codecs/rt*
  F:    include/sound/rt*.h
  
 +REALTEK RTL83xx SMI DSA ROUTER CHIPS
 +M:    Linus Walleij <linus.walleij@linaro.org>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
 +F:    drivers/net/dsa/realtek-smi*
 +F:    drivers/net/dsa/rtl83*
 +
  REGISTER MAP ABSTRACTION
  M:    Mark Brown <broonie@kernel.org>
  L:    linux-kernel@vger.kernel.org
@@@ -12403,8 -12155,6 +12403,8 @@@ S:   Maintaine
  F:    Documentation/rfkill.txt
  F:    Documentation/ABI/stable/sysfs-class-rfkill
  F:    net/rfkill/
 +F:    include/linux/rfkill.h
 +F:    include/uapi/linux/rfkill.h
  
  RHASHTABLE
  M:    Thomas Graf <tgraf@suug.ch>
@@@ -12412,9 -12162,7 +12412,9 @@@ M:   Herbert Xu <herbert@gondor.apana.org
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    lib/rhashtable.c
 +F:    lib/test_rhashtable.c
  F:    include/linux/rhashtable.h
 +F:    include/linux/rhashtable-types.h
  
  RICOH R5C592 MEMORYSTICK DRIVER
  M:    Maxim Levitsky <maximlevitsky@gmail.com>
@@@ -12636,6 -12384,7 +12636,6 @@@ F:   drivers/pci/hotplug/s390_pci_hpc.
  
  S390 VFIO-CCW DRIVER
  M:    Cornelia Huck <cohuck@redhat.com>
 -M:    Dong Jia Shi <bjsdjshi@linux.ibm.com>
  M:    Halil Pasic <pasic@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  L:    kvm@vger.kernel.org
@@@ -12872,21 -12621,15 +12872,21 @@@ S:        Maintaine
  F:    drivers/scsi/sr*
  
  SCSI RDMA PROTOCOL (SRP) INITIATOR
 -M:    Bart Van Assche <bart.vanassche@sandisk.com>
 +M:    Bart Van Assche <bvanassche@acm.org>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
 -W:    http://www.openfabrics.org
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dad/srp-initiator.git
  F:    drivers/infiniband/ulp/srp/
  F:    include/scsi/srp.h
  
 +SCSI RDMA PROTOCOL (SRP) TARGET
 +M:    Bart Van Assche <bvanassche@acm.org>
 +L:    linux-rdma@vger.kernel.org
 +L:    target-devel@vger.kernel.org
 +S:    Supported
 +Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 +F:    drivers/infiniband/ulp/srpt/
 +
  SCSI SG DRIVER
  M:    Doug Gilbert <dgilbert@interlog.com>
  L:    linux-scsi@vger.kernel.org
@@@ -12985,13 -12728,6 +12985,13 @@@ S: Maintaine
  F:    drivers/mmc/host/sdhci*
  F:    include/linux/mmc/sdhci*
  
 +SYNOPSYS SDHCI COMPLIANT DWC MSHC DRIVER
 +M:    Prabu Thangamuthu <prabu.t@synopsys.com>
 +M:    Manjunath M B <manjumb@synopsys.com>
 +L:    linux-mmc@vger.kernel.org
 +S:    Maintained
 +F:    drivers/mmc/host/sdhci-pci-dwc-mshc.c
 +
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
  M:    Ben Dooks <ben-linux@fluff.org>
  M:    Jaehoon Chung <jh80.chung@samsung.com>
@@@ -13033,7 -12769,6 +13033,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  W:    http://kernsec.org/
  S:    Supported
  F:    security/
 +X:    security/selinux/
  
  SELINUX SECURITY MODULE
  M:    Paul Moore <paul@paul-moore.com>
@@@ -13110,14 -12845,6 +13110,14 @@@ W: http://www.ibm.com/developerworks/li
  S:    Supported
  F:    net/smc/
  
 +SHARP RJ54N1CB0C SENSOR DRIVER
 +M:    Jacopo Mondi <jacopo@jmondi.org>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Odd fixes
 +F:    drivers/media/i2c/rj54n1cb0c.c
 +F:    include/media/i2c/rj54n1cb0c.h
 +
  SH_VEU V4L2 MEM2MEM DRIVER
  L:    linux-media@vger.kernel.org
  S:    Orphan
@@@ -13224,7 -12951,7 +13224,7 @@@ L:   linux-input@vger.kernel.or
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/input/touchscreen/silead.c
 -F:    drivers/platform/x86/silead_dmi.c
 +F:    drivers/platform/x86/touchscreen_dmi.c
  
  SILICON MOTION SM712 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@@ -13333,8 -13060,8 +13333,8 @@@ L:   linux-kernel@vger.kernel.or
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 -F:    include/linux/srcu.h
 -F:    kernel/rcu/srcu.c
 +F:    include/linux/srcu*.h
 +F:    kernel/rcu/srcu*.c
  
  SERIAL LOW-POWER INTER-CHIP MEDIA BUS (SLIMbus)
  M:    Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
@@@ -13432,9 -13159,8 +13432,8 @@@ F:   drivers/i2c/busses/i2c-synquacer.
  F:    Documentation/devicetree/bindings/i2c/i2c-synquacer.txt
  
  SOCIONEXT UNIPHIER SOUND DRIVER
- M:    Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
- S:    Maintained
+ S:    Orphan
  F:    sound/soc/uniphier/
  
  SOEKRIS NET48XX LED SUPPORT
@@@ -13744,13 -13470,6 +13743,13 @@@ M: H Hartley Sweeten <hsweeten@visionen
  S:    Odd Fixes
  F:    drivers/staging/comedi/
  
 +STAGING - EROFS FILE SYSTEM
 +M:    Gao Xiang <gaoxiang25@huawei.com>
 +M:    Chao Yu <yuchao0@huawei.com>
 +L:    linux-erofs@lists.ozlabs.org
 +S:    Maintained
 +F:    drivers/staging/erofs/
 +
  STAGING - FLARION FT1000 DRIVERS
  M:    Marek Belisko <marek.belisko@gmail.com>
  S:    Odd Fixes
@@@ -13943,7 -13662,7 +13942,7 @@@ M:   Konrad Rzeszutek Wilk <konrad.wilk@o
  L:    iommu@lists.linux-foundation.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
  S:    Supported
 -F:    lib/swiotlb.c
 +F:    kernel/dma/swiotlb.c
  F:    arch/*/kernel/pci-swiotlb.c
  F:    include/linux/swiotlb.h
  
@@@ -14141,12 -13860,6 +14140,12 @@@ F: include/uapi/linux/tc_act
  F:    include/uapi/linux/tc_ematch/
  F:    net/sched/
  
 +TC90522 MEDIA DRIVER
 +M:    Akihiro Tsukada <tskd08@gmail.com>
 +L:    linux-media@vger.kernel.org
 +S:    Odd Fixes
 +F:    drivers/media/dvb-frontends/tc90522*
 +
  TCP LOW PRIORITY MODULE
  M:    "Wong Hoi Sing, Edison" <hswong3i@gmail.com>
  M:    "Hung Hing Lun, Mike" <hlhung3i@gmail.com>
@@@ -14341,13 -14054,6 +14340,13 @@@ M: Laxman Dewangan <ldewangan@nvidia.co
  S:    Supported
  F:    drivers/input/keyboard/tegra-kbc.c
  
 +TEGRA NAND DRIVER
 +M:    Stefan Agner <stefan@agner.ch>
 +M:    Lucas Stach <dev@lynxeye.de>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mtd/nvidia-tegra20-nand.txt
 +F:    drivers/mtd/nand/raw/tegra_nand.c
 +
  TEGRA PWM DRIVER
  M:    Thierry Reding <thierry.reding@gmail.com>
  S:    Supported
@@@ -14411,7 -14117,6 +14410,7 @@@ F:   drivers/media/radio/radio-raremono.
  THERMAL
  M:    Zhang Rui <rui.zhang@intel.com>
  M:    Eduardo Valentin <edubezval@gmail.com>
 +R:    Daniel Lezcano <daniel.lezcano@linaro.org>
  L:    linux-pm@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
@@@ -14597,13 -14302,6 +14596,13 @@@ L: netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/ti/netcp*
  
 +TI PCM3060 ASoC CODEC DRIVER
 +M:    Kirill Marinushkin <kmarinushkin@birdec.tech>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/pcm3060.txt
 +F:    sound/soc/codecs/pcm3060*
 +
  TI TAS571X FAMILY ASoC CODEC DRIVER
  M:    Kevin Cernekee <cernekee@chromium.org>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -14736,7 -14434,6 +14735,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/RCU/torture.txt
  F:    kernel/torture.c
  F:    kernel/rcu/rcutorture.c
 +F:    kernel/rcu/rcuperf.c
  F:    kernel/locking/locktorture.c
  
  TOSHIBA ACPI EXTRAS DRIVER
@@@ -15258,7 -14955,7 +15257,7 @@@ L:   linux-usb@vger.kernel.or
  S:    Maintained
  F:    drivers/usb/typec/mux/pi3usb30532.c
  
 -USB TYPEC SUBSYSTEM
 +USB TYPEC CLASS
  M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
@@@ -15267,15 -14964,6 +15266,15 @@@ F: Documentation/driver-api/usb/typec.r
  F:    drivers/usb/typec/
  F:    include/linux/usb/typec.h
  
 +USB TYPEC BUS FOR ALTERNATE MODES
 +M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-typec
 +F:    Documentation/driver-api/usb/typec_bus.rst
 +F:    drivers/usb/typec/altmodes/
 +F:    include/linux/usb/typec_altmode.h
 +
  USB UHCI DRIVER
  M:    Alan Stern <stern@rowland.harvard.edu>
  L:    linux-usb@vger.kernel.org
@@@ -15306,7 -14994,6 +15305,7 @@@ L:   linux-usb@vger.kernel.or
  S:    Maintained
  F:    drivers/usb/gadget/function/*uvc*
  F:    drivers/usb/gadget/legacy/webcam.c
 +F:    include/uapi/linux/usb/g_uvc.h
  
  USB WIRELESS RNDIS DRIVER (rndis_wlan)
  M:    Jussi Kivilinna <jussi.kivilinna@iki.fi>
@@@ -15454,14 -15141,6 +15453,14 @@@ L: netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/via/via-velocity.*
  
 +VICODEC VIRTUAL CODEC DRIVER
 +M:    Hans Verkuil <hans.verkuil@cisco.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    https://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/platform/vicodec/*
 +
  VIDEO MULTIPLEXER DRIVER
  M:    Philipp Zabel <p.zabel@pengutronix.de>
  L:    linux-media@vger.kernel.org
@@@ -15629,7 -15308,7 +15628,7 @@@ F:   include/linux/vme
  
  VMWARE BALLOON DRIVER
  M:    Xavier Deguillard <xdeguillard@vmware.com>
 -M:    Philip Moltmann <moltmann@vmware.com>
 +M:    Nadav Amit <namit@vmware.com>
  M:    "VMware, Inc." <pv-drivers@vmware.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
@@@ -15721,7 -15400,6 +15720,7 @@@ F:   drivers/mmc/host/vub300.
  W1 DALLAS'S 1-WIRE BUS
  M:    Evgeniy Polyakov <zbr@ioremap.net>
  S:    Maintained
 +F:    Documentation/devicetree/bindings/w1/
  F:    Documentation/w1/
  F:    drivers/w1/
  F:    include/linux/w1.h
@@@ -15908,17 -15586,9 +15907,17 @@@ M: x86@kernel.or
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
  S:    Maintained
 +F:    Documentation/devicetree/bindings/x86/
  F:    Documentation/x86/
  F:    arch/x86/
  
 +X86 ENTRY CODE
 +M:    Andy Lutomirski <luto@kernel.org>
 +L:    linux-kernel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/asm
 +S:    Maintained
 +F:    arch/x86/entry/
 +
  X86 MCE INFRASTRUCTURE
  M:    Tony Luck <tony.luck@intel.com>
  M:    Borislav Petkov <bp@alien8.de>
@@@ -15941,7 -15611,7 +15940,7 @@@ F:   drivers/platform/x86
  F:    drivers/platform/olpc/
  
  X86 VDSO
 -M:    Andy Lutomirski <luto@amacapital.net>
 +M:    Andy Lutomirski <luto@kernel.org>
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso
  S:    Maintained
index 8f3bc6e37f265e2a65b3d30db87a8877f21e455e,77b265bd050531f59eeddb9eaee2cd75944f5649..c7e972b17c90205463c5a5991fc57c4d6b1df543
@@@ -16,6 -16,7 +16,7 @@@
  #include <linux/module.h>
  #include <linux/delay.h>
  #include <linux/io.h>
+ #include <linux/iopoll.h>
  #include <linux/sizes.h>
  #include <linux/pm_runtime.h>
  
@@@ -184,6 -185,24 +185,24 @@@ static void config_dma_descriptor_in_sr
        acp_reg_write(descr_info->xfer_val, acp_mmio, mmACP_SRBM_Targ_Idx_Data);
  }
  
+ static void pre_config_reset(void __iomem *acp_mmio, u16 ch_num)
+ {
+       u32 dma_ctrl;
+       int ret;
+       /* clear the reset bit */
+       dma_ctrl = acp_reg_read(acp_mmio, mmACP_DMA_CNTL_0 + ch_num);
+       dma_ctrl &= ~ACP_DMA_CNTL_0__DMAChRst_MASK;
+       acp_reg_write(dma_ctrl, acp_mmio, mmACP_DMA_CNTL_0 + ch_num);
+       /* check the reset bit before programming configuration registers */
+       ret = readl_poll_timeout(acp_mmio + ((mmACP_DMA_CNTL_0 + ch_num) * 4),
+                                dma_ctrl,
+                                !(dma_ctrl & ACP_DMA_CNTL_0__DMAChRst_MASK),
+                                100, ACP_DMA_RESET_TIME);
+       if (ret < 0)
+               pr_err("Failed to clear reset of channel : %d\n", ch_num);
+ }
  /*
   * Initialize the DMA descriptor information for transfer between
   * system memory <-> ACP SRAM
@@@ -236,6 -255,7 +255,7 @@@ static void set_acp_sysmem_dma_descript
                config_dma_descriptor_in_sram(acp_mmio, dma_dscr_idx,
                                              &dmadscr[i]);
        }
+       pre_config_reset(acp_mmio, ch);
        config_acp_dma_channel(acp_mmio, ch,
                               dma_dscr_idx - 1,
                               NUM_DSCRS_PER_CHANNEL,
@@@ -275,6 -295,7 +295,7 @@@ static void set_acp_to_i2s_dma_descript
                config_dma_descriptor_in_sram(acp_mmio, dma_dscr_idx,
                                              &dmadscr[i]);
        }
+       pre_config_reset(acp_mmio, ch);
        /* Configure the DMA channel with the above descriptore */
        config_acp_dma_channel(acp_mmio, ch, dma_dscr_idx - 1,
                               NUM_DSCRS_PER_CHANNEL,
@@@ -846,12 -867,8 +867,12 @@@ static int acp_dma_hw_params(struct snd
                return -EINVAL;
  
        if (pinfo) {
 -              rtd->i2s_instance = pinfo->i2s_instance;
 -              rtd->capture_channel = pinfo->capture_channel;
 +              if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 +                      rtd->i2s_instance = pinfo->play_i2s_instance;
 +              } else {
 +                      rtd->i2s_instance = pinfo->cap_i2s_instance;
 +                      rtd->capture_channel = pinfo->capture_channel;
 +              }
        }
        if (adata->asic_type == CHIP_STONEY) {
                val = acp_reg_read(adata->acp_mmio,
diff --combined sound/soc/sh/rcar/adg.c
index b100c44ec3a3e209d0b61c1756222355294623fc,051f96405346b2f495c94ebc409656c98634a3c8..28327dd2c6cb4e0e4110dc4787ecaa7e8884646f
@@@ -462,6 -462,11 +462,11 @@@ static void rsnd_adg_get_clkout(struct 
                goto rsnd_adg_get_clkout_end;
  
        req_size = prop->length / sizeof(u32);
+       if (req_size > REQ_SIZE) {
+               dev_err(dev,
+                       "too many clock-frequency, use top %d\n", REQ_SIZE);
+               req_size = REQ_SIZE;
+       }
  
        of_property_read_u32_array(np, "clock-frequency", req_rate, req_size);
        req_48kHz_rate = 0;
@@@ -577,7 -582,7 +582,7 @@@ static void rsnd_adg_clk_dbg_info(struc
        int i;
  
        for_each_rsnd_clk(clk, adg, i)
 -              dev_dbg(dev, "%s    : %p : %ld\n",
 +              dev_dbg(dev, "%s    : %pa : %ld\n",
                        clk_name[i], clk, clk_get_rate(clk));
  
        dev_dbg(dev, "BRGCKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n",
         * by BRGCKR::BRGCKR_31
         */
        for_each_rsnd_clkout(clk, adg, i)
 -              dev_dbg(dev, "clkout %d : %p : %ld\n", i,
 +              dev_dbg(dev, "clkout %d : %pa : %ld\n", i,
                        clk, clk_get_rate(clk));
  }
  #else
diff --combined sound/soc/sh/rcar/core.c
index e46415c807a0fd6cbc3509de4f8a5da09e875b6f,d23c2bbff0cf4e666dcf5d3a4b26fccaf22a05ba..40d7dc4f7839bd4d72fdafde1f17228ef9d1062f
  #include "rsnd.h"
  
  #define RSND_RATES SNDRV_PCM_RATE_8000_192000
 -#define RSND_FMTS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE)
 +#define RSND_FMTS (SNDRV_PCM_FMTBIT_S8 |\
 +                 SNDRV_PCM_FMTBIT_S16_LE |\
 +                 SNDRV_PCM_FMTBIT_S24_LE)
  
  static const struct of_device_id rsnd_of_match[] = {
        { .compatible = "renesas,rcar_sound-gen1", .data = (void *)RSND_GEN1 },
@@@ -282,8 -280,6 +282,8 @@@ u32 rsnd_get_adinr_bit(struct rsnd_mod 
        struct device *dev = rsnd_priv_to_dev(priv);
  
        switch (snd_pcm_format_width(runtime->format)) {
 +      case 8:
 +              return 16 << 16;
        case 16:
                return 8 << 16;
        case 24:
@@@ -335,7 -331,7 +335,7 @@@ u32 rsnd_get_dalign(struct rsnd_mod *mo
                target = cmd ? cmd : ssiu;
        }
  
 -      /* Non target mod or 24bit data needs normal DALIGN */
 +      /* Non target mod or non 16bit needs normal DALIGN */
        if ((snd_pcm_format_width(runtime->format) != 16) ||
            (mod != target))
                return 0x76543210;
@@@ -371,7 -367,7 +371,7 @@@ u32 rsnd_get_busif_shift(struct rsnd_da
         * HW    24bit data is located as 0x******00
         *
         */
 -      if (snd_pcm_format_width(runtime->format) == 16)
 +      if (snd_pcm_format_width(runtime->format) != 24)
                return 0;
  
        for (i = 0; i < ARRAY_SIZE(playback_mods); i++) {
@@@ -482,7 -478,7 +482,7 @@@ static int rsnd_status_update(u32 *stat
                        (func_call && (mod)->ops->fn) ? #fn : "");      \
                if (func_call && (mod)->ops->fn)                        \
                        tmp = (mod)->ops->fn(mod, io, param);           \
-               if (tmp)                                                \
+               if (tmp && (tmp != -EPROBE_DEFER))                      \
                        dev_err(dev, "%s[%d] : %s error %d\n",          \
                                rsnd_mod_name(mod), rsnd_mod_id(mod),   \
                                                     #fn, tmp);         \
@@@ -544,14 -540,6 +544,14 @@@ int rsnd_rdai_ssi_lane_ctrl(struct rsnd
        return rdai->ssi_lane;
  }
  
 +int rsnd_rdai_width_ctrl(struct rsnd_dai *rdai, int width)
 +{
 +      if (width > 0)
 +              rdai->chan_width = width;
 +
 +      return rdai->chan_width;
 +}
 +
  struct rsnd_dai *rsnd_rdai_get(struct rsnd_priv *priv, int id)
  {
        if ((id < 0) || (id >= rsnd_rdai_nr(priv)))
@@@ -693,7 -681,6 +693,7 @@@ static int rsnd_soc_dai_set_fmt(struct 
                rdai->frm_clk_inv = 0;
                break;
        case SND_SOC_DAIFMT_LEFT_J:
 +      case SND_SOC_DAIFMT_DSP_B:
                rdai->sys_delay = 1;
                rdai->data_alignment = 0;
                rdai->frm_clk_inv = 1;
                rdai->data_alignment = 1;
                rdai->frm_clk_inv = 1;
                break;
 +      case SND_SOC_DAIFMT_DSP_A:
 +              rdai->sys_delay = 0;
 +              rdai->data_alignment = 0;
 +              rdai->frm_clk_inv = 1;
 +              break;
        }
  
        /* set clock inversion */
@@@ -738,16 -720,6 +738,16 @@@ static int rsnd_soc_set_dai_tdm_slot(st
        struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
        struct device *dev = rsnd_priv_to_dev(priv);
  
 +      switch (slot_width) {
 +      case 16:
 +      case 24:
 +      case 32:
 +              break;
 +      default:
 +              dev_err(dev, "unsupported slot width value: %d\n", slot_width);
 +              return -EINVAL;
 +      }
 +
        switch (slots) {
        case 2:
        case 6:
                /* TDM Extend Mode */
                rsnd_rdai_channels_set(rdai, slots);
                rsnd_rdai_ssi_lane_set(rdai, 1);
 +              rsnd_rdai_width_set(rdai, slot_width);
                break;
        default:
                dev_err(dev, "unsupported TDM slots (%d)\n", slots);
@@@ -784,7 -755,7 +784,7 @@@ static unsigned int rsnd_soc_hw_rate_li
        192000,
  };
  
 -static int rsnd_soc_hw_rule(struct rsnd_priv *priv,
 +static int rsnd_soc_hw_rule(struct rsnd_dai *rdai,
                            unsigned int *list, int list_num,
                            struct snd_interval *baseline, struct snd_interval *iv)
  {
                if (!snd_interval_test(iv, list[i]))
                        continue;
  
 -              rate = rsnd_ssi_clk_query(priv,
 +              rate = rsnd_ssi_clk_query(rdai,
                                          baseline->min, list[i], NULL);
                if (rate > 0) {
                        p.min = min(p.min, list[i]);
                        p.max = max(p.max, list[i]);
                }
  
 -              rate = rsnd_ssi_clk_query(priv,
 +              rate = rsnd_ssi_clk_query(rdai,
                                          baseline->max, list[i], NULL);
                if (rate > 0) {
                        p.min = min(p.min, list[i]);
        return snd_interval_refine(iv, &p);
  }
  
 -static int __rsnd_soc_hw_rule_rate(struct snd_pcm_hw_params *params,
 -                                 struct snd_pcm_hw_rule *rule,
 -                                 int is_play)
 +static int rsnd_soc_hw_rule_rate(struct snd_pcm_hw_params *params,
 +                               struct snd_pcm_hw_rule *rule)
  {
        struct snd_interval *ic_ = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
        struct snd_interval *ir = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
        struct snd_interval ic;
 -      struct snd_soc_dai *dai = rule->private;
 -      struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
 -      struct rsnd_priv *priv = rsnd_rdai_to_priv(rdai);
 -      struct rsnd_dai_stream *io = is_play ? &rdai->playback : &rdai->capture;
 +      struct rsnd_dai_stream *io = rule->private;
 +      struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
  
        /*
         * possible sampling rate limitation is same as
        ic.min =
        ic.max = rsnd_runtime_channel_for_ssi_with_params(io, params);
  
 -      return rsnd_soc_hw_rule(priv, rsnd_soc_hw_rate_list,
 +      return rsnd_soc_hw_rule(rdai, rsnd_soc_hw_rate_list,
                                ARRAY_SIZE(rsnd_soc_hw_rate_list),
                                &ic, ir);
  }
  
 -static int rsnd_soc_hw_rule_rate_playback(struct snd_pcm_hw_params *params,
 -                               struct snd_pcm_hw_rule *rule)
 -{
 -      return __rsnd_soc_hw_rule_rate(params, rule, 1);
 -}
 -
 -static int rsnd_soc_hw_rule_rate_capture(struct snd_pcm_hw_params *params,
 -                                        struct snd_pcm_hw_rule *rule)
 -{
 -      return __rsnd_soc_hw_rule_rate(params, rule, 0);
 -}
 -
 -static int __rsnd_soc_hw_rule_channels(struct snd_pcm_hw_params *params,
 -                                     struct snd_pcm_hw_rule *rule,
 -                                     int is_play)
 +static int rsnd_soc_hw_rule_channels(struct snd_pcm_hw_params *params,
 +                                   struct snd_pcm_hw_rule *rule)
  {
        struct snd_interval *ic_ = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
        struct snd_interval *ir = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
        struct snd_interval ic;
 -      struct snd_soc_dai *dai = rule->private;
 -      struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
 -      struct rsnd_priv *priv = rsnd_rdai_to_priv(rdai);
 -      struct rsnd_dai_stream *io = is_play ? &rdai->playback : &rdai->capture;
 +      struct rsnd_dai_stream *io = rule->private;
 +      struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
  
        /*
         * possible sampling rate limitation is same as
        ic.min =
        ic.max = rsnd_runtime_channel_for_ssi_with_params(io, params);
  
 -      return rsnd_soc_hw_rule(priv, rsnd_soc_hw_channels_list,
 +      return rsnd_soc_hw_rule(rdai, rsnd_soc_hw_channels_list,
                                ARRAY_SIZE(rsnd_soc_hw_channels_list),
                                ir, &ic);
  }
  
 -static int rsnd_soc_hw_rule_channels_playback(struct snd_pcm_hw_params *params,
 -                                            struct snd_pcm_hw_rule *rule)
 -{
 -      return __rsnd_soc_hw_rule_channels(params, rule, 1);
 -}
 -
 -static int rsnd_soc_hw_rule_channels_capture(struct snd_pcm_hw_params *params,
 -                                           struct snd_pcm_hw_rule *rule)
 -{
 -      return __rsnd_soc_hw_rule_channels(params, rule, 0);
 -}
 -
  static const struct snd_pcm_hardware rsnd_pcm_hardware = {
        .info =         SNDRV_PCM_INFO_INTERLEAVED      |
                        SNDRV_PCM_INFO_MMAP             |
@@@ -881,10 -882,12 +881,10 @@@ static int rsnd_soc_dai_startup(struct 
                                struct snd_soc_dai *dai)
  {
        struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
 -      struct rsnd_priv *priv = rsnd_rdai_to_priv(rdai);
        struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream);
        struct snd_pcm_hw_constraint_list *constraint = &rdai->constraint;
        struct snd_pcm_runtime *runtime = substream->runtime;
        unsigned int max_channels = rsnd_rdai_channels_get(rdai);
 -      int ret;
        int i;
  
        rsnd_dai_stream_init(io, substream);
                int is_play = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
  
                snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
 -                                  is_play ? rsnd_soc_hw_rule_rate_playback :
 -                                            rsnd_soc_hw_rule_rate_capture,
 -                                  dai,
 +                                  rsnd_soc_hw_rule_rate,
 +                                  is_play ? &rdai->playback : &rdai->capture,
                                    SNDRV_PCM_HW_PARAM_CHANNELS, -1);
                snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
 -                                  is_play ? rsnd_soc_hw_rule_channels_playback :
 -                                            rsnd_soc_hw_rule_channels_capture,
 -                                  dai,
 +                                  rsnd_soc_hw_rule_channels,
 +                                  is_play ? &rdai->playback : &rdai->capture,
                                    SNDRV_PCM_HW_PARAM_RATE, -1);
        }
  
 -      /*
 -       * call rsnd_dai_call without spinlock
 -       */
 -      ret = rsnd_dai_call(nolock_start, io, priv);
 -      if (ret < 0)
 -              rsnd_dai_call(nolock_stop, io, priv);
 -
 -      return ret;
 +      return 0;
  }
  
  static void rsnd_soc_dai_shutdown(struct snd_pcm_substream *substream,
        /*
         * call rsnd_dai_call without spinlock
         */
 -      rsnd_dai_call(nolock_stop, io, priv);
 +      rsnd_dai_call(cleanup, io, priv);
  
        rsnd_dai_stream_quit(io);
  }
@@@ -1071,7 -1083,6 +1071,7 @@@ static void __rsnd_dai_probe(struct rsn
        rdai->capture.rdai              = rdai;
        rsnd_rdai_channels_set(rdai, 2); /* default 2ch */
        rsnd_rdai_ssi_lane_set(rdai, 1); /* default 1lane */
 +      rsnd_rdai_width_set(rdai, 32);   /* default 32bit width */
  
        for (io_i = 0;; io_i++) {
                playback = of_parse_phandle(dai_np, "playback", io_i);
@@@ -1263,15 -1274,8 +1263,15 @@@ int rsnd_kctrl_accept_anytime(struct rs
  int rsnd_kctrl_accept_runtime(struct rsnd_dai_stream *io)
  {
        struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
 +      struct rsnd_priv *priv = rsnd_io_to_priv(io);
 +      struct device *dev = rsnd_priv_to_dev(priv);
 +
 +      if (!runtime) {
 +              dev_warn(dev, "Can't update kctrl when idle\n");
 +              return 0;
 +      }
  
 -      return !!runtime;
 +      return 1;
  }
  
  struct rsnd_kctrl_cfg *rsnd_kctrl_init_m(struct rsnd_kctrl_cfg_m *cfg)
@@@ -1557,6 -1561,14 +1557,14 @@@ exit_snd_probe
                rsnd_dai_call(remove, &rdai->capture, priv);
        }
  
+       /*
+        * adg is very special mod which can't use rsnd_dai_call(remove),
+        * and it registers ADG clock on probe.
+        * It should be unregister if probe failed.
+        * Mainly it is assuming -EPROBE_DEFER case
+        */
+       rsnd_adg_remove(priv);
        return ret;
  }
  
diff --combined sound/soc/sh/rcar/dma.c
index c19342d189981b076fa9ae2b59ad52308b249a87,d65ea7bc4dac2d2608cbcfbe3d3a4ebd915ad242..0bbc4b0ea2c6d65daf62cff46489bdc9bf20e3ec
@@@ -106,9 -106,9 +106,9 @@@ static int rsnd_dmaen_stop(struct rsnd_
        return 0;
  }
  
 -static int rsnd_dmaen_nolock_stop(struct rsnd_mod *mod,
 -                                 struct rsnd_dai_stream *io,
 -                                 struct rsnd_priv *priv)
 +static int rsnd_dmaen_cleanup(struct rsnd_mod *mod,
 +                            struct rsnd_dai_stream *io,
 +                            struct rsnd_priv *priv)
  {
        struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
        /*
         * DMAEngine release uses mutex lock.
         * Thus, it shouldn't be called under spinlock.
 -       * Let's call it under nolock_start
 +       * Let's call it under prepare
         */
        if (dmaen->chan)
                dma_release_channel(dmaen->chan);
        return 0;
  }
  
 -static int rsnd_dmaen_nolock_start(struct rsnd_mod *mod,
 -                          struct rsnd_dai_stream *io,
 -                          struct rsnd_priv *priv)
 +static int rsnd_dmaen_prepare(struct rsnd_mod *mod,
 +                            struct rsnd_dai_stream *io,
 +                            struct rsnd_priv *priv)
  {
        struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
        /*
         * DMAEngine request uses mutex lock.
         * Thus, it shouldn't be called under spinlock.
 -       * Let's call it under nolock_start
 +       * Let's call it under prepare
         */
        dmaen->chan = rsnd_dmaen_request_channel(io,
                                                 dma->mod_from,
@@@ -241,6 -241,10 +241,10 @@@ static int rsnd_dmaen_attach(struct rsn
        /* try to get DMAEngine channel */
        chan = rsnd_dmaen_request_channel(io, mod_from, mod_to);
        if (IS_ERR_OR_NULL(chan)) {
+               /* Let's follow when -EPROBE_DEFER case */
+               if (PTR_ERR(chan) == -EPROBE_DEFER)
+                       return PTR_ERR(chan);
                /*
                 * DMA failed. try to PIO mode
                 * see
@@@ -287,8 -291,8 +291,8 @@@ static int rsnd_dmaen_pointer(struct rs
  
  static struct rsnd_mod_ops rsnd_dmaen_ops = {
        .name   = "audmac",
 -      .nolock_start = rsnd_dmaen_nolock_start,
 -      .nolock_stop  = rsnd_dmaen_nolock_stop,
 +      .prepare = rsnd_dmaen_prepare,
 +      .cleanup = rsnd_dmaen_cleanup,
        .start  = rsnd_dmaen_start,
        .stop   = rsnd_dmaen_stop,
        .pointer= rsnd_dmaen_pointer,
   *            Audio DMAC peri peri
   */
  static const u8 gen2_id_table_ssiu[] = {
 -      0x00, /* SSI00 */
 -      0x04, /* SSI10 */
 -      0x08, /* SSI20 */
 -      0x0c, /* SSI3  */
 -      0x0d, /* SSI4  */
 -      0x0e, /* SSI5  */
 -      0x0f, /* SSI6  */
 -      0x10, /* SSI7  */
 -      0x11, /* SSI8  */
 -      0x12, /* SSI90 */
 +      /* SSI00 ~ SSI07 */
 +      0x00, 0x01, 0x02, 0x03, 0x39, 0x3a, 0x3b, 0x3c,
 +      /* SSI10 ~ SSI17 */
 +      0x04, 0x05, 0x06, 0x07, 0x3d, 0x3e, 0x3f, 0x40,
 +      /* SSI20 ~ SSI27 */
 +      0x08, 0x09, 0x0a, 0x0b, 0x41, 0x42, 0x43, 0x44,
 +      /* SSI30 ~ SSI37 */
 +      0x0c, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b,
 +      /* SSI40 ~ SSI47 */
 +      0x0d, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52,
 +      /* SSI5 */
 +      0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 +      /* SSI6 */
 +      0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 +      /* SSI7 */
 +      0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 +      /* SSI8 */
 +      0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 +      /* SSI90 ~ SSI97 */
 +      0x12, 0x13, 0x14, 0x15, 0x53, 0x54, 0x55, 0x56,
  };
  static const u8 gen2_id_table_scu[] = {
        0x2d, /* SCU_SRCI0 */
@@@ -343,23 -337,18 +347,23 @@@ static u32 rsnd_dmapp_get_id(struct rsn
        struct rsnd_mod *src = rsnd_io_to_mod_src(io);
        struct rsnd_mod *dvc = rsnd_io_to_mod_dvc(io);
        const u8 *entry = NULL;
 -      int id = rsnd_mod_id(mod);
 +      int id = 255;
        int size = 0;
  
        if (mod == ssi) {
 +              int busif = rsnd_ssi_get_busif(io);
 +
                entry = gen2_id_table_ssiu;
                size = ARRAY_SIZE(gen2_id_table_ssiu);
 +              id = (rsnd_mod_id(mod) * 8) + busif;
        } else if (mod == src) {
                entry = gen2_id_table_scu;
                size = ARRAY_SIZE(gen2_id_table_scu);
 +              id = rsnd_mod_id(mod);
        } else if (mod == dvc) {
                entry = gen2_id_table_cmd;
                size = ARRAY_SIZE(gen2_id_table_cmd);
 +              id = rsnd_mod_id(mod);
        }
  
        if ((!entry) || (size <= id)) {
@@@ -393,7 -382,7 +397,7 @@@ static void rsnd_dmapp_write(struct rsn
        struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv);
        struct device *dev = rsnd_priv_to_dev(priv);
  
 -      dev_dbg(dev, "w %p : %08x\n", rsnd_dmapp_addr(dmac, dma, reg), data);
 +      dev_dbg(dev, "w 0x%px : %08x\n", rsnd_dmapp_addr(dmac, dma, reg), data);
  
        iowrite32(data, rsnd_dmapp_addr(dmac, dma, reg));
  }
@@@ -502,11 -491,11 +506,11 @@@ static struct rsnd_mod_ops rsnd_dmapp_o
  #define RDMA_SSI_I_N(addr, i) (addr ##_reg - 0x00300000 + (0x40 * i) + 0x8)
  #define RDMA_SSI_O_N(addr, i) (addr ##_reg - 0x00300000 + (0x40 * i) + 0xc)
  
 -#define RDMA_SSIU_I_N(addr, i)        (addr ##_reg - 0x00441000 + (0x1000 * i))
 -#define RDMA_SSIU_O_N(addr, i)        (addr ##_reg - 0x00441000 + (0x1000 * i))
 +#define RDMA_SSIU_I_N(addr, i, j) (addr ##_reg - 0x00441000 + (0x1000 * (i)) + (((j) / 4) * 0xA000) + (((j) % 4) * 0x400))
 +#define RDMA_SSIU_O_N(addr, i, j) RDMA_SSIU_I_N(addr, i, j)
  
 -#define RDMA_SSIU_I_P(addr, i)        (addr ##_reg - 0x00141000 + (0x1000 * i))
 -#define RDMA_SSIU_O_P(addr, i)        (addr ##_reg - 0x00141000 + (0x1000 * i))
 +#define RDMA_SSIU_I_P(addr, i, j) (addr ##_reg - 0x00141000 + (0x1000 * (i)) + (((j) / 4) * 0xA000) + (((j) % 4) * 0x400))
 +#define RDMA_SSIU_O_P(addr, i, j) RDMA_SSIU_I_P(addr, i, j)
  
  #define RDMA_SRC_I_N(addr, i) (addr ##_reg - 0x00500000 + (0x400 * i))
  #define RDMA_SRC_O_N(addr, i) (addr ##_reg - 0x004fc000 + (0x400 * i))
@@@ -532,7 -521,6 +536,7 @@@ rsnd_gen2_dma_addr(struct rsnd_dai_stre
                      !!rsnd_io_to_mod_mix(io) ||
                      !!rsnd_io_to_mod_ctu(io);
        int id = rsnd_mod_id(mod);
 +      int busif = rsnd_ssi_get_busif(io);
        struct dma_addr {
                dma_addr_t out_addr;
                dma_addr_t in_addr;
                },
                /* SSI */
                /* Capture */
 -              {{{ RDMA_SSI_O_N(ssi, id),      0 },
 -                { RDMA_SSIU_O_P(ssi, id),     0 },
 -                { RDMA_SSIU_O_P(ssi, id),     0 } },
 +              {{{ RDMA_SSI_O_N(ssi, id),              0 },
 +                { RDMA_SSIU_O_P(ssi, id, busif),      0 },
 +                { RDMA_SSIU_O_P(ssi, id, busif),      0 } },
                 /* Playback */
 -               {{ 0,                          RDMA_SSI_I_N(ssi, id) },
 -                { 0,                          RDMA_SSIU_I_P(ssi, id) },
 -                { 0,                          RDMA_SSIU_I_P(ssi, id) } }
 +               {{ 0,                  RDMA_SSI_I_N(ssi, id) },
 +                { 0,                  RDMA_SSIU_I_P(ssi, id, busif) },
 +                { 0,                  RDMA_SSIU_I_P(ssi, id, busif) } }
                },
                /* SSIU */
                /* Capture */
 -              {{{ RDMA_SSIU_O_N(ssi, id),     0 },
 -                { RDMA_SSIU_O_P(ssi, id),     0 },
 -                { RDMA_SSIU_O_P(ssi, id),     0 } },
 +              {{{ RDMA_SSIU_O_N(ssi, id, busif),      0 },
 +                { RDMA_SSIU_O_P(ssi, id, busif),      0 },
 +                { RDMA_SSIU_O_P(ssi, id, busif),      0 } },
                 /* Playback */
 -               {{ 0,                          RDMA_SSIU_I_N(ssi, id) },
 -                { 0,                          RDMA_SSIU_I_P(ssi, id) },
 -                { 0,                          RDMA_SSIU_I_P(ssi, id) } } },
 +               {{ 0,                  RDMA_SSIU_I_N(ssi, id, busif) },
 +                { 0,                  RDMA_SSIU_I_P(ssi, id, busif) },
 +                { 0,                  RDMA_SSIU_I_P(ssi, id, busif) } } },
        };
  
 +      /*
 +       * FIXME
 +       *
 +       * We can't support SSI9-4/5/6/7, because its address is
 +       * out of calculation rule
 +       */
 +      if ((id == 9) && (busif >= 4))
 +              dev_err(dev, "This driver doesn't support SSI%d-%d, so far",
 +                      id, busif);
 +
        /* it shouldn't happen */
        if (use_cmd && !use_src)
                dev_err(dev, "DVC is selected without SRC\n");