|
@@ -112,6 +112,7 @@ enum {
|
|
|
ALC882_6ST_DIG,
|
|
|
ALC882_ARIMA,
|
|
|
ALC882_AUTO,
|
|
|
+ ALC885_MACPRO,
|
|
|
ALC882_MODEL_LAST,
|
|
|
};
|
|
|
|
|
@@ -4507,6 +4508,100 @@ static struct hda_verb alc882_eapd_verbs[] = {
|
|
|
{ }
|
|
|
};
|
|
|
|
|
|
+/* Mac Pro test */
|
|
|
+static struct snd_kcontrol_new alc882_macpro_mixer[] = {
|
|
|
+ HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
|
|
|
+ HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
|
|
|
+ HDA_CODEC_MUTE("Headphone Playback Switch", 0x18, 0x0, HDA_OUTPUT),
|
|
|
+ HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x01, HDA_INPUT),
|
|
|
+ HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x01, HDA_INPUT),
|
|
|
+ HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x02, HDA_INPUT),
|
|
|
+ HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x02, HDA_INPUT),
|
|
|
+ { } /* end */
|
|
|
+};
|
|
|
+
|
|
|
+static struct hda_verb alc882_macpro_init_verbs[] = {
|
|
|
+ /* Front mixer: unmute input/output amp left and right (volume = 0) */
|
|
|
+ {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
|
|
|
+ {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
|
|
|
+ {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
|
|
|
+ /* Front Pin: output 0 (0x0c) */
|
|
|
+ {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
|
|
+ {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
|
|
+ {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
|
|
|
+ /* Front Mic pin: input vref at 80% */
|
|
|
+ {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
|
|
|
+ {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
|
|
+ /* Speaker: output */
|
|
|
+ {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, 0x04},
|
|
|
+ /* Headphone output (output 0 - 0x0c) */
|
|
|
+ {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
|
|
|
+ {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
|
|
+ {0x18, AC_VERB_SET_CONNECT_SEL, 0x00},
|
|
|
+
|
|
|
+ /* FIXME: use matrix-type input source selection */
|
|
|
+ /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
|
|
|
+ /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
|
|
|
+ {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
|
|
+ {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
|
|
|
+ {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
|
|
|
+ {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
|
|
|
+ /* Input mixer2 */
|
|
|
+ {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
|
|
+ {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
|
|
|
+ {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
|
|
|
+ {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
|
|
|
+ /* Input mixer3 */
|
|
|
+ {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
|
|
+ {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
|
|
|
+ {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
|
|
|
+ {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
|
|
|
+ /* ADC1: mute amp left and right */
|
|
|
+ {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
|
|
|
+ {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
|
|
|
+ /* ADC2: mute amp left and right */
|
|
|
+ {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
|
|
|
+ {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
|
|
|
+ /* ADC3: mute amp left and right */
|
|
|
+ {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
|
|
|
+ {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
|
|
|
+
|
|
|
+ { }
|
|
|
+};
|
|
|
+static void alc882_gpio_mute(struct hda_codec *codec, int pin, int muted)
|
|
|
+{
|
|
|
+ unsigned int gpiostate, gpiomask, gpiodir;
|
|
|
+
|
|
|
+ gpiostate = snd_hda_codec_read(codec, codec->afg, 0,
|
|
|
+ AC_VERB_GET_GPIO_DATA, 0);
|
|
|
+
|
|
|
+ if (!muted)
|
|
|
+ gpiostate |= (1 << pin);
|
|
|
+ else
|
|
|
+ gpiostate &= ~(1 << pin);
|
|
|
+
|
|
|
+ gpiomask = snd_hda_codec_read(codec, codec->afg, 0,
|
|
|
+ AC_VERB_GET_GPIO_MASK, 0);
|
|
|
+ gpiomask |= (1 << pin);
|
|
|
+
|
|
|
+ gpiodir = snd_hda_codec_read(codec, codec->afg, 0,
|
|
|
+ AC_VERB_GET_GPIO_DIRECTION, 0);
|
|
|
+ gpiodir |= (1 << pin);
|
|
|
+
|
|
|
+
|
|
|
+ snd_hda_codec_write(codec, codec->afg, 0,
|
|
|
+ AC_VERB_SET_GPIO_MASK, gpiomask);
|
|
|
+ snd_hda_codec_write(codec, codec->afg, 0,
|
|
|
+ AC_VERB_SET_GPIO_DIRECTION, gpiodir);
|
|
|
+
|
|
|
+ msleep(1);
|
|
|
+
|
|
|
+ snd_hda_codec_write(codec, codec->afg, 0,
|
|
|
+ AC_VERB_SET_GPIO_DATA, gpiostate);
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* generic initialization of ADC, input mixers and output mixers
|
|
|
*/
|
|
@@ -4633,6 +4728,7 @@ static const char *alc882_models[ALC882_MODEL_LAST] = {
|
|
|
[ALC882_3ST_DIG] = "3stack-dig",
|
|
|
[ALC882_6ST_DIG] = "6stack-dig",
|
|
|
[ALC882_ARIMA] = "arima",
|
|
|
+ [ALC885_MACPRO] = "macpro",
|
|
|
[ALC882_AUTO] = "auto",
|
|
|
};
|
|
|
|
|
@@ -4677,6 +4773,17 @@ static struct alc_config_preset alc882_presets[] = {
|
|
|
.channel_mode = alc882_sixstack_modes,
|
|
|
.input_mux = &alc882_capture_source,
|
|
|
},
|
|
|
+ [ALC885_MACPRO] = {
|
|
|
+ .mixers = { alc882_macpro_mixer },
|
|
|
+ .init_verbs = { alc882_macpro_init_verbs },
|
|
|
+ .num_dacs = ARRAY_SIZE(alc882_dac_nids),
|
|
|
+ .dac_nids = alc882_dac_nids,
|
|
|
+ .dig_out_nid = ALC882_DIGOUT_NID,
|
|
|
+ .dig_in_nid = ALC882_DIGIN_NID,
|
|
|
+ .num_channel_mode = ARRAY_SIZE(alc882_ch_modes),
|
|
|
+ .channel_mode = alc882_ch_modes,
|
|
|
+ .input_mux = &alc882_capture_source,
|
|
|
+ },
|
|
|
};
|
|
|
|
|
|
|
|
@@ -4804,6 +4911,11 @@ static int patch_alc882(struct hda_codec *codec)
|
|
|
if (board_config != ALC882_AUTO)
|
|
|
setup_preset(spec, &alc882_presets[board_config]);
|
|
|
|
|
|
+ if (board_config == ALC885_MACPRO) {
|
|
|
+ alc882_gpio_mute(codec, 0, 0);
|
|
|
+ alc882_gpio_mute(codec, 1, 0);
|
|
|
+ }
|
|
|
+
|
|
|
spec->stream_name_analog = "ALC882 Analog";
|
|
|
spec->stream_analog_playback = &alc882_pcm_analog_playback;
|
|
|
spec->stream_analog_capture = &alc882_pcm_analog_capture;
|