summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRodolfo Giometti <giometti@linux.it>2006-06-19 15:04:54 +0200
committerJaroslav Kysela <perex@suse.cz>2006-06-22 21:34:29 +0200
commit1459c7849ea24fd71e4d2e678caa1cc3fef754e2 (patch)
tree9faaca96c655768056850706a82ac5bb4ffc1f80 /include
parent396f739e21f3b7ea9ece08bf0abf0a45693c3047 (diff)
downloadop-kernel-dev-1459c7849ea24fd71e4d2e678caa1cc3fef754e2.zip
op-kernel-dev-1459c7849ea24fd71e4d2e678caa1cc3fef754e2.tar.gz
[ALSA] Disable AC97 AUX and VIDEO controls for WM9705 touchscreen
This patch by Rodolfo Giometti disables the AC97 AUX and VIDEO controls on the WM9705 when the touchscreen is selected as the AUX and VIDEO lines are shared with the touch controller. Changes:- o Added AC97_HAS_NO_AUX flag o Test for AC97_HAS_NO_AUX flag in snd_ac97_mixer_build() o Sets AC97_HAS_NO_VIDEO and AC97_HAS_NO_AUX in patch_wolfson05() when WM9705 touch driver is selected. Signed-off-by: Rodolfo Giometti <giometti@linux.it> Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
-rw-r--r--include/sound/ac97_codec.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index b45a737..446afc3 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -378,6 +378,7 @@
#define AC97_HAS_NO_MIC (1<<15) /* no MIC volume */
#define AC97_HAS_NO_TONE (1<<16) /* no Tone volume */
#define AC97_HAS_NO_STD_PCM (1<<17) /* no standard AC97 PCM volume and mute */
+#define AC97_HAS_NO_AUX (1<<18) /* no standard AC97 AUX volume and mute */
/* rates indexes */
#define AC97_RATES_FRONT_DAC 0
OpenPOWER on IntegriCloud