Commit 14f68633 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Still higher volume than wished, but all are driver-specific small
  fixes and look safe for this late RC.

  The majority of changes are for ASoC, especially for wcd938x driver
  and Cirrus codec drivers, while there are other random fixes including
  usual HD-audio quirks"

* tag 'sound-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (22 commits)
  ASoC: da7219: Correct the process of setting up Gnd switch in AAD
  ALSA: hda/realtek - Fixed ASUS platform headset Mic issue
  ALSA: hda/realtek: Add quirk for ASUS ROG GU603ZV
  ALSA: hda/relatek: Enable Mute LED on HP Laptop 15s-fq5xxx
  ASoC: dwc: Fix non-DT instantiation
  ASoC: codecs: tas2780: Fix log of failed reset via I2C.
  ASoC: rt5650: fix the wrong result of key button
  ASoC: cs42l42: Fix missing include of gpio/consumer.h
  ASoC: cs42l43: Update values for bias sense
  ASoC: dt-bindings: cirrus,cs42l43: Update values for bias sense
  ASoC: cs35l56: ASP1 DOUT must default to Hi-Z when not transmitting
  ASoC: pxa: fix a memory leak in probe()
  ASoC: cs35l56: Fix illegal use of init_completion()
  ASoC: codecs: wcd938x-sdw: fix runtime PM imbalance on probe errors
  ASoC: codecs: wcd938x-sdw: fix use after free on driver unbind
  ASoC: codecs: wcd938x: fix runtime PM imbalance on remove
  ASoC: codecs: wcd938x: fix regulator leaks on probe errors
  ASoC: codecs: wcd938x: fix resource leaks on bind errors
  ASoC: codecs: wcd938x: fix unbind tear down order
  ASoC: codecs: wcd938x: drop bogus bind error handling
  ...
parents c8045b4a 8e13caa2

Documentation/devicetree/bindings/sound/cirrus,cs42l43.yaml

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ properties: 
    description:

      Current at which the headset micbias sense clamp will engage, 0 to

      disable.

    enum: [ 0, 14, 23, 41, 50, 60, 68, 86, 95 ]

    enum: [ 0, 14, 24, 43, 52, 61, 71, 90, 99 ]

    default: 0



  cirrus,bias-ramp-ms:

include/sound/soc-dapm.h

+1 −0
Original line number Diff line number Diff line
@@ -469,6 +469,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card); 


int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream,

			    struct snd_pcm_hw_params *params, struct snd_soc_dai *dai);

int snd_soc_dapm_widget_name_cmp(struct snd_soc_dapm_widget *widget, const char *s);



/* dapm path setup */

int snd_soc_dapm_new_widgets(struct snd_soc_card *card);

sound/pci/hda/patch_realtek.c

+27 −0
Original line number Diff line number Diff line
@@ -7078,6 +7078,24 @@ static void alc287_fixup_bind_dacs(struct hda_codec *codec, 
					0x0); /* Make sure 0x14 was disable */

	}

}

/* Fix none verb table of Headset Mic pin */

static void alc_fixup_headset_mic(struct hda_codec *codec,

				   const struct hda_fixup *fix, int action)

{

	struct alc_spec *spec = codec->spec;

	static const struct hda_pintbl pincfgs[] = {

		{ 0x19, 0x03a1103c },

		{ }

	};



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		snd_hda_apply_pincfgs(codec, pincfgs);

		alc_update_coef_idx(codec, 0x45, 0xf<<12 | 1<<10, 5<<12);

		spec->parse_flags |= HDA_PINCFG_HEADSET_MIC;

		break;

	}

}





enum {
@@ -7344,6 +7362,7 @@ enum { 
	ALC245_FIXUP_HP_X360_MUTE_LEDS,

	ALC287_FIXUP_THINKPAD_I2S_SPK,

	ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD,

	ALC2XX_FIXUP_HEADSET_MIC,

};



/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -9448,6 +9467,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,

	},

	[ALC2XX_FIXUP_HEADSET_MIC] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_headset_mic,

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -9722,6 +9745,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x89c6, "Zbook Fury 17 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x89ca, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x89d3, "HP EliteBook 645 G9 (MB 89D2)", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8a20, "HP Laptop 15s-fq5xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),

	SND_PCI_QUIRK(0x103c, 0x8a25, "HP Victus 16-d1xxx (MB 8A25)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x103c, 0x8aa0, "HP ProBook 440 G9 (MB 8A9E)", ALC236_FIXUP_HP_GPIO_LED),
@@ -9791,6 +9815,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),

	SND_PCI_QUIRK(0x1043, 0x1573, "ASUS GZ301V", ALC285_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK),

	SND_PCI_QUIRK(0x1043, 0x1663, "ASUS GU603ZV", ALC285_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),

	SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),
@@ -10750,6 +10775,8 @@ static const struct snd_hda_pin_quirk alc269_fallback_pin_fixup_tbl[] = { 
	SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,

		{0x19, 0x40000000},

		{0x1a, 0x40000000}),

	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC2XX_FIXUP_HEADSET_MIC,

		{0x19, 0x40000000}),

	{}

};

sound/soc/codecs/cs35l56.c

+7 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static void cs35l56_patch(struct cs35l56_private *cs35l56) 


	mutex_lock(&cs35l56->base.irq_lock);



	init_completion(&cs35l56->init_completion);

	reinit_completion(&cs35l56->init_completion);



	cs35l56->soft_resetting = true;

	cs35l56_system_reset(&cs35l56->base, !!cs35l56->sdw_peripheral);
@@ -1186,6 +1186,12 @@ int cs35l56_init(struct cs35l56_private *cs35l56) 
	/* Registers could be dirty after soft reset or SoundWire enumeration */

	regcache_sync(cs35l56->base.regmap);



	/* Set ASP1 DOUT to high-impedance when it is not transmitting audio data. */

	ret = regmap_set_bits(cs35l56->base.regmap, CS35L56_ASP1_CONTROL3,

			      CS35L56_ASP1_DOUT_HIZ_CTRL_MASK);

	if (ret)

		return dev_err_probe(cs35l56->base.dev, ret, "Failed to write ASP1_CONTROL3\n");



	cs35l56->base.init_done = true;

	complete(&cs35l56->init_completion);

sound/soc/codecs/cs42l42-sdw.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include <linux/acpi.h>

#include <linux/device.h>

#include <linux/gpio/consumer.h>

#include <linux/iopoll.h>

#include <linux/module.h>

#include <linux/mod_devicetable.h>