Merge "asoc: msm-dai-q6-v2: add a new VA macro DMA TX CPU DAI"

This commit is contained in:
Linux Build Service Account 2019-01-06 06:30:41 -08:00 • committed by Gerrit - the friendly Code Review server
commit d67f7487ef
2 changed files with 28 additions and 0 deletions

View file

@ -10654,6 +10654,31 @@ static struct snd_soc_dai_driver msm_dai_q6_cdc_dma_dai[] = {
.probe = msm_dai_q6_dai_cdc_dma_probe,
.remove = msm_dai_q6_dai_cdc_dma_remove,
},
{
.capture = {
.stream_name = "VA CDC DMA2 Capture",
.aif_name = "VA_CDC_DMA_TX_2",
.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |
SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |
SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |
SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_352800 |
SNDRV_PCM_RATE_384000,
.formats = SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S24_LE |
SNDRV_PCM_FMTBIT_S24_3LE,
.channels_min = 1,
.channels_max = 8,
.rate_min = 8000,
.rate_max = 384000,
},
.name = "VA_CDC_DMA_TX_2",
.ops = &msm_dai_q6_cdc_dma_ops,
.id = AFE_PORT_ID_VA_CODEC_DMA_TX_2,
.probe = msm_dai_q6_dai_cdc_dma_probe,
.remove = msm_dai_q6_dai_cdc_dma_remove,
},
{
.playback = {
.stream_name = "RX CDC DMA0 Playback",

View file

@ -1570,6 +1570,9 @@ struct adm_cmd_connect_afe_port_v5 {
/* AFE VA Codec DMA Tx port 1 */
#define AFE_PORT_ID_VA_CODEC_DMA_TX_1 0xB023
/* AFE VA Codec DMA Tx port 2 */
#define AFE_PORT_ID_VA_CODEC_DMA_TX_2 0xB025
/* AFE Rx Codec DMA Rx port 0 */
#define AFE_PORT_ID_RX_CODEC_DMA_RX_0 0xB030