ASoC: Merge up fixes

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

diff --cc include/sound/soc.h
index de1abad06a9b0f31a2c50305d1b523d5f331a031,b3e84bc47c6fdd3fd0f7899acc2067b3917e4600..d73fe26de1669abb6f6da0dbf02e06566dd6e045
--- 1/include/sound/soc.h
--- 2/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/codecs/rt722-sdca-sdw.c
Simple merge

diff --cc sound/soc/generic/simple-card-utils.c
index 51e0e434514d143c3dd35f4faeef6ad9beef1880,32efb30c55d6959895f8f25c28532d1cd88a42c8..a1ccc300e68ca81fde0a190bba59082882699fc8
--- 1/sound/soc/generic/simple-card-utils.c
--- 2/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)

diff --cc sound/soc/soc-ops.c
Simple merge