Merge "asoc: qcs405: Update gain offset and mode for wsa8810" (1fdb5b3e) · Commits · e / devices / android_kernel_xiaomi_nabu

asoc/qcs405.c

+59 −7

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@
		#include "codecs/wsa881x.h"
		#include "codecs/csra66x0/csra66x0.h"
		#include <dt-bindings/sound/audio-codec-port-types.h>
		#include "codecs/bolero/bolero-cdc.h"
		#include "codecs/bolero/wsa-macro.h"

		#define DRV_NAME "qcs405-asoc-snd"

		@@ -4114,7 +4116,6 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
		struct snd_soc_dai *codec_dai = rtd->codec_dai;
		struct snd_card *card;
		struct snd_info_entry *entry;
		struct msm_asoc_mach_data *pdata =
		snd_soc_card_get_drvdata(rtd->card);

		@@ -4179,15 +4180,15 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
		}

		card = rtd->card->snd_card;
		entry = snd_info_create_subdir(card->module, "codecs",
		card->proc_root);
		if (!entry) {
		pr_debug("%s: Cannot create codecs module entry\n",
		if (!pdata->codec_root)
		pdata->codec_root = snd_info_create_subdir(card->module,
		"codecs", card->proc_root);
		if (!pdata->codec_root) {
		dev_dbg(codec->dev, "%s: Cannot create codecs module entry\n",
		__func__);
		ret = 0;
		goto err;
		}
		pdata->codec_root = entry;
		tasha_codec_info_create_codec_entry(pdata->codec_root, codec);

		codec_reg_done = true;
		@@ -4202,6 +4203,9 @@ static int msm_va_cdc_dma_init(struct snd_soc_pcm_runtime *rtd)
		int ret = 0;
		struct snd_soc_codec *codec = rtd->codec;
		struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
		struct snd_card *card;
		struct msm_asoc_mach_data *pdata =
		snd_soc_card_get_drvdata(rtd->card);

		ret = snd_soc_add_codec_controls(codec, msm_snd_va_controls,
		ARRAY_SIZE(msm_snd_va_controls));
		@@ -4225,6 +4229,18 @@ static int msm_va_cdc_dma_init(struct snd_soc_pcm_runtime *rtd)

		snd_soc_dapm_sync(dapm);

		card = rtd->card->snd_card;
		if (!pdata->codec_root)
		pdata->codec_root = snd_info_create_subdir(card->module,
		"codecs", card->proc_root);
		if (!pdata->codec_root) {
		dev_dbg(codec->dev, "%s: Cannot create codecs module entry\n",
		__func__);
		ret = 0;
		goto done;
		}
		bolero_info_create_codec_entry(pdata->codec_root, codec);
		done:
		return ret;
		}

		@@ -4233,11 +4249,15 @@ static int msm_wsa_cdc_dma_init(struct snd_soc_pcm_runtime *rtd)
		int ret = 0;
		struct snd_soc_codec *codec = rtd->codec;
		struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
		struct snd_soc_component *aux_comp;
		struct snd_card *card;
		struct msm_asoc_mach_data *pdata =
		snd_soc_card_get_drvdata(rtd->card);

		ret = snd_soc_add_codec_controls(codec, msm_snd_wsa_controls,
		ARRAY_SIZE(msm_snd_wsa_controls));
		if (ret < 0) {
		dev_err(codec->dev, "%s: add_codec_controls for va failed, err %d\n",
		dev_err(codec->dev, "%s: add_codec_controls for wsa failed, err %d\n",
		__func__, ret);
		return ret;
		}
		@@ -4251,6 +4271,38 @@ static int msm_wsa_cdc_dma_init(struct snd_soc_pcm_runtime *rtd)

		snd_soc_dapm_sync(dapm);

		/*
		* Send speaker configuration only for WSA8810.
		* Default configuration is for WSA8815.
		*/
		dev_dbg(codec->dev, "%s: Number of aux devices: %d\n",
		__func__, rtd->card->num_aux_devs);
		if (rtd->card->num_aux_devs &&
		!list_empty(&rtd->card->component_dev_list)) {
		aux_comp = list_first_entry(
		&rtd->card->component_dev_list,
		struct snd_soc_component,
		card_aux_list);
		if (!strcmp(aux_comp->name, WSA8810_NAME_1) \|\|
		!strcmp(aux_comp->name, WSA8810_NAME_2)) {
		wsa_macro_set_spkr_mode(rtd->codec,
		WSA_MACRO_SPKR_MODE_1);
		wsa_macro_set_spkr_gain_offset(rtd->codec,
		WSA_MACRO_GAIN_OFFSET_M1P5_DB);
		}
		}
		card = rtd->card->snd_card;
		if (!pdata->codec_root)
		pdata->codec_root = snd_info_create_subdir(card->module,
		"codecs", card->proc_root);
		if (!pdata->codec_root) {
		dev_dbg(codec->dev, "%s: Cannot create codecs module entry\n",
		__func__);
		ret = 0;
		goto done;
		}
		bolero_info_create_codec_entry(pdata->codec_root, codec);
		done:
		return ret;
		}