]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'topic/huawei-leds' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 13 Dec 2018 08:26:19 +0000 (09:26 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 13 Dec 2018 08:26:45 +0000 (09:26 +0100)
Pull Huawei LEDS and hotkey support.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
1  2 
sound/pci/hda/patch_realtek.c

index dfaa6d3d632136edc50dfaed040531f1826b6e24,9766fd249bdf89998b7149ac23711d439d37984f..129ebd8578926e5b8e4aef297fbf41244fe11e84
@@@ -388,7 -388,6 +388,7 @@@ static void alc_fill_eapd_coef(struct h
        case 0x10ec0285:
        case 0x10ec0298:
        case 0x10ec0289:
 +      case 0x10ec0300:
                alc_update_coef_idx(codec, 0x10, 1<<9, 0);
                break;
        case 0x10ec0275:
@@@ -2831,7 -2830,6 +2831,7 @@@ enum 
        ALC269_TYPE_ALC215,
        ALC269_TYPE_ALC225,
        ALC269_TYPE_ALC294,
 +      ALC269_TYPE_ALC300,
        ALC269_TYPE_ALC700,
  };
  
@@@ -2866,7 -2864,6 +2866,7 @@@ static int alc269_parse_auto_config(str
        case ALC269_TYPE_ALC215:
        case ALC269_TYPE_ALC225:
        case ALC269_TYPE_ALC294:
 +      case ALC269_TYPE_ALC300:
        case ALC269_TYPE_ALC700:
                ssids = alc269_ssids;
                break;
@@@ -4988,18 -4985,9 +4988,18 @@@ static void alc_fixup_tpt470_dock(struc
                { 0x19, 0x21a11010 }, /* dock mic */
                { }
        };
 +      /* Assure the speaker pin to be coupled with DAC NID 0x03; otherwise
 +       * the speaker output becomes too low by some reason on Thinkpads with
 +       * ALC298 codec
 +       */
 +      static hda_nid_t preferred_pairs[] = {
 +              0x14, 0x03, 0x17, 0x02, 0x21, 0x02,
 +              0
 +      };
        struct alc_spec *spec = codec->spec;
  
        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
 +              spec->gen.preferred_dacs = preferred_pairs;
                spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;
                snd_hda_apply_pincfgs(codec, pincfgs);
        } else if (action == HDA_FIXUP_ACT_INIT) {
@@@ -5370,76 -5358,6 +5370,76 @@@ static void alc274_fixup_bind_dacs(stru
        spec->gen.preferred_dacs = preferred_pairs;
  }
  
 +/* The DAC of NID 0x3 will introduce click/pop noise on headphones, so invalidate it */
 +static void alc285_fixup_invalidate_dacs(struct hda_codec *codec,
 +                            const struct hda_fixup *fix, int action)
 +{
 +      if (action != HDA_FIXUP_ACT_PRE_PROBE)
 +              return;
 +
 +      snd_hda_override_wcaps(codec, 0x03, 0);
 +}
 +
 +static const struct hda_jack_keymap alc_headset_btn_keymap[] = {
 +      { SND_JACK_BTN_0, KEY_PLAYPAUSE },
 +      { SND_JACK_BTN_1, KEY_VOICECOMMAND },
 +      { SND_JACK_BTN_2, KEY_VOLUMEUP },
 +      { SND_JACK_BTN_3, KEY_VOLUMEDOWN },
 +      {}
 +};
 +
 +static void alc_headset_btn_callback(struct hda_codec *codec,
 +                                   struct hda_jack_callback *jack)
 +{
 +      int report = 0;
 +
 +      if (jack->unsol_res & (7 << 13))
 +              report |= SND_JACK_BTN_0;
 +
 +      if (jack->unsol_res  & (1 << 16 | 3 << 8))
 +              report |= SND_JACK_BTN_1;
 +
 +      /* Volume up key */
 +      if (jack->unsol_res & (7 << 23))
 +              report |= SND_JACK_BTN_2;
 +
 +      /* Volume down key */
 +      if (jack->unsol_res & (7 << 10))
 +              report |= SND_JACK_BTN_3;
 +
 +      jack->jack->button_state = report;
 +}
 +
 +static void alc_fixup_headset_jack(struct hda_codec *codec,
 +                                  const struct hda_fixup *fix, int action)
 +{
 +
 +      switch (action) {
 +      case HDA_FIXUP_ACT_PRE_PROBE:
 +              snd_hda_jack_detect_enable_callback(codec, 0x55,
 +                                                  alc_headset_btn_callback);
 +              snd_hda_jack_add_kctl(codec, 0x55, "Headset Jack", false,
 +                                    SND_JACK_HEADSET, alc_headset_btn_keymap);
 +              break;
 +      case HDA_FIXUP_ACT_INIT:
 +              switch (codec->core.vendor_id) {
 +              case 0x10ec0225:
 +              case 0x10ec0295:
 +              case 0x10ec0299:
 +                      alc_write_coef_idx(codec, 0x48, 0xd011);
 +                      alc_update_coef_idx(codec, 0x49, 0x007f, 0x0045);
 +                      alc_update_coef_idx(codec, 0x44, 0x007f << 8, 0x0045 << 8);
 +                      break;
 +              case 0x10ec0236:
 +              case 0x10ec0256:
 +                      alc_write_coef_idx(codec, 0x48, 0xd011);
 +                      alc_update_coef_idx(codec, 0x49, 0x007f, 0x0045);
 +                      break;
 +              }
 +              break;
 +      }
 +}
 +
  /* for hda_fixup_thinkpad_acpi() */
  #include "thinkpad_helper.c"
  
@@@ -5572,15 -5490,9 +5572,16 @@@ enum 
        ALC298_FIXUP_TPT470_DOCK,
        ALC255_FIXUP_DUMMY_LINEOUT_VERB,
        ALC255_FIXUP_DELL_HEADSET_MIC,
+       ALC256_FIXUP_HUAWEI_MBXP_PINS,
        ALC295_FIXUP_HP_X360,
        ALC221_FIXUP_HP_HEADSET_MIC,
 +      ALC285_FIXUP_LENOVO_HEADPHONE_NOISE,
 +      ALC295_FIXUP_HP_AUTO_MUTE,
 +      ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,
 +      ALC294_FIXUP_ASUS_MIC,
 +      ALC294_FIXUP_ASUS_HEADSET_MIC,
 +      ALC294_FIXUP_ASUS_SPK,
 +      ALC225_FIXUP_HEADSET_JACK,
  };
  
  static const struct hda_fixup alc269_fixups[] = {
        [ALC269_FIXUP_HP_MUTE_LED_MIC3] = {
                .type = HDA_FIXUP_FUNC,
                .v.func = alc269_fixup_hp_mute_led_mic3,
 +              .chained = true,
 +              .chain_id = ALC295_FIXUP_HP_AUTO_MUTE
        },
        [ALC269_FIXUP_HP_GPIO_LED] = {
                .type = HDA_FIXUP_FUNC,
                .chained = true,
                .chain_id = ALC269_FIXUP_HEADSET_MIC
        },
+       [ALC256_FIXUP_HUAWEI_MBXP_PINS] = {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
+                       {0x12, 0x90a60130},
+                       {0x13, 0x40000000},
+                       {0x14, 0x90170110},
+                       {0x18, 0x411111f0},
+                       {0x19, 0x04a11040},
+                       {0x1a, 0x411111f0},
+                       {0x1b, 0x90170112},
+                       {0x1d, 0x40759a05},
+                       {0x1e, 0x411111f0},
+                       {0x21, 0x04211020},
+                       { }
+               },
+               .chained = true,
+               .chain_id = ALC255_FIXUP_MIC_MUTE_LED
+       },
        [ALC269_FIXUP_ASUS_X101_FUNC] = {
                .type = HDA_FIXUP_FUNC,
                .v.func = alc269_fixup_x101_headset_mic,
                .chained = true,
                .chain_id = ALC269_FIXUP_HEADSET_MIC
        },
 +      [ALC285_FIXUP_LENOVO_HEADPHONE_NOISE] = {
 +              .type = HDA_FIXUP_FUNC,
 +              .v.func = alc285_fixup_invalidate_dacs,
 +              .chained = true,
 +              .chain_id = ALC269_FIXUP_THINKPAD_ACPI
 +      },
 +      [ALC295_FIXUP_HP_AUTO_MUTE] = {
 +              .type = HDA_FIXUP_FUNC,
 +              .v.func = alc_fixup_auto_mute_via_amp,
 +      },
 +      [ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE] = {
 +              .type = HDA_FIXUP_PINS,
 +              .v.pins = (const struct hda_pintbl[]) {
 +                      { 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */
 +                      { }
 +              },
 +              .chained = true,
 +              .chain_id = ALC269_FIXUP_HEADSET_MIC
 +      },
 +      [ALC294_FIXUP_ASUS_MIC] = {
 +              .type = HDA_FIXUP_PINS,
 +              .v.pins = (const struct hda_pintbl[]) {
 +                      { 0x13, 0x90a60160 }, /* use as internal mic */
 +                      { 0x19, 0x04a11120 }, /* use as headset mic, without its own jack detect */
 +                      { }
 +              },
 +              .chained = true,
 +              .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
 +      },
 +      [ALC294_FIXUP_ASUS_HEADSET_MIC] = {
 +              .type = HDA_FIXUP_PINS,
 +              .v.pins = (const struct hda_pintbl[]) {
 +                      { 0x19, 0x01a1113c }, /* use as headset mic, without its own jack detect */
 +                      { }
 +              },
 +              .chained = true,
 +              .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
 +      },
 +      [ALC294_FIXUP_ASUS_SPK] = {
 +              .type = HDA_FIXUP_VERBS,
 +              .v.verbs = (const struct hda_verb[]) {
 +                      /* Set EAPD high */
 +                      { 0x20, AC_VERB_SET_COEF_INDEX, 0x40 },
 +                      { 0x20, AC_VERB_SET_PROC_COEF, 0x8800 },
 +                      { }
 +              },
 +              .chained = true,
 +              .chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC
 +      },
 +      [ALC225_FIXUP_HEADSET_JACK] = {
 +              .type = HDA_FIXUP_FUNC,
 +              .v.func = alc_fixup_headset_jack,
 +      },
  };
  
  static const struct snd_pci_quirk alc269_fixup_tbl[] = {
        SND_PCI_QUIRK(0x1025, 0x0762, "Acer Aspire E1-472", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),
        SND_PCI_QUIRK(0x1025, 0x0775, "Acer Aspire E1-572", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),
        SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS),
 +      SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK),
 +      SND_PCI_QUIRK(0x1025, 0x128f, "Acer Veriton Z6860G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),
 +      SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),
 +      SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
        SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS),
        SND_PCI_QUIRK(0x1028, 0x05bd, "Dell Latitude E6440", ALC292_FIXUP_DELL_E7X),
        SND_PCI_QUIRK(0x103c, 0x2336, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
        SND_PCI_QUIRK(0x103c, 0x2337, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
        SND_PCI_QUIRK(0x103c, 0x221c, "HP EliteBook 755 G2", ALC280_FIXUP_HP_HEADSET_MIC),
 +      SND_PCI_QUIRK(0x103c, 0x820d, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
        SND_PCI_QUIRK(0x103c, 0x8256, "HP", ALC221_FIXUP_HP_FRONT_MIC),
        SND_PCI_QUIRK(0x103c, 0x827e, "HP x360", ALC295_FIXUP_HP_X360),
        SND_PCI_QUIRK(0x103c, 0x82bf, "HP", ALC221_FIXUP_HP_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC),
        SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC),
        SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),
 +      SND_PCI_QUIRK(0x1043, 0x14a1, "ASUS UX533FD", ALC294_FIXUP_ASUS_SPK),
        SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),
        SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),
        SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
        SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),
        SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),
        SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),
 +      SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC),
        SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC233_FIXUP_LENOVO_MULTI_CODECS),
        SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
        SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),
        SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),
        SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),
        SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
+       SND_PCI_QUIRK(0x19e5, 0x3200, "Huawei MBX", ALC255_FIXUP_MIC_MUTE_LED),
+       SND_PCI_QUIRK(0x19e5, 0x3201, "Huawei MBX", ALC255_FIXUP_MIC_MUTE_LED),
+       SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MBXP", ALC256_FIXUP_HUAWEI_MBXP_PINS),
        SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */
  
  #if 0
@@@ -6906,7 -6777,6 +6928,7 @@@ static const struct hda_model_fixup alc
        {.id = ALC255_FIXUP_DUMMY_LINEOUT_VERB, .name = "alc255-dummy-lineout"},
        {.id = ALC255_FIXUP_DELL_HEADSET_MIC, .name = "alc255-dell-headset"},
        {.id = ALC295_FIXUP_HP_X360, .name = "alc295-hp-x360"},
 +      {.id = ALC225_FIXUP_HEADSET_JACK, .name = "alc-sense-combo"},
        {}
  };
  #define ALC225_STANDARD_PINS \
@@@ -7182,15 -7052,6 +7204,15 @@@ static const struct snd_hda_pin_quirk a
                {0x12, 0x90a60130},
                {0x19, 0x03a11020},
                {0x21, 0x0321101f}),
 +      SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_HEADPHONE_NOISE,
 +              {0x12, 0x90a60130},
 +              {0x14, 0x90170110},
 +              {0x19, 0x04a11040},
 +              {0x21, 0x04211020}),
 +      SND_HDA_PIN_QUIRK(0x10ec0286, 0x1025, "Acer", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,
 +              {0x12, 0x90a60130},
 +              {0x17, 0x90170110},
 +              {0x21, 0x02211020}),
        SND_HDA_PIN_QUIRK(0x10ec0288, 0x1028, "Dell", ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,
                {0x12, 0x90a60120},
                {0x14, 0x90170110},
        SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
                ALC292_STANDARD_PINS,
                {0x13, 0x90a60140}),
 +      SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_MIC,
 +              {0x14, 0x90170110},
 +              {0x1b, 0x90a70130},
 +              {0x21, 0x04211020}),
 +      SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_SPK,
 +              {0x12, 0x90a60130},
 +              {0x17, 0x90170110},
 +              {0x21, 0x04211020}),
        SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
                ALC295_STANDARD_PINS,
                {0x17, 0x21014020},
@@@ -7334,37 -7187,6 +7356,37 @@@ static void alc269_fill_coef(struct hda
        alc_update_coef_idx(codec, 0x4, 0, 1<<11);
  }
  
 +static void alc294_hp_init(struct hda_codec *codec)
 +{
 +      struct alc_spec *spec = codec->spec;
 +      hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
 +      int i, val;
 +
 +      if (!hp_pin)
 +              return;
 +
 +      snd_hda_codec_write(codec, hp_pin, 0,
 +                          AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
 +
 +      msleep(100);
 +
 +      snd_hda_codec_write(codec, hp_pin, 0,
 +                          AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
 +
 +      alc_update_coef_idx(codec, 0x6f, 0x000f, 0);/* Set HP depop to manual mode */
 +      alc_update_coefex_idx(codec, 0x58, 0x00, 0x8000, 0x8000); /* HP depop procedure start */
 +
 +      /* Wait for depop procedure finish  */
 +      val = alc_read_coefex_idx(codec, 0x58, 0x01);
 +      for (i = 0; i < 20 && val & 0x0080; i++) {
 +              msleep(50);
 +              val = alc_read_coefex_idx(codec, 0x58, 0x01);
 +      }
 +      /* Set HP depop to auto mode */
 +      alc_update_coef_idx(codec, 0x6f, 0x000f, 0x000b);
 +      msleep(50);
 +}
 +
  /*
   */
  static int patch_alc269(struct hda_codec *codec)
                spec->codec_variant = ALC269_TYPE_ALC294;
                spec->gen.mixer_nid = 0; /* ALC2x4 does not have any loopback mixer path */
                alc_update_coef_idx(codec, 0x6b, 0x0018, (1<<4) | (1<<3)); /* UAJ MIC Vref control by verb */
 +              alc294_hp_init(codec);
 +              break;
 +      case 0x10ec0300:
 +              spec->codec_variant = ALC269_TYPE_ALC300;
 +              spec->gen.mixer_nid = 0; /* no loopback on ALC300 */
                break;
        case 0x10ec0700:
        case 0x10ec0701:
                spec->codec_variant = ALC269_TYPE_ALC700;
                spec->gen.mixer_nid = 0; /* ALC700 does not have any loopback mixer path */
                alc_update_coef_idx(codec, 0x4a, 1 << 15, 0); /* Combo jack auto trigger control */
 +              alc294_hp_init(codec);
                break;
  
        }
@@@ -8607,7 -8423,6 +8629,7 @@@ static const struct hda_device_id snd_h
        HDA_CODEC_ENTRY(0x10ec0295, "ALC295", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0298, "ALC298", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0299, "ALC299", patch_alc269),
 +      HDA_CODEC_ENTRY(0x10ec0300, "ALC300", patch_alc269),
        HDA_CODEC_REV_ENTRY(0x10ec0861, 0x100340, "ALC660", patch_alc861),
        HDA_CODEC_ENTRY(0x10ec0660, "ALC660-VD", patch_alc861vd),
        HDA_CODEC_ENTRY(0x10ec0861, "ALC861", patch_alc861),