Commit 7debbe51 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela

[ALSA] hda-codec - Fix PM on ALC885 Intel Macs

Fix power-management on ALC885 Intel Macs.
It fixes the problem with power-saving mode, too.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent d273809e
...@@ -5276,6 +5276,20 @@ static void alc882_gpio_mute(struct hda_codec *codec, int pin, int muted) ...@@ -5276,6 +5276,20 @@ static void alc882_gpio_mute(struct hda_codec *codec, int pin, int muted)
AC_VERB_SET_GPIO_DATA, gpiostate); AC_VERB_SET_GPIO_DATA, gpiostate);
} }
/* set up GPIO at initialization */
static void alc885_macpro_init_hook(struct hda_codec *codec)
{
alc882_gpio_mute(codec, 0, 0);
alc882_gpio_mute(codec, 1, 0);
}
/* set up GPIO and update auto-muting at initialization */
static void alc885_imac24_init_hook(struct hda_codec *codec)
{
alc885_macpro_init_hook(codec);
alc885_imac24_automute(codec);
}
/* /*
* generic initialization of ADC, input mixers and output mixers * generic initialization of ADC, input mixers and output mixers
*/ */
...@@ -5480,6 +5494,7 @@ static struct alc_config_preset alc882_presets[] = { ...@@ -5480,6 +5494,7 @@ static struct alc_config_preset alc882_presets[] = {
.num_channel_mode = ARRAY_SIZE(alc882_ch_modes), .num_channel_mode = ARRAY_SIZE(alc882_ch_modes),
.channel_mode = alc882_ch_modes, .channel_mode = alc882_ch_modes,
.input_mux = &alc882_capture_source, .input_mux = &alc882_capture_source,
.init_hook = alc885_macpro_init_hook,
}, },
[ALC885_IMAC24] = { [ALC885_IMAC24] = {
.mixers = { alc885_imac24_mixer }, .mixers = { alc885_imac24_mixer },
...@@ -5492,7 +5507,7 @@ static struct alc_config_preset alc882_presets[] = { ...@@ -5492,7 +5507,7 @@ static struct alc_config_preset alc882_presets[] = {
.channel_mode = alc882_ch_modes, .channel_mode = alc882_ch_modes,
.input_mux = &alc882_capture_source, .input_mux = &alc882_capture_source,
.unsol_event = alc885_imac24_unsol_event, .unsol_event = alc885_imac24_unsol_event,
.init_hook = alc885_imac24_automute, .init_hook = alc885_imac24_init_hook,
}, },
[ALC882_TARGA] = { [ALC882_TARGA] = {
.mixers = { alc882_targa_mixer, alc882_chmode_mixer, .mixers = { alc882_targa_mixer, alc882_chmode_mixer,
...@@ -5695,11 +5710,6 @@ static int patch_alc882(struct hda_codec *codec) ...@@ -5695,11 +5710,6 @@ static int patch_alc882(struct hda_codec *codec)
if (board_config != ALC882_AUTO) if (board_config != ALC882_AUTO)
setup_preset(spec, &alc882_presets[board_config]); setup_preset(spec, &alc882_presets[board_config]);
if (board_config == ALC885_MACPRO || board_config == ALC885_IMAC24) {
alc882_gpio_mute(codec, 0, 0);
alc882_gpio_mute(codec, 1, 0);
}
spec->stream_name_analog = "ALC882 Analog"; spec->stream_name_analog = "ALC882 Analog";
spec->stream_analog_playback = &alc882_pcm_analog_playback; spec->stream_analog_playback = &alc882_pcm_analog_playback;
spec->stream_analog_capture = &alc882_pcm_analog_capture; spec->stream_analog_capture = &alc882_pcm_analog_capture;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment