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

Merge "ASoC: codecs: Correct stream name, add dapm sync"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-31 21:24:15 -07:00 • committed by Gerrit - the friendly Code Review server
commit 6210291d06
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3181,7 +3181,7 @@ static struct snd_soc_dai_driver msm_anlg_cdc_i2s_dai[] = {
.name = "msm_anlg_cdc_i2s_rx1",
.id = AIF1_PB,
.playback = {
.stream_name = "Playback",
.stream_name = "PDM Playback",
.rates = SDM660_CDC_RATES,
.formats = SDM660_CDC_FORMATS,
.rate_max = 192000,
@ -3195,7 +3195,7 @@ static struct snd_soc_dai_driver msm_anlg_cdc_i2s_dai[] = {
.name = "msm_anlg_cdc_i2s_tx1",
.id = AIF1_CAP,
.capture = {
.stream_name = "Record",
.stream_name = "PDM Capture",
.rates = SDM660_CDC_RATES,
.formats = SDM660_CDC_FORMATS,
.rate_max = 48000,
@ -4167,6 +4167,8 @@ static int msm_anlg_cdc_soc_probe(struct snd_soc_codec *codec)
snd_soc_dapm_ignore_suspend(dapm, "PDM Playback");
snd_soc_dapm_ignore_suspend(dapm, "PDM Capture");
snd_soc_dapm_sync(dapm);
return 0;
}

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

@ -1207,6 +1207,8 @@ static int msm_dig_cdc_soc_probe(struct snd_soc_codec *codec)
snd_soc_dapm_ignore_suspend(dapm, "PDM_OUT_RX2");
snd_soc_dapm_ignore_suspend(dapm, "PDM_OUT_RX3");
snd_soc_dapm_sync(dapm);
return 0;
}
@ -2127,8 +2129,8 @@ static int msm_dig_resume(struct device *dev)
}
static const struct dev_pm_ops msm_dig_pm_ops = {
.suspend = msm_dig_suspend,
.resume = msm_dig_resume,
.suspend_late = msm_dig_suspend,
.resume_early = msm_dig_resume,
};
#endif