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

Merge tag 'asoc-fix-v6.10-rc1' of... 

Merge tag 'asoc-fix-v6.10-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.10

Several serieses of fixes that have come in since the merge window,
mostly for Intel systems.  The biggest thing is some updates from Peter
which fix support for a series of Intel laptops which have been found to
use 16 bit rather than 32 bit DMIC configuration blobs in their firmware
descriptions.  We also have a bunch of fixes for module annotations, and
some smaller single patch fixes.
parents 700fe6fd c85578e7

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -5187,7 +5187,6 @@ F: Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml 
F:	drivers/media/cec/i2c/ch7322.c









CIRRUS LOGIC AUDIO CODEC DRIVERS









M:	James Schulman <james.schulman@cirrus.com>









M:	David Rhodes <david.rhodes@cirrus.com>









M:	Richard Fitzgerald <rf@opensource.cirrus.com>









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
































sound/soc/codecs/cs42l43.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -310,7 +310,8 @@ static int cs42l43_startup(struct snd_pcm_substream *substream, struct snd_soc_d







	struct snd_soc_component *component = dai->component;









	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);









	struct cs42l43 *cs42l43 = priv->core;









	int provider = !!regmap_test_bits(cs42l43->regmap, CS42L43_ASP_CLK_CONFIG2,









	int provider = !dai->id || !!regmap_test_bits(cs42l43->regmap,









						      CS42L43_ASP_CLK_CONFIG2,









						      CS42L43_ASP_MASTER_MODE_MASK);



















	if (provider)
































sound/soc/codecs/wm_adsp.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -2085,5 +2085,6 @@ static const struct cs_dsp_client_ops wm_adsp2_client_ops = {







	.watchdog_expired = wm_adsp_fatal_error,









};



















MODULE_DESCRIPTION("Cirrus Logic ASoC DSP Support");









MODULE_LICENSE("GPL v2");









MODULE_IMPORT_NS(FW_CS_DSP);
























sound/soc/intel/boards/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -652,7 +652,7 @@ if SND_SOC_SOF_INTEL_SOUNDWIRE

















config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH









	tristate "SoundWire generic machine driver"









	depends on I2C && ACPI









	depends on I2C && SPI_MASTER && ACPI









	depends on MFD_INTEL_LPSS || COMPILE_TEST









	depends on SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES || COMPILE_TEST









	depends on SOUNDWIRE
































sound/soc/sof/amd/acp-common.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -258,8 +258,8 @@ const struct snd_sof_dsp_ops sof_acp_common_ops = {







};









EXPORT_SYMBOL_NS(sof_acp_common_ops, SND_SOC_SOF_AMD_COMMON);



















MODULE_LICENSE("Dual BSD/GPL");









MODULE_DESCRIPTION("ACP SOF COMMON Driver");









MODULE_IMPORT_NS(SND_SOC_SOF_AMD_COMMON);









MODULE_IMPORT_NS(SND_SOC_SOF_XTENSA);









MODULE_IMPORT_NS(SOUNDWIRE_AMD_INIT);








MODULE_DESCRIPTION("ACP SOF COMMON Driver");









MODULE_LICENSE("Dual BSD/GPL");