Merge "ASoC: msm: audio: update soundcard name for tashalite" (4da19e9e) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/msm8952-dai-links.c

+16 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -21,6 +21,11 @@
		#include "../codecs/wcd9335.h"

		#define DEV_NAME_STR_LEN 32
		enum TASHA_LITE_DEVICE {
		MSM8952_TASHA_LITE = 0,
		MSM8953_TASHA_LITE,
		NUM_OF_TASHA_LITE_DEVICE,
		};

		static struct snd_soc_card snd_soc_card_msm[MAX_CODECS];
		static struct snd_soc_card snd_soc_card_msm_card;
		@@ -1461,7 +1466,10 @@ struct snd_soc_card populate_snd_card_dailinks(struct device dev)
		struct snd_soc_dai_link *msm8952_dai_links = NULL;
		int num_links, ret, len1, len2, len3, len4;
		enum codec_variant codec_ver = 0;
		const char *tasha_lite = "msm8952-tashalite-snd-card";
		const char *tasha_lite[NUM_OF_TASHA_LITE_DEVICE] = {
		"msm8952-tashalite-snd-card",
		"msm8953-tashalite-snd-card"
		};

		card->dev = dev;
		ret = snd_soc_of_parse_card_name(card, "qcom,model");
		@@ -1489,8 +1497,12 @@ struct snd_soc_card populate_snd_card_dailinks(struct device dev)
		msm8952_dai_links = msm8952_tomtom_dai_links;
		} else if (strnstr(card->name, "tasha", strlen(card->name))) {
		codec_ver = tasha_codec_ver();
		if (codec_ver == WCD9326)
		card->name = tasha_lite;
		if (codec_ver == WCD9326) {
		if (!strcmp(card->name, "msm8952-tasha-snd-card"))
		card->name = tasha_lite[MSM8952_TASHA_LITE];
		else if (!strcmp(card->name, "msm8953-tasha-snd-card"))
		card->name = tasha_lite[MSM8953_TASHA_LITE];
		}

		len1 = ARRAY_SIZE(msm8952_common_fe_dai);
		len2 = len1 + ARRAY_SIZE(msm8952_tasha_fe_dai);