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

Pull sound updates from Takashi Iwai:
 "We've got many code additions at this cycle as a result of quite a few
  new drivers. Below are highlights:

  Core stuff:
   - Fix the long-standing issue with the device registration order; the
     control device is now registered at last
   - PCM locking code cleanups for RT kernels
   - Fixes for possible races in ALSA timer resolution accesses
   - TLV offset definitions in uapi

  ASoC:
   - Many fixes for the topology stuff, including fixes for v4 ABI
     compatibility
   - Lots of cleanups / quirks for Intel platforms based on Realtek
     CODECs
   - Continued componentization works, removing legacy CODEC stuff
   - Conversion of OMAP DMA to the new, more standard SDMA-PCM driver
   - Fixes and updates to Cirrus Logic SoC drivers
   - New Qualcomm DSP support
   - New drivers for Analog SSM2305, Atmel I2S controllers, Mediatek
     MT6351, MT6797 and MT7622, Qualcomm DSPs, Realtek RT1305, RT1306
     and RT5668 and TI TSCS454

  HD-audio:
   - Finally better support for some CA0132 boards, allowing Windows
     firmware
   - HP Spectre x360 support along with a bulk of COEF stuff
   - Blacklisting power save default some known boards reported on
     Fedora

  USB-audio:
   - Continued improvements on UAC3 support; now BADD is supported
   - Fixes / improvements for Dell WD15 dock
   - Allow DMA coherent pages for PCM buffers for ARCH, MIPS & co

  Others:
   - New Xen sound frontend driver support
   - Cache implementation and other improvements for FireWire DICE
   - Conversions to octal permissions in allover places"

* tag 'sound-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (386 commits)
  ASoC: dapm: delete dapm_kcontrol_data paths list before freeing it
  ALSA: usb-audio: remove redundant check on err
  ASoC: topology: Move skl-tplg-interface.h to uapi
  ASoC: topology: Move v4 manifest header data structures to uapi
  ASoC: topology: Improve backwards compatibility with v4 topology files
  ALSA: pci/hda: Remove unused, broken, header file
  ASoC: TSCS454: Add Support
  ASoC: Intel: kbl: Move codec sysclk config to codec_init function
  ASoC: simple-card: set cpu dai clk in hw_params
  ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream()
  ALSA: oxygen: use match_string() helper
  ASoC: dapm: use match_string() helper
  ASoC: max98095: use match_string() helper
  ASoC: max98088: use match_string() helper
  ASoC: Intel: bytcr_rt5651: Set card long_name based on quirks
  ASoC: mt6797-mt6351: add hostless phone call path
  ASoC: mt6797: add Hostless DAI
  ASoC: mt6797: add PCM interface
  ASoC: mediatek: export mtk-afe symbols as needed
  ASoC: codecs: PCM1789: include gpio/consumer.h
  ...

diff --combined Documentation/sound/alsa-configuration.rst
index ab5761148163d92fecb336adfde7d323deba690f,b1052e18292d7b07d480e55743fb23b4b4aebbbb..4d83c1c0ca04fb7702bb9ac2da3013a2ed2c09bd
--- 1/Documentation/sound/alsa-configuration.rst
--- 2/Documentation/sound/alsa-configuration.rst
+++ b/Documentation/sound/alsa-configuration.rst
@@@ -1062,7 -1062,7 +1062,7 @@@ output (with ``--no-upload`` option) t
  ML (see the section `Links and Addresses`_).
  
  ``power_save`` and ``power_save_controller`` options are for power-saving
 -mode.  See powersave.txt for details.
 +mode.  See powersave.rst for details.
  
  Note 2: If you get click noises on output, try the module option
  ``position_fix=1`` or ``2``.  ``position_fix=1`` will use the SD_LPIB
@@@ -1133,7 -1133,7 +1133,7 @@@ line_outs_monito
  enable_monitor
      Enable Analog Out on Channel 63/64 by default.
  
 -See hdspm.txt for details.
 +See hdspm.rst for details.
  
  Module snd-ice1712
  ------------------
@@@ -2224,6 -2224,13 +2224,13 @@@ quirk_alia
      Quirk alias list, pass strings like ``0123abcd:5678beef``, which
      applies the existing quirk for the device 5678:beef to a new
      device 0123:abcd.
+ use_vmalloc
+     Use vmalloc() for allocations of the PCM buffers (default: yes).
+     For architectures with non-coherent memory like ARM or MIPS, the
+     mmap access may give inconsistent results with vmalloc'ed
+     buffers.  If mmap is used on such architectures, turn off this
+     option, so that the DMA-coherent buffers are allocated and used
+     instead.
  
  This module supports multiple devices, autoprobe and hotplugging.
  

diff --combined Documentation/sound/soc/codec.rst
index 240770ea761e942c31041c98b47a99bbee238b69,58f625fe3d39720a87dea848c5ce5c965d688c18..8a9737eb7597252e97937b2e8637290e372d3ada
--- 1/Documentation/sound/soc/codec.rst
--- 2/Documentation/sound/soc/codec.rst
+++ b/Documentation/sound/soc/codec.rst
@@@ -139,7 -139,7 +139,7 @@@ DAPM descriptio
  ----------------
  The Dynamic Audio Power Management description describes the codec power
  components and their relationships and registers to the ASoC core.
 -Please read dapm.txt for details of building the description.
 +Please read dapm.rst for details of building the description.
  
  Please also see the examples in other codec drivers.
  
@@@ -179,12 -179,12 +179,12 @@@ i.e
  
    static int wm8974_mute(struct snd_soc_dai *dai, int mute)
    {
-       struct snd_soc_codec *codec = dai->codec;
-       u16 mute_reg = snd_soc_read(codec, WM8974_DAC) & 0xffbf;
+       struct snd_soc_component *component = dai->component;
+       u16 mute_reg = snd_soc_component_read32(component, WM8974_DAC) & 0xffbf;
  
        if (mute)
-               snd_soc_write(codec, WM8974_DAC, mute_reg | 0x40);
+               snd_soc_component_write(component, WM8974_DAC, mute_reg | 0x40);
        else
-               snd_soc_write(codec, WM8974_DAC, mute_reg);
+               snd_soc_component_write(component, WM8974_DAC, mute_reg);
        return 0;
    }

diff --combined Documentation/sound/soc/platform.rst
index 02c93a8b9c3be8745d921687c27520b975597e30,cc817078daa65d0ef19d5f8daa5e9656d988bc08..c1badea53d3d377edc8b9a978160b8cceb5f83c9
--- 1/Documentation/sound/soc/platform.rst
--- 2/Documentation/sound/soc/platform.rst
+++ b/Documentation/sound/soc/platform.rst
@@@ -23,30 -23,26 +23,26 @@@ The platform DMA driver optionally supp
    };
  
  The platform driver exports its DMA functionality via struct
- snd_soc_platform_driver:-
+ snd_soc_component_driver:-
  ::
  
-   struct snd_soc_platform_driver {
-       char *name;
+   struct snd_soc_component_driver {
+       const char *name;
  
-       int (*probe)(struct platform_device *pdev);
-       int (*remove)(struct platform_device *pdev);
-       int (*suspend)(struct platform_device *pdev, struct snd_soc_cpu_dai *cpu_dai);
-       int (*resume)(struct platform_device *pdev, struct snd_soc_cpu_dai *cpu_dai);
+       ...
+       int (*probe)(struct snd_soc_component *);
+       void (*remove)(struct snd_soc_component *);
+       int (*suspend)(struct snd_soc_component *);
+       int (*resume)(struct snd_soc_component *);
  
        /* pcm creation and destruction */
-       int (*pcm_new)(struct snd_card *, struct snd_soc_codec_dai *, struct snd_pcm *);
+       int (*pcm_new)(struct snd_soc_pcm_runtime *);
        void (*pcm_free)(struct snd_pcm *);
  
-       /*
-        * For platform caused delay reporting.
-        * Optional.
-        */
-       snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,
-               struct snd_soc_dai *);
- 
-       /* platform stream ops */
-       struct snd_pcm_ops *pcm_ops;
+       ...
+       const struct snd_pcm_ops *ops;
+       const struct snd_compr_ops *compr_ops;
+       ...
    };
  
  Please refer to the ALSA driver documentation for details of audio DMA.
@@@ -66,7 -62,7 +62,7 @@@ Each SoC DAI driver must provide the fo
  4. SYSCLK configuration
  5. Suspend and resume (optional)
  
 -Please see codec.txt for a description of items 1 - 4.
 +Please see codec.rst for a description of items 1 - 4.
  
  
  SoC DSP Drivers

diff --combined MAINTAINERS
index 8ebb000a2fbf462482c5e33696ed0133162d8b19,488b88071c13a12f9070984a7fbdc87ecbb6b424..cfae882e63df0afba8dde963d9cf545b9207d388
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -137,9 -137,9 +137,9 @@@ Maintainers List (try to look for most 
                -----------------------------------
  
  3C59X NETWORK DRIVER
 -M:    Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
 +M:    Steffen Klassert <klassert@kernel.org>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/networking/vortex.txt
  F:    drivers/net/ethernet/3com/3c59x.c
  
@@@ -564,9 -564,8 +564,9 @@@ S: Maintaine
  F:    drivers/media/dvb-frontends/af9033*
  
  AFFS FILE SYSTEM
 +M:    David Sterba <[email protected]>
  L:    [email protected]
 -S:    Orphan
 +S:    Odd Fixes
  F:    Documentation/filesystems/affs.txt
  F:    fs/affs/
  
@@@ -767,14 -766,12 +767,14 @@@ F:      drivers/gpu/drm/amd/amdgpu/amdgpu_am
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
  F:    drivers/gpu/drm/amd/amdkfd/
  F:    drivers/gpu/drm/amd/include/cik_structs.h
  F:    drivers/gpu/drm/amd/include/kgd_kfd_interface.h
  F:    drivers/gpu/drm/amd/include/vi_structs.h
 +F:    drivers/gpu/drm/amd/include/v9_structs.h
  F:    include/uapi/linux/kfd_ioctl.h
  
  AMD SEATTLE DEVICE TREE SUPPORT
@@@ -908,8 -905,6 +908,8 @@@ ANDROID ION DRIVE
  M:    Laura Abbott <[email protected]>
  M:    Sumit Semwal <[email protected]>
  L:    [email protected]
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    drivers/staging/android/ion
  F:    drivers/staging/android/uapi/ion.h
@@@ -1213,6 -1208,7 +1213,6 @@@ F:      drivers/*/*alpine
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <[email protected]>
  M:    Lars Persson <[email protected]>
 -M:    Niklas Cassel <[email protected]>
  S:    Maintained
  L:    [email protected]
  F:    arch/arm/mach-artpec
@@@ -2333,16 -2329,8 +2333,16 @@@ S:    Maintaine
  F:    drivers/gpio/gpio-ath79.c
  F:    Documentation/devicetree/bindings/gpio/gpio-ath79.txt
  
 +ATHEROS 71XX/9XXX USB PHY DRIVER
 +M:    Alban Bedel <[email protected]>
 +W:    https://github.com/AlbanBedel/linux
 +T:    git git://github.com/AlbanBedel/linux
 +S:    Maintained
 +F:    drivers/phy/qualcomm/phy-ath79-usb.c
 +F:    Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
 +
  ATHEROS ATH GENERIC UTILITIES
 -M:    "Luis R. Rodriguez" <[email protected]>
 +M:    Kalle Valo <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/wireless/ath/*
@@@ -2357,7 -2345,7 +2357,7 @@@ S:      Maintaine
  F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH6KL WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@qca.qualcomm.com>
 +M:    Kalle Valo <kvalo@codeaurora.org>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ath6kl
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@@ -2564,6 -2552,7 +2564,6 @@@ F:      Documentation/devicetree/bindings/so
  F:    sound/soc/atmel/tse850-pcm5142.c
  
  AZ6007 DVB DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -2628,7 -2617,7 +2628,7 @@@ S:      Maintaine
  F:    drivers/net/hamradio/baycom*
  
  BCACHE (BLOCK LAYER CACHE)
 -M:    Michael Lyle <[email protected]>
 +M:    Coly Li <[email protected]>
  M:    Kent Overstreet <[email protected]>
  L:    [email protected]
  W:    http://bcache.evilpiepirate.org
@@@ -3092,6 -3081,7 +3092,6 @@@ F:      include/linux/btrfs
  F:    include/uapi/linux/btrfs*
  
  BTTV VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -3441,12 -3431,6 +3441,12 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
  F:    drivers/input/touchscreen/chipone_icn8318.c
  
 +CHIPONE ICN8505 I2C TOUCHSCREEN DRIVER
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/input/touchscreen/chipone_icn8505.c
 +
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Benson Leung <[email protected]>
  M:    Olof Johansson <[email protected]>
@@@ -3707,6 -3691,7 +3707,6 @@@ F:      drivers/cpufreq/arm_big_little_dt.
  
  CPU POWER MONITORING SUBSYSTEM
  M:    Thomas Renninger <[email protected]>
 -M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -3825,6 -3810,7 +3825,6 @@@ S:      Maintaine
  F:    drivers/media/dvb-frontends/cx24120*
  
  CX88 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -4325,7 -4311,7 +4325,7 @@@ F:      Documentation/driver-api/dma-buf.rs
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 -M:    Vinod Koul <v[email protected]>
 +M:    Vinod Koul <v[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  S:    Maintained
@@@ -4346,14 -4332,12 +4346,14 @@@ W:   http://git.infradead.org/users/hch/d
  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:    include/asm-generic/dma-mapping.h
  F:    include/linux/dma-direct.h
  F:    include/linux/dma-mapping.h
 +F:    include/linux/dma-noncoherent.h
  
  DME1737 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <[email protected]>
@@@ -4687,7 -4671,7 +4687,7 @@@ F:      Documentation/devicetree/bindings/di
  
  DRM DRIVERS FOR FREESCALE DCU
  M:    Stefan Agner <[email protected]>
 -M:    Alison Wang <alison.wang@freescale.com>
 +M:    Alison Wang <alison.wang@nxp.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/gpu/drm/fsl-dcu/
@@@ -4798,14 -4782,6 +4798,14 @@@ S:    Maintaine
  F:    drivers/gpu/drm/omapdrm/
  F:    Documentation/devicetree/bindings/display/ti/
  
 +DRM DRIVERS FOR V3D
 +M:    Eric Anholt <[email protected]>
 +S:    Supported
 +F:    drivers/gpu/drm/v3d/
 +F:    include/uapi/drm/v3d_drm.h
 +F:    Documentation/devicetree/bindings/display/brcm,bcm-v3d.txt
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  DRM DRIVERS FOR VC4
  M:    Eric Anholt <[email protected]>
  T:    git git://github.com/anholt/linux
@@@ -4852,15 -4828,6 +4852,15 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tinydrm/
  F:    include/drm/tinydrm/
  
 +DRM DRIVERS FOR XEN
 +M:    Oleksandr Andrushchenko <[email protected]>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/gpu/drm/xen/
 +F:    Documentation/gpu/xen-front.rst
 +
  DRM TTM SUBSYSTEM
  M:    Christian Koenig <[email protected]>
  M:    Roger He <[email protected]>
@@@ -5084,6 -5051,7 +5084,6 @@@ F:      drivers/edac/thunderx_edac
  
  EDAC-CORE
  M:    Borislav Petkov <[email protected]>
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
@@@ -5112,6 -5080,7 +5112,6 @@@ S:      Maintaine
  F:    drivers/edac/fsl_ddr_edac.*
  
  EDAC-GHES
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5128,18 -5097,21 +5128,18 @@@ S:   Maintaine
  F:    drivers/edac/i5000_edac.c
  
  EDAC-I5400
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/i5400_edac.c
  
  EDAC-I7300
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/i7300_edac.c
  
  EDAC-I7CORE
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5189,6 -5161,7 +5189,6 @@@ S:      Maintaine
  F:    drivers/edac/r82600_edac.c
  
  EDAC-SBRIDGE
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5247,6 -5220,7 +5247,6 @@@ S:      Maintaine
  F:    drivers/net/ethernet/ibm/ehea/
  
  EM28XX VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -5423,6 -5397,7 +5423,6 @@@ S:      Maintaine
  F:    drivers/iommu/exynos-iommu.c
  
  EZchip NPS platform support
 -M:    Elad Kanfi <[email protected]>
  M:    Vineet Gupta <[email protected]>
  S:    Supported
  F:    arch/arc/plat-eznps
@@@ -5448,11 -5423,6 +5448,11 @@@ S:    Maintaine
  F:    Documentation/hwmon/f71805f
  F:    drivers/hwmon/f71805f.c
  
 +FADDR2LINE
 +M:    Josh Poimboeuf <[email protected]>
 +S:    Maintained
 +F:    scripts/faddr2line
 +
  FANOTIFY
  M:    Jan Kara <[email protected]>
  R:    Amir Goldstein <[email protected]>
@@@ -5605,7 -5575,6 +5605,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
  Q:    http://patchwork.kernel.org/project/linux-fpga/list/
  F:    Documentation/fpga/
 +F:    Documentation/driver-api/fpga/
  F:    Documentation/devicetree/bindings/fpga/
  F:    drivers/fpga/
  F:    include/linux/fpga/
@@@ -5989,8 -5958,8 +5989,8 @@@ S:      Maintaine
  F:    scripts/get_maintainer.pl
  
  GFS2 FILE SYSTEM
 -M:    Steven Whitehouse <[email protected]>
  M:    Bob Peterson <[email protected]>
 +M:    Andreas Gruenbacher <[email protected]>
  L:    [email protected]
  W:    http://sources.redhat.com/cluster/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
@@@ -6258,7 -6227,6 +6258,7 @@@ L:      [email protected]
  W:    http://hwmon.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/
  F:    Documentation/hwmon/
  F:    drivers/hwmon/
  F:    include/linux/hwmon*.h
@@@ -6545,15 -6513,9 +6545,15 @@@ F:    Documentation/networking/hinic.tx
  F:    drivers/net/ethernet/huawei/hinic/
  
  HUGETLB FILESYSTEM
 -M:    Nadia Yvette Chambers <[email protected]>
 +M:    Mike Kravetz <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    fs/hugetlbfs/
 +F:    mm/hugetlb.c
 +F:    include/linux/hugetlb.h
 +F:    Documentation/admin-guide/mm/hugetlbpage.rst
 +F:    Documentation/vm/hugetlbfs_reserv.rst
 +F:    Documentation/ABI/testing/sysfs-kernel-mm-hugepages
  
  HVA ST MEDIA DRIVER
  M:    Jean-Christophe Trotin <[email protected]>
@@@ -6793,12 -6755,6 +6793,12 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvfc*
  
 +IBM Power Virtual Management Channel Driver
 +M:    Bryant G. Ly <[email protected]>
 +M:    Steven Royer <[email protected]>
 +S:    Supported
 +F:    drivers/misc/ibmvmc.*
 +
  IBM Power Virtual SCSI Device Drivers
  M:    Tyrel Datwyler <[email protected]>
  L:    [email protected]
@@@ -7082,14 -7038,13 +7082,13 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/video/fbdev/i810/
  
- INTEL ASoC BDW/HSW DRIVERS
+ INTEL ASoC DRIVERS
+ M:    Pierre-Louis Bossart <[email protected]>
+ M:    Liam Girdwood <[email protected]>
  M:    Jie Yang <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
- F:    sound/soc/intel/common/sst-dsp*
- F:    sound/soc/intel/common/sst-firmware.c
- F:    sound/soc/intel/boards/broadwell.c
- F:    sound/soc/intel/haswell/
+ F:    sound/soc/intel/
  
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <[email protected]>
@@@ -7455,6 -7410,16 +7454,6 @@@ S:     Obsolet
  F:    include/uapi/linux/ipx.h
  F:    drivers/staging/ipx/
  
 -IRDA SUBSYSTEM
 -M:    Samuel Ortiz <[email protected]>
 -L:    [email protected] (subscribers-only)
 -L:    [email protected]
 -W:    http://irda.sourceforge.net/
 -S:    Obsolete
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
 -F:    Documentation/networking/irda.txt
 -F:    drivers/staging/irda/
 -
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Marc Zyngier <[email protected]>
  S:    Maintained
@@@ -7719,11 -7684,9 +7718,11 @@@ L:    [email protected]
  S:    Maintained
  F:    Documentation/kbuild/
  F:    Makefile
 -F:    scripts/Makefile.*
 +F:    scripts/Kbuild*
 +F:    scripts/Makefile*
  F:    scripts/basic/
  F:    scripts/mk*
 +F:    scripts/mod/
  F:    scripts/package/
  
  KERNEL JANITORS
@@@ -7748,10 -7711,10 +7747,10 @@@ F:   include/linux/sunrpc
  F:    include/uapi/linux/sunrpc/
  
  KERNEL SELFTEST FRAMEWORK
 -M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
 +Q:    https://patchwork.kernel.org/project/linux-kselftest/list/
  S:    Maintained
  F:    tools/testing/selftests/
  F:    Documentation/dev-tools/kselftest*
@@@ -7789,7 -7752,7 +7788,7 @@@ F:      arch/x86/include/asm/svm.
  F:    arch/x86/kvm/svm.c
  
  KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm)
 -M:    Christoffer Dall <christoffer.dall@linaro.org>
 +M:    Christoffer Dall <christoffer.dall@arm.com>
  M:    Marc Zyngier <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -7803,7 -7766,7 +7802,7 @@@ F:      virt/kvm/arm
  F:    include/kvm/arm_*
  
  KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
 -M:    Christoffer Dall <christoffer.dall@linaro.org>
 +M:    Christoffer Dall <christoffer.dall@arm.com>
  M:    Marc Zyngier <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -8257,7 -8220,7 +8256,7 @@@ F:      drivers/misc/lkdtm/
  
  LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
  M:    Alan Stern <[email protected]>
 -M:    Andrea Parri <parri.andrea@gmail.com>
 +M:    Andrea Parri <andrea.parri@amarulasolutions.com>
  M:    Will Deacon <[email protected]>
  M:    Peter Zijlstra <[email protected]>
  M:    Boqun Feng <[email protected]>
@@@ -8364,7 -8327,6 +8363,7 @@@ F:      Documentation/admin-guide/LSM/LoadPi
  LOCKING PRIMITIVES
  M:    Peter Zijlstra <[email protected]>
  M:    Ingo Molnar <[email protected]>
 +M:    Will Deacon <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
  S:    Maintained
@@@ -8916,6 -8878,7 +8915,6 @@@ F:      Documentation/devicetree/bindings/me
  F:    drivers/staging/media/tegra-vde/
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  P:    LinuxTV.org Project
  L:    [email protected]
@@@ -9075,6 -9038,7 +9074,6 @@@ Q:      http://patchwork.ozlabs.org/project/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_*
  
  MELLANOX ETHERNET INNOVA DRIVER
 -M:    Ilan Tayari <[email protected]>
  R:    Boris Pismenny <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -9084,6 -9048,7 +9083,6 @@@ F:      drivers/net/ethernet/mellanox/mlx5/c
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
  
  MELLANOX ETHERNET INNOVA IPSEC DRIVER
 -M:    Ilan Tayari <[email protected]>
  R:    Boris Pismenny <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -9139,6 -9104,7 +9138,6 @@@ F:      include/uapi/rdma/mlx4-abi.
  
  MELLANOX MLX5 core VPI driver
  M:    Saeed Mahameed <[email protected]>
 -M:    Matan Barak <[email protected]>
  M:    Leon Romanovsky <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -9149,6 -9115,7 +9148,6 @@@ F:      drivers/net/ethernet/mellanox/mlx5/c
  F:    include/linux/mlx5/
  
  MELLANOX MLX5 IB driver
 -M:    Matan Barak <[email protected]>
  M:    Leon Romanovsky <[email protected]>
  L:    [email protected]
  W:    http://www.mellanox.com
@@@ -9749,7 -9716,7 +9748,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/netronome/
  
  NETWORK BLOCK DEVICE (NBD)
 -M:    Josef Bacik <jbacik@fb.com>
 +M:    Josef Bacik <josef@toxicpanda.com>
  S:    Maintained
  L:    [email protected]
  L:    [email protected]
@@@ -9765,7 -9732,6 +9764,7 @@@ W:      https://fedorahosted.org/dropwatch
  F:    net/core/drop_monitor.c
  
  NETWORKING DRIVERS
 +M:    "David S. Miller" <[email protected]>
  L:    [email protected]
  W:    http://www.linuxfoundation.org/en/Net
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
@@@ -9882,6 -9848,7 +9881,6 @@@ F:      net/netfilter/xt_CONNSECMARK.
  F:    net/netfilter/xt_SECMARK.c
  
  NETWORKING [TLS]
 -M:    Ilya Lesokhin <[email protected]>
  M:    Aviad Yehezkel <[email protected]>
  M:    Dave Watson <[email protected]>
  L:    [email protected]
@@@ -9921,7 -9888,7 +9920,7 @@@ F:      include/linux/platform_data/nxp-nci.
  F:    Documentation/devicetree/bindings/net/nfc/
  
  NFS, SUNRPC, AND LOCKD CLIENTS
 -M:    Trond Myklebust <trond.myklebust@primarydata.com>
 +M:    Trond Myklebust <trond.myklebust@hammerspace.com>
  M:    Anna Schumaker <[email protected]>
  L:    [email protected]
  W:    http://client.linux-nfs.org
@@@ -10941,6 -10908,7 +10940,6 @@@ F:   drivers/pci/host
  F:    drivers/pci/dwc/
  
  PCIE DRIVER FOR AXIS ARTPEC
 -M:    Niklas Cassel <[email protected]>
  M:    Jesper Nilsson <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -11301,7 -11269,6 +11300,7 @@@ M:   Sebastian Reichel <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-class-power
  F:    Documentation/devicetree/bindings/power/supply/
  F:    include/linux/power_supply.h
  F:    drivers/power/supply/
@@@ -11682,7 -11649,7 +11681,7 @@@ S:   Maintaine
  F:    drivers/media/tuners/qt1010*
  
  QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@qca.qualcomm.com>
 +M:    Kalle Valo <kvalo@codeaurora.org>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ath10k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@@ -11704,13 -11671,6 +11703,13 @@@ F: Documentation/devicetree/bindings/me
  F:    Documentation/media/v4l-drivers/qcom_camss.rst
  F:    drivers/media/platform/qcom/camss-8x16/
  
 +QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
 +M:  Ilia Lin <[email protected]>
 +L:  [email protected]
 +S:  Maintained
 +F:  Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
 +F:  drivers/cpufreq/qcom-cpufreq-kryo.c
 +
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <[email protected]>
  L:    [email protected]
@@@ -11740,7 -11700,7 +11739,7 @@@ S:   Maintaine
  F:    drivers/media/platform/qcom/venus/
  
  QUALCOMM WCN36XX WIRELESS DRIVER
 -M:    Eugene Krasnikov <[email protected]>
 +M:    Kalle Valo <[email protected]>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/wcn36xx
  T:    git git://github.com/KrasnikovEugene/wcn36xx.git
@@@ -12278,7 -12238,7 +12277,7 @@@ F:   Documentation/s390/vfio-ccw.tx
  F:    include/uapi/linux/vfio_ccw.h
  
  S390 ZCRYPT DRIVER
 -M:    Harald Freudenberger <freude@de.ibm.com>
 +M:    Harald Freudenberger <freude@linux.ibm.com>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12307,6 -12267,7 +12306,6 @@@ S:   Odd Fixe
  F:    drivers/media/i2c/saa6588*
  
  SAA7134 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -12545,7 -12506,6 +12544,7 @@@ F:   drivers/scsi/st_*.
  SCTP PROTOCOL
  M:    Vlad Yasevich <[email protected]>
  M:    Neil Horman <[email protected]>
 +M:    Marcelo Ricardo Leitner <[email protected]>
  L:    [email protected]
  W:    http://lksctp.sourceforge.net
  S:    Maintained
@@@ -12811,6 -12771,7 +12810,6 @@@ S:   Maintaine
  F:    drivers/media/radio/si4713/radio-usb-si4713.c
  
  SIANO DVB DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -13322,12 -13283,6 +13321,12 @@@ M: Jan-Benedict Glaw <[email protected]
  S:    Maintained
  F:    arch/alpha/kernel/srm_env.c
  
 +ST STM32 I2C/SMBUS DRIVER
 +M:    Pierre-Yves MORDRET <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-stm32*
 +
  STABLE BRANCH
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -13807,6 -13762,7 +13806,6 @@@ S:   Maintaine
  F:    drivers/media/i2c/tda9840*
  
  TEA5761 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -13815,6 -13771,7 +13814,6 @@@ S:   Odd fixe
  F:    drivers/media/tuners/tea5761.*
  
  TEA5767 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -13904,6 -13861,7 +13903,6 @@@ S:   Supporte
  F:    drivers/iommu/tegra*
  
  TEGRA KBC DRIVER
 -M:    Rakesh Iyer <[email protected]>
  M:    Laxman Dewangan <[email protected]>
  S:    Supported
  F:    drivers/input/keyboard/tegra-kbc.c
@@@ -14006,7 -13964,7 +14005,7 @@@ THUNDERBOLT DRIVE
  M:    Andreas Noever <[email protected]>
  M:    Michael Jamet <[email protected]>
  M:    Mika Westerberg <[email protected]>
 -M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
 +M:    Yehezkel Bernat <YehezkelShB@gmail.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
  S:    Maintained
  F:    Documentation/admin-guide/thunderbolt.rst
@@@ -14016,7 -13974,7 +14015,7 @@@ F:   include/linux/thunderbolt.
  THUNDERBOLT NETWORK DRIVER
  M:    Michael Jamet <[email protected]>
  M:    Mika Westerberg <[email protected]>
 -M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
 +M:    Yehezkel Bernat <YehezkelShB@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/thunderbolt.c
@@@ -14230,6 -14188,7 +14229,6 @@@ F:   Documentation/networking/tlan.tx
  F:    drivers/net/ethernet/ti/tlan.*
  
  TM6000 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -14428,15 -14387,6 +14427,15 @@@ S: Maintaine
  F:    drivers/tc/
  F:    include/linux/tc.h
  
 +TURBOSTAT UTILITY
 +M:    "Len Brown" <[email protected]>
 +L:    [email protected]
 +B:    https://bugzilla.kernel.org
 +Q:    https://patchwork.kernel.org/project/linux-pm/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat
 +S:    Supported
 +F:    tools/power/x86/turbostat/
 +
  TW5864 VIDEO4LINUX DRIVER
  M:    Bluecherry Maintainers <[email protected]>
  M:    Anton Sviridenko <[email protected]>
@@@ -14721,13 -14671,13 +14720,13 @@@ F:        drivers/usb/common/usb-otg-fsm.
  
  USB OVER IP DRIVER
  M:    Valentina Manea <[email protected]>
 -M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/usb/usbip_protocol.txt
  F:    drivers/usb/usbip/
  F:    tools/usb/usbip/
 +F:    tools/testing/selftests/drivers/usb/usbip/
  
  USB PEGASUS DRIVER
  M:    Petko Manolov <[email protected]>
@@@ -15465,6 -15415,7 +15464,6 @@@ S:   Maintaine
  F:    arch/x86/entry/vdso/
  
  XC2028/3028 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -15542,6 -15493,13 +15541,13 @@@ S: Supporte
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*
  
+ XEN SOUND FRONTEND DRIVER
+ M:    Oleksandr Andrushchenko <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Supported
+ F:    sound/xen/*
+ 
  XFS FILESYSTEM
  M:    Darrick J. Wong <[email protected]>
  M:    [email protected]
@@@ -15580,14 -15538,6 +15586,14 @@@ L: [email protected]
  S:    Supported
  F:    drivers/char/xillybus/
  
 +XLP9XX I2C DRIVER
 +M:    George Cherian <[email protected]>
 +M:    Jan Glauber <[email protected]>
 +L:    [email protected]
 +W:    http://www.cavium.com
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-xlp9xx.c
 +
  XRA1403 GPIO EXPANDER
  M:    Nandor Han <[email protected]>
  M:    Semi Malinen <[email protected]>
@@@ -15706,7 -15656,7 +15712,7 @@@ L:   [email protected]
  S:    Maintained
  F:    mm/zsmalloc.c
  F:    include/linux/zsmalloc.h
 -F:    Documentation/vm/zsmalloc.txt
 +F:    Documentation/vm/zsmalloc.rst
  
  ZSWAP COMPRESSED SWAP CACHING
  M:    Seth Jennings <[email protected]>

diff --combined arch/arm/mach-ep93xx/core.c
index 0581ffbedddd3761b832dc5b457bb3269ee34c17,48d6a9e01dc8aef472645bcf28906508e73ca2e8..faf48a3b1fea913813681430bc55f3697a2c0028
--- 1/arch/arm/mach-ep93xx/core.c
--- 2/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@@ -323,7 -323,7 +323,7 @@@ void __init ep93xx_register_eth(struct 
  
  /* All EP93xx devices use the same two GPIO pins for I2C bit-banging */
  static struct gpiod_lookup_table ep93xx_i2c_gpiod_table = {
 -      .dev_id         = "i2c-gpio",
 +      .dev_id         = "i2c-gpio.0",
        .table          = {
                /* Use local offsets on gpiochip/port "G" */
                GPIO_LOOKUP_IDX("G", 1, NULL, 0,
@@@ -635,6 -635,7 +635,7 @@@ EXPORT_SYMBOL(ep93xx_keypad_release_gpi
   *************************************************************************/
  static struct resource ep93xx_i2s_resource[] = {
        DEFINE_RES_MEM(EP93XX_I2S_PHYS_BASE, 0x100),
+       DEFINE_RES_IRQ(IRQ_EP93XX_SAI),
  };
  
  static struct platform_device ep93xx_i2s_device = {

diff --combined include/linux/usb/audio-v2.h
index 49699255cfd3475430d655f4c9e1a52d7e840249,a96ed2ce32541050971f8141921d65a8c5c66ceb..ba4b3e3327ff30a394d82b65f0499dd2b974853f
--- 1/include/linux/usb/audio-v2.h
--- 2/include/linux/usb/audio-v2.h
+++ b/include/linux/usb/audio-v2.h
@@@ -94,7 -94,7 +94,7 @@@ struct uac_clock_selector_descriptor 
        __u8 bClockID;
        __u8 bNrInPins;
        __u8 baCSourceID[];
 -      /* bmControls, bAssocTerminal and iClockSource omitted */
 +      /* bmControls and iClockSource omitted */
  } __attribute__((packed));
  
  /* 4.7.2.3 Clock Multiplier Descriptor */
@@@ -189,6 -189,13 +189,13 @@@ struct uac2_iso_endpoint_descriptor 
  #define UAC2_CONTROL_DATA_OVERRUN     (3 << 2)
  #define UAC2_CONTROL_DATA_UNDERRUN    (3 << 4)
  
+ /* 5.2.5.4.2 Connector Control Parameter Block */
+ struct uac2_connectors_ctl_blk {
+       __u8 bNrChannels;
+       __le32 bmChannelConfig;
+       __u8 iChannelNames;
+ } __attribute__((packed));
+ 
  /* 6.1 Interrupt Data Message */
  
  #define UAC2_INTERRUPT_DATA_MSG_VENDOR        (1 << 0)

diff --combined include/sound/soc-dai.h
index 3ddb575eed54aa71e6f1ed3c4b19ce4b5e2ef1a1,568f6a72c974d13c6012e64828b92eb6d5ac6889..e6f8c40ed43c3f1615aaad20af4e467a3bc937e5
--- 1/include/sound/soc-dai.h
--- 2/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@@ -170,8 -170,6 +170,8 @@@ struct snd_soc_dai_ops 
                unsigned int rx_num, unsigned int *rx_slot);
        int (*set_tristate)(struct snd_soc_dai *dai, int tristate);
  
 +      int (*set_sdw_stream)(struct snd_soc_dai *dai,
 +                      void *stream, int direction);
        /*
         * DAI digital mute - optional.
         * Called by soc-core to minimise any pops.
@@@ -296,8 -294,8 +296,8 @@@ struct snd_soc_dai 
        struct snd_soc_dai_driver *driver;
  
        /* DAI runtime info */
-       unsigned int capture_active:1;          /* stream is in use */
-       unsigned int playback_active:1;         /* stream is in use */
+       unsigned int capture_active;            /* stream usage count */
+       unsigned int playback_active;           /* stream usage count */
        unsigned int probed:1;
  
        unsigned int active;
@@@ -315,7 -313,6 +315,6 @@@
        unsigned int sample_bits;
  
        /* parent platform/codec */
-       struct snd_soc_codec *codec;
        struct snd_soc_component *component;
  
        /* CODEC TDM slot masks and params (for fixup) */
@@@ -360,25 -357,4 +359,25 @@@ static inline void *snd_soc_dai_get_drv
        return dev_get_drvdata(dai->dev);
  }
  
 +/**
 + * snd_soc_dai_set_sdw_stream() - Configures a DAI for SDW stream operation
 + * @dai: DAI
 + * @stream: STREAM
 + * @direction: Stream direction(Playback/Capture)
 + * SoundWire subsystem doesn't have a notion of direction and we reuse
 + * the ASoC stream direction to configure sink/source ports.
 + * Playback maps to source ports and Capture for sink ports.
 + *
 + * This should be invoked with NULL to clear the stream set previously.
 + * Returns 0 on success, a negative error code otherwise.
 + */
 +static inline int snd_soc_dai_set_sdw_stream(struct snd_soc_dai *dai,
 +                              void *stream, int direction)
 +{
 +      if (dai->driver->ops->set_sdw_stream)
 +              return dai->driver->ops->set_sdw_stream(dai, stream, direction);
 +      else
 +              return -ENOTSUPP;
 +}
 +
  #endif