Commit 96382b4f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/xen' into for-next 



Merge Xen para-virtualized frontend driver from Oleksandr Andrushchenko.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents d0aa5909 190a5f2e

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -15494,6 +15494,13 @@ S: Supported 
F:	arch/x86/xen/*swiotlb*

F:	drivers/xen/*swiotlb*



XEN SOUND FRONTEND DRIVER

M:	Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>

L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/xen/*



XFS FILESYSTEM

M:	Darrick J. Wong <darrick.wong@oracle.com>

M:	linux-xfs@vger.kernel.org

sound/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ source "sound/x86/Kconfig" 


source "sound/synth/Kconfig"



source "sound/xen/Kconfig"



endif # SND



endif # !UML

sound/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
obj-$(CONFIG_SOUND) += soundcore.o

obj-$(CONFIG_DMASOUND) += oss/dmasound/

obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \

	firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/ x86/

	firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/ x86/ xen/

obj-$(CONFIG_SND_AOA) += aoa/



# This one must be compilable even if sound is configured out

sound/xen/Kconfig

0 → 100644
+10 −0
Original line number Diff line number Diff line 
# ALSA Xen drivers



config SND_XEN_FRONTEND

	tristate "Xen para-virtualized sound frontend driver"

	depends on XEN

	select SND_PCM

	select XEN_XENBUS_FRONTEND

	help

	  Choose this option if you want to enable a para-virtualized

	  frontend sound driver for Xen guest OSes.

sound/xen/Makefile

0 → 100644
+9 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0 OR MIT



snd_xen_front-objs := xen_snd_front.o \

		      xen_snd_front_cfg.o \

		      xen_snd_front_evtchnl.o \

		      xen_snd_front_shbuf.o \

		      xen_snd_front_alsa.o



obj-$(CONFIG_SND_XEN_FRONTEND) += snd_xen_front.o