Commit ecda3d95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Just two HD-audio fixups for a recent Realtek codec model. It's pretty
  safe to apply (and unsurprisingly boring)"

* tag 'sound-4.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - fix headset mic problem for Dell machines with alc236
  ALSA: hda/realtek - Add support for ALC236/ALC3204
parents f3415787 f265788c

sound/pci/hda/patch_realtek.c

+19 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) 
	case 0x10ec0215:

	case 0x10ec0225:

	case 0x10ec0233:

	case 0x10ec0236:

	case 0x10ec0255:

	case 0x10ec0256:

	case 0x10ec0282:
@@ -911,6 +912,7 @@ static struct alc_codec_rename_pci_table rename_pci_tbl[] = { 
	{ 0x10ec0275, 0x1028, 0, "ALC3260" },

	{ 0x10ec0899, 0x1028, 0, "ALC3861" },

	{ 0x10ec0298, 0x1028, 0, "ALC3266" },

	{ 0x10ec0236, 0x1028, 0, "ALC3204" },

	{ 0x10ec0256, 0x1028, 0, "ALC3246" },

	{ 0x10ec0225, 0x1028, 0, "ALC3253" },

	{ 0x10ec0295, 0x1028, 0, "ALC3254" },
@@ -3930,6 +3932,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) 
		alc_process_coef_fw(codec, coef0255_1);

		alc_process_coef_fw(codec, coef0255);

		break;

	case 0x10ec0236:

	case 0x10ec0256:

		alc_process_coef_fw(codec, coef0256);

		alc_process_coef_fw(codec, coef0255);
@@ -4028,6 +4031,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, 
	};



	switch (codec->core.vendor_id) {

	case 0x10ec0236:

	case 0x10ec0255:

	case 0x10ec0256:

		alc_write_coef_idx(codec, 0x45, 0xc489);
@@ -4160,6 +4164,7 @@ static void alc_headset_mode_default(struct hda_codec *codec) 
		alc_process_coef_fw(codec, alc225_pre_hsmode);

		alc_process_coef_fw(codec, coef0225);

		break;

	case 0x10ec0236:

	case 0x10ec0255:

	case 0x10ec0256:

		alc_process_coef_fw(codec, coef0255);
@@ -4256,6 +4261,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) 
	case 0x10ec0255:

		alc_process_coef_fw(codec, coef0255);

		break;

	case 0x10ec0236:

	case 0x10ec0256:

		alc_process_coef_fw(codec, coef0256);

		break;
@@ -4366,6 +4372,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) 
	case 0x10ec0255:

		alc_process_coef_fw(codec, coef0255);

		break;

	case 0x10ec0236:

	case 0x10ec0256:

		alc_process_coef_fw(codec, coef0256);

		break;
@@ -4451,6 +4458,7 @@ static void alc_determine_headset_type(struct hda_codec *codec) 
	};



	switch (codec->core.vendor_id) {

	case 0x10ec0236:

	case 0x10ec0255:

	case 0x10ec0256:

		alc_process_coef_fw(codec, coef0255);
@@ -4705,6 +4713,7 @@ static void alc255_set_default_jack_type(struct hda_codec *codec) 
	case 0x10ec0255:

		alc_process_coef_fw(codec, alc255fw);

		break;

	case 0x10ec0236:

	case 0x10ec0256:

		alc_process_coef_fw(codec, alc256fw);

		break;
@@ -6419,6 +6428,14 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
		ALC225_STANDARD_PINS,

		{0x12, 0xb7a60130},

		{0x1b, 0x90170110}),

	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		{0x12, 0x90a60140},

		{0x14, 0x90170110},

		{0x21, 0x02211020}),

	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		{0x12, 0x90a60140},

		{0x14, 0x90170150},

		{0x21, 0x02211020}),

	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,

		{0x14, 0x90170110},

		{0x21, 0x02211020}),
@@ -6806,6 +6823,7 @@ static int patch_alc269(struct hda_codec *codec) 
	case 0x10ec0255:

		spec->codec_variant = ALC269_TYPE_ALC255;

		break;

	case 0x10ec0236:

	case 0x10ec0256:

		spec->codec_variant = ALC269_TYPE_ALC256;

		spec->shutup = alc256_shutup;
@@ -7857,6 +7875,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = { 
	HDA_CODEC_ENTRY(0x10ec0233, "ALC233", patch_alc269),

	HDA_CODEC_ENTRY(0x10ec0234, "ALC234", patch_alc269),

	HDA_CODEC_ENTRY(0x10ec0235, "ALC233", patch_alc269),

	HDA_CODEC_ENTRY(0x10ec0236, "ALC236", patch_alc269),

	HDA_CODEC_ENTRY(0x10ec0255, "ALC255", patch_alc269),

	HDA_CODEC_ENTRY(0x10ec0256, "ALC256", patch_alc269),

	HDA_CODEC_ENTRY(0x10ec0260, "ALC260", patch_alc260),

CRA Git | Maintained and supported by SUSTech CRA and CCSE