Commit d601b666 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next

parents 6913a9db 1ac32930

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -7822,6 +7822,13 @@ F: Documentation/sound/alsa/soc/ 
F:	sound/soc/

F:	include/sound/soc*



SOUND - DMAENGINE HELPERS

M:	Lars-Peter Clausen <lars@metafoo.de>

S:	Supported

F:	include/sound/dmaengine_pcm.h

F:	sound/core/pcm_dmaengine.c

F:	sound/soc/soc-generic-dmaengine-pcm.c



SPARC + UltraSPARC (sparc/sparc64)

M:	"David S. Miller" <davem@davemloft.net>

L:	sparclinux@vger.kernel.org

sound/pci/hda/hda_codec.c

+2 −2
Original line number Diff line number Diff line
@@ -4864,8 +4864,8 @@ static void hda_power_work(struct work_struct *work) 
	spin_unlock(&codec->power_lock);



	state = hda_call_codec_suspend(codec, true);

	codec->pm_down_notified = 0;

	if (!bus->power_keep_link_on && (state & AC_PWRST_CLK_STOP_OK)) {

	if (!codec->pm_down_notified &&

	    !bus->power_keep_link_on && (state & AC_PWRST_CLK_STOP_OK)) {

		codec->pm_down_notified = 1;

		hda_call_pm_notify(bus, false);

	}

sound/pci/hda/hda_generic.c

+3 −1
Original line number Diff line number Diff line
@@ -4475,9 +4475,11 @@ int snd_hda_gen_build_controls(struct hda_codec *codec) 
					    true, &spec->vmaster_mute.sw_kctl);

		if (err < 0)

			return err;

		if (spec->vmaster_mute.hook)

		if (spec->vmaster_mute.hook) {

			snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute,

						 spec->vmaster_mute_enum);

			snd_hda_sync_vmaster_hook(&spec->vmaster_mute);

		}

	}



	free_kctls(spec); /* no longer needed */

sound/pci/hda/patch_analog.c

+17 −1
Original line number Diff line number Diff line
@@ -968,6 +968,15 @@ static void ad1884_fixup_hp_eapd(struct hda_codec *codec, 
	}

}



static void ad1884_fixup_thinkpad(struct hda_codec *codec,

				  const struct hda_fixup *fix, int action)

{

	struct ad198x_spec *spec = codec->spec;



	if (action == HDA_FIXUP_ACT_PRE_PROBE)

		spec->gen.keep_eapd_on = 1;

}



/* set magic COEFs for dmic */

static const struct hda_verb ad1884_dmic_init_verbs[] = {

	{0x01, AC_VERB_SET_COEF_INDEX, 0x13f7},
@@ -979,6 +988,7 @@ enum { 
	AD1884_FIXUP_AMP_OVERRIDE,

	AD1884_FIXUP_HP_EAPD,

	AD1884_FIXUP_DMIC_COEF,

	AD1884_FIXUP_THINKPAD,

	AD1884_FIXUP_HP_TOUCHSMART,

};
@@ -997,6 +1007,12 @@ static const struct hda_fixup ad1884_fixups[] = { 
		.type = HDA_FIXUP_VERBS,

		.v.verbs = ad1884_dmic_init_verbs,

	},

	[AD1884_FIXUP_THINKPAD] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = ad1884_fixup_thinkpad,

		.chained = true,

		.chain_id = AD1884_FIXUP_DMIC_COEF,

	},

	[AD1884_FIXUP_HP_TOUCHSMART] = {

		.type = HDA_FIXUP_VERBS,

		.v.verbs = ad1884_dmic_init_verbs,
@@ -1008,7 +1024,7 @@ static const struct hda_fixup ad1884_fixups[] = { 
static const struct snd_pci_quirk ad1884_fixup_tbl[] = {

	SND_PCI_QUIRK(0x103c, 0x2a82, "HP Touchsmart", AD1884_FIXUP_HP_TOUCHSMART),

	SND_PCI_QUIRK_VENDOR(0x103c, "HP", AD1884_FIXUP_HP_EAPD),

	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1884_FIXUP_DMIC_COEF),

	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1884_FIXUP_THINKPAD),

	{}

};