From: Mark Brown <broonie@kernel.org>
Date: Fri, 14 Mar 2025 02:31:06 +0000 (+0000)
Subject: ASoC: Merge up fixes
X-Git-Tag: v6.15-rc1~173^2~4^2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0afd7d370c6f577c1dacb1512e18048eabf322e;p=thirdparty%2Fkernel%2Flinux.git

ASoC: Merge up fixes

Merge the for-6.14 to resolve conflicts with simple-card-utils.c due to
parallel delveopment.
---

e0afd7d370c6f577c1dacb1512e18048eabf322e
diff --cc include/sound/soc.h
index de1abad06a9b0,b3e84bc47c6fd..d73fe26de1669
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@@ -1223,10 -1261,12 +1223,13 @@@ void snd_soc_close_delayed_work(struct 
  
  /* mixer control */
  struct soc_mixer_control {
- 	int min, max, platform_max;
+ 	/* Minimum and maximum specified as written to the hardware */
+ 	int min, max;
+ 	/* Limited maximum value specified as presented through the control */
+ 	int platform_max;
  	int reg, rreg;
  	unsigned int shift, rshift;
 +	u32 num_channels;
  	unsigned int sign_bit;
  	unsigned int invert:1;
  	unsigned int autodisable:1;
diff --cc sound/soc/generic/simple-card-utils.c
index 51e0e434514d1,32efb30c55d69..a1ccc300e68ca
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@@ -1099,10 -1074,10 +1099,11 @@@ static int graph_get_dai_id(struct devi
  	return id;
  }
  
 -int graph_util_parse_dai(struct device *dev, struct device_node *ep,
 +int graph_util_parse_dai(struct simple_util_priv *priv, struct device_node *ep,
  			 struct snd_soc_dai_link_component *dlc, int *is_single_link)
  {
 +	struct device *dev = simple_priv_to_dev(priv);
+ 	struct device_node *node;
  	struct of_phandle_args args = {};
  	struct snd_soc_dai *dai;
  	int ret;
@@@ -1153,8 -1127,10 +1154,10 @@@
  	 *    if he unbinded CPU or Codec.
  	 */
  	ret = snd_soc_get_dlc(&args, dlc);
- 	if (ret < 0)
+ 	if (ret < 0) {
+ 		of_node_put(node);
 -		return ret;
 +		goto end;
+ 	}
  
  parse_dai_end:
  	if (is_single_link)