summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorRaymond Yau <superquad.vortex2@gmail.com>2013-02-14 20:37:22 +0800
committerTakashi Iwai <tiwai@suse.de>2013-02-14 15:01:52 +0100
commitf3c90242a3b9e32f510229c4c1313df6ca7f1667 (patch)
tree3b125d2303e35d6e43edd543d808241d7b1e86b3 /sound/pci
parent9727b490e543de956b8ba356e2d5499097d0b7a2 (diff)
downloadlinux-3.10-f3c90242a3b9e32f510229c4c1313df6ca7f1667.tar.gz
linux-3.10-f3c90242a3b9e32f510229c4c1313df6ca7f1667.tar.bz2
linux-3.10-f3c90242a3b9e32f510229c4c1313df6ca7f1667.zip
ALSA: au88x0 - Define channel map for au88x0
Define channel map for playback, capture devices of au88x0 Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/au88x0/au88x0_pcm.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c
index a4184bb2776..b46dc9b24db 100644
--- a/sound/pci/au88x0/au88x0_pcm.c
+++ b/sound/pci/au88x0/au88x0_pcm.c
@@ -650,6 +650,29 @@ static int snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)
snd_dma_pci_data(chip->pci_dev),
0x10000, 0x10000);
+ switch (VORTEX_PCM_TYPE(pcm)) {
+ case VORTEX_PCM_ADB:
+ err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,
+ snd_pcm_std_chmaps,
+ VORTEX_IS_QUAD(chip) ? 4 : 2,
+ 0, NULL);
+ if (err < 0)
+ return err;
+ err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_CAPTURE,
+ snd_pcm_std_chmaps, 2, 0, NULL);
+ if (err < 0)
+ return err;
+ break;
+#ifdef CHIP_AU8830
+ case VORTEX_PCM_A3D:
+ err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,
+ snd_pcm_std_chmaps, 1, 0, NULL);
+ if (err < 0)
+ return err;
+ break;
+#endif
+ };
+
if (VORTEX_PCM_TYPE(pcm) == VORTEX_PCM_SPDIF) {
for (i = 0; i < ARRAY_SIZE(snd_vortex_mixer_spdif); i++) {
kctl = snd_ctl_new1(&snd_vortex_mixer_spdif[i], chip);