mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 10:01:43 +00:00
ALSA: hda: add 2-channel mode to Intel ALC889/ALC889A models
This 2-channel mode is useful in that it will broadcast a 2-channel audio stream to all front/side/... ports. Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
71443b0b74
commit
dd7714c922
@ -6680,19 +6680,28 @@ static struct hda_channel_mode alc883_3ST_6ch_intel_modes[3] = {
|
||||
{ 6, alc883_3ST_ch6_intel_init },
|
||||
};
|
||||
|
||||
/*
|
||||
* 2ch mode
|
||||
*/
|
||||
static struct hda_verb alc889_ch2_intel_init[] = {
|
||||
{ 0x14, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
{ 0x19, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
{ 0x16, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
{ 0x17, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
|
||||
{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/*
|
||||
* 6ch mode
|
||||
*/
|
||||
static struct hda_verb alc889_ch6_intel_init[] = {
|
||||
{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
|
||||
{ 0x14, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
{ 0x19, AC_VERB_SET_CONNECT_SEL, 0x01 },
|
||||
{ 0x16, AC_VERB_SET_CONNECT_SEL, 0x02 },
|
||||
{ 0x17, AC_VERB_SET_CONNECT_SEL, 0x03 },
|
||||
{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
|
||||
{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
|
||||
{ } /* end */
|
||||
};
|
||||
@ -6701,21 +6710,18 @@ static struct hda_verb alc889_ch6_intel_init[] = {
|
||||
* 8ch mode
|
||||
*/
|
||||
static struct hda_verb alc889_ch8_intel_init[] = {
|
||||
{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
{ 0x14, AC_VERB_SET_CONNECT_SEL, 0x00 },
|
||||
{ 0x19, AC_VERB_SET_CONNECT_SEL, 0x01 },
|
||||
{ 0x16, AC_VERB_SET_CONNECT_SEL, 0x02 },
|
||||
{ 0x17, AC_VERB_SET_CONNECT_SEL, 0x03 },
|
||||
{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x03 },
|
||||
{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x03 },
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
static struct hda_channel_mode alc889_8ch_intel_modes[2] = {
|
||||
static struct hda_channel_mode alc889_8ch_intel_modes[3] = {
|
||||
{ 2, alc889_ch2_intel_init },
|
||||
{ 6, alc889_ch6_intel_init },
|
||||
{ 8, alc889_ch8_intel_init },
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user