From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 15 Jun 2026 18:19:22 +0000 (+0200)
Subject: Merge tag 'asoc-v7.2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5e90e8844692deb7bbcd029e8b92b3a20441903;p=thirdparty%2Flinux.git

Merge tag 'asoc-v7.2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v7.2

There's been quite a lot of framework improvements this time around,
though mainly cleanups and robustness rather than user visible features.
The same pattern is seen with a lot of the driver work that's going on,
there are new features but a huge proportion of this is bug fixing and
cleanup work.  We also have a good selectio of new device support.

 - Improvements to SDCA jack handling from Charles Keepax.
 - Use of device links to make suspend handling more robust from Richard
   Fitzgerald.
 - Use of a new helper to factor out a common pattern in SoundWire
   enmeration from Charles Keepax.
 - Slimming down of the component from Kuninori Morimoto.
 - Simplification of format auto selection from Kuninori Morimoto.
 - Lots of conversions to guard() from Bui Duc Phuc.
 - Addition of a simple-amplifier driver supporting more featureful GPIO
   controller amplifiers than the previous basic driver from Herve
   Codina.
 - Support for AMD ACP 7.x, Cirrus Logic CS42448/CS42888, Everest Semi
   ES9356, Mediatek MT2701 and MT8196, Renesas RZ/G3E, Spacemit K3,
   Texas Instruments TAC5xx2 and TAS67524.
---

c5e90e8844692deb7bbcd029e8b92b3a20441903
diff --cc sound/soc/loongson/loongson_dma.c
index f3ed14a48bd59,ed970343d283f..44fdce22f58c6
--- a/sound/soc/loongson/loongson_dma.c
+++ b/sound/soc/loongson/loongson_dma.c
@@@ -195,13 -195,12 +195,13 @@@ static int loongson_idma_pcm_hw_params(
  }
  
  static snd_pcm_uframes_t
- loongson_pcm_pointer(struct snd_soc_component *component,
- 		     struct snd_pcm_substream *substream)
+ loongson_idma_pcm_pointer(struct snd_soc_component *component,
+ 			  struct snd_pcm_substream *substream)
  {
  	struct snd_pcm_runtime *runtime = substream->runtime;
 +	struct device *dev = substream->pcm->card->dev;
  	struct loongson_runtime_data *prtd = runtime->private_data;
- 	struct loongson_dma_desc *desc;
+ 	struct loongson_idma_desc *desc;
  	snd_pcm_uframes_t x;
  	u64 addr;