samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: lahaina: Update all dai_links to conform to latest kernel

Browse Source 
Audio reach architecture needs straight dais, update dais
to conform to latest 5.4 kernel.

Change-Id: I13db7276589cefa5fe0951eb8852a0f4fd1b75a0
Signed-off-by: Ashish Jain <ashishj@codeaurora.org>
(cherry picked from commit f0a9c1831f232e676a183234d64ec9a893216e8f)
This commit is contained in:
Ashish Jain
2020-06-19 20:25:29 +05:30
parent 3afce0de68
commit dacb2cc698
2 changed files with 74 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
asoc/lahaina.c
View File

@@ -387,10 +387,11 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_capture = 1, .capture_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_suspend = 1, .ignore_suspend = 1,
.ops = &msm_common_be_ops,
SND_SOC_DAILINK_REG(proxy_tx), SND_SOC_DAILINK_REG(proxy_tx),
}, },
/* Proxy Rx BACK END DAI Link */ /* Proxy Rx BACK END DAI Link */
@@ -400,11 +401,12 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_playback = 1, .playback_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.ignore_suspend = 1, .ignore_suspend = 1,
.ops = &msm_common_be_ops,
SND_SOC_DAILINK_REG(proxy_rx), SND_SOC_DAILINK_REG(proxy_rx),
}, },
{ {
@@ -413,7 +415,7 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_playback = 1, .playback_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
@@ -427,7 +429,7 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_capture = 1, .capture_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_suspend = 1, .ignore_suspend = 1,
@@ -443,7 +445,7 @@ static struct snd_soc_dai_link msm_wcn_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_playback = 1, .playback_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.init = &msm_wcn_init, .init = &msm_wcn_init,
@@ -459,7 +461,7 @@ static struct snd_soc_dai_link msm_wcn_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_capture = 1, .capture_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ops = &msm_common_be_ops, .ops = &msm_common_be_ops,
@@ -477,7 +479,7 @@ static struct snd_soc_dai_link ext_disp_be_dai_link[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_playback = 1, .playback_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
@@ -492,7 +494,7 @@ static struct snd_soc_dai_link ext_disp_be_dai_link[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_playback = 1, .playback_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
@@ -511,7 +513,7 @@ static struct snd_soc_dai_link msm_wsa_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_playback = 1, .playback_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
@@ -526,7 +528,7 @@ static struct snd_soc_dai_link msm_wsa_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_playback = 1, .playback_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
@@ -540,7 +542,7 @@ static struct snd_soc_dai_link msm_wsa_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_capture = 1, .capture_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_suspend = 1, .ignore_suspend = 1,
@@ -557,7 +559,7 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_playback = 1, .playback_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
@@ -572,7 +574,7 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_playback = 1, .playback_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
@@ -586,7 +588,7 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_playback = 1, .playback_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
@@ -600,7 +602,7 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_playback = 1, .playback_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
@@ -614,7 +616,7 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_playback = 1, .playback_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
@@ -629,7 +631,7 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_capture = 1, .capture_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_suspend = 1, .ignore_suspend = 1,
@@ -642,7 +644,7 @@ static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_capture = 1, .capture_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_suspend = 1, .ignore_suspend = 1,
@@ -658,7 +660,7 @@ static struct snd_soc_dai_link msm_va_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_capture = 1, .capture_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_suspend = 1, .ignore_suspend = 1,
@@ -671,7 +673,7 @@ static struct snd_soc_dai_link msm_va_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_capture = 1, .capture_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_suspend = 1, .ignore_suspend = 1,
@@ -684,7 +686,7 @@ static struct snd_soc_dai_link msm_va_cdc_dma_be_dai_links[] = {
#if IS_ENABLED(CONFIG_AUDIO_QGKI) #if IS_ENABLED(CONFIG_AUDIO_QGKI)
.async_ops = ASYNC_DPCM_SND_SOC_PREPARE, .async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
#endif /* CONFIG_AUDIO_QGKI */ #endif /* CONFIG_AUDIO_QGKI */
.dpcm_capture = 1, .capture_only = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST, .trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST}, SND_SOC_DPCM_TRIGGER_POST},
.ignore_suspend = 1, .ignore_suspend = 1,
@@ -825,7 +827,7 @@ static struct snd_soc_dai_link msm_stub_be_dai_links[] = {
{ {
.name = LPASS_BE_PRI_AUXPCM_RX, .name = LPASS_BE_PRI_AUXPCM_RX,
.stream_name = LPASS_BE_PRI_AUXPCM_RX, .stream_name = LPASS_BE_PRI_AUXPCM_RX,
.dpcm_playback = 1, .playback_only = 1,
.init = &msm_audrx_stub_init, .init = &msm_audrx_stub_init,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.ignore_suspend = 1, .ignore_suspend = 1,
@@ -835,7 +837,7 @@ static struct snd_soc_dai_link msm_stub_be_dai_links[] = {
{ {
.name = LPASS_BE_PRI_AUXPCM_TX, .name = LPASS_BE_PRI_AUXPCM_TX,
.stream_name = LPASS_BE_PRI_AUXPCM_TX, .stream_name = LPASS_BE_PRI_AUXPCM_TX,
.dpcm_capture = 1, .capture_only = 1,
.ignore_suspend = 1, .ignore_suspend = 1,
.ops = &msm_stub_be_ops, .ops = &msm_stub_be_ops,
SND_SOC_DAILINK_REG(auxpcm_tx), SND_SOC_DAILINK_REG(auxpcm_tx),
@@ -1255,7 +1257,6 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "%s: No platform supplied from device tree\n", __func__); dev_err(&pdev->dev, "%s: No platform supplied from device tree\n", __func__);
return -EINVAL; return -EINVAL;
} }
pdata = devm_kzalloc(&pdev->dev, pdata = devm_kzalloc(&pdev->dev,
sizeof(struct msm_asoc_mach_data), GFP_KERNEL); sizeof(struct msm_asoc_mach_data), GFP_KERNEL);
if (!pdata) if (!pdata)

70
asoc/msm_dailink.h
View File

@@ -8,87 +8,105 @@
SND_SOC_DAILINK_DEFS(usb_audio_rx, SND_SOC_DAILINK_DEFS(usb_audio_rx,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_DUMMY())); DAILINK_COMP_ARRAY(COMP_DUMMY()),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(usb_audio_tx, SND_SOC_DAILINK_DEFS(usb_audio_tx,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_DUMMY())); DAILINK_COMP_ARRAY(COMP_DUMMY()),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(slimbus_7_rx, SND_SOC_DAILINK_DEFS(slimbus_7_rx,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("btfmslim_slave", DAILINK_COMP_ARRAY(COMP_CODEC("btfmslim_slave",
"btfm_bt_sco_a2dp_slim_rx"))); "btfm_bt_sco_a2dp_slim_rx")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(slimbus_7_tx, SND_SOC_DAILINK_DEFS(slimbus_7_tx,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("btfmslim_slave", DAILINK_COMP_ARRAY(COMP_CODEC("btfmslim_slave",
"btfm_bt_sco_slim_tx"))); "btfm_bt_sco_slim_tx")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(display_port, SND_SOC_DAILINK_DEFS(display_port,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("msm-ext-disp-audio-codec-rx", DAILINK_COMP_ARRAY(COMP_CODEC("msm-ext-disp-audio-codec-rx",
"msm_dp_audio_codec_rx_dai"))); "msm_dp_audio_codec_rx_dai")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(display_port1, SND_SOC_DAILINK_DEFS(display_port1,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("msm-ext-disp-audio-codec-rx", DAILINK_COMP_ARRAY(COMP_CODEC("msm-ext-disp-audio-codec-rx",
"msm_dp_audio_codec_rx1_dai"))); "msm_dp_audio_codec_rx1_dai")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(auxpcm_rx, SND_SOC_DAILINK_DEFS(auxpcm_rx,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-rx"))); DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-rx")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(auxpcm_tx, SND_SOC_DAILINK_DEFS(auxpcm_tx,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-tx"))); DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-tx")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(wsa_dma_rx0, SND_SOC_DAILINK_DEFS(wsa_dma_rx0,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_rx1"), DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_rx1"),
COMP_CODEC("wsa-codec1", "wsa_rx1"), COMP_CODEC("wsa-codec1", "wsa_rx1"),
COMP_CODEC("wsa-codec2", "wsa_rx2"))); COMP_CODEC("wsa-codec2", "wsa_rx2")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(wsa_dma_rx1, SND_SOC_DAILINK_DEFS(wsa_dma_rx1,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_rx_mix"), DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_rx_mix"),
COMP_CODEC("wsa-codec1", "wsa_rx1"), COMP_CODEC("wsa-codec1", "wsa_rx1"),
COMP_CODEC("wsa-codec2", "wsa_rx2"))); COMP_CODEC("wsa-codec2", "wsa_rx2")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(wsa_dma_tx1, SND_SOC_DAILINK_DEFS(wsa_dma_tx1,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_echo"), DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_echo"),
COMP_CODEC("wsa-codec1", "wsa_rx1"), COMP_CODEC("wsa-codec1", "wsa_rx1"),
COMP_CODEC("wsa-codec2", "wsa_rx2"))); COMP_CODEC("wsa-codec2", "wsa_rx2")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(rx_dma_rx0, SND_SOC_DAILINK_DEFS(rx_dma_rx0,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx1"), DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx1"),
COMP_CODEC("wcd938x_codec", "wcd938x_cdc"))); COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(rx_dma_rx1, SND_SOC_DAILINK_DEFS(rx_dma_rx1,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx2"), DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx2"),
COMP_CODEC("wcd938x_codec", "wcd938x_cdc"))); COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(rx_dma_rx2, SND_SOC_DAILINK_DEFS(rx_dma_rx2,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx3"), DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx3"),
COMP_CODEC("wcd938x_codec", "wcd938x_cdc"))); COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(rx_dma_rx3, SND_SOC_DAILINK_DEFS(rx_dma_rx3,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx4"), DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx4"),
COMP_CODEC("wcd938x_codec", "wcd938x_cdc"))); COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(rx_dma_rx6, SND_SOC_DAILINK_DEFS(rx_dma_rx6,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx6"), DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx6"),
COMP_CODEC("swr-haptics", "swr_haptics"))); COMP_CODEC("swr-haptics", "swr_haptics")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(tx_dma_tx3, SND_SOC_DAILINK_DEFS(tx_dma_tx3,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "tx_macro_tx1"), DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "tx_macro_tx1"),
COMP_CODEC("wcd938x_codec", "wcd938x_cdc"))); COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(tx_dma_tx4, SND_SOC_DAILINK_DEFS(tx_dma_tx4,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
@@ -97,24 +115,30 @@ SND_SOC_DAILINK_DEFS(tx_dma_tx4,
COMP_CODEC("swr-dmic.01", "swr_dmic_tx0"), COMP_CODEC("swr-dmic.01", "swr_dmic_tx0"),
COMP_CODEC("swr-dmic.02", "swr_dmic_tx1"), COMP_CODEC("swr-dmic.02", "swr_dmic_tx1"),
COMP_CODEC("swr-dmic.03", "swr_dmic_tx2"), COMP_CODEC("swr-dmic.03", "swr_dmic_tx2"),
COMP_CODEC("swr-dmic.04", "swr_dmic_tx3"))); COMP_CODEC("swr-dmic.04", "swr_dmic_tx3")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(va_dma_tx0, SND_SOC_DAILINK_DEFS(va_dma_tx0,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "va_macro_tx1"))); DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "va_macro_tx1")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(va_dma_tx1, SND_SOC_DAILINK_DEFS(va_dma_tx1,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "va_macro_tx2"))); DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "va_macro_tx2")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(va_dma_tx2, SND_SOC_DAILINK_DEFS(va_dma_tx2,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "va_macro_tx3"))); DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "va_macro_tx3")),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(proxy_tx, SND_SOC_DAILINK_DEFS(proxy_tx,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_DUMMY())); DAILINK_COMP_ARRAY(COMP_DUMMY()),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));
SND_SOC_DAILINK_DEFS(proxy_rx, SND_SOC_DAILINK_DEFS(proxy_rx,
DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
DAILINK_COMP_ARRAY(COMP_DUMMY())); DAILINK_COMP_ARRAY(COMP_DUMMY()),
DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));