Commit 27f51860 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes. All changes are device-specific, and
  nothing stands out.

   - A regression fix for HD-audio HDMI probe

   - USB-audio hardening patches for issues spotted by fuzzers

   - ASoC fixes for TAS278x, SoundWire and Cirrus

   - Usual HD-audio and USB-audio quirks"

* tag 'sound-6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: usb-audio: Add native DSD quirks for PureAudio DAC series
  ASoC: rsnd: fix OF node reference leak in rsnd_ssiu_probe()
  ALSA: hda/tas2781: Correct the wrong project ID
  ALSA: usb-audio: Fix NULL pointer dereference in snd_usb_mixer_controls_badd
  ASoC: SDCA: bug fix while parsing mipi-sdca-control-cn-list
  ALSA: usb-audio: Fix potential overflow of PCM transfer buffer
  ALSA: hda/tas2781: Add new quirk for HP new projects
  ASoC: tas2781: fix getting the wrong device number
  ASoC: codecs: va-macro: fix resource leak in probe error path
  ASoC: tas2783A: Fix issues in firmware parsing
  ASoC: sdw_utils: fix device reference leak in is_sdca_endpoint_present()
  ASoC: cs4271: Fix regulator leak on probe failure
  ALSA: hda/hdmi: Fix breakage at probing nvhdmi-mcp driver
  ASoC: da7213: Use component driver suspend/resume
  ALSA: usb-audio: add min_mute quirk for SteelSeries Arctis
  ASoC: doc: cs35l56: Update firmware filename description for B0 silicon
parents d4f8cccc 21a9ab5b

Documentation/sound/codecs/cs35l56.rst

+4 −5
Original line number Diff line number Diff line
@@ -105,10 +105,10 @@ In this example the SSID is 10280c63. 


The format of the firmware file names is:



SoundWire (except CS35L56 Rev B0):

SoundWire:

    cs35lxx-b0-dsp1-misc-SSID[-spkidX]-l?u?



SoundWire CS35L56 Rev B0:

SoundWire CS35L56 Rev B0 firmware released before kernel version 6.16:

    cs35lxx-b0-dsp1-misc-SSID[-spkidX]-ampN



Non-SoundWire (HDA and I2S):
@@ -127,9 +127,8 @@ Where: 
  * spkidX is an optional part, used for laptops that have firmware

    configurations for different makes and models of internal speakers.



The CS35L56 Rev B0 continues to use the old filename scheme because a

large number of firmware files have already been published with these

names.

Early firmware for CS35L56 Rev B0 used the ALSA prefix (ampN) as the

filename qualifier. Support for the l?u? qualifier was added in kernel 6.16.



Sound Open Firmware and ALSA topology files

-------------------------------------------

sound/hda/codecs/hdmi/nvhdmi-mcp.c

+2 −2
Original line number Diff line number Diff line
@@ -350,8 +350,8 @@ static int nvhdmi_mcp_probe(struct hda_codec *codec, 
static const struct hda_codec_ops nvhdmi_mcp_codec_ops = {

	.probe = nvhdmi_mcp_probe,

	.remove = snd_hda_hdmi_simple_remove,

	.build_controls = nvhdmi_mcp_build_pcms,

	.build_pcms = nvhdmi_mcp_build_controls,

	.build_pcms = nvhdmi_mcp_build_pcms,

	.build_controls = nvhdmi_mcp_build_controls,

	.init = nvhdmi_mcp_init,

	.unsol_event = snd_hda_hdmi_simple_unsol_event,

};

sound/hda/codecs/realtek/alc269.c

+9 −0
Original line number Diff line number Diff line
@@ -6694,6 +6694,15 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8e60, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e61, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e62, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8ed5, "HP Merino13X", ALC245_FIXUP_TAS2781_SPI_2),

	SND_PCI_QUIRK(0x103c, 0x8ed6, "HP Merino13", ALC245_FIXUP_TAS2781_SPI_2),

	SND_PCI_QUIRK(0x103c, 0x8ed7, "HP Merino14", ALC245_FIXUP_TAS2781_SPI_2),

	SND_PCI_QUIRK(0x103c, 0x8ed8, "HP Merino16", ALC245_FIXUP_TAS2781_SPI_2),

	SND_PCI_QUIRK(0x103c, 0x8ed9, "HP Merino14W", ALC245_FIXUP_TAS2781_SPI_2),

	SND_PCI_QUIRK(0x103c, 0x8eda, "HP Merino16W", ALC245_FIXUP_TAS2781_SPI_2),

	SND_PCI_QUIRK(0x103c, 0x8f40, "HP Lampas14", ALC287_FIXUP_TXNW2781_I2C),

	SND_PCI_QUIRK(0x103c, 0x8f41, "HP Lampas16", ALC287_FIXUP_TXNW2781_I2C),

	SND_PCI_QUIRK(0x103c, 0x8f42, "HP LampasW14", ALC287_FIXUP_TXNW2781_I2C),

	SND_PCI_QUIRK(0x1043, 0x1032, "ASUS VivoBook X513EA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1034, "ASUS GU605C", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),

	SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),

sound/soc/codecs/cs4271.c

+7 −3
Original line number Diff line number Diff line
@@ -581,17 +581,17 @@ static int cs4271_component_probe(struct snd_soc_component *component) 


	ret = regcache_sync(cs4271->regmap);

	if (ret < 0)

		return ret;

		goto err_disable_regulator;



	ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,

				 CS4271_MODE2_PDN | CS4271_MODE2_CPEN,

				 CS4271_MODE2_PDN | CS4271_MODE2_CPEN);

	if (ret < 0)

		return ret;

		goto err_disable_regulator;

	ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,

				 CS4271_MODE2_PDN, 0);

	if (ret < 0)

		return ret;

		goto err_disable_regulator;

	/* Power-up sequence requires 85 uS */

	udelay(85);
@@ -601,6 +601,10 @@ static int cs4271_component_probe(struct snd_soc_component *component) 
				   CS4271_MODE2_MUTECAEQUB);



	return 0;



err_disable_regulator:

	regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies);

	return ret;

}



static void cs4271_component_remove(struct snd_soc_component *component)

sound/soc/codecs/da7213.c

+44 −25
Original line number Diff line number Diff line
@@ -2124,11 +2124,50 @@ static int da7213_probe(struct snd_soc_component *component) 
	return 0;

}



static int da7213_runtime_suspend(struct device *dev)

{

	struct da7213_priv *da7213 = dev_get_drvdata(dev);



	regcache_cache_only(da7213->regmap, true);

	regcache_mark_dirty(da7213->regmap);

	regulator_bulk_disable(DA7213_NUM_SUPPLIES, da7213->supplies);



	return 0;

}



static int da7213_runtime_resume(struct device *dev)

{

	struct da7213_priv *da7213 = dev_get_drvdata(dev);

	int ret;



	ret = regulator_bulk_enable(DA7213_NUM_SUPPLIES, da7213->supplies);

	if (ret < 0)

		return ret;

	regcache_cache_only(da7213->regmap, false);

	return regcache_sync(da7213->regmap);

}



static int da7213_suspend(struct snd_soc_component *component)

{

	struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);



	return da7213_runtime_suspend(da7213->dev);

}



static int da7213_resume(struct snd_soc_component *component)

{

	struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);



	return da7213_runtime_resume(da7213->dev);

}



static const struct snd_soc_component_driver soc_component_dev_da7213 = {

	.probe			= da7213_probe,

	.set_bias_level		= da7213_set_bias_level,

	.controls		= da7213_snd_controls,

	.num_controls		= ARRAY_SIZE(da7213_snd_controls),

	.suspend		= da7213_suspend,

	.resume			= da7213_resume,

	.dapm_widgets		= da7213_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(da7213_dapm_widgets),

	.dapm_routes		= da7213_audio_map,
@@ -2175,6 +2214,8 @@ static int da7213_i2c_probe(struct i2c_client *i2c) 
	if (!da7213->fin_min_rate)

		return -EINVAL;



	da7213->dev = &i2c->dev;



	i2c_set_clientdata(i2c, da7213);



	/* Get required supplies */
@@ -2224,31 +2265,9 @@ static void da7213_i2c_remove(struct i2c_client *i2c) 
	pm_runtime_disable(&i2c->dev);

}



static int da7213_runtime_suspend(struct device *dev)

{

	struct da7213_priv *da7213 = dev_get_drvdata(dev);



	regcache_cache_only(da7213->regmap, true);

	regcache_mark_dirty(da7213->regmap);

	regulator_bulk_disable(DA7213_NUM_SUPPLIES, da7213->supplies);



	return 0;

}



static int da7213_runtime_resume(struct device *dev)

{

	struct da7213_priv *da7213 = dev_get_drvdata(dev);

	int ret;



	ret = regulator_bulk_enable(DA7213_NUM_SUPPLIES, da7213->supplies);

	if (ret < 0)

		return ret;

	regcache_cache_only(da7213->regmap, false);

	return regcache_sync(da7213->regmap);

}



static DEFINE_RUNTIME_DEV_PM_OPS(da7213_pm, da7213_runtime_suspend,

				 da7213_runtime_resume, NULL);

static const struct dev_pm_ops da7213_pm = {

	RUNTIME_PM_OPS(da7213_runtime_suspend, da7213_runtime_resume, NULL)

};



static const struct i2c_device_id da7213_i2c_id[] = {

	{ "da7213" },