ASoC: SOF: Make string/uuid tokens parsing generic

Modify the parsing logic for string/uuid type
tokens to make them generic enough to handle
multiple vendor tuples of the same type.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Author: ranj063

sound/soc/sof/topology.c

@@ -755,9 +755,11 @@ static void sof_parse_uuid_tokens(struct snd_soc_component *scomp,
 				  void *object,
 				  const struct sof_topology_token *tokens,
 				  int count,
-				  struct snd_soc_tplg_vendor_array *array)
+				  struct snd_soc_tplg_vendor_array *array,
+				  int *index)
 {
 	struct snd_soc_tplg_vendor_uuid_elem *elem;
+	bool match = false;
 	int i, j;
 
 	/* parse element by element */
@@ -774,6 +776,12 @@ static void sof_parse_uuid_tokens(struct snd_soc_component *scomp,
 			if (tokens[j].token != le32_to_cpu(elem->token))
 				continue;
 
+			/* update index for the first matched token */
+			if (index && !match) {
+				match = true;
+				(*index)++;
+			}
+
 			/* matched - now load token */
 			tokens[j].get_token(elem, object, tokens[j].offset,
 					    tokens[j].size);
@@ -785,9 +793,11 @@ static void sof_parse_string_tokens(struct snd_soc_component *scomp,
 				    void *object,
 				    const struct sof_topology_token *tokens,
 				    int count,
-				    struct snd_soc_tplg_vendor_array *array)
+				    struct snd_soc_tplg_vendor_array *array,
+				    int *index)
 {
 	struct snd_soc_tplg_vendor_string_elem *elem;
+	bool match = false;
 	int i, j;
 
 	/* parse element by element */
@@ -804,6 +814,12 @@ static void sof_parse_string_tokens(struct snd_soc_component *scomp,
 			if (tokens[j].token != le32_to_cpu(elem->token))
 				continue;
 
+			/* update index for the first matched token */
+			if (index && !match) {
+				match = true;
+				(*index)++;
+			}
+
 			/* matched - now load token */
 			tokens[j].get_token(elem, object, tokens[j].offset,
 					    tokens[j].size);
@@ -895,11 +911,11 @@ static int sof_parse_tokens(struct snd_soc_component *scomp,
 		switch (le32_to_cpu(array->type)) {
 		case SND_SOC_TPLG_TUPLE_TYPE_UUID:
 			sof_parse_uuid_tokens(scomp, object, tokens, count,
-					      array);
+					      array, &index);
 			break;
 		case SND_SOC_TPLG_TUPLE_TYPE_STRING:
 			sof_parse_string_tokens(scomp, object, tokens, count,
-						array);
+						array, &index);
 			break;
 		case SND_SOC_TPLG_TUPLE_TYPE_BOOL:
 		case SND_SOC_TPLG_TUPLE_TYPE_BYTE: