|
@@ -3443,6 +3443,56 @@ static void alc283_fixup_chromebook(struct hda_codec *codec,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+/* mute tablet speaker pin (0x14) via dock plugging in addition */
|
|
|
+static void asus_tx300_automute(struct hda_codec *codec)
|
|
|
+{
|
|
|
+ struct alc_spec *spec = codec->spec;
|
|
|
+ snd_hda_gen_update_outputs(codec);
|
|
|
+ if (snd_hda_jack_detect(codec, 0x1b))
|
|
|
+ spec->gen.mute_bits |= (1ULL << 0x14);
|
|
|
+}
|
|
|
+
|
|
|
+static void alc282_fixup_asus_tx300(struct hda_codec *codec,
|
|
|
+ const struct hda_fixup *fix, int action)
|
|
|
+{
|
|
|
+ struct alc_spec *spec = codec->spec;
|
|
|
+ /* TX300 needs to set up GPIO2 for the speaker amp */
|
|
|
+ static const struct hda_verb gpio2_verbs[] = {
|
|
|
+ { 0x01, AC_VERB_SET_GPIO_MASK, 0x04 },
|
|
|
+ { 0x01, AC_VERB_SET_GPIO_DIRECTION, 0x04 },
|
|
|
+ { 0x01, AC_VERB_SET_GPIO_DATA, 0x04 },
|
|
|
+ {}
|
|
|
+ };
|
|
|
+ static const struct hda_pintbl dock_pins[] = {
|
|
|
+ { 0x1b, 0x21114000 }, /* dock speaker pin */
|
|
|
+ {}
|
|
|
+ };
|
|
|
+ struct snd_kcontrol *kctl;
|
|
|
+
|
|
|
+ switch (action) {
|
|
|
+ case HDA_FIXUP_ACT_PRE_PROBE:
|
|
|
+ snd_hda_add_verbs(codec, gpio2_verbs);
|
|
|
+ snd_hda_apply_pincfgs(codec, dock_pins);
|
|
|
+ spec->gen.auto_mute_via_amp = 1;
|
|
|
+ spec->gen.automute_hook = asus_tx300_automute;
|
|
|
+ snd_hda_jack_detect_enable_callback(codec, 0x1b,
|
|
|
+ HDA_GEN_HP_EVENT,
|
|
|
+ snd_hda_gen_hp_automute);
|
|
|
+ break;
|
|
|
+ case HDA_FIXUP_ACT_BUILD:
|
|
|
+ /* this is a bit tricky; give more sane names for the main
|
|
|
+ * (tablet) speaker and the dock speaker, respectively
|
|
|
+ */
|
|
|
+ kctl = snd_hda_find_mixer_ctl(codec, "Speaker Playback Switch");
|
|
|
+ if (kctl)
|
|
|
+ strcpy(kctl->id.name, "Dock Speaker Playback Switch");
|
|
|
+ kctl = snd_hda_find_mixer_ctl(codec, "Bass Speaker Playback Switch");
|
|
|
+ if (kctl)
|
|
|
+ strcpy(kctl->id.name, "Speaker Playback Switch");
|
|
|
+ break;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
enum {
|
|
|
ALC269_FIXUP_SONY_VAIO,
|
|
|
ALC275_FIXUP_SONY_VAIO_GPIO2,
|
|
@@ -3480,6 +3530,7 @@ enum {
|
|
|
ALC269_FIXUP_LIMIT_INT_MIC_BOOST,
|
|
|
ALC269VB_FIXUP_ORDISSIMO_EVE2,
|
|
|
ALC283_FIXUP_CHROME_BOOK,
|
|
|
+ ALC282_FIXUP_ASUS_TX300,
|
|
|
};
|
|
|
|
|
|
static const struct hda_fixup alc269_fixups[] = {
|
|
@@ -3735,6 +3786,10 @@ static const struct hda_fixup alc269_fixups[] = {
|
|
|
.type = HDA_FIXUP_FUNC,
|
|
|
.v.func = alc283_fixup_chromebook,
|
|
|
},
|
|
|
+ [ALC282_FIXUP_ASUS_TX300] = {
|
|
|
+ .type = HDA_FIXUP_FUNC,
|
|
|
+ .v.func = alc282_fixup_asus_tx300,
|
|
|
+ },
|
|
|
};
|
|
|
|
|
|
static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
|
@@ -3784,6 +3839,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
|
|
SND_PCI_QUIRK(0x103c, 0x1983, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),
|
|
|
SND_PCI_QUIRK(0x103c, 0x21ed, "HP Falco Chromebook", ALC283_FIXUP_CHROME_BOOK),
|
|
|
SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED),
|
|
|
+ SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
|
|
|
SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
|
|
|
SND_PCI_QUIRK(0x1043, 0x115d, "Asus 1015E", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
|
|
|
SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_DMIC),
|