Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit d06ac14399a0af7e4da0c67cff30d30d7e02df46

Authored by David Henningsson
Committed by Takashi Iwai
1 parent 4909a0caab
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ALSA: hda - add quirks for mute LED on two HP machines 

These two machines have no mute LED string in BIOS.

BugLink: https://bugs.launchpad.net/bugs/1128934
Tested-by: Tammy Yang <tammy.yang@canonical.com>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 19 additions and 0 deletions Side-by-side Diff

sound/pci/hda/patch_realtek.c
Diff comments   View file @ d06ac14
... ... @@ -2726,6 +2726,18 @@
2726 2726 }
2727 2727 }
2728 2728  
  2729 +static void alc269_fixup_hp_mute_led_mic1(struct hda_codec *codec,
  2730 + const struct hda_fixup *fix, int action)
  2731 +{
  2732 + struct alc_spec *spec = codec->spec;
  2733 + if (action == HDA_FIXUP_ACT_PRE_PROBE) {
  2734 + spec->mute_led_polarity = 0;
  2735 + spec->mute_led_nid = 0x18;
  2736 + spec->gen.vmaster_mute.hook = alc269_fixup_mic_mute_hook;
  2737 + spec->gen.vmaster_mute_enum = 1;
  2738 + }
  2739 +}
  2740 +
2729 2741 static void alc269_fixup_hp_mute_led_mic2(struct hda_codec *codec,
2730 2742 const struct hda_fixup *fix, int action)
2731 2743 {
... ... @@ -2771,6 +2783,7 @@
2771 2783 ALC269VB_FIXUP_AMIC,
2772 2784 ALC269VB_FIXUP_DMIC,
2773 2785 ALC269_FIXUP_HP_MUTE_LED,
  2786 + ALC269_FIXUP_HP_MUTE_LED_MIC1,
2774 2787 ALC269_FIXUP_HP_MUTE_LED_MIC2,
2775 2788 ALC269_FIXUP_INV_DMIC,
2776 2789 ALC269_FIXUP_LENOVO_DOCK,
... ... @@ -2903,6 +2916,10 @@
2903 2916 .type = HDA_FIXUP_FUNC,
2904 2917 .v.func = alc269_fixup_hp_mute_led,
2905 2918 },
  2919 + [ALC269_FIXUP_HP_MUTE_LED_MIC1] = {
  2920 + .type = HDA_FIXUP_FUNC,
  2921 + .v.func = alc269_fixup_hp_mute_led_mic1,
  2922 + },
2906 2923 [ALC269_FIXUP_HP_MUTE_LED_MIC2] = {
2907 2924 .type = HDA_FIXUP_FUNC,
2908 2925 .v.func = alc269_fixup_hp_mute_led_mic2,
... ... @@ -2947,6 +2964,8 @@
2947 2964 SND_PCI_QUIRK(0x1025, 0x029b, "Acer 1810TZ", ALC269_FIXUP_INV_DMIC),
2948 2965 SND_PCI_QUIRK(0x1025, 0x0349, "Acer AOD260", ALC269_FIXUP_INV_DMIC),
2949 2966 SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
  2967 + SND_PCI_QUIRK(0x103c, 0x1973, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),
  2968 + SND_PCI_QUIRK(0x103c, 0x1983, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),
2950 2969 SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED),
2951 2970 SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_DMIC),
2952 2971 SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_DMIC),