Merge "ASoC: msmcobalt: send ANC config for WCD9340 codec"

This commit is contained in:
Linux Build Service Account 2016-09-29 11:20:32 -07:00 committed by Gerrit - the friendly Code Review server
commit c60a678c0e

View file

@ -2486,17 +2486,18 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
goto err_afe_cfg; goto err_afe_cfg;
} }
if (!strcmp(dev_name(codec_dai->dev), "tasha_codec")) { config_data = msm_codec_fn.get_afe_config_fn(codec,
config_data = msm_codec_fn.get_afe_config_fn(codec, AFE_AANC_VERSION);
AFE_AANC_VERSION); if (config_data) {
if (config_data) { ret = afe_set_config(AFE_AANC_VERSION, config_data, 0);
ret = afe_set_config(AFE_AANC_VERSION, config_data, 0); if (ret) {
if (ret) { pr_err("%s: Failed to set aanc version %d\n",
pr_err("%s: Failed to set aanc version %d\n", __func__, ret);
__func__, ret); goto err_afe_cfg;
goto err_afe_cfg;
}
} }
}
if (!strcmp(dev_name(codec_dai->dev), "tasha_codec")) {
config_data = msm_codec_fn.get_afe_config_fn(codec, config_data = msm_codec_fn.get_afe_config_fn(codec,
AFE_CDC_CLIP_REGISTERS_CONFIG); AFE_CDC_CLIP_REGISTERS_CONFIG);
if (config_data) { if (config_data) {