1 files changed, 52 insertions, 4 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 06199e4e930f..4d11fbfca5e2 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3583,6 +3583,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
                 break;
         case 0x10ec0286:
         case 0x10ec0288:
+        case 0x10ec0298:
                 alc_process_coef_fw(codec, coef0288);
                 break;
         case 0x10ec0292:
@@ -3657,6 +3658,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
                 break;
         case 0x10ec0286:
         case 0x10ec0288:
+        case 0x10ec0298:
                 alc_update_coef_idx(codec, 0x4f, 0x000c, 0);
                 snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
                 alc_process_coef_fw(codec, coef0288);
@@ -3736,6 +3738,7 @@ static void alc_headset_mode_default(struct hda_codec *codec)
                 break;
         case 0x10ec0286:
         case 0x10ec0288:
+        case 0x10ec0298:
                 alc_process_coef_fw(codec, coef0288);
                 break;
                 break;
@@ -3801,6 +3804,9 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
         case 0x10ec0283:
                 alc_process_coef_fw(codec, coef0233);
                 break;
+        case 0x10ec0298:
+                alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0020);/* Headset output enable */
+                /* ALC298 jack type setting is the same with ALC286/ALC288 */
         case 0x10ec0286:
         case 0x10ec0288:
                 alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xd400);
@@ -3869,6 +3875,9 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
         case 0x10ec0283:
                 alc_process_coef_fw(codec, coef0233);
                 break;
+        case 0x10ec0298:
+                alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0010);/* Headset output enable */
+                /* ALC298 jack type setting is the same with ALC286/ALC288 */
         case 0x10ec0286:
         case 0x10ec0288:
                 alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xe400);
@@ -3931,6 +3940,9 @@ static void alc_determine_headset_type(struct hda_codec *codec)
                 val = alc_read_coef_idx(codec, 0x46);
                 is_ctia = (val & 0x0070) == 0x0070;
                 break;
+        case 0x10ec0298:
+                alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0020); /* Headset output enable */
+                /* ALC298 check jack type is the same with ALC286/ALC288 */
         case 0x10ec0286:
         case 0x10ec0288:
                 alc_process_coef_fw(codec, coef0288);
@@ -4190,11 +4202,18 @@ static void alc_shutup_dell_xps13(struct hda_codec *codec)
 static void alc_fixup_dell_xps13(struct hda_codec *codec,
                                 const struct hda_fixup *fix, int action)
 {
-        if (action == HDA_FIXUP_ACT_PROBE) {
-                struct alc_spec *spec = codec->spec;
-                struct hda_input_mux *imux = &spec->gen.input_mux;
-                int i;
+        struct alc_spec *spec = codec->spec;
+        struct hda_input_mux *imux = &spec->gen.input_mux;
+        int i;
 
+        switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                /* mic pin 0x19 must be initialized with Vref Hi-Z, otherwise
+                 * it causes a click noise at start up
+                 */
+                snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);
+                break;
+        case HDA_FIXUP_ACT_PROBE:
                 spec->shutup = alc_shutup_dell_xps13;
 
                 /* Make the internal mic the default input source. */
@@ -4204,6 +4223,7 @@ static void alc_fixup_dell_xps13(struct hda_codec *codec,
                                 break;
                         }
                 }
+                break;
         }
 }
 
@@ -4484,6 +4504,7 @@ enum {
         ALC288_FIXUP_DELL_HEADSET_MODE,
         ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,
         ALC288_FIXUP_DELL_XPS_13_GPIO6,
+        ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,
 };
 
 static const struct hda_fixup alc269_fixups[] = {
@@ -5006,6 +5027,16 @@ static const struct hda_fixup alc269_fixups[] = {
                 .chained = true,
                 .chain_id = ALC288_FIXUP_DELL1_MIC_NO_PRESENCE
         },
+        [ALC298_FIXUP_DELL1_MIC_NO_PRESENCE] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */
+                        { 0x1a, 0x01a1913d }, /* use as headphone mic, without its own jack detect */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_HEADSET_MODE
+        },
 };
 
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -5211,6 +5242,8 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
         {.id = ALC271_FIXUP_DMIC, .name = "alc271-dmic"},
         {.id = ALC269_FIXUP_INV_DMIC, .name = "inv-dmic"},
         {.id = ALC269_FIXUP_HEADSET_MIC, .name = "headset-mic"},
+        {.id = ALC269_FIXUP_HEADSET_MODE, .name = "headset-mode"},
+        {.id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, .name = "headset-mode-no-hp-mic"},
         {.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"},
         {.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},
         {.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"},
@@ -5269,6 +5302,13 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
         {0x1d, 0x40700001}, \
         {0x1e, 0x411111f0}
 
+#define ALC298_STANDARD_PINS \
+        {0x18, 0x411111f0}, \
+        {0x19, 0x411111f0}, \
+        {0x1a, 0x411111f0}, \
+        {0x1e, 0x411111f0}, \
+        {0x1f, 0x411111f0}
+
 static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
         SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,
                 ALC255_STANDARD_PINS,
@@ -5534,6 +5574,14 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
                 {0x16, 0x411111f0},
                 {0x18, 0x411111f0},
                 {0x19, 0x411111f0}),
+        SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,
+                ALC298_STANDARD_PINS,
+                {0x12, 0x90a60130},
+                {0x13, 0x40000000},
+                {0x14, 0x411111f0},
+                {0x17, 0x90170140},
+                {0x1d, 0x4068a36d},
+                {0x21, 0x03211020}),
         {}
 };