Merge remote-tracking branches 'asoc/topic/es8328', 'asoc/topic/find-dai', 'asoc...

diff --combined MAINTAINERS
index a727d9959ecd1d982e8e35ab20d3ee2eaeed57a5,03e00c7c88ebca4161bff9d4be82d59f3698f177,03e00c7c88ebca4161bff9d4be82d59f3698f177,734bd0dfc49e118ab28300f163ee94ae5a69a395,03e00c7c88ebca4161bff9d4be82d59f3698f177,03e00c7c88ebca4161bff9d4be82d59f3698f177..09a9cf1e0a8a88149f94c6c4ece08f4b47720c89
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@ -872,9 -872,9 -872,9 -872,9 -872,9 -872,9 +872,9 @@@@@@@ F:     drivers/perf/arm_pmu.
      F:        include/linux/perf/arm_pmu.h
      
      ARM PORT
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      F:        arch/arm/
      
@@@@@@@ -886,35 -886,35 -886,35 -886,35 -886,35 -886,35 +886,35 @@@@@@@ F:      arch/arm/plat-*
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
      
      ARM PRIMECELL AACI PL041 DRIVER
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      S:        Maintained
      F:        sound/arm/aaci.*
      
      ARM PRIMECELL CLCD PL110 DRIVER
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      S:        Maintained
      F:        drivers/video/fbdev/amba-clcd.*
      
      ARM PRIMECELL KMI PL050 DRIVER
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      S:        Maintained
      F:        drivers/input/serio/ambakmi.*
      F:        include/linux/amba/kmi.h
      
      ARM PRIMECELL MMCI PL180/1 DRIVER
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      S:        Maintained
      F:        drivers/mmc/host/mmci.*
      F:        include/linux/amba/mmci.h
      
      ARM PRIMECELL UART PL010 AND PL011 DRIVERS
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      S:        Maintained
      F:        drivers/tty/serial/amba-pl01*.c
      F:        include/linux/amba/serial.h
      
      ARM PRIMECELL BUS SUPPORT
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      S:        Maintained
      F:        drivers/amba/
      F:        include/linux/amba/bus.h
@@@@@@@ -1036,7 -1036,7 -1036,7 -1036,7 -1036,7 -1036,7 +1036,7 @@@@@@@ L:      linux-arm-kernel@lists.infradead.or
      S:        Maintained
      
      ARM/CLKDEV SUPPORT
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
      S:        Maintained
      F:        arch/arm/include/asm/clkdev.h
@@@@@@@ -1093,9 -1093,9 -1093,9 -1093,9 -1093,9 -1093,9 +1093,9 @@@@@@@ F:      arch/arm/boot/dts/cx92755
      N:        digicolor
      
      ARM/EBSA110 MACHINE SUPPORT
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      F:        arch/arm/mach-ebsa110/
      F:        drivers/net/ethernet/amd/am79c961a.*
@@@@@@@ -1124,9 -1124,9 -1124,9 -1124,9 -1124,9 -1124,9 +1124,9 @@@@@@@ T:      git git://git.berlios.de/gemini-boar
      F:        arch/arm/mm/*-fa*
      
      ARM/FOOTBRIDGE ARCHITECTURE
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      F:        arch/arm/include/asm/hardware/dec21285.h
      F:        arch/arm/mach-footbridge/
@@@@@@@ -1457,7 -1457,7 -1457,7 -1457,7 -1457,7 -1457,7 +1457,7 @@@@@@@ S:      Maintaine
      ARM/PT DIGITAL BOARD PORT
      M:        Stefan Eletzhofer <stefan.eletzhofer@eletztrick.de>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      
      ARM/QUALCOMM SUPPORT
@@@@@@@ -1493,9 -1493,9 -1493,9 -1493,9 -1493,9 -1493,9 +1493,9 @@@@@@@ S:      Supporte
      F:        arch/arm64/boot/dts/renesas/
      
      ARM/RISCPC ARCHITECTURE
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      F:        arch/arm/include/asm/hardware/entry-macro-iomd.S
      F:        arch/arm/include/asm/hardware/ioc.h
@@@@@@@ -1773,9 -1773,9 -1773,9 -1773,9 -1773,9 -1773,9 +1773,9 @@@@@@@ F:      drivers/clk/versatile/clk-vexpress-o
      F:        drivers/clocksource/versatile.c
      
      ARM/VFP SUPPORT
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      F:        arch/arm/vfp/
      
@@@@@@@ -2921,7 -2921,7 -2921,7 -2921,7 -2921,7 -2921,7 +2921,7 @@@@@@@ F:      mm/cleancache.
      F:        include/linux/cleancache.h
      
      CLK API
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-clk@vger.kernel.org
      S:        Maintained
      F:        include/linux/clk.h
@@@@@@@ -3354,9 -3354,9 -3354,9 -3354,9 -3354,9 -3354,9 +3354,9 @@@@@@@ S:      Supporte
      F:        drivers/net/ethernet/stmicro/stmmac/
      
      CYBERPRO FB DRIVER
 -----M:        Russell King <linux@arm.linux.org.uk>
 +++++M:        Russell King <linux@armlinux.org.uk>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -----W:        http://www.arm.linux.org.uk/
 +++++W:        http://www.armlinux.org.uk/
      S:        Maintained
      F:        drivers/video/fbdev/cyber2000fb.*
      
@@@@@@@ -3881,7 -3881,7 -3881,7 -3881,7 -3881,7 -3881,7 +3881,7 @@@@@@@ F:      Documentation/devicetree/bindings/di
      
      DRM DRIVERS FOR VIVANTE GPU IP
      M:        Lucas Stach <l.stach@pengutronix.de>
 -----R:        Russell King <linux+etnaviv@arm.linux.org.uk>
 +++++R:        Russell King <linux+etnaviv@armlinux.org.uk>
      R:        Christian Gmeiner <christian.gmeiner@gmail.com>
      L:        dri-devel@lists.freedesktop.org
      S:        Maintained
@@@@@@@ -4223,8 -4223,8 -4223,8 -4223,8 -4223,8 -4223,8 +4223,8 @@@@@@@ F:      Documentation/efi-stub.tx
      F:        arch/ia64/kernel/efi.c
      F:        arch/x86/boot/compressed/eboot.[ch]
      F:        arch/x86/include/asm/efi.h
 -----F:        arch/x86/platform/efi/*
 -----F:        drivers/firmware/efi/*
 +++++F:        arch/x86/platform/efi/
 +++++F:        drivers/firmware/efi/
      F:        include/linux/efi*.h
      
      EFI VARIABLE FILESYSTEM
@@@@@@@ -4302,7 -4302,7 -4302,7 -4302,7 -4302,7 -4302,7 +4302,7 @@@@@@@ F:      drivers/net/ethernet/agere
      
      ETHERNET BRIDGE
      M:        Stephen Hemminger <stephen@networkplumber.org>
 -----L:        bridge@lists.linux-foundation.org
 +++++L:        bridge@lists.linux-foundation.org (moderated for non-subscribers)
      L:        netdev@vger.kernel.org
      W:        http://www.linuxfoundation.org/en/Net:Bridge
      S:        Maintained
@@@@@@@ -4661,6 -4661,6 -4661,6 -4661,7 -4661,6 -4661,6 +4661,7 @@@@@@@ FREESCALE SOC SOUND DRIVER
      M:        Timur Tabi <timur@tabi.org>
      M:        Nicolin Chen <nicoleotsuka@gmail.com>
      M:        Xiubo Li <Xiubo.Lee@gmail.com>
+++ ++R:        Fabio Estevam <fabio.estevam@nxp.com>
      L:        alsa-devel@alsa-project.org (moderated for non-subscribers)
      L:        linuxppc-dev@lists.ozlabs.org
      S:        Maintained
@@@@@@@ -4744,7 -4744,7 -4744,7 -4745,7 -4744,7 -4744,7 +4745,7 @@@@@@@ F:      drivers/platform/x86/fujitsu-tablet.
      
      FUSE: FILESYSTEM IN USERSPACE
      M:        Miklos Szeredi <miklos@szeredi.hu>
 -----L:        fuse-devel@lists.sourceforge.net
 +++++L:        linux-fsdevel@vger.kernel.org
      W:        http://fuse.sourceforge.net/
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
      S:        Maintained
@@@@@@@ -4903,7 -4903,7 -4903,7 -4904,7 -4903,7 -4903,7 +4904,7 @@@@@@@ F:      net/ipv4/gre_offload.
      F:        include/net/gre.h
      
      GRETH 10/100/1G Ethernet MAC device driver
 -----M:        Kristoffer Glembo <kristoffer@gaisler.com>
 +++++M:        Andreas Larsson <andreas@gaisler.com>
      L:        netdev@vger.kernel.org
      S:        Maintained
      F:        drivers/net/ethernet/aeroflex/
@@@@@@@ -5042,7 -5042,6 -5042,6 -5043,6 -5042,6 -5042,6 +5043,7 @@@@@@@ F:      include/linux/hw_random.
      HARDWARE SPINLOCK CORE
      M:        Ohad Ben-Cohen <ohad@wizery.com>
      M:        Bjorn Andersson <bjorn.andersson@linaro.org>
 +++++L:        linux-remoteproc@vger.kernel.org
      S:        Maintained
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
      F:        Documentation/hwspinlock.txt
@@@@@@@ -5751,7 -5750,7 -5750,7 -5751,7 -5750,7 -5750,7 +5752,7 @@@@@@@ R:      Don Skidmore <donald.c.skidmore@inte
      R:        Bruce Allan <bruce.w.allan@intel.com>
      R:        John Ronciak <john.ronciak@intel.com>
      R:        Mitch Williams <mitch.a.williams@intel.com>
 -----L:        intel-wired-lan@lists.osuosl.org
 +++++L:        intel-wired-lan@lists.osuosl.org (moderated for non-subscribers)
      W:        http://www.intel.com/support/feedback.htm
      W:        http://e1000.sourceforge.net/
      Q:        http://patchwork.ozlabs.org/project/intel-wired-lan/list/
@@@@@@@ -6027,7 -6026,7 -6026,7 -6027,7 -6026,7 -6026,7 +6028,7 @@@@@@@ F:      include/scsi/*iscsi
      
      ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
      M:        Or Gerlitz <ogerlitz@mellanox.com>
 -----M:        Sagi Grimberg <sagig@mellanox.com>
 +++++M:        Sagi Grimberg <sagi@grimberg.me>
      M:        Roi Dayan <roid@mellanox.com>
      L:        linux-rdma@vger.kernel.org
      S:        Supported
@@@@@@@ -6037,7 -6036,7 -6036,7 -6037,7 -6036,7 -6036,7 +6038,7 @@@@@@@ Q:      http://patchwork.kernel.org/project/
      F:        drivers/infiniband/ulp/iser/
      
      ISCSI EXTENSIONS FOR RDMA (ISER) TARGET
 -----M:        Sagi Grimberg <sagig@mellanox.com>
 +++++M:        Sagi Grimberg <sagi@grimberg.me>
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
      L:        linux-rdma@vger.kernel.org
      L:        target-devel@vger.kernel.org
@@@@@@@ -6252,8 -6251,8 -6251,8 -6252,8 -6251,8 -6251,8 +6253,8 @@@@@@@ S:      Maintaine
      F:        tools/testing/selftests
      
      KERNEL VIRTUAL MACHINE (KVM)
 -----M:        Gleb Natapov <gleb@kernel.org>
      M:        Paolo Bonzini <pbonzini@redhat.com>
 +++++M:        Radim Krčmář <rkrcmar@redhat.com>
      L:        kvm@vger.kernel.org
      W:        http://www.linux-kvm.org
      T:        git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
@@@@@@@ -6400,10 -6399,10 -6399,10 -6400,10 -6399,10 -6399,10 +6401,10 @@@@@@@ F:       mm/kmemleak.
      F:        mm/kmemleak-test.c
      
      KPROBES
 -----M:        Ananth N Mavinakayanahalli <ananth@in.ibm.com>
 +++++M:        Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
      M:        Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
      M:        "David S. Miller" <davem@davemloft.net>
 -----M:        Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
 +++++M:        Masami Hiramatsu <mhiramat@kernel.org>
      S:        Maintained
      F:        Documentation/kprobes.txt
      F:        include/linux/kprobes.h
@@@@@@@ -6905,7 -6904,7 -6904,7 -6905,7 -6904,7 -6904,7 +6906,7 @@@@@@@ L:      linux-man@vger.kernel.or
      S:        Maintained
      
      MARVELL ARMADA DRM SUPPORT
 -----M:        Russell King <rmk+kernel@arm.linux.org.uk>
 +++++M:        Russell King <rmk+kernel@armlinux.org.uk>
      S:        Maintained
      F:        drivers/gpu/drm/armada/
      
@@@@@@@ -7576,7 -7575,7 -7575,7 -7576,7 -7575,7 -7575,7 +7577,7 @@@@@@@ F:      drivers/infiniband/hw/nes
      
      NETEM NETWORK EMULATOR
      M:        Stephen Hemminger <stephen@networkplumber.org>
 -----L:        netem@lists.linux-foundation.org
 +++++L:        netem@lists.linux-foundation.org (moderated for non-subscribers)
      S:        Maintained
      F:        net/sched/sch_netem.c
      
@@@@@@@ -7905,7 -7904,7 -7904,7 -7905,7 -7904,7 -7904,7 +7906,7 @@@@@@@ S:      Supporte
      F:        drivers/nfc/nxp-nci
      
      NXP TDA998X DRM DRIVER
 -----M:        Russell King <rmk+kernel@arm.linux.org.uk>
 +++++M:        Russell King <rmk+kernel@armlinux.org.uk>
      S:        Supported
      F:        drivers/gpu/drm/i2c/tda998x_drv.c
      F:        include/drm/i2c/tda998x.h
@@@@@@@ -7978,7 -7977,7 -7977,7 -7978,7 -7977,7 -7977,7 +7979,7 @@@@@@@ F:      arch/arm/*omap*/*pm
      F:        drivers/cpufreq/omap-cpufreq.c
      
      OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
 -----M:        Rajendra Nayak <rnayak@ti.com>
 +++++M:        Rajendra Nayak <rnayak@codeaurora.org>
      M:        Paul Walmsley <paul@pwsan.com>
      L:        linux-omap@vger.kernel.org
      S:        Maintained
@@@@@@@ -8254,7 -8253,7 -8253,7 -8254,7 -8253,7 -8253,7 +8255,7 @@@@@@@ F:      Documentation/filesystems/overlayfs.
      
      ORANGEFS FILESYSTEM
      M:        Mike Marshall <hubcap@omnibond.com>
 -----L:        pvfs2-developers@beowulf-underground.org
 +++++L:        pvfs2-developers@beowulf-underground.org (subscribers-only)
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
      S:        Supported
      F:        fs/orangefs/
@@@@@@@ -8712,8 -8711,6 -8711,6 -8712,6 -8711,6 -8711,6 +8713,8 @@@@@@@ F:      drivers/pinctrl/sh-pfc
      
      PIN CONTROLLER - SAMSUNG
      M:        Tomasz Figa <tomasz.figa@gmail.com>
 +++++M:        Krzysztof Kozlowski <k.kozlowski@samsung.com>
 +++++M:        Sylwester Nawrocki <s.nawrocki@samsung.com>
      L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
      L:        linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
      S:        Maintained
@@@@@@@ -9142,13 -9139,6 -9139,6 -9140,6 -9139,6 -9139,6 +9143,13 @@@@@@@ T:    git git://github.com/KrasnikovEugene
      S:        Supported
      F:        drivers/net/wireless/ath/wcn36xx/
      
 +++++QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
 +++++M:        Gabriel Somlo <somlo@cmu.edu>
 +++++M:        "Michael S. Tsirkin" <mst@redhat.com>
 +++++L:        qemu-devel@nongnu.org
 +++++S:        Maintained
 +++++F:        drivers/firmware/qemu_fw_cfg.c
 +++++
      RADOS BLOCK DEVICE (RBD)
      M:        Ilya Dryomov <idryomov@gmail.com>
      M:        Sage Weil <sage@redhat.com>
@@@@@@@ -9324,7 -9314,6 -9314,6 -9315,6 -9314,6 -9314,6 +9325,7 @@@@@@@ F:      include/linux/regmap.
      REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
      M:        Ohad Ben-Cohen <ohad@wizery.com>
      M:        Bjorn Andersson <bjorn.andersson@linaro.org>
 +++++L:        linux-remoteproc@vger.kernel.org
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
      S:        Maintained
      F:        drivers/remoteproc/
@@@@@@@ -9334,7 -9323,6 -9323,6 -9324,6 -9323,6 -9323,6 +9335,7 @@@@@@@ F:      include/linux/remoteproc.
      REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
      M:        Ohad Ben-Cohen <ohad@wizery.com>
      M:        Bjorn Andersson <bjorn.andersson@linaro.org>
 +++++L:        linux-remoteproc@vger.kernel.org
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
      S:        Maintained
      F:        drivers/rpmsg/
@@@@@@@ -10014,8 -10002,7 -10002,7 -10003,7 -10002,7 -10002,7 +10015,8 @@@@@@@ F:       drivers/infiniband/hw/ocrdma
      
      SFC NETWORK DRIVER
      M:        Solarflare linux maintainers <linux-net-drivers@solarflare.com>
 -----M:        Shradha Shah <sshah@solarflare.com>
 +++++M:        Edward Cree <ecree@solarflare.com>
 +++++M:        Bert Kenward <bkenward@solarflare.com>
      L:        netdev@vger.kernel.org
      S:        Supported
      F:        drivers/net/ethernet/sfc/
@@@@@@@ -10596,14 -10583,6 -10583,6 -10584,6 -10583,6 -10583,6 +10597,14 @@@@@@@ L:     linux-tegra@vger.kernel.or
      S:        Maintained
      F:        drivers/staging/nvec/
      
 +++++STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 +++++M:        Jens Frederich <jfrederich@gmail.com>
 +++++M:        Daniel Drake <dsd@laptop.org>
 +++++M:        Jon Nettleton <jon.nettleton@gmail.com>
 +++++W:        http://wiki.laptop.org/go/DCON
 +++++S:        Maintained
 +++++F:        drivers/staging/olpc_dcon/
 +++++
      STAGING - REALTEK RTL8712U DRIVERS
      M:        Larry Finger <Larry.Finger@lwfinger.net>
      M:        Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
@@@@@@@ -11072,15 -11051,6 -11051,6 -11052,6 -11051,6 -11051,6 +11073,15 @@@@@@@ S:     Maintaine
      F:        drivers/clk/ti/
      F:        include/linux/clk/ti.h
      
 +++++TI ETHERNET SWITCH DRIVER (CPSW)
 +++++M:        Mugunthan V N <mugunthanvnm@ti.com>
 +++++R:        Grygorii Strashko <grygorii.strashko@ti.com>
 +++++L:        linux-omap@vger.kernel.org
 +++++L:        netdev@vger.kernel.org
 +++++S:        Maintained
 +++++F:        drivers/net/ethernet/ti/cpsw*
 +++++F:        drivers/net/ethernet/ti/davinci*
 +++++
      TI FLASH MEDIA INTERFACE DRIVER
      M:        Alex Dubov <oakad@yahoo.com>
      S:        Maintained
@@@@@@@ -11167,8 -11137,8 -11137,8 -11138,8 -11137,8 -11137,8 +11168,8 @@@@@@@ F:       include/uapi/linux/tipc*.
      F:        net/tipc/
      
      TILE ARCHITECTURE
 -----M:        Chris Metcalf <cmetcalf@ezchip.com>
 -----W:        http://www.ezchip.com/scm/
 +++++M:        Chris Metcalf <cmetcalf@mellanox.com>
 +++++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
      F:        arch/tile/
@@@@@@@ -12232,9 -12202,9 -12202,9 -12203,9 -12202,9 -12202,9 +12233,9 @@@@@@@ S:       Maintaine
      F:        drivers/media/tuners/tuner-xc2028.*
      
      XEN HYPERVISOR INTERFACE
 -----M:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      M:        Boris Ostrovsky <boris.ostrovsky@oracle.com>
      M:        David Vrabel <david.vrabel@citrix.com>
 +++++M:        Juergen Gross <jgross@suse.com>
      L:        xen-devel@lists.xenproject.org (moderated for non-subscribers)
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
      S:        Supported
@@@@@@@ -12246,16 -12216,16 -12216,16 -12217,16 -12216,16 -12216,16 +12247,16 @@@@@@@ F:        include/xen
      F:        include/uapi/xen/
      
      XEN HYPERVISOR ARM
 -----M:        Stefano Stabellini <stefano.stabellini@eu.citrix.com>
 +++++M:        Stefano Stabellini <sstabellini@kernel.org>
      L:        xen-devel@lists.xenproject.org (moderated for non-subscribers)
 -----S:        Supported
 +++++S:        Maintained
      F:        arch/arm/xen/
      F:        arch/arm/include/asm/xen/
      
      XEN HYPERVISOR ARM64
 -----M:        Stefano Stabellini <stefano.stabellini@eu.citrix.com>
 +++++M:        Stefano Stabellini <sstabellini@kernel.org>
      L:        xen-devel@lists.xenproject.org (moderated for non-subscribers)
 -----S:        Supported
 +++++S:        Maintained
      F:        arch/arm64/xen/
      F:        arch/arm64/include/asm/xen/
      

diff --combined include/sound/soc.h
index ef25e86d51ee68ad588790b7e212cf1d0d95b092,02b4a215fd751e6fcddf1856f667fe8c3e56a2eb,7687e2d4b0e4c4b65be77a4a965865f04ed04fc6,02b4a215fd751e6fcddf1856f667fe8c3e56a2eb,02b4a215fd751e6fcddf1856f667fe8c3e56a2eb,02b4a215fd751e6fcddf1856f667fe8c3e56a2eb..fd7b58a58d6f9c26b484210a237df709e3fb2f4d
--- 1/include/sound/soc.h
--- 2/include/sound/soc.h
--- 3/include/sound/soc.h
--- 4/include/sound/soc.h
--- 5/include/sound/soc.h
--- 6/include/sound/soc.h
+++ b/include/sound/soc.h
@@@@@@@ -1002,7 -1002,7 -1002,7 -1002,7 -1002,7 -1002,7 +1002,7 @@@@@@@ struct snd_soc_dai_link 
         */
        const char *platform_name;
        struct device_node *platform_of_node;
 -----  int be_id;      /* optional ID for machine driver BE identification */
 +++++  int id; /* optional ID for machine driver link identification */
      
        const struct snd_soc_pcm_stream *params;
        unsigned int num_params;
@@@@@@@ -1683,6 -1683,6 -1683,9 -1683,6 -1683,6 -1683,6 +1683,9 @@@@@@@ void snd_soc_remove_dai_link(struct snd
      int snd_soc_register_dai(struct snd_soc_component *component,
        struct snd_soc_dai_driver *dai_drv);
      
++ +++struct snd_soc_dai *snd_soc_find_dai(
++ +++  const struct snd_soc_dai_link_component *dlc);
++ +++
      #include <sound/soc-dai.h>
      
      #ifdef CONFIG_DEBUG_FS

diff --combined sound/soc/fsl/fsl_ssi.c
index 08dcbbf60adbcf8b7461b6a88959492af3fba5ea,ed8de1035cda159d0d186f2cded0fb7a97fbceb4,ed8de1035cda159d0d186f2cded0fb7a97fbceb4,ed8de1035cda159d0d186f2cded0fb7a97fbceb4,ed8de1035cda159d0d186f2cded0fb7a97fbceb4,d2dd47d2d500d23cd2b1c41c62cea7ecc4a7d888..632ecc0e39562aab90a880e0c8b678a4ccea1078
--- 1/sound/soc/fsl/fsl_ssi.c
--- 2/sound/soc/fsl/fsl_ssi.c
--- 3/sound/soc/fsl/fsl_ssi.c
--- 4/sound/soc/fsl/fsl_ssi.c
--- 5/sound/soc/fsl/fsl_ssi.c
--- 6/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@@@@@@ -137,7 -137,6 -137,6 -137,6 -137,6 -137,6 +137,7 @@@@@@@ static bool fsl_ssi_volatile_reg(struc
        case CCSR_SSI_SACDAT:
        case CCSR_SSI_SATAG:
        case CCSR_SSI_SACCST:
 +++++  case CCSR_SSI_SOR:
                return true;
        default:
                return false;
@@@@@@@ -262,6 -261,6 -261,6 -261,6 -261,6 -261,7 +262,7 @@@@@@@ struct fsl_ssi_private 
        struct fsl_ssi_dbg dbg_stats;
      
        const struct fsl_ssi_soc_data *soc;
+++++   struct device *dev;
      };
      
      /*
@@@@@@@ -400,6 -399,6 -399,6 -399,6 -399,6 -400,26 +401,26 @@@@@@@ static void fsl_ssi_rxtx_config(struct 
        }
      }
      
+++++ /*
+++++  * Clear RX or TX FIFO to remove samples from the previous
+++++  * stream session which may be still present in the FIFO and
+++++  * may introduce bad samples and/or channel slipping.
+++++  *
+++++  * Note: The SOR is not documented in recent IMX datasheet, but
+++++  * is described in IMX51 reference manual at section 56.3.3.15.
+++++  */
+++++ static void fsl_ssi_fifo_clear(struct fsl_ssi_private *ssi_private,
+++++           bool is_rx)
+++++ {
+++++   if (is_rx) {
+++++           regmap_update_bits(ssi_private->regs, CCSR_SSI_SOR,
+++++                   CCSR_SSI_SOR_RX_CLR, CCSR_SSI_SOR_RX_CLR);
+++++   } else {
+++++           regmap_update_bits(ssi_private->regs, CCSR_SSI_SOR,
+++++                   CCSR_SSI_SOR_TX_CLR, CCSR_SSI_SOR_TX_CLR);
+++++   }
+++++ }
+++++ 
      /*
       * Calculate the bits that have to be disabled for the current stream that is
       * getting disabled. This keeps the bits enabled that are necessary for the
@@@@@@@ -475,9 -474,9 -474,9 -474,9 -474,9 -495,11 +496,11 @@@@@@@ static void fsl_ssi_config(struct fsl_s
         * (online configuration)
         */
        if (enable) {
-----           regmap_update_bits(regs, CCSR_SSI_SIER, vals->sier, vals->sier);
+++++           fsl_ssi_fifo_clear(ssi_private, vals->scr & CCSR_SSI_SCR_RE);
+++++ 
                regmap_update_bits(regs, CCSR_SSI_SRCR, vals->srcr, vals->srcr);
                regmap_update_bits(regs, CCSR_SSI_STCR, vals->stcr, vals->stcr);
+++++           regmap_update_bits(regs, CCSR_SSI_SIER, vals->sier, vals->sier);
        } else {
                u32 sier;
                u32 srcr;
@@@@@@@ -507,8 -506,8 -506,8 -506,8 -506,8 -529,40 +530,40 @@@@@@@
      
      config_done:
        /* Enabling of subunits is done after configuration */
-----   if (enable)
+++++   if (enable) {
+++++           if (ssi_private->use_dma && (vals->scr & CCSR_SSI_SCR_TE)) {
+++++                   /*
+++++                    * Be sure the Tx FIFO is filled when TE is set.
+++++                    * Otherwise, there are some chances to start the
+++++                    * playback with some void samples inserted first,
+++++                    * generating a channel slip.
+++++                    *
+++++                    * First, SSIEN must be set, to let the FIFO be filled.
+++++                    *
+++++                    * Notes:
+++++                    * - Limit this fix to the DMA case until FIQ cases can
+++++                    *   be tested.
+++++                    * - Limit the length of the busy loop to not lock the
+++++                    *   system too long, even if 1-2 loops are sufficient
+++++                    *   in general.
+++++                    */
+++++                   int i;
+++++                   int max_loop = 100;
+++++                   regmap_update_bits(regs, CCSR_SSI_SCR,
+++++                                   CCSR_SSI_SCR_SSIEN, CCSR_SSI_SCR_SSIEN);
+++++                   for (i = 0; i < max_loop; i++) {
+++++                           u32 sfcsr;
+++++                           regmap_read(regs, CCSR_SSI_SFCSR, &sfcsr);
+++++                           if (CCSR_SSI_SFCSR_TFCNT0(sfcsr))
+++++                                   break;
+++++                   }
+++++                   if (i == max_loop) {
+++++                           dev_err(ssi_private->dev,
+++++                                   "Timeout waiting TX FIFO filling\n");
+++++                   }
+++++           }
                regmap_update_bits(regs, CCSR_SSI_SCR, vals->scr, vals->scr);
+++++   }
      }
      
      
@@@@@@@ -671,6 -670,6 -670,6 -670,6 -670,6 -725,15 +726,15 @@@@@@@ static int fsl_ssi_set_bclk(struct snd_
        if (IS_ERR(ssi_private->baudclk))
                return -EINVAL;
      
+++++   /*
+++++    * Hardware limitation: The bclk rate must be
+++++    * never greater than 1/5 IPG clock rate
+++++    */
+++++   if (freq * 5 > clk_get_rate(ssi_private->clk)) {
+++++           dev_err(cpu_dai->dev, "bitclk > ipgclk/5\n");
+++++           return -EINVAL;
+++++   }
+++++ 
        baudclk_is_used = ssi_private->baudclk_streams & ~(BIT(substream->stream));
      
        /* It should be already enough to divide clock by setting pm alone */
@@@@@@@ -687,13 -686,13 -686,13 -686,13 -686,13 -750,6 +751,6 @@@@@@@
                else
                        clkrate = clk_round_rate(ssi_private->baudclk, tmprate);
      
-----           /*
-----            * Hardware limitation: The bclk rate must be
-----            * never greater than 1/5 IPG clock rate
-----            */
-----           if (clkrate * 5 > clk_get_rate(ssi_private->clk))
-----                   continue;
----- 
                clkrate /= factor;
                afreq = clkrate / (i + 1);
      
@@@@@@@ -1159,14 -1158,14 -1158,14 -1158,14 -1158,14 -1215,14 +1216,14 @@@@@@@ static struct snd_soc_dai_driver fsl_ss
        .playback = {
                .stream_name = "CPU-Playback",
                .channels_min = 1,
-----           .channels_max = 2,
+++++           .channels_max = 32,
                .rates = FSLSSI_I2S_RATES,
                .formats = FSLSSI_I2S_FORMATS,
        },
        .capture = {
                .stream_name = "CPU-Capture",
                .channels_min = 1,
-----           .channels_max = 2,
+++++           .channels_max = 32,
                .rates = FSLSSI_I2S_RATES,
                .formats = FSLSSI_I2S_FORMATS,
        },
@@@@@@@ -1403,6 -1402,6 -1402,6 -1402,6 -1402,6 -1459,7 +1460,7 @@@@@@@ static int fsl_ssi_probe(struct platfor
        }
      
        ssi_private->soc = of_id->data;
+++++   ssi_private->dev = &pdev->dev;
      
        sprop = of_get_property(np, "fsl,mode", NULL);
        if (sprop) {