diff options
author | Maciej S. Szmigiero <mail@maciej.szmigiero.name> | 2015-07-07 15:53:15 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-07-08 03:40:36 -0400 |
commit | 52051942943f4ef95a8e953aeed84360291380d8 (patch) | |
tree | 443d6b53d5c68f8c135a3844804fb83c724cf983 /sound/pci/emu10k1 | |
parent | 274b2000a09220bb2b930af432a2262db7063bd9 (diff) |
ALSA: emu10k1: enable TAD mic out on Audigy
Enable TAD output on Audigy naming it "Phone Output",
to be consistent with TAD input which is called "Phone".
According to Creative doc
( http://support.creative.com/kb/ShowArticle.aspx?sid=3026 )
this should output just mic signal.
Signed-off-by: Maciej Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1')
-rw-r--r-- | sound/pci/emu10k1/emumixer.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index f1cb7b37c8ec..567b5cb24753 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c | |||
@@ -1819,8 +1819,6 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, | |||
1819 | * the Philips ADC for 24bit capture */ | 1819 | * the Philips ADC for 24bit capture */ |
1820 | "PCM Playback Switch", | 1820 | "PCM Playback Switch", |
1821 | "PCM Playback Volume", | 1821 | "PCM Playback Volume", |
1822 | "Master Mono Playback Switch", | ||
1823 | "Master Mono Playback Volume", | ||
1824 | "Master Playback Switch", | 1822 | "Master Playback Switch", |
1825 | "Master Playback Volume", | 1823 | "Master Playback Volume", |
1826 | "PCM Out Path & Mute", | 1824 | "PCM Out Path & Mute", |
@@ -1848,6 +1846,8 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, | |||
1848 | /* "Wave Capture Volume", "PCM Capture Volume", */ | 1846 | /* "Wave Capture Volume", "PCM Capture Volume", */ |
1849 | "Wave Master Playback Volume", "Master Playback Volume", | 1847 | "Wave Master Playback Volume", "Master Playback Volume", |
1850 | "AMic Playback Volume", "Mic Playback Volume", | 1848 | "AMic Playback Volume", "Mic Playback Volume", |
1849 | "Master Mono Playback Switch", "Phone Output Playback Switch", | ||
1850 | "Master Mono Playback Volume", "Phone Output Playback Volume", | ||
1851 | NULL | 1851 | NULL |
1852 | }; | 1852 | }; |
1853 | static char *audigy_rename_ctls_i2c_adc[] = { | 1853 | static char *audigy_rename_ctls_i2c_adc[] = { |
@@ -1873,8 +1873,6 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, | |||
1873 | * the Philips ADC for 24bit capture */ | 1873 | * the Philips ADC for 24bit capture */ |
1874 | "PCM Playback Switch", | 1874 | "PCM Playback Switch", |
1875 | "PCM Playback Volume", | 1875 | "PCM Playback Volume", |
1876 | "Master Mono Playback Switch", | ||
1877 | "Master Mono Playback Volume", | ||
1878 | "Capture Source", | 1876 | "Capture Source", |
1879 | "Capture Switch", | 1877 | "Capture Switch", |
1880 | "Capture Volume", | 1878 | "Capture Volume", |
@@ -1906,7 +1904,8 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, | |||
1906 | "Aux Playback Volume", "Aux Capture Volume", | 1904 | "Aux Playback Volume", "Aux Capture Volume", |
1907 | "Video Playback Switch", "Video Capture Switch", | 1905 | "Video Playback Switch", "Video Capture Switch", |
1908 | "Video Playback Volume", "Video Capture Volume", | 1906 | "Video Playback Volume", "Video Capture Volume", |
1909 | 1907 | "Master Mono Playback Switch", "Phone Output Playback Switch", | |
1908 | "Master Mono Playback Volume", "Phone Output Playback Volume", | ||
1910 | NULL | 1909 | NULL |
1911 | }; | 1910 | }; |
1912 | 1911 | ||
@@ -1941,6 +1940,9 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, | |||
1941 | snd_ac97_write_cache(emu->ac97, AC97_MASTER, 0x0000); | 1940 | snd_ac97_write_cache(emu->ac97, AC97_MASTER, 0x0000); |
1942 | /* set capture source to mic */ | 1941 | /* set capture source to mic */ |
1943 | snd_ac97_write_cache(emu->ac97, AC97_REC_SEL, 0x0000); | 1942 | snd_ac97_write_cache(emu->ac97, AC97_REC_SEL, 0x0000); |
1943 | /* set mono output (TAD) to mic */ | ||
1944 | snd_ac97_update_bits(emu->ac97, AC97_GENERAL_PURPOSE, | ||
1945 | 0x0200, 0x0200); | ||
1944 | if (emu->card_capabilities->adc_1361t) | 1946 | if (emu->card_capabilities->adc_1361t) |
1945 | c = audigy_remove_ctls_1361t_adc; | 1947 | c = audigy_remove_ctls_1361t_adc; |
1946 | else | 1948 | else |