From: Takashi Iwai Date: Mon, 8 Jul 2019 12:45:20 +0000 (+0200) Subject: Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... X-Git-Tag: for-linus-20190715~28^2~7 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3c53c6255d598db7084c5c3d7553d7200e857818;p=linux-block.git Merge tag 'asoc-v5.3' of https://git./linux/kernel/git/broonie/sound into for-linus 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 --- 3c53c6255d598db7084c5c3d7553d7200e857818 diff --cc sound/firewire/dice/Makefile index 7efca3648c6a,115eadd8d42e..7a62dafd0f78 --- a/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/pci/rme9652/hdspm.c index 982b297b3d0a,6f5eaa510bbc..81a6f4b2bd3c --- a/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 + * + * Modified 2019-05-23 fix AIO single speed ADAT capture and playback + * by Philippe.Bekaert@uhasselt.be - * - * 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 - * */ /* ************* Register Documentation *******************************************************