Merge "ASoC: msm: updating EFUSE registers for tasha and tashalite." (1b1db17d) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/codecs/wcd9335.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -13721,21 +13721,21 @@ void tasha_get_codec_ver(struct tasha_priv *tasha)
		int i;
		u8 val;
		struct tasha_reg_mask_val codec_reg[] = {
		{WCD9335_CHIP_TIER_CTRL_EFUSE_VAL_OUT10, 0xFF, 0xFF},
		{WCD9335_CHIP_TIER_CTRL_EFUSE_VAL_OUT11, 0xFF, 0x83},
		{WCD9335_CHIP_TIER_CTRL_EFUSE_VAL_OUT12, 0xFF, 0x0A},
		{WCD9335_CHIP_TIER_CTRL_EFUSE_VAL_OUT10, 0xFF, 0x00},
		{WCD9335_CHIP_TIER_CTRL_EFUSE_VAL_OUT11, 0xFF, 0x00},
		{WCD9335_CHIP_TIER_CTRL_EFUSE_VAL_OUT12, 0xFF, 0x00},
		};

		__tasha_enable_efuse_sensing(tasha);
		for (i = 0; i < ARRAY_SIZE(codec_reg); i++) {
		val = wcd9xxx_reg_read(&tasha->wcd9xxx->core_res,
		codec_reg[i].reg);
		if (!(val && codec_reg[i].val)) {
		if (!(val)) {
		codec_ver = WCD9335;
		goto ret;
		}
		}
		} else
		codec_ver = WCD9326;
		}
		ret:
		pr_debug("%s: codec is %d\n", __func__, codec_ver);
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -1739,6 +1739,9 @@ 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 == WCD9XXX)
		return NULL;
		if (codec_ver == WCD9326) {
		if (!strcmp(card->name, "msm8952-tasha-snd-card"))
		card->name = tasha_lite[MSM8952_TASHA_LITE];