At Thu, 30 Oct 2014 08:26:01 +0100,
David Henningsson wrote:
>
> These HP machines needs GPIO 4 low to enable the headphone amplifier.
> In addition, we still need to control LEDs via vref and GPIO.
>
> Cc: <email address hidden>
> BugLink: https://bugs.launchpad.net/bugs/1387128
> Tested-by: TienFu Chen <email address hidden>
> Signed-off-by: David Henningsson <email address hidden>
At Thu, 30 Oct 2014 08:26:01 +0100, /bugs.launchpad .net/bugs/ 1387128
David Henningsson wrote:
>
> These HP machines needs GPIO 4 low to enable the headphone amplifier.
> In addition, we still need to control LEDs via vref and GPIO.
>
> Cc: <email address hidden>
> BugLink: https:/
> Tested-by: TienFu Chen <email address hidden>
> Signed-off-by: David Henningsson <email address hidden>
Thanks, applied both now.
Takashi
> --- hda/patch_ realtek. c | 33 +++++++ +++++++ +++++++ +++++++ +---- pci/hda/ patch_realtek. c b/sound/ pci/hda/ patch_realtek. c pci/hda/ patch_realtek. c pci/hda/ patch_realtek. c fixup_hp_ gpio_mic1_ led(struct hda_codec *codec, fixup_hp_ gpio4(struct hda_codec *codec, SET_GPIO_ MASK, 0x18 }, SET_GPIO_ DIRECTION, 0x18 }, ACT_PRE_ PROBE) { vmaster_ mute.hook = alc269_ fixup_hp_ gpio_mute_ hook; cap_sync_ hook = alc269_ fixup_hp_ cap_mic_ mute_hook; mute_led_ nid = 0x18; add_verbs( codec, gpio_init); fixup_hp_ line1_mic1_ led(struct hda_codec *codec, FIXUP_BXBT2807_ MIC, FIXUP_DELL_ WMI_MIC_ MUTE_LED, FIXUP_ASPIRE_ V5_PINS, FIXUP_HP_ GPIO4, FIXUP_HP_ GPIO4] = { fixup_hp_ gpio4, QUIRK(0x103c, 0x22cf, "HP", ALC269_ FIXUP_HP_ MUTE_LED_ MIC1), QUIRK(0x103c, 0x22dc, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x22fb, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x8004, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x8004, "HP", ALC269_ FIXUP_HP_ GPIO4), QUIRK(0x103c, 0x221b, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2221, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2255, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2256, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2257, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2258, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2258, "HP", ALC269_ FIXUP_HP_ GPIO4), QUIRK(0x103c, 0x2259, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x225a, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2260, "HP", ALC269_ FIXUP_HP_ MUTE_LED_ MIC1), QUIRK(0x103c, 0x2265, "HP", ALC269_ FIXUP_HP_ MUTE_LED_ MIC1), QUIRK(0x103c, 0x2272, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2273, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2277, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x2277, "HP", ALC269_ FIXUP_HP_ GPIO4), QUIRK(0x103c, 0x2278, "HP", ALC269_ FIXUP_HP_ GPIO_MIC1_ LED), QUIRK(0x103c, 0x227f, "HP", ALC269_ FIXUP_HP_ MUTE_LED_ MIC1), QUIRK(0x103c, 0x2282, "HP", ALC269_ FIXUP_HP_ MUTE_LED_ MIC1),
> sound/pci/
> 1 file changed, 29 insertions(+), 4 deletions(-)
>
> diff --git a/sound/
> index 9bc0301..d16d8ec 100644
> --- a/sound/
> +++ b/sound/
> @@ -3350,6 +3350,27 @@ static void alc269_
> }
> }
>
> +static void alc280_
> + const struct hda_fixup *fix, int action)
> +{
> + /* Like hp_gpio_mic1_led, but also needs GPIO4 low to enable headphone amp */
> + struct alc_spec *spec = codec->spec;
> + static const struct hda_verb gpio_init[] = {
> + { 0x01, AC_VERB_
> + { 0x01, AC_VERB_
> + {}
> + };
> +
> + if (action == HDA_FIXUP_
> + spec->gen.
> + spec->gen.
> + spec->gpio_led = 0;
> + spec->cap_
> + snd_hda_
> + codec->power_filter = led_power_filter;
> + }
> +}
> +
> static void alc269_
> const struct hda_fixup *fix, int action)
> {
> @@ -4217,6 +4238,7 @@ enum {
> ALC283_
> ALC255_
> ALC282_
> + ALC280_
> };
>
> static const struct hda_fixup alc269_fixups[] = {
> @@ -4680,7 +4702,10 @@ static const struct hda_fixup alc269_fixups[] = {
> { },
> },
> },
> -
> + [ALC280_
> + .type = HDA_FIXUP_FUNC,
> + .v.func = alc280_
> + },
> };
>
> static const struct snd_pci_quirk alc269_fixup_tbl[] = {
> @@ -4728,7 +4753,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
> SND_PCI_
> SND_PCI_
> SND_PCI_
> - SND_PCI_
> + SND_PCI_
> /* ALC290 */
> SND_PCI_
> SND_PCI_
> @@ -4742,7 +4767,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
> SND_PCI_
> SND_PCI_
> SND_PCI_
> - SND_PCI_
> + SND_PCI_
> SND_PCI_
> SND_PCI_
> SND_PCI_
> @@ -4751,7 +4776,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
> SND_PCI_
> SND_PCI_
> SND_PCI_
> - SND_PCI_
> + SND_PCI_
> SND_PCI_
> SND_PCI_
> SND_PCI_
> --
> 1.9.1
>