evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: Add support for ADIE RTC on SDM660 internal codec"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-09 13:15:50 -08:00 • committed by Gerrit - the friendly Code Review server
commit 12cba4a7d8
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c
View file

@ -3989,7 +3989,7 @@ static ssize_t msm_anlg_codec_version_read(struct snd_info_entry *entry,
switch (get_codec_version(sdm660_cdc_priv)) {
case DRAX_CDC:
len = snprintf(buffer, sizeof(buffer), "DRAX_CDC_1_0\n");
len = snprintf(buffer, sizeof(buffer), "DRAX-CDC_1_0\n");
break;
default:
len = snprintf(buffer, sizeof(buffer), "VER_UNDEFINED\n");

2
sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c
View file

@ -1089,7 +1089,7 @@ static ssize_t msm_dig_codec_version_read(struct snd_info_entry *entry,
switch (msm_dig->version) {
case DRAX_CDC:
len = snprintf(buffer, sizeof(buffer), "DRAX_CDC_1_0\n");
len = snprintf(buffer, sizeof(buffer), "SDM660-CDC_1_0\n");
break;
default:
len = snprintf(buffer, sizeof(buffer), "VER_UNDEFINED\n");

4
sound/soc/msm/sdm660-internal.c
View file

@ -1256,6 +1256,7 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(ana_cdc);
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_pcm_runtime *rtd_aux = rtd->card->rtd_aux;
struct msm_asoc_mach_data *pdata = snd_soc_card_get_drvdata(rtd->card);
struct snd_card *card;
int ret = -ENOMEM;
@ -1330,6 +1331,7 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
__func__);
goto done;
}
pdata->codec_root = codec_root;
msm_dig_codec_info_create_codec_entry(codec_root, dig_cdc);
msm_anlg_codec_info_create_codec_entry(codec_root, ana_cdc);
done:
@ -1341,6 +1343,7 @@ static int msm_sdw_audrx_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_codec *codec = rtd->codec;
struct snd_soc_dapm_context *dapm =
snd_soc_codec_get_dapm(codec);
struct msm_asoc_mach_data *pdata = snd_soc_card_get_drvdata(rtd->card);
struct snd_card *card;
snd_soc_add_codec_controls(codec, msm_sdw_controls,
@ -1363,6 +1366,7 @@ static int msm_sdw_audrx_init(struct snd_soc_pcm_runtime *rtd)
__func__);
goto done;
}
pdata->codec_root = codec_root;
msm_sdw_codec_info_create_codec_entry(codec_root, codec);
done:
return 0;