A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 22:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ASoC: msm: qdsp6v2: Remove unused FE DAIs"

Browse source
This commit is contained in:
Linux Build Service Account 2017-11-17 02:33:45 -08:00 • committed by Gerrit - the friendly Code Review server
commit e722894df5
4 changed files with 2 additions and 717 deletions
Download patch file Download diff file Expand all files Collapse all files

127
asoc/msm-dai-fe.c
View file

@ -154,31 +154,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
.name = "MultiMedia2",
.probe = fe_dai_probe,
},
{
.playback = {
.stream_name = "CS-VOICE Playback",
.aif_name = "CS-VOICE_DL1",
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.channels_min = 1,
.channels_max = 2,
.rate_min = 8000,
.rate_max = 48000,
},
.capture = {
.stream_name = "CS-VOICE Capture",
.aif_name = "CS-VOICE_UL1",
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.channels_min = 1,
.channels_max = 2,
.rate_min = 8000,
.rate_max = 48000,
},
.ops = &msm_fe_dai_ops,
.name = "CS-VOICE",
.probe = fe_dai_probe,
},
{
.playback = {
.stream_name = "VoIP Playback",
@ -746,31 +721,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
.name = "VOICE_STUB",
.probe = fe_dai_probe,
},
{
.playback = {
.stream_name = "VoLTE Playback",
.aif_name = "VoLTE_DL",
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.channels_min = 1,
.channels_max = 2,
.rate_min = 8000,
.rate_max = 48000,
},
.capture = {
.stream_name = "VoLTE Capture",
.aif_name = "VoLTE_UL",
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.channels_min = 1,
.channels_max = 2,
.rate_min = 8000,
.rate_max = 48000,
},
.ops = &msm_fe_dai_ops,
.name = "VoLTE",
.probe = fe_dai_probe,
},
{
.playback = {
.stream_name = "MI2S_RX_HOSTLESS Playback",
@ -2013,58 +1963,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
.name = "QUAT_TDM_RX_7_HOSTLESS",
.probe = fe_dai_probe,
},
{
.playback = {
.stream_name = "Voice2 Playback",
.aif_name = "VOICE2_DL",
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.channels_min = 1,
.channels_max = 2,
.rate_min = 8000,
.rate_max = 48000,
},
.capture = {
.stream_name = "Voice2 Capture",
.aif_name = "VOICE2_UL",
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.channels_min = 1,
.channels_max = 2,
.rate_min = 8000,
.rate_max = 48000,
},
.ops = &msm_fe_dai_ops,
.name = "Voice2",
.probe = fe_dai_probe,
},
{
.playback = {
.stream_name = "Pseudo Playback",
.aif_name = "MM_DL9",
.rates = (SNDRV_PCM_RATE_8000_48000 |
SNDRV_PCM_RATE_KNOT),
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.channels_min = 1,
.channels_max = 8,
.rate_min = 8000,
.rate_max = 48000,
},
.capture = {
.stream_name = "Pseudo Capture",
.aif_name = "MM_UL9",
.rates = (SNDRV_PCM_RATE_8000_48000|
SNDRV_PCM_RATE_KNOT),
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.channels_min = 1,
.channels_max = 8,
.rate_min = 8000,
.rate_max = 48000,
},
.ops = &msm_fe_Multimedia_dai_ops,
.name = "Pseudo",
.probe = fe_dai_probe,
},
{
.playback = {
.stream_name = "DTMF_RX_HOSTLESS Playback",
@ -2335,31 +2233,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
.name = "LSM8",
.probe = fe_dai_probe,
},
{
.playback = {
.stream_name = "VoWLAN Playback",
.aif_name = "VoWLAN_DL",
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.channels_min = 1,
.channels_max = 2,
.rate_min = 8000,
.rate_max = 48000,
},
.capture = {
.stream_name = "VoWLAN Capture",
.aif_name = "VoWLAN_UL",
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.channels_min = 1,
.channels_max = 2,
.rate_min = 8000,
.rate_max = 48000,
},
.ops = &msm_fe_dai_ops,
.name = "VoWLAN",
.probe = fe_dai_probe,
},
/* FE DAIs created for multiple instances of offload playback */
{
.playback = {

586
asoc/msm-pcm-routing-v2.c
View file

File diff suppressed because it is too large Load diff

4
asoc/msm-pcm-routing-v2.h
View file

@ -211,14 +211,11 @@ enum {
MSM_FRONTEND_DAI_MULTIMEDIA18,
MSM_FRONTEND_DAI_MULTIMEDIA19,
MSM_FRONTEND_DAI_MULTIMEDIA20,
MSM_FRONTEND_DAI_CS_VOICE,
MSM_FRONTEND_DAI_VOIP,
MSM_FRONTEND_DAI_AFE_RX,
MSM_FRONTEND_DAI_AFE_TX,
MSM_FRONTEND_DAI_VOICE_STUB,
MSM_FRONTEND_DAI_VOLTE,
MSM_FRONTEND_DAI_DTMF_RX,
MSM_FRONTEND_DAI_VOICE2,
MSM_FRONTEND_DAI_QCHAT,
MSM_FRONTEND_DAI_VOLTE_STUB,
MSM_FRONTEND_DAI_LSM1,
@ -230,7 +227,6 @@ enum {
MSM_FRONTEND_DAI_LSM7,
MSM_FRONTEND_DAI_LSM8,
MSM_FRONTEND_DAI_VOICE2_STUB,
MSM_FRONTEND_DAI_VOWLAN,
MSM_FRONTEND_DAI_VOICEMMODE1,
MSM_FRONTEND_DAI_VOICEMMODE2,
MSM_FRONTEND_DAI_MAX,

2
asoc/msm-qti-pp-config.c
View file

@ -27,7 +27,7 @@
/* EQUALIZER */
/* Equal to Frontend after last of the MULTIMEDIA SESSIONS */
#define MAX_EQ_SESSIONS MSM_FRONTEND_DAI_CS_VOICE
#define MAX_EQ_SESSIONS (MSM_FRONTEND_DAI_MULTIMEDIA20 + 1)
enum {
EQ_BAND1 = 0,