mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 06:09:23 -04:00
Merge "ASoC: keep align of the FE pcm id"
This commit is contained in:
commit
b2e6980433
2 changed files with 14 additions and 14 deletions
14
asoc/sa6155.c
Normal file → Executable file
14
asoc/sa6155.c
Normal file → Executable file
|
|
@ -5892,6 +5892,13 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = {
|
|||
.id = MSM_FRONTEND_DAI_MULTIMEDIA25,
|
||||
SND_SOC_DAILINK_REG(multimedia25),
|
||||
},
|
||||
{
|
||||
.name = "MSM AFE-PCM TX1",
|
||||
.stream_name = "AFE-PROXY TX1",
|
||||
.dpcm_capture = 1,
|
||||
.ignore_suspend = 1,
|
||||
SND_SOC_DAILINK_REG(afepcm_tx1),
|
||||
},
|
||||
{
|
||||
.name = MSM_DAILINK_NAME(Media31),
|
||||
.stream_name = "MultiMedia31",
|
||||
|
|
@ -5956,13 +5963,6 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = {
|
|||
.id = MSM_FRONTEND_DAI_MULTIMEDIA34,
|
||||
SND_SOC_DAILINK_REG(multimedia34),
|
||||
},
|
||||
{
|
||||
.name = "MSM AFE-PCM TX1",
|
||||
.stream_name = "AFE-PROXY TX1",
|
||||
.dpcm_capture = 1,
|
||||
.ignore_suspend = 1,
|
||||
SND_SOC_DAILINK_REG(afepcm_tx1),
|
||||
},
|
||||
};
|
||||
|
||||
static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {
|
||||
|
|
|
|||
14
asoc/sa8155.c
Normal file → Executable file
14
asoc/sa8155.c
Normal file → Executable file
|
|
@ -5797,6 +5797,13 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = {
|
|||
.id = MSM_FRONTEND_DAI_MULTIMEDIA25,
|
||||
SND_SOC_DAILINK_REG(multimedia25),
|
||||
},
|
||||
{
|
||||
.name = "MSM AFE-PCM TX1",
|
||||
.stream_name = "AFE-PROXY TX1",
|
||||
.dpcm_capture = 1,
|
||||
.ignore_suspend = 1,
|
||||
SND_SOC_DAILINK_REG(afepcm_tx1),
|
||||
},
|
||||
{
|
||||
.name = MSM_DAILINK_NAME(Media31),
|
||||
.stream_name = "MultiMedia31",
|
||||
|
|
@ -5861,13 +5868,6 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = {
|
|||
.id = MSM_FRONTEND_DAI_MULTIMEDIA34,
|
||||
SND_SOC_DAILINK_REG(multimedia34),
|
||||
},
|
||||
{
|
||||
.name = "MSM AFE-PCM TX1",
|
||||
.stream_name = "AFE-PROXY TX1",
|
||||
.dpcm_capture = 1,
|
||||
.ignore_suspend = 1,
|
||||
SND_SOC_DAILINK_REG(afepcm_tx1),
|
||||
},
|
||||
};
|
||||
|
||||
static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue