Merge tag 'asoc-v5.6-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

ASoC: Fixes for v5.6

A collection of updates for bugs fixed since the initial pull
request, the most important one being the addition of COMMON_CLK
for wcd934x which is needed for MFD to be merged.

diff --combined MAINTAINERS
index cf6ccca,5e5382e..9316dcf
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -720,7 -720,7 +720,7 @@@ F: Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-altera.c
  
  ALTERA MAILBOX DRIVER
 -M:    Ley Foon Tan <lftan@altera.com>
 +M:    Ley Foon Tan <ley.foon.tan@intel.com>
  L:    nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/mailbox/mailbox-altera.c
@@@ -771,8 -771,6 +771,8 @@@ F: drivers/thermal/thermal_mmio.
  
  AMAZON ETHERNET DRIVERS
  M:    Netanel Belgazal <netanel@amazon.com>
 +M:    Arthur Kiyanovski <akiyano@amazon.com>
 +R:    Guy Tzalik <gtzalik@amazon.com>
  R:    Saeed Bishara <saeedb@amazon.com>
  R:    Zorik Machulsky <zorik@amazon.com>
  L:    netdev@vger.kernel.org
@@@ -1407,7 -1405,7 +1407,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  
  ARM/ACTIONS SEMI ARCHITECTURE
  M:    Andreas Färber <afaerber@suse.de>
 -R:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 +M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  N:    owl
@@@ -2274,7 -2272,6 +2274,7 @@@ F:      drivers/*/*s3c64xx
  F:    drivers/*/*s5pv210*
  F:    drivers/memory/samsung/
  F:    drivers/soc/samsung/
 +F:    drivers/tty/serial/samsung*
  F:    include/linux/soc/samsung/
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
@@@ -3150,7 -3147,7 +3150,7 @@@ S:      Maintaine
  F:    arch/mips/net/
  
  BPF JIT for NFP NICs
 -M:    Jakub Kicinski <jakub.kicinski@netronome.com>
 +M:    Jakub Kicinski <kuba@kernel.org>
  L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Supported
@@@ -4973,7 -4970,6 +4973,7 @@@ F:      include/linux/dma-buf
  F:    include/linux/reservation.h
  F:    include/linux/*fence.h
  F:    Documentation/driver-api/dma-buf.rst
 +K:    dma_(buf|fence|resv)
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
@@@ -5003,7 -4999,7 +5003,7 @@@ F:      include/linux/dma-mapping.
  F:    include/linux/dma-noncoherent.h
  
  DMC FREQUENCY DRIVER FOR SAMSUNG EXYNOS5422
 -M:    Lukasz Luba <l.luba@partner.samsung.com>
 +M:    Lukasz Luba <lukasz.luba@arm.com>
  L:    linux-pm@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
@@@ -6029,7 -6025,6 +6029,7 @@@ M:      Yash Shah <yash.shah@sifive.com
  L:    linux-edac@vger.kernel.org
  S:    Supported
  F:    drivers/edac/sifive_edac.c
 +F:    drivers/soc/sifive_l2_cache.c
  
  EDAC-SKYLAKE
  M:    Tony Luck <tony.luck@intel.com>
@@@ -7036,7 -7031,6 +7036,7 @@@ L:      linux-acpi@vger.kernel.or
  S:    Maintained
  F:    Documentation/firmware-guide/acpi/gpio-properties.rst
  F:    drivers/gpio/gpiolib-acpi.c
 +F:    drivers/gpio/gpiolib-acpi.h
  
  GPIO IR Transmitter
  M:    Sean Young <sean@mess.org>
@@@ -9044,6 -9038,7 +9044,6 @@@ F:      include/linux/umh.
  
  KERNEL VIRTUAL MACHINE (KVM)
  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
@@@ -9078,9 -9073,9 +9078,9 @@@ F:      virt/kvm/arm
  F:    include/kvm/arm_*
  
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
 -M:    James Hogan <jhogan@kernel.org>
  L:    linux-mips@vger.kernel.org
 -S:    Supported
 +L:    kvm@vger.kernel.org
 +S:    Orphan
  F:    arch/mips/include/uapi/asm/kvm*
  F:    arch/mips/include/asm/kvm*
  F:    arch/mips/kvm/
@@@ -9115,6 -9110,7 +9115,6 @@@ F:      tools/testing/selftests/kvm/*/s390x
  
  KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
  M:    Paolo Bonzini <pbonzini@redhat.com>
 -M:    Radim Krčmář <rkrcmar@redhat.com>
  R:    Sean Christopherson <sean.j.christopherson@intel.com>
  R:    Vitaly Kuznetsov <vkuznets@redhat.com>
  R:    Wanpeng Li <wanpengli@tencent.com>
@@@ -10112,7 -10108,6 +10112,7 @@@ S:   Maintaine
  F:    drivers/media/radio/radio-maxiradio*
  
  MCAN MMIO DEVICE DRIVER
 +M:    Dan Murphy <dmurphy@ti.com>
  M:    Sriram Dash <sriram.dash@samsung.com>
  L:    linux-can@vger.kernel.org
  S:    Maintained
@@@ -11431,7 -11426,7 +11431,7 @@@ F:   include/uapi/linux/netrom.
  F:    net/netrom/
  
  NETRONOME ETHERNET DRIVERS
 -M:    Jakub Kicinski <jakub.kicinski@netronome.com>
 +M:    Jakub Kicinski <kuba@kernel.org>
  L:    oss-drivers@netronome.com
  S:    Maintained
  F:    drivers/net/ethernet/netronome/
@@@ -11460,8 -11455,8 +11460,8 @@@ M:   "David S. Miller" <davem@davemloft.n
  L:    netdev@vger.kernel.org
  W:    http://www.linuxfoundation.org/en/Net
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
  S:    Odd Fixes
  F:    Documentation/devicetree/bindings/net/
  F:    drivers/net/
@@@ -11502,8 -11497,8 +11502,8 @@@ M:   "David S. Miller" <davem@davemloft.n
  L:    netdev@vger.kernel.org
  W:    http://www.linuxfoundation.org/en/Net
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
  B:    mailto:netdev@vger.kernel.org
  S:    Maintained
  F:    net/
@@@ -11548,7 -11543,7 +11548,7 @@@ M:   "David S. Miller" <davem@davemloft.n
  M:    Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
  M:    Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
  L:    netdev@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
  S:    Maintained
  F:    net/ipv4/
  F:    net/ipv6/
@@@ -11591,7 -11586,7 +11591,7 @@@ M:   Boris Pismenny <borisp@mellanox.com
  M:    Aviad Yehezkel <aviadye@mellanox.com>
  M:    John Fastabend <john.fastabend@gmail.com>
  M:    Daniel Borkmann <daniel@iogearbox.net>
 -M:    Jakub Kicinski <jakub.kicinski@netronome.com>
 +M:    Jakub Kicinski <kuba@kernel.org>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    net/tls/*
@@@ -11603,7 -11598,7 +11603,7 @@@ L:   linux-wireless@vger.kernel.or
  Q:    http://patchwork.kernel.org/project/linux-wireless/list/
  
  NETDEVSIM
 -M:    Jakub Kicinski <jakub.kicinski@netronome.com>
 +M:    Jakub Kicinski <kuba@kernel.org>
  S:    Maintained
  F:    drivers/net/netdevsim/*
  
@@@ -11680,7 -11675,7 +11680,7 @@@ F:   Documentation/scsi/NinjaSCSI.tx
  F:    drivers/scsi/nsp32*
  
  NIOS2 ARCHITECTURE
 -M:    Ley Foon Tan <lftan@altera.com>
 +M:    Ley Foon Tan <ley.foon.tan@intel.com>
  L:    nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
  S:    Maintained
@@@ -12398,7 -12393,7 +12398,7 @@@ L:   linux-unionfs@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git
  S:    Supported
  F:    fs/overlayfs/
 -F:    Documentation/filesystems/overlayfs.txt
 +F:    Documentation/filesystems/overlayfs.rst
  
  P54 WIRELESS DRIVER
  M:    Christian Lamparter <chunkeey@googlemail.com>
@@@ -12564,7 -12559,7 +12564,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pci-aardvark.c
  
  PCI DRIVER FOR ALTERA PCIE IP
 -M:    Ley Foon Tan <lftan@altera.com>
 +M:    Ley Foon Tan <ley.foon.tan@intel.com>
  L:    rfi@lists.rocketboards.org (moderated for non-subscribers)
  L:    linux-pci@vger.kernel.org
  S:    Supported
@@@ -12743,7 -12738,7 +12743,7 @@@ S:   Supporte
  F:    Documentation/PCI/pci-error-recovery.rst
  
  PCI MSI DRIVER FOR ALTERA MSI IP
 -M:    Ley Foon Tan <lftan@altera.com>
 +M:    Ley Foon Tan <ley.foon.tan@intel.com>
  L:    rfi@lists.rocketboards.org (moderated for non-subscribers)
  L:    linux-pci@vger.kernel.org
  S:    Supported
@@@ -13679,6 -13674,7 +13679,6 @@@ F:   drivers/net/ethernet/qualcomm/emac
  
  QUALCOMM ETHQOS ETHERNET DRIVER
  M:    Vinod Koul <vkoul@kernel.org>
 -M:    Niklas Cassel <niklas.cassel@linaro.org>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@@ -13712,15 -13708,6 +13712,15 @@@ L: linux-arm-msm@vger.kernel.or
  S:    Maintained
  F:    drivers/iommu/qcom_iommu.c
  
 +QUALCOMM RMNET DRIVER
 +M:    Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
 +M:    Sean Tranchetti <stranche@codeaurora.org>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/qualcomm/rmnet/
 +F:    Documentation/networking/device_drivers/qualcomm/rmnet.txt
 +F:    include/linux/if_rmnet.h
 +
  QUALCOMM TSENS THERMAL DRIVER
  M:    Amit Kucheria <amit.kucheria@linaro.org>
  L:    linux-pm@vger.kernel.org
@@@ -13947,7 -13934,6 +13947,6 @@@ F:   include/linux/platform_data/rtc-
  F:    tools/testing/selftests/rtc/
  
  REALTEK AUDIO CODECS
- M:    Bard Liao <bardliao@realtek.com>
  M:    Oder Chiou <oder_chiou@realtek.com>
  S:    Maintained
  F:    sound/soc/codecs/rt*
@@@ -14120,7 -14106,6 +14119,7 @@@ M:   Paul Walmsley <paul.walmsley@sifive.
  M:    Palmer Dabbelt <palmer@dabbelt.com>
  M:    Albert Ou <aou@eecs.berkeley.edu>
  L:    linux-riscv@lists.infradead.org
 +P:    Documentation/riscv/patch-acceptance.rst
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
  S:    Supported
  F:    arch/riscv/
@@@ -14548,6 -14533,8 +14547,6 @@@ F:   include/linux/platform_data/spi-s3c6
  
  SAMSUNG SXGBE DRIVERS
  M:    Byungho An <bh74.an@samsung.com>
 -M:    Girish K S <ks.giri@samsung.com>
 -M:    Vipul Pandya <vipul.pandya@samsung.com>
  S:    Supported
  L:    netdev@vger.kernel.org
  F:    drivers/net/ethernet/samsung/sxgbe/
@@@ -16326,10 -16313,12 +16325,10 @@@ 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>
 +M:    Daniel Lezcano <daniel.lezcano@linaro.org>
  R:    Amit Kucheria <amit.kucheria@verdurent.com>
  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
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
  Q:    https://patchwork.kernel.org/project/linux-pm/list/
  S:    Supported
  F:    drivers/thermal/
@@@ -16543,13 -16532,6 +16542,13 @@@ L: alsa-devel@alsa-project.org (moderat
  S:    Odd Fixes
  F:    sound/soc/codecs/tas571x*
  
 +TI TCAN4X5X DEVICE DRIVER
 +M:    Dan Murphy <dmurphy@ti.com>
 +L:    linux-can@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/can/tcan4x5x.txt
 +F:    drivers/net/can/m_can/tcan4x5x.c
 +
  TI TRF7970A NFC DRIVER
  M:    Mark Greer <mgreer@animalcreek.com>
  L:    linux-wireless@vger.kernel.org
@@@ -18042,7 -18024,7 +18041,7 @@@ XDP (eXpress Data Path
  M:    Alexei Starovoitov <ast@kernel.org>
  M:    Daniel Borkmann <daniel@iogearbox.net>
  M:    David S. Miller <davem@davemloft.net>
 -M:    Jakub Kicinski <jakub.kicinski@netronome.com>
 +M:    Jakub Kicinski <kuba@kernel.org>
  M:    Jesper Dangaard Brouer <hawk@kernel.org>
  M:    John Fastabend <john.fastabend@gmail.com>
  L:    netdev@vger.kernel.org

diff --combined sound/soc/sof/intel/hda.h
index a4d030b,d1f87a1..6191d91
--- 1/sound/soc/sof/intel/hda.h
--- 2/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@@ -348,7 -348,7 +348,7 @@@
  
  /* Number of DAIs */
  #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
 -#define SOF_SKL_NUM_DAIS              14
 +#define SOF_SKL_NUM_DAIS              15
  #else
  #define SOF_SKL_NUM_DAIS              8
  #endif
@@@ -586,15 -586,14 +586,14 @@@ void hda_codec_jack_check(struct snd_so
        (IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI) || \
         IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))
  
- void hda_codec_i915_get(struct snd_sof_dev *sdev);
- void hda_codec_i915_put(struct snd_sof_dev *sdev);
+ void hda_codec_i915_display_power(struct snd_sof_dev *sdev, bool enable);
  int hda_codec_i915_init(struct snd_sof_dev *sdev);
  int hda_codec_i915_exit(struct snd_sof_dev *sdev);
  
  #else
  
- static inline void hda_codec_i915_get(struct snd_sof_dev *sdev)  { }
- static inline void hda_codec_i915_put(struct snd_sof_dev *sdev)  { }
+ static inline void hda_codec_i915_display_power(struct snd_sof_dev *sdev,
+                                               bool enable) { }
  static inline int hda_codec_i915_init(struct snd_sof_dev *sdev) { return 0; }
  static inline int hda_codec_i915_exit(struct snd_sof_dev *sdev) { return 0; }