diff options
| author | Xiaojun Sang <xsang@codeaurora.org> | 2017-02-13 15:58:30 +0800 |
|---|---|---|
| committer | Xiaojun Sang <xsang@codeaurora.org> | 2017-02-27 13:13:52 +0800 |
| commit | f575888a10220060dfab7a7d4f93ce7646d414e5 (patch) | |
| tree | 84e1f9a112579954f3a156445e77fc2db7a02c70 | |
| parent | 49d57d9b26e1a73dfe6e6ec5dfc3725908483696 (diff) | |
Revert "ASoC: soc: add a new dailink for VI recording"
This reverts commit 713c5979d0a7 ("ASoC: soc: add
a new dailink for VI recording").
There is no need to support concurrency of VI recording
and speaker protection.
CRs-Fixed: 1113625
Change-Id: I4cf63c5c099dc02be858af3b9aae0e93545a64eb
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
| -rw-r--r-- | sound/soc/msm/msm8998.c | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/sound/soc/msm/msm8998.c b/sound/soc/msm/msm8998.c index e7b51c5c2c00..6157599cac62 100644 --- a/sound/soc/msm/msm8998.c +++ b/sound/soc/msm/msm8998.c @@ -2905,7 +2905,6 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, break; case MSM_BACKEND_DAI_SLIMBUS_4_TX: - case MSM_BACKEND_DAI_SLIMBUS_TX_VI: param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT, SNDRV_PCM_FORMAT_S32_LE); rate->min = rate->max = SAMPLING_RATE_8KHZ; @@ -3698,8 +3697,7 @@ static int msm_snd_hw_params(struct snd_pcm_substream *substream, /* For <codec>_tx3 case */ else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_1_TX) user_set_tx_ch = slim_tx_cfg[1].channels; - else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_4_TX || - dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_TX_VI) + else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_4_TX) user_set_tx_ch = msm_vi_feed_tx_ch; else user_set_tx_ch = tx_ch_cnt; @@ -5724,22 +5722,6 @@ static struct snd_soc_dai_link msm_tasha_be_dai_links[] = { .ignore_pmdown_time = 1, .ignore_suspend = 1, }, - /* Slimbus VI Recording */ - { - .name = LPASS_BE_SLIMBUS_TX_VI, - .stream_name = "Slimbus VI Capture", - .cpu_dai_name = "msm-dai-q6-dev.20233", - .platform_name = "msm-pcm-routing", - .codec_name = "tasha_codec", - .codec_dai_name = "tasha_vifeedback", - .be_id = MSM_BACKEND_DAI_SLIMBUS_TX_VI, - .be_hw_params_fixup = msm_be_hw_params_fixup, - .ops = &msm_be_ops, - .ignore_suspend = 1, - .no_pcm = 1, - .dpcm_capture = 1, - .ignore_pmdown_time = 1, - }, }; static struct snd_soc_dai_link msm_tavil_be_dai_links[] = { @@ -5912,23 +5894,6 @@ static struct snd_soc_dai_link msm_tavil_be_dai_links[] = { .ignore_pmdown_time = 1, .ignore_suspend = 1, }, - - /* Slimbus VI Recording */ - { - .name = LPASS_BE_SLIMBUS_TX_VI, - .stream_name = "Slimbus VI Capture", - .cpu_dai_name = "msm-dai-q6-dev.20233", - .platform_name = "msm-pcm-routing", - .codec_name = "tavil_codec", - .codec_dai_name = "tavil_vifeedback", - .be_id = MSM_BACKEND_DAI_SLIMBUS_TX_VI, - .be_hw_params_fixup = msm_be_hw_params_fixup, - .ops = &msm_be_ops, - .ignore_suspend = 1, - .no_pcm = 1, - .dpcm_capture = 1, - .ignore_pmdown_time = 1, - }, }; static struct snd_soc_dai_link msm_wcn_be_dai_links[] = { |