diff options
author | Jochen Voss <voss@seehuhn.de> | 2006-10-04 12:04:10 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 03:00:03 -0500 |
commit | a58e7cb16dfae8a3c1c98a7ab7ca02a9e9b38921 (patch) | |
tree | a81382ccf27b01f0c28b1e9812fe27cb8a84fbd0 /sound/pci/ice1712/revo.c | |
parent | e4f8e656d8c152c08cd44d0e3c21f009fab09952 (diff) |
[ALSA] Enable capture from line-in and CD on Revolution 5.1
Enable capture from line-in and CD on the Revolution 5.1 card.
This patch adds support for switching between the 5 input channels of
the AK5365 ADC and modifies the Revolution 5.1 driver to make use of
this facility. Previously the capture channel was fixed to channel 0
(microphone on the Revolution 5.1 card).
Signed-off-by: Jochen Voss <voss@seehuhn.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/ice1712/revo.c')
-rw-r--r-- | sound/pci/ice1712/revo.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c index bf98ea34feb0..d556de59b9ae 100644 --- a/sound/pci/ice1712/revo.c +++ b/sound/pci/ice1712/revo.c | |||
@@ -107,11 +107,19 @@ static struct snd_akm4xxx_dac_channel revo51_dac[] = { | |||
107 | AK_DAC("PCM Rear Playback Volume", 2), | 107 | AK_DAC("PCM Rear Playback Volume", 2), |
108 | }; | 108 | }; |
109 | 109 | ||
110 | static const char *revo51_adc_input_names[] = { | ||
111 | "Mic", | ||
112 | "Line", | ||
113 | "CD", | ||
114 | NULL | ||
115 | }; | ||
116 | |||
110 | static struct snd_akm4xxx_adc_channel revo51_adc[] = { | 117 | static struct snd_akm4xxx_adc_channel revo51_adc[] = { |
111 | { | 118 | { |
112 | .name = "PCM Capture Volume", | 119 | .name = "PCM Capture Volume", |
113 | .switch_name = "PCM Capture Switch", | 120 | .switch_name = "PCM Capture Switch", |
114 | .num_channels = 2 | 121 | .num_channels = 2, |
122 | .input_names = revo51_adc_input_names | ||
115 | }, | 123 | }, |
116 | }; | 124 | }; |
117 | 125 | ||