aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/xonar_pcm179x.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-12-02 05:39:34 -0500
committerTakashi Iwai <tiwai@suse.de>2010-12-06 08:48:08 -0500
commite96f38f732d24515792296b3738842934c985539 (patch)
tree627b4c03b4f1b12e903a265f97ba98767af0c0aa /sound/pci/oxygen/xonar_pcm179x.c
parent2509ec623d44320419d44d4060dbedf91b8d192d (diff)
ALSA: virtuoso: fix front panel routing for D1/DX/ST(X)
The "Front Panel" switch on the Xonar D1/DX actually switches only the output direction, so mark it appropriately. The front panel microphone is controlled by the FMIC2MIC bit of the CM9780. It was unconditionally enabled on the D1/DX and never set on the ST(X); add a control for it. Selecting the front panel microphone as source does not actually disable the microphone jack, but this is bug-compatible with the Windows driver, and users rely on it. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/xonar_pcm179x.c')
-rw-r--r--sound/pci/oxygen/xonar_pcm179x.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c
index 3850834f989c..5193d73a916d 100644
--- a/sound/pci/oxygen/xonar_pcm179x.c
+++ b/sound/pci/oxygen/xonar_pcm179x.c
@@ -1079,7 +1079,8 @@ static const struct oxygen_model model_xonar_st = {
1079 .model_data_size = sizeof(struct xonar_pcm179x), 1079 .model_data_size = sizeof(struct xonar_pcm179x),
1080 .device_config = PLAYBACK_0_TO_I2S | 1080 .device_config = PLAYBACK_0_TO_I2S |
1081 PLAYBACK_1_TO_SPDIF | 1081 PLAYBACK_1_TO_SPDIF |
1082 CAPTURE_0_FROM_I2S_2, 1082 CAPTURE_0_FROM_I2S_2 |
1083 AC97_FMIC_SWITCH,
1083 .dac_channels = 2, 1084 .dac_channels = 2,
1084 .dac_volume_min = 255 - 2*60, 1085 .dac_volume_min = 255 - 2*60,
1085 .dac_volume_max = 255, 1086 .dac_volume_max = 255,