Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752140AbbGOIOW (ORCPT ); Wed, 15 Jul 2015 04:14:22 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49590 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751815AbbGOIOT (ORCPT ); Wed, 15 Jul 2015 04:14:19 -0400 Date: Wed, 15 Jul 2015 10:14:16 +0200 Message-ID: From: Takashi Iwai To: Keith Packard Cc: Jaroslav Kysela , Kailang Yang , Hui Wang , David Henningsson , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ALSA: hda/realtek: Enable HP amp and mute LED on HP Folio 9480m In-Reply-To: <86si8qw3gn.fsf@hiro.keithp.com> References: <1436892035-19589-1-git-send-email-keithp@keithp.com> <1436895871-2459-1-git-send-email-keithp@keithp.com> <86si8qw3gn.fsf@hiro.keithp.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.5 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2993 Lines: 83 On Wed, 15 Jul 2015 04:37:44 +0200, Keith Packard wrote: > > Takashi Iwai writes: > > > Thanks for the patch. But this looks suboptimal, unfortunately, since > > it keeps the amp always on, and more badly, it would block the power > > save of the widget root node. > > Thanks very much for your feedback; I wasn't sure precisely how this > code worked and tried to make a change that was as close as I could > manage to existing examples. > > > Can just using gpio_mute_led_mask=0x18 and gpio_led=0 (also drop > > AC_VERB_SET_GPIO_DATA in gpio_init[]) work instead? If GPIO4 is the > > the amp, we can associate it with the master mute control together > > with the mute LED. The only concern would be the possible click > > noise, but it doesn't happen on most machines. > > It's not quite that simple; the GPIO4 value is inverted from the mute > LED value (the amp is powered up when GPIO4 is set). Ah, right, there was already a fixup for GPIO4 low, and yours is for GPIO4 high. > What I've done is to make the amp powered only when a headphone is > plugged in, and then removed the code which was disabling power saving, > which lets everything (including the amp) get turned back off when the > device goes idle. > > Here's a second version of the patch. Thanks! The new patch looks good, but I think we don't have to use the headset code, as your case looks more like a headphone, not a combo headset that needs the special handling. If so, the change can be reduced something like below. Could you check whether this is enough? Takashi --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3430,6 +3430,37 @@ static void alc280_fixup_hp_gpio4(struct hda_codec *codec, } } +static void alc280_hp_gpio4_hp_automue(struct hda_codec *codec, + struct hda_jack_callback *jack) +{ + snd_hda_gen_hp_automute(codec, jack); + /* mute_led_polarity is set to 0, so we pass inverted value here */ + alc_update_gpio_led(codec, 0x10, !spec->gen.hp_jack_present); +} + +/* GPIO3 = mute LED, GPIO4 high = enable headphone amp */ +static void alc280_fixup_hp_gpio4_hp_amp(struct hda_codec *codec, + const struct hda_fixup *fix, + int action) +{ + struct alc_spec *spec = codec->spec; + static const struct hda_verb gpio_init[] = { + { 0x01, AC_VERB_SET_GPIO_MASK, 0x18 }, + { 0x01, AC_VERB_SET_GPIO_DIRECTION, 0x18 }, + {} + }; + + if (action == HDA_FIXUP_ACT_PRE_PROBE) { + spec->gen.vmaster_mute.hook = alc_fixup_gpio_mute_hook; + spec->gen.hp_automute_hook = alc280_hp_gpio4_hp_automue; + spec->gpio_led = 0; + spec->mute_led_polarity = 0; + spec->gpio_mute_led_mask = 0x08; + snd_hda_add_verbs(codec, gpio_init); + codec->power_filter = led_power_filter; + } +} + -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/