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

Commit 9b957794 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "It seems that Santa overslept with a bunch of gifts; the majority of
  changes here are various device-specific ASoC fixes, most notably the
  revert of rcar IOMMU support and fsl_ssi AC97 fixes, but also lots of
  small fixes for codecs. Besides that, the usual HD-audio quirks and
  fixes are included, too"

* tag 'sound-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (31 commits)
  ALSA: hda - Fix missing COEF init for ALC225/295/299
  ALSA: hda: Drop useless WARN_ON()
  ALSA: hda - change the location for one mic on a Lenovo machine
  ALSA: hda - fix headset mic detection issue on a Dell machine
  ALSA: hda - Add MIC_NO_PRESENCE fixup for 2 HP machines
  ASoC: rsnd: fixup ADG register mask
  ASoC: rt5514-spi: only enable wakeup when fully initialized
  ASoC: nau8825: fix issue that pop noise when start capture
  ASoC: rt5663: Fix the wrong result of the first jack detection
  ASoC: rsnd: ssi: fix race condition in rsnd_ssi_pointer_update
  ASoC: Intel: Change kern log level to avoid unwanted messages
  ASoC: atmel-classd: select correct Kconfig symbol
  ASoC: wm_adsp: Fix validation of firmware and coeff lengths
  ASoC: Intel: Skylake: Do not check dev_type for dmic link type
  ASoC: rockchip: disable clock on error
  ASoC: tlv320aic31xx: Fix GPIO1 register definition
  ASoC: codecs: msm8916-wcd: Fix supported formats
  ASoC: fsl_asrc: Fix typo in a field define
  ASoC: rsnd: ssiu: clear SSI_MODE for non TDM Extended modes
  ASoC: da7218: Correct IRQ level in DT binding example
  ...
parents beacbc68 44be77c5

Documentation/devicetree/bindings/sound/da7218.txt

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ Example: 
		compatible = "dlg,da7218";

		reg = <0x1a>;

		interrupt-parent = <&gpio6>;

		interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

		wakeup-source;



		VDD-supply = <&reg_audio>;

Documentation/devicetree/bindings/sound/da7219.txt

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ Example: 
		reg = <0x1a>;



		interrupt-parent = <&gpio6>;

		interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;



		VDD-supply = <&reg_audio>;

		VDDMIC-supply = <&reg_audio>;

sound/hda/hdac_i915.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int hdac_component_master_match(struct device *dev, void *data) 
 */

int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *aops)

{

	if (WARN_ON(!hdac_acomp))

	if (!hdac_acomp)

		return -ENODEV;



	hdac_acomp->audio_ops = aops;

sound/pci/hda/patch_conexant.c

+29 −0
Original line number Diff line number Diff line
@@ -271,6 +271,8 @@ enum { 
	CXT_FIXUP_HP_SPECTRE,

	CXT_FIXUP_HP_GATE_MIC,

	CXT_FIXUP_MUTE_LED_GPIO,

	CXT_FIXUP_HEADSET_MIC,

	CXT_FIXUP_HP_MIC_NO_PRESENCE,

};



/* for hda_fixup_thinkpad_acpi() */
@@ -350,6 +352,18 @@ static void cxt_fixup_headphone_mic(struct hda_codec *codec, 
	}

}



static void cxt_fixup_headset_mic(struct hda_codec *codec,

				    const struct hda_fixup *fix, int action)

{

	struct conexant_spec *spec = codec->spec;



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		spec->parse_flags |= HDA_PINCFG_HEADSET_MIC;

		break;

	}

}



/* OPLC XO 1.5 fixup */



/* OLPC XO-1.5 supports DC input mode (e.g. for use with analog sensors)
@@ -880,6 +894,19 @@ static const struct hda_fixup cxt_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = cxt_fixup_mute_led_gpio,

	},

	[CXT_FIXUP_HEADSET_MIC] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = cxt_fixup_headset_mic,

	},

	[CXT_FIXUP_HP_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x1a, 0x02a1113c },

			{ }

		},

		.chained = true,

		.chain_id = CXT_FIXUP_HEADSET_MIC,

	},

};



static const struct snd_pci_quirk cxt5045_fixups[] = {
@@ -934,6 +961,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC),

	SND_PCI_QUIRK(0x103c, 0x814f, "HP ZBook 15u G3", CXT_FIXUP_MUTE_LED_GPIO),

	SND_PCI_QUIRK(0x103c, 0x822e, "HP ProBook 440 G4", CXT_FIXUP_MUTE_LED_GPIO),

	SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),

	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),

sound/pci/hda/patch_realtek.c

+11 −3
Original line number Diff line number Diff line
@@ -324,8 +324,12 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) 
	case 0x10ec0292:

		alc_update_coef_idx(codec, 0x4, 1<<15, 0);

		break;

	case 0x10ec0215:

	case 0x10ec0225:

	case 0x10ec0295:

	case 0x10ec0299:

		alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000);

		/* fallthrough */

	case 0x10ec0215:

	case 0x10ec0233:

	case 0x10ec0236:

	case 0x10ec0255:
@@ -336,10 +340,8 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) 
	case 0x10ec0286:

	case 0x10ec0288:

	case 0x10ec0285:

	case 0x10ec0295:

	case 0x10ec0298:

	case 0x10ec0289:

	case 0x10ec0299:

		alc_update_coef_idx(codec, 0x10, 1<<9, 0);

		break;

	case 0x10ec0275:
@@ -6328,6 +6330,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),

	SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),

	SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),

	SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),

	SND_PCI_QUIRK(0x17aa, 0x3112, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),

	SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
@@ -6585,6 +6588,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		{0x1b, 0x01011020},

		{0x21, 0x02211010}),

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

		{0x12, 0x90a60130},

		{0x14, 0x90170110},

		{0x1b, 0x01011020},

		{0x21, 0x0221101f}),

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

		{0x12, 0x90a60160},

		{0x14, 0x90170120},