Merge remote-tracking branches 'asoc/topic/uniphier', 'asoc/topic/utils', 'asoc/topic...

diff --combined MAINTAINERS
index 8e4d79ad1371c53baeccda317c6d9408946d9fd6,55ae8ea8722a8f79b2af7c5345f5e8cb99f50874,aa71ab52fd76d1607b36f476dde8e0060f500070,aa71ab52fd76d1607b36f476dde8e0060f500070,aa71ab52fd76d1607b36f476dde8e0060f500070,aa71ab52fd76d1607b36f476dde8e0060f500070..f4800a4c50659dc7a7f5a2473eaba716d1216e6f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@ -554,13 -554,13 -554,13 -554,13 -554,13 -554,13 +554,13 @@@@@@@ S:      Orpha
      F:        Documentation/filesystems/affs.txt
      F:        fs/affs/
      
 -----AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN
 +++++AFS FILESYSTEM
      M:        David Howells <[email protected]>
      L:        [email protected]
      S:        Supported
      F:        fs/afs/
 -----F:        include/net/af_rxrpc.h
 -----F:        net/rxrpc/af_rxrpc.c
 +++++F:        include/trace/events/afs.h
 +++++F:        Documentation/filesystems/afs.txt
      W:        https://www.infradead.org/~dhowells/kafs/
      
      AGPGART DRIVER
@@@@@@@ -859,8 -859,7 -859,7 -859,7 -859,7 -859,7 +859,8 @@@@@@@ F:     kernel/configs/android
      ANDROID DRIVERS
      M:        Greg Kroah-Hartman <[email protected]>
      M:        Arve Hjønnevåg <[email protected]>
 -----M:        Riley Andrews <[email protected]>
 +++++M:        Todd Kjos <[email protected]>
 +++++M:        Martijn Coenen <[email protected]>
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
      L:        [email protected]
      S:        Supported
@@@@@@@ -2047,7 -2046,7 -2046,7 -2046,7 -2046,7 -2046,7 +2047,7 @@@@@@@ F:      arch/arm/boot/dts/uniphier
      F:        arch/arm/include/asm/hardware/cache-uniphier.h
      F:        arch/arm/mach-uniphier/
      F:        arch/arm/mm/cache-uniphier.c
 -----F:        arch/arm64/boot/dts/socionext/
 +++++F:        arch/arm64/boot/dts/socionext/uniphier*
      F:        drivers/bus/uniphier-system-bus.c
      F:        drivers/clk/uniphier/
      F:        drivers/gpio/gpio-uniphier.c
@@@@@@@ -2621,22 -2620,24 -2620,24 -2620,24 -2620,24 -2620,24 +2621,22 @@@@@@@ F:       fs/bfs
      F:        include/uapi/linux/bfs_fs.h
      
      BLACKFIN ARCHITECTURE
 -----M:        Steven Miao <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      T:        git git://git.code.sf.net/p/adi-linux/code
      W:        http://blackfin.uclinux.org
 -----S:        Supported
 +++++S:        Orphan
      F:        arch/blackfin/
      
      BLACKFIN EMAC DRIVER
      L:        [email protected] (moderated for non-subscribers)
      W:        http://blackfin.uclinux.org
 -----S:        Supported
 +++++S:        Orphan
      F:        drivers/net/ethernet/adi/
      
      BLACKFIN MEDIA DRIVER
 -----M:        Scott Jiang <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      W:        http://blackfin.uclinux.org/
 -----S:        Supported
 +++++S:        Orphan
      F:        drivers/media/platform/blackfin/
      F:        drivers/media/i2c/adv7183*
      F:        drivers/media/i2c/vs6624*
@@@@@@@ -2644,25 -2645,25 -2645,25 -2645,25 -2645,25 -2645,25 +2644,25 @@@@@@@
      BLACKFIN RTC DRIVER
      L:        [email protected] (moderated for non-subscribers)
      W:        http://blackfin.uclinux.org
 -----S:        Supported
 +++++S:        Orphan
      F:        drivers/rtc/rtc-bfin.c
      
      BLACKFIN SDH DRIVER
      L:        [email protected] (moderated for non-subscribers)
      W:        http://blackfin.uclinux.org
 -----S:        Supported
 +++++S:        Orphan
      F:        drivers/mmc/host/bfin_sdh.c
      
      BLACKFIN SERIAL DRIVER
      L:        [email protected] (moderated for non-subscribers)
      W:        http://blackfin.uclinux.org
 -----S:        Supported
 +++++S:        Orphan
      F:        drivers/tty/serial/bfin_uart.c
      
      BLACKFIN WATCHDOG DRIVER
      L:        [email protected] (moderated for non-subscribers)
      W:        http://blackfin.uclinux.org
 -----S:        Supported
 +++++S:        Orphan
      F:        drivers/watchdog/bfin_wdt.c
      
      BLINKM RGB LED DRIVER
@@@@@@@ -5149,15 -5150,15 -5150,15 -5150,15 -5150,15 -5150,15 +5149,15 @@@@@@@ F:       sound/usb/misc/ua101.
      EFI TEST DRIVER
      L:        [email protected]
      M:        Ivan Hu <[email protected]>
 -----M:        Matt Fleming <[email protected]>
 +++++M:        Ard Biesheuvel <[email protected]>
      S:        Maintained
      F:        drivers/firmware/efi/test/
      
      EFI VARIABLE FILESYSTEM
      M:        Matthew Garrett <[email protected]>
      M:        Jeremy Kerr <[email protected]>
 -----M:        Matt Fleming <[email protected]>
 -----T:        git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
 +++++M:        Ard Biesheuvel <[email protected]>
 +++++T:        git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
      L:        [email protected]
      S:        Maintained
      F:        fs/efivarfs/
@@@@@@@ -5318,6 -5319,7 -5319,7 -5319,7 -5319,7 -5319,7 +5318,6 @@@@@@@ S:      Supporte
      F:        security/integrity/evm/
      
      EXTENSIBLE FIRMWARE INTERFACE (EFI)
 -----M:        Matt Fleming <[email protected]>
      M:        Ard Biesheuvel <[email protected]>
      L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
@@@@@@@ -5428,7 -5430,7 -5430,7 -5430,7 -5430,7 -5430,7 +5428,7 @@@@@@@ F:      drivers/media/tuners/fc2580
      
      FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
      M:        Johannes Thumshirn <[email protected]>
 -----L:        fcoe-devel@open-fcoe.org
 +++++L:        [email protected].org
      W:        www.Open-FCoE.org
      S:        Supported
      F:        drivers/scsi/libfc/
@@@@@@@ -6172,6 -6174,7 -6174,7 -6174,7 -6174,7 -6174,7 +6172,6 @@@@@@@ M:      Jean Delvare <[email protected]
      M:        Guenter Roeck <[email protected]>
      L:        [email protected]
      W:        http://hwmon.wiki.kernel.org/
 -----T:        quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
      S:        Maintained
      F:        Documentation/hwmon/
@@@@@@@ -7764,7 -7767,6 -7767,6 -7767,6 -7767,6 -7767,6 +7764,7 @@@@@@@ F:      security/keys
      
      KGDB / KDB /debug_core
      M:        Jason Wessel <[email protected]>
 +++++M:        Daniel Thompson <[email protected]>
      W:        http://kgdb.wiki.kernel.org/
      L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
@@@@@@@ -9329,9 -9331,9 -9331,9 -9331,9 -9331,9 -9331,9 +9329,9 @@@@@@@ F:      drivers/gpu/drm/mxsfb
      F:        Documentation/devicetree/bindings/display/mxsfb-drm.txt
      
      MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 -----M:        Hyong-Youb Kim <hykim@myri.com>
 +++++M:        Chris Lee <christopher.lee@cspi.com>
      L:        [email protected]
 -----W:        https://www.myricom.com/support/downloads/myri10ge.html
 +++++W:        https://www.cspi.com/ethernet-products/support/downloads/
      S:        Supported
      F:        drivers/net/ethernet/myricom/myri10ge/
      
@@@@@@@ -9803,7 -9805,6 -9805,6 -9805,6 -9805,6 -9805,6 +9803,7 @@@@@@@ NXP TFA9879 DRIVE
      M:        Peter Rosin <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      S:        Maintained
 +++++F:        Documentation/devicetree/bindings/sound/tfa9879.txt
      F:        sound/soc/codecs/tfa9879*
      
      NXP-NCI NFC DRIVER
@@@@@@@ -11776,18 -11777,6 -11777,6 -11777,6 -11777,6 -11777,6 +11776,18 @@@@@@@ T:     git git://git.kernel.org/pub/scm/lin
      S:        Maintained
      F:        drivers/net/wireless/realtek/rtl8xxxu/
      
 +++++RXRPC SOCKETS (AF_RXRPC)
 +++++M:        David Howells <[email protected]>
 +++++L:        [email protected]
 +++++S:        Supported
 +++++F:        net/rxrpc/
 +++++F:        include/keys/rxrpc-type.h
 +++++F:        include/net/af_rxrpc.h
 +++++F:        include/trace/events/rxrpc.h
 +++++F:        include/uapi/linux/rxrpc.h
 +++++F:        Documentation/networking/rxrpc.txt
 +++++W:        https://www.infradead.org/~dhowells/kafs/
 +++++
      S3 SAVAGE FRAMEBUFFER DRIVER
      M:        Antonino Daplas <[email protected]>
      L:        [email protected]
@@@@@@@ -12592,6 -12581,12 -12581,6 -12581,6 -12581,6 -12581,6 +12592,12 @@@@@@@ F:     include/media/soc
      F:        drivers/media/i2c/soc_camera/
      F:        drivers/media/platform/soc_camera/
      
+ ++++SOCIONEXT UNIPHIER SOUND DRIVER
+ ++++M:        Katsuhiro Suzuki <[email protected]>
+ ++++L:        [email protected] (moderated for non-subscribers)
+ ++++S:        Maintained
+ ++++F:        sound/soc/uniphier/
+ ++++
      SOEKRIS NET48XX LED SUPPORT
      M:        Chris Boot <[email protected]>
      S:        Maintained
@@@@@@@ -12641,14 -12636,6 -12630,6 -12630,6 -12630,6 -12630,6 +12647,14 @@@@@@@ S:     Maintaine
      F:        drivers/ssb/
      F:        include/linux/ssb/
      
 +++++SONY IMX274 SENSOR DRIVER
 +++++M:        Leon Luo <[email protected]>
 +++++L:        [email protected]
 +++++T:        git git://linuxtv.org/media_tree.git
 +++++S:        Maintained
 +++++F:        drivers/media/i2c/imx274.c
 +++++F:        Documentation/devicetree/bindings/media/i2c/imx274.txt
 +++++
      SONY MEMORYSTICK CARD SUPPORT
      M:        Alex Dubov <[email protected]>
      W:        http://tifmxx.berlios.de/
@@@@@@@ -13115,7 -13102,6 -13096,6 -13096,6 -13096,6 -13096,6 +13121,7 @@@@@@@ F:       drivers/dma/dw
      
      SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
      M:        Jie Deng <[email protected]>
 +++++M:        Jose Abreu <[email protected]>
      L:        [email protected]
      S:        Supported
      F:        drivers/net/ethernet/synopsys/
@@@@@@@ -13491,7 -13477,6 -13471,6 -13471,6 -13471,6 -13471,6 +13497,7 @@@@@@@ M:       Mika Westerberg <mika.westerberg@lin
      M:        Yehezkel Bernat <[email protected]>
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
      S:        Maintained
 +++++F:        Documentation/admin-guide/thunderbolt.rst
      F:        drivers/thunderbolt/
      F:        include/linux/thunderbolt.h
      
@@@@@@@ -13669,8 -13654,10 -13648,10 -13648,10 -13648,10 -13648,10 +13675,8 @@@@@@@ F:  drivers/net/wireless/ti
      F:        include/linux/wl12xx.h
      
      TILE ARCHITECTURE
 -----M:        Chris Metcalf <[email protected]>
      W:        http://www.mellanox.com/repository/solutions/tile-scm/
 -----T:        git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git
 -----S:        Supported
 +++++S:        Orphan
      F:        arch/tile/
      F:        drivers/char/tile-srom.c
      F:        drivers/edac/tile_edac.c
@@@@@@@ -13850,13 -13837,6 -13831,6 -13831,6 -13831,6 -13831,6 +13856,13 @@@@@@@ T:     git git://git.kernel.org/pub/scm/lin
      S:        Maintained
      K:        ^Subject:.*(?i)trivial
      
 +++++TEMPO SEMICONDUCTOR DRIVERS
 +++++M:        Steven Eckhoff <[email protected]>
 +++++S:        Maintained
 +++++F:        sound/soc/codecs/tscs*.c
 +++++F:        sound/soc/codecs/tscs*.h
 +++++F:        Documentation/devicetree/bindings/sound/tscs*.txt
 +++++
      TTY LAYER
      M:        Greg Kroah-Hartman <[email protected]>
      M:        Jiri Slaby <[email protected]>