Unverified Commit 2c9abde4 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge up fixes 

Merge branch 'for-6.11' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-6.12 for some AMD work.
parents 5f83ee4b a42db293

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -18526,7 +18526,6 @@ F: drivers/crypto/intel/qat/ 








QCOM AUDIO (ASoC) DRIVERS









M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>









M:	Banajit Goswami <bgoswami@quicinc.com>









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









L:	linux-arm-msm@vger.kernel.org









S:	Supported

























sound/soc/amd/acp/acp-legacy-mach.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -227,6 +227,8 @@ static const struct platform_device_id board_ids[] = {







	},









	{ }









};









MODULE_DEVICE_TABLE(platform, board_ids);



















static struct platform_driver acp_asoc_audio = {









	.driver = {









		.pm = &snd_soc_pm_ops,
































sound/soc/codecs/lpass-macro-common.h



+6
−0






























Original line number
Diff line number
Diff line







@@ -49,6 +49,12 @@ static inline void lpass_macro_pds_exit_action(void *pds)







static inline const char *lpass_macro_get_codec_version_string(int version)









{









	switch (version) {









	case LPASS_CODEC_VERSION_1_0:









		return "v1.0";









	case LPASS_CODEC_VERSION_1_1:









		return "v1.1";









	case LPASS_CODEC_VERSION_1_2:









		return "v1.2";









	case LPASS_CODEC_VERSION_2_0:









		return "v2.0";









	case LPASS_CODEC_VERSION_2_1:
































sound/soc/codecs/lpass-va-macro.c



+4
−0






























Original line number
Diff line number
Diff line







@@ -1485,6 +1485,10 @@ static void va_macro_set_lpass_codec_version(struct va_macro *va)







	if ((core_id_0 == 0x02) && (core_id_1 == 0x0F) && (core_id_2 == 0x80 || core_id_2 == 0x81))









		version = LPASS_CODEC_VERSION_2_8;



















	if (version == LPASS_CODEC_VERSION_UNKNOWN)









		dev_warn(va->dev, "Unknown Codec version, ID: %02x / %02x / %02x\n",









			 core_id_0, core_id_1, core_id_2);



















	lpass_macro_set_codec_version(version);



















	dev_dbg(va->dev, "LPASS Codec Version %s\n", lpass_macro_get_codec_version_string(version));
































sound/soc/codecs/wcd937x.c



+2
−3






























Original line number
Diff line number
Diff line







@@ -242,10 +242,9 @@ static const struct regmap_irq_chip wcd937x_regmap_irq_chip = {

















static void wcd937x_reset(struct wcd937x_priv *wcd937x)









{









	usleep_range(20, 30);



















	gpiod_set_value(wcd937x->reset_gpio, 1);



















	usleep_range(20, 30);









	gpiod_set_value(wcd937x->reset_gpio, 0);









	usleep_range(20, 30);









}