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

Merge tag 'asoc-fix-v6.12-rc6' of... 

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

ASoC: Fixes for v6.12

A moderately large pile of small changes here, split fairly evenly
between fixes and ID additions/quirks and all of it driver specific.
parents dabc44c2 48b86532

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -21697,6 +21697,15 @@ S: Supported 
W:	https://github.com/thesofproject/linux/

F:	sound/soc/sof/









SOUND - GENERIC SOUND CARD (Simple-Audio-Card, Audio-Graph-Card)









M:	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>









S:	Supported









L:	linux-sound@vger.kernel.org









F:	sound/soc/generic/









F:	include/sound/simple_card*









F:	Documentation/devicetree/bindings/sound/simple-card.yaml









F:	Documentation/devicetree/bindings/sound/audio-graph*.yaml

















SOUNDWIRE SUBSYSTEM









M:	Vinod Koul <vkoul@kernel.org>









M:	Bard Liao <yung-chuan.liao@linux.intel.com>

























sound/soc/amd/yc/acp6x-mach.c



+14
−0






























Original line number
Diff line number
Diff line







@@ -227,6 +227,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {







			DMI_MATCH(DMI_PRODUCT_NAME, "21M3"),









		}









	},









	{









		.driver_data = &acp6x_card,









		.matches = {









			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),









			DMI_MATCH(DMI_PRODUCT_NAME, "21M4"),









		}









	},









	{









		.driver_data = &acp6x_card,









		.matches = {








@@ -395,6 +402,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {







			DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 15 2022"),









		}









	},









	{









		.driver_data = &acp6x_card,









		.matches = {









			DMI_MATCH(DMI_BOARD_VENDOR, "TIMI"),









			DMI_MATCH(DMI_PRODUCT_NAME, "Xiaomi Book Pro 14 2022"),









		}









	},









	{









		.driver_data = &acp6x_card,









		.matches = {
































sound/soc/codecs/tas2781-fmwlib.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -1992,6 +1992,7 @@ static int tasdevice_dspfw_ready(const struct firmware *fmw,







		break;









	case 0x202:









	case 0x400:









	case 0x401:









		tas_priv->fw_parse_variable_header =









			fw_parse_variable_header_git;









		tas_priv->fw_parse_program_data =
































sound/soc/sof/amd/acp.c



+9
−1






























Original line number
Diff line number
Diff line







@@ -342,11 +342,19 @@ int acp_dma_status(struct acp_dev_data *adata, unsigned char ch)







{









	struct snd_sof_dev *sdev = adata->dev;









	unsigned int val;









	unsigned int acp_dma_ch_sts;









	int ret = 0;



















	switch (adata->pci_rev) {









	case ACP70_PCI_ID:









		acp_dma_ch_sts = ACP70_DMA_CH_STS;









		break;









	default:









		acp_dma_ch_sts = ACP_DMA_CH_STS;









	}









	val = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_DMA_CNTL_0 + ch * sizeof(u32));









	if (val & ACP_DMA_CH_RUN) {









		ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_DMA_CH_STS, val, !val,









		ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, acp_dma_ch_sts, val, !val,









						    ACP_REG_POLL_INTERVAL,









						    ACP_DMA_COMPLETE_TIMEOUT_US);









		if (ret < 0)
































sound/soc/sof/sof-client-probes-ipc4.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -125,6 +125,7 @@ static int ipc4_probes_init(struct sof_client_dev *cdev, u32 stream_tag,







	msg.primary |= SOF_IPC4_MSG_TARGET(SOF_IPC4_MODULE_MSG);









	msg.extension = SOF_IPC4_MOD_EXT_DST_MOD_INSTANCE(INVALID_PIPELINE_ID);









	msg.extension |= SOF_IPC4_MOD_EXT_CORE_ID(0);









	msg.extension |= SOF_IPC4_MOD_EXT_PARAM_SIZE(sizeof(cfg) / sizeof(uint32_t));



















	msg.data_size = sizeof(cfg);









	msg.data_ptr = &cfg;