mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-12 15:49:17 -04:00
Merge "asoc: qcs405: fix codec dma dai ids"
This commit is contained in:
commit
cf05e6d33c
1 changed files with 18 additions and 19 deletions
|
|
@ -6626,7 +6626,7 @@ static struct snd_soc_dai_link msm_va_cdc_dma_be_dai_links[] = {
|
|||
{
|
||||
.name = LPASS_BE_VA_CDC_DMA_TX_0,
|
||||
.stream_name = "VA CDC DMA0 Capture",
|
||||
.cpu_dai_name = "msm-dai-cdc-dma.49153",
|
||||
.cpu_dai_name = "msm-dai-cdc-dma-dev.45089",
|
||||
.platform_name = "msm-pcm-routing",
|
||||
.codec_name = "bolero_codec",
|
||||
.codec_dai_name = "va_macro_tx1",
|
||||
|
|
@ -6641,7 +6641,7 @@ static struct snd_soc_dai_link msm_va_cdc_dma_be_dai_links[] = {
|
|||
{
|
||||
.name = LPASS_BE_VA_CDC_DMA_TX_1,
|
||||
.stream_name = "VA CDC DMA1 Capture",
|
||||
.cpu_dai_name = "msm-dai-cdc-dma.49155",
|
||||
.cpu_dai_name = "msm-dai-cdc-dma-dev.45091",
|
||||
.platform_name = "msm-pcm-routing",
|
||||
.codec_name = "bolero_codec",
|
||||
.codec_dai_name = "va_macro_tx2",
|
||||
|
|
@ -6901,34 +6901,33 @@ static struct snd_soc_dai_link msm_stub_be_dai_links[] = {
|
|||
|
||||
/* Backend DAI Links */
|
||||
{
|
||||
.name = LPASS_BE_SLIMBUS_0_RX,
|
||||
.stream_name = "Slimbus Playback",
|
||||
.cpu_dai_name = "msm-dai-q6-dev.16384",
|
||||
.name = LPASS_BE_VA_CDC_DMA_TX_0,
|
||||
.stream_name = "VA CDC DMA0 Capture",
|
||||
.cpu_dai_name = "msm-dai-cdc-dma-dev.45089",
|
||||
.platform_name = "msm-pcm-routing",
|
||||
.codec_name = "msm-stub-codec.1",
|
||||
.codec_dai_name = "msm-stub-rx",
|
||||
.no_pcm = 1,
|
||||
.dpcm_playback = 1,
|
||||
.id = MSM_BACKEND_DAI_SLIMBUS_0_RX,
|
||||
.init = &msm_audrx_stub_init,
|
||||
.be_hw_params_fixup = msm_be_hw_params_fixup,
|
||||
.ignore_pmdown_time = 1, /* dai link has playback support */
|
||||
.ignore_suspend = 1,
|
||||
.ops = &msm_stub_be_ops,
|
||||
},
|
||||
{
|
||||
.name = LPASS_BE_SLIMBUS_0_TX,
|
||||
.stream_name = "Slimbus Capture",
|
||||
.cpu_dai_name = "msm-dai-q6-dev.16385",
|
||||
.platform_name = "msm-pcm-routing",
|
||||
.codec_name = "msm-stub-codec.1",
|
||||
.codec_dai_name = "msm-stub-tx",
|
||||
.codec_name = "bolero_codec",
|
||||
.codec_dai_name = "va_macro_tx1",
|
||||
.no_pcm = 1,
|
||||
.dpcm_capture = 1,
|
||||
.id = MSM_BACKEND_DAI_SLIMBUS_0_TX,
|
||||
.init = &msm_va_cdc_dma_init,
|
||||
.id = MSM_BACKEND_DAI_VA_CDC_DMA_TX_0,
|
||||
.be_hw_params_fixup = msm_be_hw_params_fixup,
|
||||
.ignore_suspend = 1,
|
||||
.ops = &msm_stub_be_ops,
|
||||
.ops = &msm_cdc_dma_be_ops,
|
||||
},
|
||||
{
|
||||
.name = LPASS_BE_VA_CDC_DMA_TX_1,
|
||||
.stream_name = "VA CDC DMA1 Capture",
|
||||
.cpu_dai_name = "msm-dai-cdc-dma-dev.45091",
|
||||
.platform_name = "msm-pcm-routing",
|
||||
.codec_name = "bolero_codec",
|
||||
.codec_dai_name = "va_macro_tx2",
|
||||
.no_pcm = 1,
|
||||
.dpcm_capture = 1,
|
||||
.id = MSM_BACKEND_DAI_VA_CDC_DMA_TX_1,
|
||||
.be_hw_params_fixup = msm_be_hw_params_fixup,
|
||||
.ignore_suspend = 1,
|
||||
.ops = &msm_cdc_dma_be_ops,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue