[linux-oem][PATCH v2 4/4] ALSA: hda/realtek - update ALC225 depop optimize

[Aaron Ma]

On 2018年03月08日 16:32, Wen-chien Jesse Sung wrote:
> From: Kailang Yang <kailang at realtek.com>
> 
> Add ALC225 its own depop functions for alc_init and alc_shutup.
> Add depop optimize step for headset mode functions.
> 
> Signed-off-by: Kailang Yang <kailang at realtek.com>
> Signed-off-by: Takashi Iwai <tiwai at suse.de>
> (backported from commit da911b1f5e98f21b20aa042748dfe73e36322fb1)
> Signed-off-by: Wen-chien Jesse Sung <jesse.sung at canonical.com>
> ---
>  sound/pci/hda/patch_realtek.c | 103 +++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 102 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index ea7340602228..37778fae5027 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -3138,6 +3138,93 @@ static void alc256_shutup(struct hda_codec *codec)
>  	snd_hda_shutup_pins(codec);
>  }
>  
> +static void alc225_init(struct hda_codec *codec)
> +{
> +	struct alc_spec *spec = codec->spec;
> +	hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
> +	bool hp1_pin_sense, hp2_pin_sense;
> +
> +	if (!hp_pin)
> +		return;
> +
> +	msleep(30);
> +
> +	hp1_pin_sense = snd_hda_jack_detect(codec, hp_pin);
> +	hp2_pin_sense = snd_hda_jack_detect(codec, 0x16);
> +
> +	if (hp1_pin_sense || hp2_pin_sense)
> +		msleep(2);
> +
> +	alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */
> +
> +	if (hp1_pin_sense)
> +		snd_hda_codec_write(codec, hp_pin, 0,
> +			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
> +	if (hp2_pin_sense)
> +		snd_hda_codec_write(codec, 0x16, 0,
> +			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
> +
> +	if (hp1_pin_sense || hp2_pin_sense)
> +		msleep(85);
> +
> +	if (hp1_pin_sense)
> +		snd_hda_codec_write(codec, hp_pin, 0,
> +			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
> +	if (hp2_pin_sense)
> +		snd_hda_codec_write(codec, 0x16, 0,
> +			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
> +
> +	if (hp1_pin_sense || hp2_pin_sense)
> +		msleep(100);
> +
> +	alc_update_coef_idx(codec, 0x4a, 3 << 10, 0);
> +	alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x4); /* Hight power */
> +}
> +
> +static void alc225_shutup(struct hda_codec *codec)
> +{
> +	struct alc_spec *spec = codec->spec;
> +	hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
> +	bool hp1_pin_sense, hp2_pin_sense;
> +
> +	if (!hp_pin) {
> +		alc269_shutup(codec);
> +		return;
> +	}
> +
> +	/* 3k pull low control for Headset jack. */
> +	alc_update_coef_idx(codec, 0x4a, 0, 3 << 10);
> +
> +	hp1_pin_sense = snd_hda_jack_detect(codec, hp_pin);
> +	hp2_pin_sense = snd_hda_jack_detect(codec, 0x16);
> +
> +	if (hp1_pin_sense || hp2_pin_sense)
> +		msleep(2);
> +
> +	if (hp1_pin_sense)
> +		snd_hda_codec_write(codec, hp_pin, 0,
> +			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
> +	if (hp2_pin_sense)
> +		snd_hda_codec_write(codec, 0x16, 0,
> +			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
> +
> +	if (hp1_pin_sense || hp2_pin_sense)
> +		msleep(85);
> +
> +	if (hp1_pin_sense)
> +		snd_hda_codec_write(codec, hp_pin, 0,
> +			    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
> +	if (hp2_pin_sense)
> +		snd_hda_codec_write(codec, 0x16, 0,
> +			    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
> +
> +	if (hp1_pin_sense || hp2_pin_sense)
> +		msleep(100);
> +
> +	alc_auto_setup_eapd(codec, false);
> +	snd_hda_shutup_pins(codec);
> +}
> +
>  static void alc_default_init(struct hda_codec *codec)
>  {
>  	struct alc_spec *spec = codec->spec;
> @@ -4559,6 +4646,12 @@ static void alc_determine_headset_type(struct hda_codec *codec)
>  	case 0x10ec0295:
>  	case 0x10ec0289:
>  	case 0x10ec0299:
> +		snd_hda_codec_write(codec, 0x21, 0,
> +			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
> +		msleep(80);
> +		snd_hda_codec_write(codec, 0x21, 0,
> +			    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
> +
>  		alc_process_coef_fw(codec, alc225_pre_hsmode);
>  		alc_update_coef_idx(codec, 0x67, 0xf000, 0x1000);
>  		val = alc_read_coef_idx(codec, 0x45);
> @@ -4578,6 +4671,12 @@ static void alc_determine_headset_type(struct hda_codec *codec)
>  		alc_update_coef_idx(codec, 0x4a, 7<<6, 7<<6);
>  		alc_update_coef_idx(codec, 0x4a, 3<<4, 3<<4);
>  		alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000);
> +
> +		snd_hda_codec_write(codec, 0x21, 0,
> +			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
> +		msleep(80);
> +		snd_hda_codec_write(codec, 0x21, 0,
> +			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
>  		break;
>  	case 0x10ec0867:
>  		is_ctia = true;
> @@ -6919,7 +7018,9 @@ static int patch_alc269(struct hda_codec *codec)
>  		break;
>  	case 0x10ec0299:
>  		spec->codec_variant = ALC269_TYPE_ALC225;
> -		spec->gen.mixer_nid = 0; /* no loopback on ALC299 */
> +		spec->shutup = alc225_shutup;
> +		spec->init_hook = alc225_init;
> +		spec->gen.mixer_nid = 0; /* no loopback on ALC225, ALC295 and ALC299 */

This change is introduced by commit e674ac9a470547ae6b9714e6bbe4960b60d148c6

Please cherry-pick it individually if you really want it be in.

Regards,
Aaron


>  		break;
>  	case 0x10ec0234:
>  	case 0x10ec0274: