summaryrefslogtreecommitdiffstats
path: root/sound/usb/Makefile
diff options
context:
space:
mode:
authorShuah Khan2016-03-02 17:50:31 +0100
committerMauro Carvalho Chehab2016-03-03 19:01:13 +0100
commitaebb2b89bff0fdeb4e7ddd73dcbccde1a0f27554 (patch)
treeaad7f1862beb01250032ac02d46d1dac11ccaa18 /sound/usb/Makefile
parent[media] dw2102: add support for TeVii S662 (diff)
downloadkernel-qcow2-linux-aebb2b89bff0fdeb4e7ddd73dcbccde1a0f27554.tar.gz
kernel-qcow2-linux-aebb2b89bff0fdeb4e7ddd73dcbccde1a0f27554.tar.xz
kernel-qcow2-linux-aebb2b89bff0fdeb4e7ddd73dcbccde1a0f27554.zip
[media] sound/usb: Use Media Controller API to share media resources
Change ALSA driver to use Media Controller API to share media resources with DVB and V4L2 drivers on a AU0828 media device. Media Controller specific initialization is done after sound card is registered. ALSA creates Media interface and entity function graph nodes for Control, Mixer, PCM Playback, and PCM Capture devices. snd_usb_hw_params() will call Media Controller enable source handler interface to request the media resource. If resource request is granted, it will release it from snd_usb_hw_free(). If resource is busy, -EBUSY is returned. Media specific cleanup is done in usb_audio_disconnect(). Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> Acked-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'sound/usb/Makefile')
-rw-r--r--sound/usb/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 2d2d122b069f..8dca3c407f5a 100644
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -15,6 +15,8 @@ snd-usb-audio-objs := card.o \
quirks.o \
stream.o
+snd-usb-audio-$(CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER) += media.o
+
snd-usbmidi-lib-objs := midi.o
# Toplevel Module Dependency