diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-31 21:24:15 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-31 21:24:15 -0700 |
commit | 6210291d06c74d54418c306f93b3fba1395d4aa2 (patch) | |
tree | fcc088c173859cdbecc005f4ea99cf0e6bf87097 | |
parent | 68a715abd54e5dad37f0d39165063e8ed55fbac7 (diff) | |
parent | 353aac57a9f36bdfec942b129dfe705d3520d22b (diff) |
Merge "ASoC: codecs: Correct stream name, add dapm sync"
-rw-r--r-- | sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c | 6 | ||||
-rw-r--r-- | sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c index 52dae06a7ee8..699e7251023f 100644 --- a/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c +++ b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c @@ -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; } diff --git a/sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c b/sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c index 2f8c8d6b8a7a..c6074570bb50 100644 --- a/sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c +++ b/sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c @@ -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 |