mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 13:49:24 -04:00
Merge "asoc: add fe-dai multimedia31/32/33/34 and routing rules"
This commit is contained in:
commit
07f045f49b
3 changed files with 1245 additions and 183 deletions
|
|
@ -2936,6 +2936,20 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
|
|||
.rate_min = 8000,
|
||||
.rate_max = 384000,
|
||||
},
|
||||
.capture = {
|
||||
.stream_name = "MultiMedia31 Capture",
|
||||
.aif_name = "MM_UL31",
|
||||
.rates = (SNDRV_PCM_RATE_8000_384000 |
|
||||
SNDRV_PCM_RATE_KNOT),
|
||||
.formats = (SNDRV_PCM_FMTBIT_S16_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_3LE |
|
||||
SNDRV_PCM_FMTBIT_S32_LE),
|
||||
.channels_min = 1,
|
||||
.channels_max = 32,
|
||||
.rate_min = 8000,
|
||||
.rate_max = 48000,
|
||||
},
|
||||
.ops = &msm_fe_Multimedia_dai_ops,
|
||||
.name = "MultiMedia31",
|
||||
.probe = fe_dai_probe,
|
||||
|
|
@ -2955,10 +2969,90 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
|
|||
.rate_min = 8000,
|
||||
.rate_max = 384000,
|
||||
},
|
||||
.capture = {
|
||||
.stream_name = "MultiMedia32 Capture",
|
||||
.aif_name = "MM_UL32",
|
||||
.rates = (SNDRV_PCM_RATE_8000_384000 |
|
||||
SNDRV_PCM_RATE_KNOT),
|
||||
.formats = (SNDRV_PCM_FMTBIT_S16_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_3LE |
|
||||
SNDRV_PCM_FMTBIT_S32_LE),
|
||||
.channels_min = 1,
|
||||
.channels_max = 32,
|
||||
.rate_min = 8000,
|
||||
.rate_max = 48000,
|
||||
},
|
||||
.ops = &msm_fe_Multimedia_dai_ops,
|
||||
.name = "MultiMedia32",
|
||||
.probe = fe_dai_probe,
|
||||
},
|
||||
{
|
||||
.playback = {
|
||||
.stream_name = "MultiMedia33 Playback",
|
||||
.aif_name = "MM_DL33",
|
||||
.rates = (SNDRV_PCM_RATE_8000_384000 |
|
||||
SNDRV_PCM_RATE_KNOT),
|
||||
.formats = (SNDRV_PCM_FMTBIT_S16_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_3LE |
|
||||
SNDRV_PCM_FMTBIT_S32_LE),
|
||||
.channels_min = 1,
|
||||
.channels_max = 32,
|
||||
.rate_min = 8000,
|
||||
.rate_max = 384000,
|
||||
},
|
||||
.capture = {
|
||||
.stream_name = "MultiMedia33 Capture",
|
||||
.aif_name = "MM_UL33",
|
||||
.rates = (SNDRV_PCM_RATE_8000_384000 |
|
||||
SNDRV_PCM_RATE_KNOT),
|
||||
.formats = (SNDRV_PCM_FMTBIT_S16_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_3LE |
|
||||
SNDRV_PCM_FMTBIT_S32_LE),
|
||||
.channels_min = 1,
|
||||
.channels_max = 32,
|
||||
.rate_min = 8000,
|
||||
.rate_max = 48000,
|
||||
},
|
||||
.ops = &msm_fe_Multimedia_dai_ops,
|
||||
.name = "MultiMedia33",
|
||||
.probe = fe_dai_probe,
|
||||
},
|
||||
{
|
||||
.playback = {
|
||||
.stream_name = "MultiMedia34 Playback",
|
||||
.aif_name = "MM_DL34",
|
||||
.rates = (SNDRV_PCM_RATE_8000_384000 |
|
||||
SNDRV_PCM_RATE_KNOT),
|
||||
.formats = (SNDRV_PCM_FMTBIT_S16_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_3LE |
|
||||
SNDRV_PCM_FMTBIT_S32_LE),
|
||||
.channels_min = 1,
|
||||
.channels_max = 32,
|
||||
.rate_min = 8000,
|
||||
.rate_max = 384000,
|
||||
},
|
||||
.capture = {
|
||||
.stream_name = "MultiMedia34 Capture",
|
||||
.aif_name = "MM_UL34",
|
||||
.rates = (SNDRV_PCM_RATE_8000_384000 |
|
||||
SNDRV_PCM_RATE_KNOT),
|
||||
.formats = (SNDRV_PCM_FMTBIT_S16_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_3LE |
|
||||
SNDRV_PCM_FMTBIT_S32_LE),
|
||||
.channels_min = 1,
|
||||
.channels_max = 32,
|
||||
.rate_min = 8000,
|
||||
.rate_max = 48000,
|
||||
},
|
||||
.ops = &msm_fe_Multimedia_dai_ops,
|
||||
.name = "MultiMedia34",
|
||||
.probe = fe_dai_probe,
|
||||
},
|
||||
};
|
||||
|
||||
static int msm_fe_dai_dev_probe(struct platform_device *pdev)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -274,6 +274,8 @@ enum {
|
|||
MSM_FRONTEND_DAI_MULTIMEDIA30,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA31,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA32,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA33,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA34,
|
||||
MSM_FRONTEND_DAI_VOIP,
|
||||
MSM_FRONTEND_DAI_AFE_RX,
|
||||
MSM_FRONTEND_DAI_AFE_TX,
|
||||
|
|
|
|||
Loading…
Reference in a new issue