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

ASoC: Updates for v5.3

This is a very big update, mainly thanks to Morimoto-san's refactoring
work and some fairly large new drivers.

 - Lots more work on moving towards a component based framework from
   Morimoto-san.
 - Support for force disconnecting muxes from Jerome Brunet.
 - New drivers for Cirrus Logic CS47L35, CS47L85 and CS47L90, Conexant
   CX2072X, Realtek RT1011 and RT1308.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --cc include/sound/hda_codec.h
Simple merge

diff --cc sound/core/control.c
Simple merge

diff --cc sound/core/seq/oss/seq_oss_ioctl.c
Simple merge

diff --cc sound/core/seq/oss/seq_oss_rw.c
Simple merge

diff --cc sound/firewire/amdtp-am824.c
Simple merge

diff --cc sound/firewire/amdtp-stream-trace.h
Simple merge

diff --cc sound/firewire/amdtp-stream.c
Simple merge

diff --cc sound/firewire/bebob/bebob.h
Simple merge

diff --cc sound/firewire/bebob/bebob_midi.c
Simple merge

diff --cc sound/firewire/bebob/bebob_pcm.c
Simple merge

diff --cc sound/firewire/bebob/bebob_stream.c
Simple merge

diff --cc sound/firewire/cmp.c
Simple merge

diff --cc sound/firewire/dice/Makefile
index 7efca3648c6afc4a7285907edf43b0d228d65a5a,115eadd8d42e7d289280c5f84d24299347fb6735..7a62dafd0f788e59f2e88ec25f1c7e9a25e5b833
--- 1/sound/firewire/dice/Makefile
--- 2/sound/firewire/dice/Makefile
+++ b/sound/firewire/dice/Makefile
@@@ -1,4 -1,5 +1,5 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
  snd-dice-objs := dice-transaction.o dice-stream.o dice-proc.o dice-midi.o \
                 dice-pcm.o dice-hwdep.o dice.o dice-tcelectronic.o \
 -               dice-alesis.o dice-extension.o dice-mytek.o
 +               dice-alesis.o dice-extension.o dice-mytek.o dice-presonus.o
  obj-$(CONFIG_SND_DICE) += snd-dice.o

diff --cc sound/firewire/dice/dice-midi.c
Simple merge

diff --cc sound/firewire/dice/dice-pcm.c
Simple merge

diff --cc sound/firewire/dice/dice-stream.c
Simple merge

diff --cc sound/firewire/dice/dice.c
Simple merge

diff --cc sound/firewire/dice/dice.h
Simple merge

diff --cc sound/firewire/digi00x/amdtp-dot.c
Simple merge

diff --cc sound/firewire/digi00x/digi00x-midi.c
Simple merge

diff --cc sound/firewire/digi00x/digi00x-pcm.c
Simple merge

diff --cc sound/firewire/digi00x/digi00x-stream.c
Simple merge

diff --cc sound/firewire/digi00x/digi00x.h
Simple merge

diff --cc sound/firewire/fireface/ff-pcm.c
Simple merge

diff --cc sound/firewire/fireface/ff-stream.c
Simple merge

diff --cc sound/firewire/fireface/ff.h
Simple merge

diff --cc sound/firewire/fireworks/fireworks.h
Simple merge

diff --cc sound/firewire/fireworks/fireworks_midi.c
Simple merge

diff --cc sound/firewire/fireworks/fireworks_pcm.c
Simple merge

diff --cc sound/firewire/fireworks/fireworks_stream.c
Simple merge

diff --cc sound/firewire/motu/amdtp-motu-trace.h
Simple merge

diff --cc sound/firewire/motu/amdtp-motu.c
Simple merge

diff --cc sound/firewire/motu/motu-midi.c
Simple merge

diff --cc sound/firewire/motu/motu-pcm.c
Simple merge

diff --cc sound/firewire/motu/motu-stream.c
Simple merge

diff --cc sound/firewire/motu/motu.h
Simple merge

diff --cc sound/firewire/oxfw/oxfw-midi.c
Simple merge

diff --cc sound/firewire/oxfw/oxfw-pcm.c
Simple merge

diff --cc sound/firewire/oxfw/oxfw-stream.c
Simple merge

diff --cc sound/firewire/oxfw/oxfw.c
Simple merge

diff --cc sound/firewire/oxfw/oxfw.h
Simple merge

diff --cc sound/firewire/tascam/amdtp-tascam.c
Simple merge

diff --cc sound/firewire/tascam/tascam-pcm.c
Simple merge

diff --cc sound/firewire/tascam/tascam-stream.c
Simple merge

diff --cc sound/firewire/tascam/tascam.h
Simple merge

diff --cc sound/hda/hdac_controller.c
Simple merge

diff --cc sound/hda/hdac_device.c
Simple merge

diff --cc sound/pci/asihpi/asihpi.c
Simple merge

diff --cc sound/pci/cs4281.c
Simple merge

diff --cc sound/pci/hda/hda_codec.c
Simple merge

diff --cc sound/pci/hda/hda_controller.c
Simple merge

diff --cc sound/pci/hda/hda_controller.h
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/pci/hda/hda_jack.c
Simple merge

diff --cc sound/pci/hda/patch_ca0132.c
Simple merge

diff --cc sound/pci/hda/patch_hdmi.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge

diff --cc sound/pci/lx6464es/lx_core.c
Simple merge

diff --cc sound/pci/rme9652/hdspm.c
index 982b297b3d0a8ec77aed4ae3e1c04b83938150e8,6f5eaa510bbcee57488a3f7e2618161f6640fba1..81a6f4b2bd3c52c93abc6a35a83c1e24437fa57e
--- 1/sound/pci/rme9652/hdspm.c
--- 2/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@@ -22,24 -23,6 +23,9 @@@
   *      Modified 2011-01-14 added S/PDIF input on RayDATs by Adrian Knoth
   *
   *    Modified 2011-01-25 variable period sizes on RayDAT/AIO by Adrian Knoth
-  *
-  *   This program is free software; you can redistribute it and/or modify
-  *   it under the terms of the GNU General Public License as published by
-  *   the Free Software Foundation; either version 2 of the License, or
-  *   (at your option) any later version.
-  *
-  *   This program is distributed in the hope that it will be useful,
-  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *   GNU General Public License for more details.
-  *
-  *   You should have received a copy of the GNU General Public License
-  *   along with this program; if not, write to the Free Software
-  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-  *
 + *
 + *      Modified 2019-05-23 fix AIO single speed ADAT capture and playback
 + *      by Philippe.Bekaert@uhasselt.be
   */
  
  /* *************    Register Documentation   *******************************************************

diff --cc sound/soc/codecs/hdac_hdmi.c
Simple merge

diff --cc sound/soc/sof/intel/hda.c
Simple merge

diff --cc sound/usb/format.c
Simple merge

diff --cc sound/usb/helper.c
Simple merge

diff --cc sound/usb/line6/driver.c
Simple merge

diff --cc sound/usb/line6/driver.h
Simple merge

diff --cc sound/usb/line6/pcm.c
Simple merge

diff --cc sound/usb/line6/pod.c
Simple merge

diff --cc sound/usb/line6/podhd.c
Simple merge

diff --cc sound/usb/line6/toneport.c
Simple merge

diff --cc sound/usb/line6/variax.c
Simple merge

diff --cc sound/usb/mixer.c
Simple merge

diff --cc sound/usb/mixer_quirks.c
Simple merge

diff --cc sound/usb/quirks-table.h
Simple merge

diff --cc sound/usb/quirks.c
Simple merge