Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f2e99fe authored by Lydia Wang's avatar Lydia Wang Committed by Takashi Iwai
Browse files

ALSA: HDA VIA: Add Jack detect feature for VT1708. 



VT1708 does not support unsolicited response, but we need hp detect to
automute speaker. Implemented in workqueue.

Signed-off-by: default avatarLydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: default avatarLogan Li <loganli@viatech.com.cn>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent dcf34c8c

sound/pci/hda/patch_via.c

+173 −57
Original line number Diff line number Diff line
@@ -89,6 +89,64 @@ enum VIA_HDA_CODEC { 
	CODEC_TYPES,

};



struct via_spec {

	/* codec parameterization */

	struct snd_kcontrol_new *mixers[4];

	unsigned int num_mixers;



	struct hda_verb *init_verbs[5];

	unsigned int num_iverbs;



	char *stream_name_analog;

	struct hda_pcm_stream *stream_analog_playback;

	struct hda_pcm_stream *stream_analog_capture;



	char *stream_name_digital;

	struct hda_pcm_stream *stream_digital_playback;

	struct hda_pcm_stream *stream_digital_capture;



	/* playback */

	struct hda_multi_out multiout;

	hda_nid_t slave_dig_outs[2];



	/* capture */

	unsigned int num_adc_nids;

	hda_nid_t *adc_nids;

	hda_nid_t mux_nids[3];

	hda_nid_t dig_in_nid;

	hda_nid_t dig_in_pin;



	/* capture source */

	const struct hda_input_mux *input_mux;

	unsigned int cur_mux[3];



	/* PCM information */

	struct hda_pcm pcm_rec[3];



	/* dynamic controls, init_verbs and input_mux */

	struct auto_pin_cfg autocfg;

	struct snd_array kctls;

	struct hda_input_mux private_imux[2];

	hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];



	/* HP mode source */

	const struct hda_input_mux *hp_mux;

	unsigned int hp_independent_mode;

	unsigned int hp_independent_mode_index;

	unsigned int smart51_enabled;



	enum VIA_HDA_CODEC codec_type;



	/* work to check hp jack state */

	struct hda_codec *codec;

	struct delayed_work vt1708_hp_work;

	int vt1708_jack_detectect;

	int vt1708_hp_present;

#ifdef CONFIG_SND_HDA_POWER_SAVE

	struct hda_loopback_check loopback;

#endif

};



static enum VIA_HDA_CODEC get_codec_type(struct hda_codec *codec)

{

	u32 vendor_id = codec->vendor_id;
@@ -181,6 +239,31 @@ static int mic_boost_volume_info(struct snd_kcontrol *kcontrol, 


static void analog_low_current_mode(struct hda_codec *codec, int stream_idle);

static void set_jack_power_state(struct hda_codec *codec);

static int is_aa_path_mute(struct hda_codec *codec);



static void vt1708_start_hp_work(struct via_spec *spec)

{

	if (spec->codec_type != VT1708 || spec->autocfg.hp_pins[0] == 0)

		return;

	snd_hda_codec_write(spec->codec, 0x1, 0, 0xf81,

			    !spec->vt1708_jack_detectect);

	if (!delayed_work_pending(&spec->vt1708_hp_work))

		schedule_delayed_work(&spec->vt1708_hp_work,

				      msecs_to_jiffies(100));

}



static void vt1708_stop_hp_work(struct via_spec *spec)

{

	if (spec->codec_type != VT1708 || spec->autocfg.hp_pins[0] == 0)

		return;

	if (snd_hda_get_bool_hint(spec->codec, "analog_loopback_hp_detect") == 1

	    && !is_aa_path_mute(spec->codec))

		return;

	snd_hda_codec_write(spec->codec, 0x1, 0, 0xf81,

			    !spec->vt1708_jack_detectect);

	cancel_delayed_work(&spec->vt1708_hp_work);

	flush_scheduled_work();

}



static int analog_input_switch_put(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)
@@ -190,6 +273,12 @@ static int analog_input_switch_put(struct snd_kcontrol *kcontrol, 


	set_jack_power_state(codec);

	analog_low_current_mode(snd_kcontrol_chip(kcontrol), -1);

	if (snd_hda_get_bool_hint(codec, "analog_loopback_hp_detect") == 1) {

		if (is_aa_path_mute(codec))

			vt1708_start_hp_work(codec->spec);

		else

			vt1708_stop_hp_work(codec->spec);

	}

	return change;

}
@@ -210,59 +299,6 @@ static struct snd_kcontrol_new vt1708_control_templates[] = { 
};





struct via_spec {

	/* codec parameterization */

	struct snd_kcontrol_new *mixers[4];

	unsigned int num_mixers;



	struct hda_verb *init_verbs[5];

	unsigned int num_iverbs;



	char *stream_name_analog;

	struct hda_pcm_stream *stream_analog_playback;

	struct hda_pcm_stream *stream_analog_capture;



	char *stream_name_digital;

	struct hda_pcm_stream *stream_digital_playback;

	struct hda_pcm_stream *stream_digital_capture;



	/* playback */

	struct hda_multi_out multiout;

	hda_nid_t slave_dig_outs[2];



	/* capture */

	unsigned int num_adc_nids;

	hda_nid_t *adc_nids;

	hda_nid_t mux_nids[3];

	hda_nid_t dig_in_nid;

	hda_nid_t dig_in_pin;



	/* capture source */

	const struct hda_input_mux *input_mux;

	unsigned int cur_mux[3];



	/* PCM information */

	struct hda_pcm pcm_rec[3];



	/* dynamic controls, init_verbs and input_mux */

	struct auto_pin_cfg autocfg;

	struct snd_array kctls;

	struct hda_input_mux private_imux[2];

	hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];



	/* HP mode source */

	const struct hda_input_mux *hp_mux;

	unsigned int hp_independent_mode;

	unsigned int hp_independent_mode_index;

	unsigned int smart51_enabled;



	enum VIA_HDA_CODEC codec_type;



#ifdef CONFIG_SND_HDA_POWER_SAVE

	struct hda_loopback_check loopback;

#endif

};



static hda_nid_t vt1708_adc_nids[2] = {

	/* ADC1-2 */

	0x15, 0x27
@@ -981,7 +1017,6 @@ static int via_playback_pcm_open(struct hda_pcm_stream *hinfo, 
	struct via_spec *spec = codec->spec;

	int idle = substream->pstr->substream_opened == 1

		&& substream->ref_count == 0;



	analog_low_current_mode(codec, idle);

	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream,

					     hinfo);
@@ -994,6 +1029,7 @@ static int via_playback_pcm_prepare(struct hda_pcm_stream *hinfo, 
				    struct snd_pcm_substream *substream)

{

	struct via_spec *spec = codec->spec;

	vt1708_start_hp_work(spec);

	return snd_hda_multi_out_analog_prepare(codec, &spec->multiout,

						stream_tag, format, substream);

}
@@ -1003,6 +1039,7 @@ static int via_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, 
				    struct snd_pcm_substream *substream)

{

	struct via_spec *spec = codec->spec;

	vt1708_stop_hp_work(spec);

	return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);

}
@@ -1094,7 +1131,7 @@ static int via_playback_multi_pcm_prepare(struct hda_pcm_stream *hinfo, 
			snd_hda_codec_setup_stream(codec, mout->hp_nid,

						   stream_tag, 0, format);

	}



	vt1708_start_hp_work(spec);

	return 0;

}
@@ -1134,7 +1171,7 @@ static int via_playback_multi_pcm_cleanup(struct hda_pcm_stream *hinfo, 
			snd_hda_codec_setup_stream(codec, mout->hp_nid,

						   0, 0, 0);

	}



	vt1708_stop_hp_work(spec);

	return 0;

}
@@ -1345,6 +1382,7 @@ static void via_free(struct hda_codec *codec) 
		return;



	via_free_kctls(codec);

	vt1708_stop_hp_work(spec);

	kfree(codec->spec);

}
@@ -1464,6 +1502,15 @@ static int via_init(struct hda_codec *codec) 
 	return 0;

}



#ifdef SND_HDA_NEEDS_RESUME

static int via_suspend(struct hda_codec *codec, pm_message_t state)

{

	struct via_spec *spec = codec->spec;

	vt1708_stop_hp_work(spec);

	return 0;

}

#endif



#ifdef CONFIG_SND_HDA_POWER_SAVE

static int via_check_power_status(struct hda_codec *codec, hda_nid_t nid)

{
@@ -1479,6 +1526,9 @@ static struct hda_codec_ops via_patch_ops = { 
	.build_pcms = via_build_pcms,

	.init = via_init,

	.free = via_free,

#ifdef SND_HDA_NEEDS_RESUME

	.suspend = via_suspend,

#endif

#ifdef CONFIG_SND_HDA_POWER_SAVE

	.check_power_status = via_check_power_status,

#endif
@@ -1728,6 +1778,51 @@ static void vt1708_set_pinconfig_connect(struct hda_codec *codec, hda_nid_t nid) 
	return;

}



static int vt1708_jack_detectect_get(struct snd_kcontrol *kcontrol,

				     struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	struct via_spec *spec = codec->spec;



	if (spec->codec_type != VT1708)

		return 0;

	spec->vt1708_jack_detectect =

		!((snd_hda_codec_read(codec, 0x1, 0, 0xf84, 0) >> 8) & 0x1);

	ucontrol->value.integer.value[0] = spec->vt1708_jack_detectect;

	return 0;

}



static int vt1708_jack_detectect_put(struct snd_kcontrol *kcontrol,

				     struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	struct via_spec *spec = codec->spec;

	int change;



	if (spec->codec_type != VT1708)

		return 0;

	spec->vt1708_jack_detectect = ucontrol->value.integer.value[0];

	change = (0x1 & (snd_hda_codec_read(codec, 0x1, 0, 0xf84, 0) >> 8))

		== !spec->vt1708_jack_detectect;

	if (spec->vt1708_jack_detectect) {

		mute_aa_path(codec, 1);

		notify_aa_path_ctls(codec);

	}

	return change;

}



static struct snd_kcontrol_new vt1708_jack_detectect[] = {

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Jack Detect",

		.count = 1,

		.info = snd_ctl_boolean_mono_info,

		.get = vt1708_jack_detectect_get,

		.put = vt1708_jack_detectect_put,

	},

	{} /* end */

};



static int vt1708_parse_auto_config(struct hda_codec *codec)

{

	struct via_spec *spec = codec->spec;
@@ -1753,6 +1848,10 @@ static int vt1708_parse_auto_config(struct hda_codec *codec) 
	if (err < 0)

		return err;

	err = vt1708_auto_create_analog_input_ctls(spec, &spec->autocfg);

	if (err < 0)

		return err;

	/* add jack detect on/off control */

	err = snd_hda_add_new_ctls(codec, vt1708_jack_detectect);

	if (err < 0)

		return err;
@@ -1788,6 +1887,22 @@ static int via_auto_init(struct hda_codec *codec) 
	return 0;

}



static void vt1708_update_hp_jack_state(struct work_struct *work)

{

	struct via_spec *spec = container_of(work, struct via_spec,

					     vt1708_hp_work.work);

	if (spec->codec_type != VT1708)

		return;

	/* if jack state toggled */

	if (spec->vt1708_hp_present

	    != (snd_hda_codec_read(spec->codec, spec->autocfg.hp_pins[0], 0,

				   AC_VERB_GET_PIN_SENSE, 0) >> 31)) {

		spec->vt1708_hp_present ^= 1;

		via_hp_automute(spec->codec);

	}

	vt1708_start_hp_work(spec);

}



static int get_mux_nids(struct hda_codec *codec)

{

	struct via_spec *spec = codec->spec;
@@ -1864,7 +1979,8 @@ static int patch_vt1708(struct hda_codec *codec) 
#ifdef CONFIG_SND_HDA_POWER_SAVE

	spec->loopback.amplist = vt1708_loopbacks;

#endif



	spec->codec = codec;

	INIT_DELAYED_WORK(&spec->vt1708_hp_work, vt1708_update_hp_jack_state);

	return 0;

}