ALSA: hda - Improved MacBook 3,1 support
This patch adds support for MacBook 3,1 sound by adding a model new "mb31" with the appropriate init verbs, mixers and channel modes to the ALC883 configuration. patch_alc882() and patch_alc883() are modified to handle the MacBook 3,1 sound-chip (Realtek ALC889A) correctly. Signed-off-by: Torben Schulz <public@letorbi.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Torben Schulz
Takashi Iwai
Родитель
313f6e2d40
Коммит
eb4c41d30b
|
|
@ -157,6 +157,7 @@ ALC883/888
|
|||
fujitsu-xa3530 Fujitsu AMILO XA3530
|
||||
3stack-6ch-intel Intel DG33* boards
|
||||
asus-p5q ASUS P5Q-EM boards
|
||||
mb31 MacBook 3,1
|
||||
auto auto-config reading BIOS (default)
|
||||
|
||||
ALC861/660
|
||||
|
|
|
|||
|
|
@ -240,6 +240,7 @@ enum {
|
|||
ALC883_3ST_6ch_INTEL,
|
||||
ALC888_ASUS_M90V,
|
||||
ALC888_ASUS_EEE1601,
|
||||
ALC889A_MB31,
|
||||
ALC1200_ASUS_P5Q,
|
||||
ALC883_AUTO,
|
||||
ALC883_MODEL_LAST,
|
||||
|
|
@ -7291,7 +7292,7 @@ static int patch_alc882(struct hda_codec *codec)
|
|||
case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */
|
||||
case 0x106b00a4: /* MacbookPro4,1 */
|
||||
case 0x106b2c00: /* Macbook Pro rev3 */
|
||||
case 0x106b3600: /* Macbook 3.1 */
|
||||
/* Macbook 3.1 (0x106b3600) is handled by patch_alc883() */
|
||||
case 0x106b3800: /* MacbookPro4,1 - latter revision */
|
||||
board_config = ALC885_MBP3;
|
||||
break;
|
||||
|
|
@ -7493,6 +7494,17 @@ static struct hda_input_mux alc883_asus_eee1601_capture_source = {
|
|||
},
|
||||
};
|
||||
|
||||
static struct hda_input_mux alc889A_mb31_capture_source = {
|
||||
.num_items = 2,
|
||||
.items = {
|
||||
{ "Mic", 0x0 },
|
||||
/* Front Mic (0x01) unused */
|
||||
{ "Line", 0x2 },
|
||||
/* Line 2 (0x03) unused */
|
||||
/* CD (0x04) unsused? */
|
||||
},
|
||||
};
|
||||
|
||||
/*
|
||||
* 2ch mode
|
||||
*/
|
||||
|
|
@ -7611,6 +7623,49 @@ static struct hda_channel_mode alc883_sixstack_modes[2] = {
|
|||
{ 8, alc883_sixstack_ch8_init },
|
||||
};
|
||||
|
||||
/* 2ch mode (Speaker:front, Subwoofer:CLFE, Line:input, Headphones:front) */
|
||||
static struct hda_verb alc889A_mb31_ch2_init[] = {
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP as front */
|
||||
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Subwoofer on */
|
||||
{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Line as input */
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Line off */
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/* 4ch mode (Speaker:front, Subwoofer:CLFE, Line:CLFE, Headphones:front) */
|
||||
static struct hda_verb alc889A_mb31_ch4_init[] = {
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP as front */
|
||||
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Subwoofer on */
|
||||
{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Line as output */
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Line on */
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/* 5ch mode (Speaker:front, Subwoofer:CLFE, Line:input, Headphones:rear) */
|
||||
static struct hda_verb alc889A_mb31_ch5_init[] = {
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, /* HP as rear */
|
||||
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Subwoofer on */
|
||||
{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Line as input */
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Line off */
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/* 6ch mode (Speaker:front, Subwoofer:off, Line:CLFE, Headphones:Rear) */
|
||||
static struct hda_verb alc889A_mb31_ch6_init[] = {
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, /* HP as front */
|
||||
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Subwoofer off */
|
||||
{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* Line as output */
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Line on */
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
static struct hda_channel_mode alc889A_mb31_6ch_modes[4] = {
|
||||
{ 2, alc889A_mb31_ch2_init },
|
||||
{ 4, alc889A_mb31_ch4_init },
|
||||
{ 5, alc889A_mb31_ch5_init },
|
||||
{ 6, alc889A_mb31_ch6_init },
|
||||
};
|
||||
|
||||
static struct hda_verb alc883_medion_eapd_verbs[] = {
|
||||
/* eanable EAPD on medion laptop */
|
||||
{0x20, AC_VERB_SET_COEF_INDEX, 0x07},
|
||||
|
|
@ -7889,6 +7944,32 @@ static struct snd_kcontrol_new alc888_lenovo_sky_mixer[] = {
|
|||
{ } /* end */
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new alc889A_mb31_mixer[] = {
|
||||
/* Output mixers */
|
||||
HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
|
||||
HDA_BIND_MUTE("Front Playback Switch", 0x0c, 0x02, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x00, HDA_OUTPUT),
|
||||
HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 0x02, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x00,
|
||||
HDA_OUTPUT),
|
||||
HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 0x02, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x00, HDA_OUTPUT),
|
||||
HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 0x02, HDA_INPUT),
|
||||
/* Output switches */
|
||||
HDA_CODEC_MUTE("Enable Speaker", 0x14, 0x00, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE("Enable Headphones", 0x15, 0x00, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE_MONO("Enable LFE", 0x16, 2, 0x00, HDA_OUTPUT),
|
||||
/* Boost mixers */
|
||||
HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x00, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Line Boost", 0x1a, 0x00, HDA_INPUT),
|
||||
/* Input mixers */
|
||||
HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x00, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x00, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
static struct hda_bind_ctls alc883_bind_cap_vol = {
|
||||
.ops = &snd_hda_bind_vol,
|
||||
.values = {
|
||||
|
|
@ -8561,6 +8642,42 @@ static void alc883_eee1601_inithook(struct hda_codec *codec)
|
|||
alc_automute_pin(codec);
|
||||
}
|
||||
|
||||
static struct hda_verb alc889A_mb31_verbs[] = {
|
||||
/* Init rear pin (used as headphone output) */
|
||||
{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc4}, /* Apple Headphones */
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Connect to front */
|
||||
{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
|
||||
/* Init line pin (used as output in 4ch and 6ch mode) */
|
||||
{0x1a, AC_VERB_SET_CONNECT_SEL, 0x02}, /* Connect to CLFE */
|
||||
/* Init line 2 pin (used as headphone out by default) */
|
||||
{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Use as input */
|
||||
{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Mute output */
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/* Mute speakers according to the headphone jack state */
|
||||
static void alc889A_mb31_automute(struct hda_codec *codec)
|
||||
{
|
||||
unsigned int present;
|
||||
|
||||
/* Mute only in 2ch or 4ch mode */
|
||||
if (snd_hda_codec_read(codec, 0x15, 0, AC_VERB_GET_CONNECT_SEL, 0)
|
||||
== 0x00) {
|
||||
present = snd_hda_codec_read(codec, 0x15, 0,
|
||||
AC_VERB_GET_PIN_SENSE, 0) & AC_PINSENSE_PRESENCE;
|
||||
snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
|
||||
HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
|
||||
snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
|
||||
HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
|
||||
}
|
||||
}
|
||||
|
||||
static void alc889A_mb31_unsol_event(struct hda_codec *codec, unsigned int res)
|
||||
{
|
||||
if ((res >> 26) == ALC880_HP_EVENT)
|
||||
alc889A_mb31_automute(codec);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SND_HDA_POWER_SAVE
|
||||
#define alc883_loopbacks alc880_loopbacks
|
||||
#endif
|
||||
|
|
@ -8601,6 +8718,7 @@ static const char *alc883_models[ALC883_MODEL_LAST] = {
|
|||
[ALC888_FUJITSU_XA3530] = "fujitsu-xa3530",
|
||||
[ALC883_3ST_6ch_INTEL] = "3stack-6ch-intel",
|
||||
[ALC1200_ASUS_P5Q] = "asus-p5q",
|
||||
[ALC889A_MB31] = "mb31",
|
||||
[ALC883_AUTO] = "auto",
|
||||
};
|
||||
|
||||
|
|
@ -9052,6 +9170,21 @@ static struct alc_config_preset alc883_presets[] = {
|
|||
.channel_mode = alc883_sixstack_modes,
|
||||
.input_mux = &alc883_capture_source,
|
||||
},
|
||||
[ALC889A_MB31] = {
|
||||
.mixers = { alc889A_mb31_mixer, alc883_chmode_mixer},
|
||||
.init_verbs = { alc883_init_verbs, alc889A_mb31_verbs,
|
||||
alc880_gpio1_init_verbs },
|
||||
.adc_nids = alc883_adc_nids,
|
||||
.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
|
||||
.dac_nids = alc883_dac_nids,
|
||||
.num_dacs = ARRAY_SIZE(alc883_dac_nids),
|
||||
.channel_mode = alc889A_mb31_6ch_modes,
|
||||
.num_channel_mode = ARRAY_SIZE(alc889A_mb31_6ch_modes),
|
||||
.input_mux = &alc889A_mb31_capture_source,
|
||||
.dig_out_nid = ALC883_DIGOUT_NID,
|
||||
.unsol_event = alc889A_mb31_unsol_event,
|
||||
.init_hook = alc889A_mb31_automute,
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -9197,10 +9330,18 @@ static int patch_alc883(struct hda_codec *codec)
|
|||
board_config = snd_hda_check_board_config(codec, ALC883_MODEL_LAST,
|
||||
alc883_models,
|
||||
alc883_cfg_tbl);
|
||||
if (board_config < 0) {
|
||||
printk(KERN_INFO "hda_codec: Unknown model for %s, "
|
||||
"trying auto-probe from BIOS...\n", codec->chip_name);
|
||||
board_config = ALC883_AUTO;
|
||||
if (board_config < 0 || board_config >= ALC883_MODEL_LAST) {
|
||||
/* Pick up systems that don't supply PCI SSID */
|
||||
switch (codec->subsystem_id) {
|
||||
case 0x106b3600: /* Macbook 3.1 */
|
||||
board_config = ALC889A_MB31;
|
||||
break;
|
||||
default:
|
||||
printk(KERN_INFO
|
||||
"hda_codec: Unknown model for %s, trying "
|
||||
"auto-probe from BIOS...\n", codec->chip_name);
|
||||
board_config = ALC883_AUTO;
|
||||
}
|
||||
}
|
||||
|
||||
if (board_config == ALC883_AUTO) {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче