diff --git a/asoc/msm_dailink.h b/asoc/msm_dailink.h old mode 100755 new mode 100644 index a0cd86b591..faa9ee032b --- a/asoc/msm_dailink.h +++ b/asoc/msm_dailink.h @@ -342,6 +342,16 @@ SND_SOC_DAILINK_DEFS(multimedia25, DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-loopback"))); +SND_SOC_DAILINK_DEFS(multimedia33, + DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia33")), + DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), + DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-dsp.0"))); + +SND_SOC_DAILINK_DEFS(multimedia34, + DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia34")), + DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), + DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-dsp.0"))); + SND_SOC_DAILINK_DEFS(int_hfp_bt_hostless, DAILINK_COMP_ARRAY(COMP_CPU("INT_HFP_BT_HOSTLESS")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), diff --git a/asoc/sa6155.c b/asoc/sa6155.c old mode 100755 new mode 100644 index 287783aa84..0aab88387b --- a/asoc/sa6155.c +++ b/asoc/sa6155.c @@ -5760,6 +5760,70 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = { .id = MSM_FRONTEND_DAI_MULTIMEDIA25, SND_SOC_DAILINK_REG(multimedia25), }, + { + .name = MSM_DAILINK_NAME(Media31), + .stream_name = "MultiMedia31", + .dynamic = 1, +#if IS_ENABLED(CONFIG_AUDIO_QGKI) + .async_ops = ASYNC_DPCM_SND_SOC_PREPARE, +#endif /* CONFIG_AUDIO_QGKI */ + .dpcm_playback = 1, + .dpcm_capture = 1, + .trigger = {SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST}, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .id = MSM_FRONTEND_DAI_MULTIMEDIA31, + SND_SOC_DAILINK_REG(multimedia31), + }, + { + .name = MSM_DAILINK_NAME(Media32), + .stream_name = "MultiMedia32", + .dynamic = 1, +#if IS_ENABLED(CONFIG_AUDIO_QGKI) + .async_ops = ASYNC_DPCM_SND_SOC_PREPARE, +#endif /* CONFIG_AUDIO_QGKI */ + .dpcm_playback = 1, + .dpcm_capture = 1, + .trigger = {SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST}, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .id = MSM_FRONTEND_DAI_MULTIMEDIA32, + SND_SOC_DAILINK_REG(multimedia32), + }, + { + .name = MSM_DAILINK_NAME(Media33), + .stream_name = "MultiMedia33", + .dynamic = 1, +#if IS_ENABLED(CONFIG_AUDIO_QGKI) + .async_ops = ASYNC_DPCM_SND_SOC_PREPARE, +#endif /* CONFIG_AUDIO_QGKI */ + .dpcm_playback = 1, + .dpcm_capture = 1, + .trigger = {SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST}, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .id = MSM_FRONTEND_DAI_MULTIMEDIA33, + SND_SOC_DAILINK_REG(multimedia33), + }, + { + .name = MSM_DAILINK_NAME(Media34), + .stream_name = "MultiMedia34", + .dynamic = 1, +#if IS_ENABLED(CONFIG_AUDIO_QGKI) + .async_ops = ASYNC_DPCM_SND_SOC_PREPARE, +#endif /* CONFIG_AUDIO_QGKI */ + .dpcm_playback = 1, + .dpcm_capture = 1, + .trigger = {SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST}, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .id = MSM_FRONTEND_DAI_MULTIMEDIA34, + SND_SOC_DAILINK_REG(multimedia34), + }, }; static struct snd_soc_dai_link msm_custom_fe_dai_links[] = { diff --git a/asoc/sa8155.c b/asoc/sa8155.c old mode 100755 new mode 100644 index 544a79140b..5a672c867a --- a/asoc/sa8155.c +++ b/asoc/sa8155.c @@ -5758,6 +5758,70 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = { .id = MSM_FRONTEND_DAI_MULTIMEDIA25, SND_SOC_DAILINK_REG(multimedia25), }, + { + .name = MSM_DAILINK_NAME(Media31), + .stream_name = "MultiMedia31", + .dynamic = 1, +#if IS_ENABLED(CONFIG_AUDIO_QGKI) + .async_ops = ASYNC_DPCM_SND_SOC_PREPARE, +#endif /* CONFIG_AUDIO_QGKI */ + .dpcm_playback = 1, + .dpcm_capture = 1, + .trigger = {SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST}, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .id = MSM_FRONTEND_DAI_MULTIMEDIA31, + SND_SOC_DAILINK_REG(multimedia31), + }, + { + .name = MSM_DAILINK_NAME(Media32), + .stream_name = "MultiMedia32", + .dynamic = 1, +#if IS_ENABLED(CONFIG_AUDIO_QGKI) + .async_ops = ASYNC_DPCM_SND_SOC_PREPARE, +#endif /* CONFIG_AUDIO_QGKI */ + .dpcm_playback = 1, + .dpcm_capture = 1, + .trigger = {SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST}, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .id = MSM_FRONTEND_DAI_MULTIMEDIA32, + SND_SOC_DAILINK_REG(multimedia32), + }, + { + .name = MSM_DAILINK_NAME(Media33), + .stream_name = "MultiMedia33", + .dynamic = 1, +#if IS_ENABLED(CONFIG_AUDIO_QGKI) + .async_ops = ASYNC_DPCM_SND_SOC_PREPARE, +#endif /* CONFIG_AUDIO_QGKI */ + .dpcm_playback = 1, + .dpcm_capture = 1, + .trigger = {SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST}, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .id = MSM_FRONTEND_DAI_MULTIMEDIA33, + SND_SOC_DAILINK_REG(multimedia33), + }, + { + .name = MSM_DAILINK_NAME(Media34), + .stream_name = "MultiMedia34", + .dynamic = 1, +#if IS_ENABLED(CONFIG_AUDIO_QGKI) + .async_ops = ASYNC_DPCM_SND_SOC_PREPARE, +#endif /* CONFIG_AUDIO_QGKI */ + .dpcm_playback = 1, + .dpcm_capture = 1, + .trigger = {SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST}, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .id = MSM_FRONTEND_DAI_MULTIMEDIA34, + SND_SOC_DAILINK_REG(multimedia34), + }, }; static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {