From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Apr 2025 19:43:13 +0000 (-0700)
Subject: Merge tag 'soundwire-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul... 
X-Git-Tag: v6.15-rc1~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d31167e844bac8be7587781c52af450b6451f01;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'soundwire-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire

Pull soundwire updates from Vinod Koul:

 - Support for SoundWire Bulk Register Access (BRA) protocol in core
   along with Intel driver support and ASoC bits required

 - AMD driver updates and support for ACP 7.0 and 7.1 platforms

* tag 'soundwire-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire: (28 commits)
  soundwire: take in count the bandwidth of a prepared stream
  ASoC: rt711-sdca: add DP0 support
  soundwire: debugfs: add interface for BPT/BRA transfers
  ASoC: SOF: Intel: hda-sdw-bpt: add CHAIN_DMA support
  soundwire: intel_ace2x: add BPT send_async/wait callbacks
  soundwire: intel: add BPT context definition
  ASoC: SOF: Intel: hda-sdw-bpt: add helpers for SoundWire BPT DMA
  soundwire: intel_auxdevice: add indirection for BPT send_async/wait
  soundwire: cadence: add BTP/BRA helpers to format data
  soundwire: bus: add bpt_stream pointer
  soundwire: bus: add send_async/wait APIs for BPT protocol
  soundwire: stream: reuse existing code for BPT stream
  soundwire: stream: special-case the bus compute_params() routine
  soundwire: stream: extend sdw_alloc_stream() to take 'type' parameter
  soundwire: extend sdw_stream_type to BPT
  soundwire: cadence: add BTP support for DP0
  Documentation: driver: add SoundWire BRA description
  soundwire: amd: change the log level for command response log
  soundwire: slave: fix an OF node reference leak in soundwire slave device
  soundwire: Use str_enable_disable-like helpers
  ...
---

4d31167e844bac8be7587781c52af450b6451f01
diff --cc sound/soc/qcom/sdw.c
index 1d01b9329e08c,875da4adb1d7b..7d7981d4295b4
--- a/sound/soc/qcom/sdw.c
+++ b/sound/soc/qcom/sdw.c
@@@ -23,13 -23,11 +23,13 @@@ int qcom_snd_sdw_startup(struct snd_pcm
  {
  	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
  	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
 +	u32 rx_ch[SDW_MAX_PORTS], tx_ch[SDW_MAX_PORTS];
  	struct sdw_stream_runtime *sruntime;
  	struct snd_soc_dai *codec_dai;
 -	int ret, i;
 +	u32 rx_ch_cnt = 0, tx_ch_cnt = 0;
 +	int ret, i, j;
  
- 	sruntime = sdw_alloc_stream(cpu_dai->name);
+ 	sruntime = sdw_alloc_stream(cpu_dai->name, SDW_STREAM_PCM);
  	if (!sruntime)
  		return -ENOMEM;