diff options
| -rw-r--r-- | sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c | 2 | ||||
| -rw-r--r-- | sound/soc/msm/sdm660-internal.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c index 85cf0eb48ee0..8f7db4d13378 100644 --- a/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c +++ b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c @@ -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"); diff --git a/sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c b/sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c index df0bdf666ba1..5e078dba0448 100644 --- a/sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c +++ b/sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c @@ -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"); diff --git a/sound/soc/msm/sdm660-internal.c b/sound/soc/msm/sdm660-internal.c index 6bbde623a7c1..05c4a6f93c31 100644 --- a/sound/soc/msm/sdm660-internal.c +++ b/sound/soc/msm/sdm660-internal.c @@ -1259,6 +1259,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; @@ -1333,6 +1334,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: @@ -1344,6 +1346,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, @@ -1366,6 +1369,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; |