ASoC: SOF: ipc4-topology: Add new tokens for input/output pin format count

[sfrench/cifs-2.6.git] / sound / soc / sof / topology.c

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 3a091f18731f049257658241c76f68eabfc009dd..b642835e14df6994eb27c5c9a4e333874b1d8d39 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -1231,35 +1231,43 @@ static int sof_widget_parse_tokens(struct snd_soc_component *scomp, struct snd_s
 
                        continue;
                case SOF_IN_AUDIO_FORMAT_TOKENS:
-               case SOF_OUT_AUDIO_FORMAT_TOKENS:
-                       num_sets = sof_get_token_value(SOF_TKN_COMP_NUM_AUDIO_FORMATS,
+                       num_sets = sof_get_token_value(SOF_TKN_COMP_NUM_INPUT_AUDIO_FORMATS,
                                                       swidget->tuples, swidget->num_tuples);
-
                        if (num_sets < 0) {
-                               dev_err(sdev->dev, "Invalid audio format count for %s\n",
+                               dev_err(sdev->dev, "Invalid input audio format count for %s\n",
                                        swidget->widget->name);
                                ret = num_sets;
                                goto err;
                        }
-
-                       if (num_sets > 1) {
-                               struct snd_sof_tuple *new_tuples;
-
-                               num_tuples += token_list[object_token_list[i]].count * num_sets;
-                               new_tuples = krealloc(swidget->tuples,
-                                                     sizeof(*new_tuples) * num_tuples, GFP_KERNEL);
-                               if (!new_tuples) {
-                                       ret = -ENOMEM;
-                                       goto err;
-                               }
-
-                               swidget->tuples = new_tuples;
+                       break;
+               case SOF_OUT_AUDIO_FORMAT_TOKENS:
+                       num_sets = sof_get_token_value(SOF_TKN_COMP_NUM_OUTPUT_AUDIO_FORMATS,
+                                                      swidget->tuples, swidget->num_tuples);
+                       if (num_sets < 0) {
+                               dev_err(sdev->dev, "Invalid output audio format count for %s\n",
+                                       swidget->widget->name);
+                               ret = num_sets;
+                               goto err;
                        }
                        break;
                default:
                        break;
                }
 
+               if (num_sets > 1) {
+                       struct snd_sof_tuple *new_tuples;
+
+                       num_tuples += token_list[object_token_list[i]].count * num_sets;
+                       new_tuples = krealloc(swidget->tuples,
+                                             sizeof(*new_tuples) * num_tuples, GFP_KERNEL);
+                       if (!new_tuples) {
+                               ret = -ENOMEM;
+                               goto err;
+                       }
+
+                       swidget->tuples = new_tuples;
+               }
+
                /* copy one set of tuples per token ID into swidget->tuples */
                ret = sof_copy_tuples(sdev, private->array, le32_to_cpu(private->size),
                                      object_token_list[i], num_sets, swidget->tuples,