diff options
author | Jie Yang <yang.jie@intel.com> | 2015-04-27 21:20:56 +0800 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-04-27 21:37:40 +0200 |
commit | 9058cbe1eed29381f84dec9f96980f5a4ea1025f (patch) | |
tree | a2b6d9a24d69014b3dbec47acd1a9f3369b4ce3b /sound/core/Makefile | |
parent | b787f68c36d49bb1d9236f403813641efa74a031 (diff) | |
download | linux-stable-9058cbe1eed29381f84dec9f96980f5a4ea1025f.tar.gz linux-stable-9058cbe1eed29381f84dec9f96980f5a4ea1025f.tar.bz2 linux-stable-9058cbe1eed29381f84dec9f96980f5a4ea1025f.zip |
ALSA: jack: implement kctl creating for jack devices
Currently the ALSA jack core registers only input devices for each jack
registered. These jack input devices are not readable by userspace devices
that run as non root. This patch series will implement kctls inside the
core jack part, including kctls creating, status changing report, for both
HD-Audio and ASoC jack. This allows non root userspace to read jack status
and act on it.
This patch adds a new API called snd_jack_add_new_kctl(), which will create
a kcontrol, add it to the card, and also attach it to the jack kctl list.
This patch also initialises the jack kctl list after jack is newed, and
reports kctl status when jack insertion/removal events occur.
snd_jack_new() is updated in the following patches to also support creating
phantom jacks and jack kcontrols. We then remove these duplicated features
from HDA jack and have jack kctls handled by core throughout HDA and ASoC.
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Modified-by: Jie Yang <yang.jie@intel.com>
Signed-off-by: Jie Yang <yang.jie@intel.com>
Reveiwed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/Makefile')
-rw-r--r-- | sound/core/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile index 4daf2f58261c..e041dc25f2c8 100644 --- a/sound/core/Makefile +++ b/sound/core/Makefile @@ -7,8 +7,7 @@ snd-y := sound.o init.o memory.o info.o control.o misc.o device.o snd-$(CONFIG_ISA_DMA_API) += isadma.o snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o snd-$(CONFIG_SND_VMASTER) += vmaster.o -snd-$(CONFIG_SND_KCTL_JACK) += ctljack.o -snd-$(CONFIG_SND_JACK) += jack.o +snd-$(CONFIG_SND_JACK) += ctljack.o jack.o snd-pcm-y := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ pcm_memory.o memalloc.o |