From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 21 Mar 2022 15:19:21 +0000 (+0100)
Subject: Merge tag 'asoc-v5.18' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=646b907e1559f006c79a752ee3eebe220ceb983d;p=linux.git

Merge tag 'asoc-v5.18' of https://git./linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v5.18

Quite a quiet release for ASoC, lots of work on drivers and platforms
but nothing too groundbreaking but not much on the core itself:

 - Start of moving SoF to support multiple IPC mechanisms.
 - Use of NHLT ACPI table to reduce the amount of quirking required for
   Intel systems.
 - Some building blocks for use in forthcoming Intel AVS driver for
   legacy Intel DSP firmwares.
 - Support for AMD PDM, Atmel PDMC, Awinic AW8738, i.MX cards with
   TLV320AIC31xx, Intel machines with CS35L41 and ESSX8336, Mediatek
   MT8181 wideband bluetooth, nVidia Tegra234, Qualcomm SC7280, Renesas
   RZ/V2L, Texas Instruments TAS585M
---

646b907e1559f006c79a752ee3eebe220ceb983d
diff --cc sound/soc/amd/acp/acp-sof-mach.c
index 4cc431e54fe1a,c1d9650fc2225..3346677949e3e
--- a/sound/soc/amd/acp/acp-sof-mach.c
+++ b/sound/soc/amd/acp/acp-sof-mach.c
@@@ -37,9 -37,18 +37,18 @@@ static struct acp_card_drvdata sof_rt56
  	.hs_codec_id = RT5682,
  	.amp_codec_id = MAX98360A,
  	.dmic_codec_id = DMIC,
 -	.gpio_spkr_en = EN_SPKR_GPIO_NK,
 +	.gpio_spkr_en = EN_SPKR_GPIO_NONE,
  };
  
+ static struct acp_card_drvdata sof_rt5682s_rt1019_data = {
+ 	.hs_cpu_id = I2S_SP,
+ 	.amp_cpu_id = I2S_SP,
+ 	.dmic_cpu_id = DMIC,
+ 	.hs_codec_id = RT5682S,
+ 	.amp_codec_id = RT1019,
+ 	.dmic_codec_id = DMIC,
+ };
+ 
  static struct acp_card_drvdata sof_rt5682s_max_data = {
  	.hs_cpu_id = I2S_SP,
  	.amp_cpu_id = I2S_SP,
diff --cc sound/soc/sof/intel/hda-loader.c
index 9bbfdab8009de,3c0d7cbdf1748..2ac5d9d0719bc
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@@ -55,26 -73,25 +73,26 @@@ static struct hdac_ext_stream *cl_strea
  	hstream->bufsize = size;
  
  	if (direction == SNDRV_PCM_STREAM_CAPTURE) {
- 		ret = hda_dsp_iccmax_stream_hw_params(sdev, dsp_stream, dmab, NULL);
+ 		ret = hda_dsp_iccmax_stream_hw_params(sdev, hext_stream, dmab, NULL);
  		if (ret < 0) {
  			dev_err(sdev->dev, "error: iccmax stream prepare failed: %d\n", ret);
 -			goto error;
 +			goto out_free;
  		}
  	} else {
- 		ret = hda_dsp_stream_hw_params(sdev, dsp_stream, dmab, NULL);
+ 		ret = hda_dsp_stream_hw_params(sdev, hext_stream, dmab, NULL);
  		if (ret < 0) {
  			dev_err(sdev->dev, "error: hdac prepare failed: %d\n", ret);
 -			goto error;
 +			goto out_free;
  		}
- 		hda_dsp_stream_spib_config(sdev, dsp_stream, HDA_DSP_SPIB_ENABLE, size);
+ 		hda_dsp_stream_spib_config(sdev, hext_stream, HDA_DSP_SPIB_ENABLE, size);
  	}
  
- 	return dsp_stream;
+ 	return hext_stream;
  
 -error:
 -	hda_dsp_stream_put(sdev, direction, hstream->stream_tag);
 +out_free:
  	snd_dma_free_pages(dmab);
 +out_put:
 +	hda_dsp_stream_put(sdev, direction, hstream->stream_tag);
  	return ERR_PTR(ret);
  }