diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-12 11:45:01 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-12 11:45:01 -0400 |
commit | 3b7523fc828e41b2988feb400704e01b67859d78 (patch) | |
tree | b050535f3d972f2d6584d2ab1d5a8094779d49b9 /sound | |
parent | 5d75bc557859805f00eeddb09d7cc8ffc7e5334e (diff) |
ALSA: hda - Add comments for the previous fix for conexant codecs
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_conexant.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 6cb184e9c2f1..bc016fade192 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
@@ -1196,6 +1196,10 @@ static int cxt5047_hp_master_sw_put(struct snd_kcontrol *kcontrol, | |||
1196 | * the headphone jack | 1196 | * the headphone jack |
1197 | */ | 1197 | */ |
1198 | bits = (!spec->hp_present && spec->cur_eapd) ? 0 : HDA_AMP_MUTE; | 1198 | bits = (!spec->hp_present && spec->cur_eapd) ? 0 : HDA_AMP_MUTE; |
1199 | /* NOTE: Conexat codec needs the index for *OUTPUT* amp of | ||
1200 | * pin widgets unlike other codecs. In this case, we need to | ||
1201 | * set index 0x01 for the volume from the mixer amp 0x19. | ||
1202 | */ | ||
1199 | snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0x01, | 1203 | snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0x01, |
1200 | HDA_AMP_MUTE, bits); | 1204 | HDA_AMP_MUTE, bits); |
1201 | bits = spec->cur_eapd ? 0 : HDA_AMP_MUTE; | 1205 | bits = spec->cur_eapd ? 0 : HDA_AMP_MUTE; |
@@ -1214,6 +1218,7 @@ static void cxt5047_hp_automute(struct hda_codec *codec) | |||
1214 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; | 1218 | AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; |
1215 | 1219 | ||
1216 | bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0; | 1220 | bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0; |
1221 | /* See the note in cxt5047_hp_master_sw_put */ | ||
1217 | snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0x01, | 1222 | snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0x01, |
1218 | HDA_AMP_MUTE, bits); | 1223 | HDA_AMP_MUTE, bits); |
1219 | } | 1224 | } |
@@ -1276,6 +1281,7 @@ static struct snd_kcontrol_new cxt5047_base_mixers[] = { | |||
1276 | }; | 1281 | }; |
1277 | 1282 | ||
1278 | static struct snd_kcontrol_new cxt5047_hp_spk_mixers[] = { | 1283 | static struct snd_kcontrol_new cxt5047_hp_spk_mixers[] = { |
1284 | /* See the note in cxt5047_hp_master_sw_put */ | ||
1279 | HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x01, HDA_OUTPUT), | 1285 | HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x01, HDA_OUTPUT), |
1280 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x13, 0x00, HDA_OUTPUT), | 1286 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x13, 0x00, HDA_OUTPUT), |
1281 | {} | 1287 | {} |