Merge "ASoC: msm: modify soundcard name depending on the codec" (53ec7db9) · Commits · e / devices / android_kernel_xiaomi_markw

include/linux/mfd/wcd9xxx/core.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ enum codec_variant {
		WCD9XXX,
		WCD9330,
		WCD9335,
		WCD9326,
		};

		enum {

sound/soc/codecs/wcd9335.c

+64 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,8 @@ enum tasha_sido_voltage {
		SIDO_VOLTAGE_NOMINAL_MV = 1100,
		};

		static enum codec_variant codec_ver;

		static int dig_core_collapse_enable = 1;
		module_param(dig_core_collapse_enable, int,
		S_IRUGO \| S_IWUSR \| S_IWGRP);
		@@ -12467,6 +12469,65 @@ err:
		return;
		}

		/*
		* tasha_codec_ver: to get tasha codec version
		* @codec: handle to snd_soc_codec *
		* return enum codec_variant - version
		*/
		enum codec_variant tasha_codec_ver(void)
		{
		return codec_ver;
		}
		EXPORT_SYMBOL(tasha_codec_ver);

		static int __tasha_enable_efuse_sensing(struct tasha_priv *tasha)
		{
		__tasha_cdc_mclk_enable(tasha, true);

		wcd9xxx_reg_update_bits(&tasha->wcd9xxx->core_res,
		WCD9335_CHIP_TIER_CTRL_EFUSE_CTL, 0x1E, 0x20);
		wcd9xxx_reg_update_bits(&tasha->wcd9xxx->core_res,
		WCD9335_CHIP_TIER_CTRL_EFUSE_CTL, 0x01, 0x01);

		/*
		* 5ms sleep required after enabling efuse control
		* before checking the status.
		*/
		usleep_range(5000, 5500);
		if (!(wcd9xxx_reg_read(&tasha->wcd9xxx->core_res,
		WCD9335_CHIP_TIER_CTRL_EFUSE_STATUS) & 0x01))
		WARN(1, "%s: Efuse sense is not complete\n", __func__);

		__tasha_cdc_mclk_enable(tasha, false);

		return 0;
		}

		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},
		};

		__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)) {
		codec_ver = WCD9335;
		goto ret;
		}
		}
		codec_ver = WCD9326;
		ret:
		pr_debug("%s: codec is %d\n", __func__, codec_ver);
		}
		EXPORT_SYMBOL(tasha_get_codec_ver);

		static int tasha_probe(struct platform_device *pdev)
		{
		int ret = 0;
		@@ -12559,6 +12620,9 @@ static int tasha_probe(struct platform_device *pdev)
		/* Update codec register default values */
		tasha_update_reg_defaults(tasha);
		schedule_work(&tasha->swr_add_devices_work);

		tasha_get_codec_ver(tasha);

		return ret;

		resmgr_remove:

sound/soc/codecs/wcd9335.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -144,4 +144,5 @@ extern int tasha_codec_enable_standalone_micbias(struct snd_soc_codec *codec,
		bool enable);
		extern int tasha_set_spkr_mode(struct snd_soc_codec *codec, int mode);
		extern int tasha_set_spkr_gain_offset(struct snd_soc_codec *codec, int offset);
		extern enum codec_variant tasha_codec_ver(void);
		#endif

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -1438,6 +1438,8 @@ struct snd_soc_card populate_snd_card_dailinks(struct device dev)
		struct snd_soc_card *card = &snd_soc_card_msm_card;
		struct snd_soc_dai_link *msm8952_dai_links = NULL;
		int num_links, ret, len1, len2, len3;
		enum codec_variant codec_ver = 0;
		const char *tasha_lite = "msm8952-tashalite-snd-card";

		card->dev = dev;
		ret = snd_soc_of_parse_card_name(card, "qcom,model");
		@@ -1467,6 +1469,9 @@ struct snd_soc_card populate_snd_card_dailinks(struct device dev)
		!strcmp(card->name, "msm8976-tasha-skun-snd-card") \|\|
		!strcmp(card->name, "msm8952-tasha-snd-card") \|\|
		!strcmp(card->name, "msm8952-tasha-skun-snd-card")) {
		codec_ver = tasha_codec_ver();
		if (codec_ver == WCD9326)
		card->name = tasha_lite;

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