diff options
| author |   Clemens Ladisch <clemens@ladisch.de> | 2010-12-02 11:39:34 +0100 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2010-12-06 14:48:08 +0100 |
| commit | e96f38f732d24515792296b3738842934c985539 (patch) | |
| tree | 627b4c03b4f1b12e903a265f97ba98767af0c0aa /sound/pci/oxygen/xonar_pcm179x.c | |
| parent | ALSA: virtuoso: add HDMI enable switch for HDAV1.3 (diff) | |
| download | linux-dev-e96f38f732d24515792296b3738842934c985539.tar.xz linux-dev-e96f38f732d24515792296b3738842934c985539.zip | |
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 '')
| -rw-r--r-- | sound/pci/oxygen/xonar_pcm179x.c | 3 |
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 = { .model_data_size = sizeof(struct xonar_pcm179x), .device_config = PLAYBACK_0_TO_I2S | PLAYBACK_1_TO_SPDIF | - CAPTURE_0_FROM_I2S_2, + CAPTURE_0_FROM_I2S_2 | + AC97_FMIC_SWITCH, .dac_channels = 2, .dac_volume_min = 255 - 2*60, .dac_volume_max = 255, |