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

Commit 9eb6e9b1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda

parents a4567cb3 88d68602

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -5648,7 +5648,6 @@ F: drivers/media/video/*7146* 
F:	include/media/*7146*



SAMSUNG AUDIO (ASoC) DRIVERS

M:	Jassi Brar <jassisinghbrar@gmail.com>

M:	Sangbeom Kim <sbkim73@samsung.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

sound/pci/hda/hda_intel.c

+0 −1
Original line number Diff line number Diff line
@@ -2507,7 +2507,6 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { 
	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),

sound/pci/hda/patch_cirrus.c

+1 −1
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ static const char * const cs420x_models[CS420X_MODELS] = { 
	[CS420X_MBP53] = "mbp53",

	[CS420X_MBP55] = "mbp55",

	[CS420X_IMAC27] = "imac27",

	[CS420X_IMAC27] = "apple",

	[CS420X_APPLE] = "apple",

	[CS420X_AUTO] = "auto",

};

sound/pci/hda/patch_sigmatel.c

+3 −19
Original line number Diff line number Diff line
@@ -4441,7 +4441,9 @@ static int stac92xx_init(struct hda_codec *codec) 
		int pinctl, def_conf;



		/* power on when no jack detection is available */

		if (!spec->hp_detect) {

		/* or when the VREF is used for controlling LED */

		if (!spec->hp_detect ||

		    (spec->gpio_led > 8 && spec->gpio_led == nid)) {

			stac_toggle_power_map(codec, nid, 1);

			continue;

		}
@@ -5055,20 +5057,6 @@ static int stac92xx_pre_resume(struct hda_codec *codec) 
	return 0;

}



static int stac92xx_post_suspend(struct hda_codec *codec)

{

	struct sigmatel_spec *spec = codec->spec;

	if (spec->gpio_led > 8) {

		/* with vref-out pin used for mute led control

		 * codec AFG is prevented from D3 state, but on

		 * system suspend it can (and should) be used

		 */

		snd_hda_codec_read(codec, codec->afg, 0,

				AC_VERB_SET_POWER_STATE, AC_PWRST_D3);

	}

	return 0;

}



static void stac92xx_set_power_state(struct hda_codec *codec, hda_nid_t fg,

				unsigned int power_state)

{
@@ -5668,8 +5656,6 @@ again: 
		} else {

			codec->patch_ops.set_power_state =

					stac92xx_set_power_state;

			codec->patch_ops.post_suspend =

					stac92xx_post_suspend;

		}

		codec->patch_ops.pre_resume = stac92xx_pre_resume;

		codec->patch_ops.check_power_status =
@@ -5983,8 +5969,6 @@ again: 
		} else {

			codec->patch_ops.set_power_state =

					stac92xx_set_power_state;

			codec->patch_ops.post_suspend =

					stac92xx_post_suspend;

		}

		codec->patch_ops.pre_resume = stac92xx_pre_resume;

		codec->patch_ops.check_power_status =

sound/pci/hda/patch_via.c

+43 −33
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ struct via_spec { 
	/* work to check hp jack state */

	struct hda_codec *codec;

	struct delayed_work vt1708_hp_work;

	int hp_work_active;

	int vt1708_jack_detect;

	int vt1708_hp_present;
@@ -305,27 +306,35 @@ enum { 
static void analog_low_current_mode(struct hda_codec *codec);

static bool is_aa_path_mute(struct hda_codec *codec);



static void vt1708_start_hp_work(struct via_spec *spec)

#define hp_detect_with_aa(codec) \

	(snd_hda_get_bool_hint(codec, "analog_loopback_hp_detect") == 1 && \

	 !is_aa_path_mute(codec))



static void vt1708_stop_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_detect);

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

		schedule_delayed_work(&spec->vt1708_hp_work,

				      msecs_to_jiffies(100));

	if (spec->hp_work_active) {

		snd_hda_codec_write(spec->codec, 0x1, 0, 0xf81, 1);

		cancel_delayed_work_sync(&spec->vt1708_hp_work);

		spec->hp_work_active = 0;

	}

}



static void vt1708_stop_hp_work(struct via_spec *spec)

static void vt1708_update_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_detect);

	cancel_delayed_work_sync(&spec->vt1708_hp_work);

	if (spec->vt1708_jack_detect &&

	    (spec->active_streams || hp_detect_with_aa(spec->codec))) {

		if (!spec->hp_work_active) {

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

			schedule_delayed_work(&spec->vt1708_hp_work,

					      msecs_to_jiffies(100));

			spec->hp_work_active = 1;

		}

	} else if (!hp_detect_with_aa(spec->codec))

		vt1708_stop_hp_work(spec);

}



static void set_widgets_power_state(struct hda_codec *codec)
@@ -343,12 +352,7 @@ static int analog_input_switch_put(struct snd_kcontrol *kcontrol, 


	set_widgets_power_state(codec);

	analog_low_current_mode(snd_kcontrol_chip(kcontrol));

	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);

	}

	vt1708_update_hp_work(codec->spec);

	return change;

}
@@ -1154,7 +1158,7 @@ static int via_playback_multi_pcm_prepare(struct hda_pcm_stream *hinfo, 
	spec->cur_dac_stream_tag = stream_tag;

	spec->cur_dac_format = format;

	mutex_unlock(&spec->config_mutex);

	vt1708_start_hp_work(spec);

	vt1708_update_hp_work(spec);

	return 0;

}
@@ -1174,7 +1178,7 @@ static int via_playback_hp_pcm_prepare(struct hda_pcm_stream *hinfo, 
	spec->cur_hp_stream_tag = stream_tag;

	spec->cur_hp_format = format;

	mutex_unlock(&spec->config_mutex);

	vt1708_start_hp_work(spec);

	vt1708_update_hp_work(spec);

	return 0;

}
@@ -1188,7 +1192,7 @@ static int via_playback_multi_pcm_cleanup(struct hda_pcm_stream *hinfo, 
	snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);

	spec->active_streams &= ~STREAM_MULTI_OUT;

	mutex_unlock(&spec->config_mutex);

	vt1708_stop_hp_work(spec);

	vt1708_update_hp_work(spec);

	return 0;

}
@@ -1203,7 +1207,7 @@ static int via_playback_hp_pcm_cleanup(struct hda_pcm_stream *hinfo, 
		snd_hda_codec_setup_stream(codec, spec->hp_dac_nid, 0, 0, 0);

	spec->active_streams &= ~STREAM_INDEP_HP;

	mutex_unlock(&spec->config_mutex);

	vt1708_stop_hp_work(spec);

	vt1708_update_hp_work(spec);

	return 0;

}
@@ -1645,7 +1649,8 @@ static void via_hp_automute(struct hda_codec *codec) 
	int nums;

	struct via_spec *spec = codec->spec;



	if (!spec->hp_independent_mode && spec->autocfg.hp_pins[0])

	if (!spec->hp_independent_mode && spec->autocfg.hp_pins[0] &&

	    (spec->codec_type != VT1708 || spec->vt1708_jack_detect))

		present = snd_hda_jack_detect(codec, spec->autocfg.hp_pins[0]);



	if (spec->smart51_enabled)
@@ -2612,8 +2617,6 @@ static int vt1708_jack_detect_get(struct snd_kcontrol *kcontrol, 


	if (spec->codec_type != VT1708)

		return 0;

	spec->vt1708_jack_detect =

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

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

	return 0;

}
@@ -2623,18 +2626,22 @@ static int vt1708_jack_detect_put(struct snd_kcontrol *kcontrol, 
{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	struct via_spec *spec = codec->spec;

	int change;

	int val;



	if (spec->codec_type != VT1708)

		return 0;

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

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

		== !spec->vt1708_jack_detect;

	if (spec->vt1708_jack_detect) {

	val = !!ucontrol->value.integer.value[0];

	if (spec->vt1708_jack_detect == val)

		return 0;

	spec->vt1708_jack_detect = val;

	if (spec->vt1708_jack_detect &&

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

		mute_aa_path(codec, 1);

		notify_aa_path_ctls(codec);

	}

	return change;

	via_hp_automute(codec);

	vt1708_update_hp_work(spec);

	return 1;

}



static const struct snd_kcontrol_new vt1708_jack_detect_ctl = {
@@ -2771,6 +2778,7 @@ static int via_init(struct hda_codec *codec) 
	via_auto_init_unsol_event(codec);



	via_hp_automute(codec);

	vt1708_update_hp_work(spec);



	return 0;

}
@@ -2787,7 +2795,9 @@ static void vt1708_update_hp_jack_state(struct work_struct *work) 
		spec->vt1708_hp_present ^= 1;

		via_hp_automute(spec->codec);

	}

	vt1708_start_hp_work(spec);

	if (spec->vt1708_jack_detect)

		schedule_delayed_work(&spec->vt1708_hp_work,

				      msecs_to_jiffies(100));

}



static int get_mux_nids(struct hda_codec *codec)