Merge "ASoC: msm: add support for VI sense recording"
This commit is contained in:
Linux Build Service Account
Gerrit - the friendly Code Review server
commit
3238c76389
9 changed files with 13 additions and 90 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2016, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 and
|
||||
|
|
@ -187,11 +187,6 @@
|
|||
qcom,msm-dai-q6-dev-id = <16393>;
|
||||
};
|
||||
|
||||
sb_4_tx_vi: qcom,msm-dai-q6-sb-4-tx-vi {
|
||||
compatible = "qcom,msm-dai-q6-dev";
|
||||
qcom,msm-dai-q6-dev-id = <20233>;
|
||||
};
|
||||
|
||||
sb_5_tx: qcom,msm-dai-q6-sb-5-tx {
|
||||
compatible = "qcom,msm-dai-q6-dev";
|
||||
qcom,msm-dai-q6-dev-id = <16395>;
|
||||
|
|
|
|||
|
|
@ -105,8 +105,7 @@
|
|||
<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,
|
||||
<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
|
||||
<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,
|
||||
<&sb_4_rx>, <&sb_4_tx>, <&sb_4_tx_vi>,
|
||||
<&sb_5_tx>,
|
||||
<&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>,
|
||||
<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
|
||||
<&afe_proxy_tx>, <&incall_record_rx>,
|
||||
<&incall_record_tx>, <&incall_music_rx>,
|
||||
|
|
@ -127,7 +126,6 @@
|
|||
"msm-dai-q6-dev.16388", "msm-dai-q6-dev.16389",
|
||||
"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",
|
||||
"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",
|
||||
"msm-dai-q6-dev.20233",
|
||||
"msm-dai-q6-dev.16395", "msm-dai-q6-dev.224",
|
||||
"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",
|
||||
"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
|
||||
|
|
@ -239,8 +237,7 @@
|
|||
<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,
|
||||
<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
|
||||
<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,
|
||||
<&sb_4_rx>, <&sb_4_tx>, <&sb_4_tx_vi>,
|
||||
<&sb_5_tx>,
|
||||
<&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>,
|
||||
<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
|
||||
<&afe_proxy_tx>, <&incall_record_rx>,
|
||||
<&incall_record_tx>, <&incall_music_rx>,
|
||||
|
|
@ -261,7 +258,6 @@
|
|||
"msm-dai-q6-dev.16388", "msm-dai-q6-dev.16389",
|
||||
"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",
|
||||
"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",
|
||||
"msm-dai-q6-dev.20233",
|
||||
"msm-dai-q6-dev.16395", "msm-dai-q6-dev.224",
|
||||
"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",
|
||||
"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
|
||||
|
|
|
|||
|
|
@ -933,7 +933,6 @@ struct adm_cmd_connect_afe_port_v5 {
|
|||
#define SLIMBUS_3_TX 0x4007
|
||||
#define SLIMBUS_4_RX 0x4008
|
||||
#define SLIMBUS_4_TX 0x4009
|
||||
#define SLIMBUS_TX_VI 0x4f09
|
||||
#define SLIMBUS_5_RX 0x400a
|
||||
#define SLIMBUS_5_TX 0x400b
|
||||
#define SLIMBUS_6_RX 0x400c
|
||||
|
|
|
|||
|
|
@ -2906,7 +2906,6 @@ static int msm_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
|
|||
break;
|
||||
|
||||
case MSM_BACKEND_DAI_SLIMBUS_4_TX:
|
||||
case MSM_BACKEND_DAI_SLIMBUS_TX_VI:
|
||||
param_set_mask(params, SNDRV_PCM_HW_PARAM_FORMAT,
|
||||
SNDRV_PCM_FORMAT_S32_LE);
|
||||
rate->min = rate->max = SAMPLING_RATE_8KHZ;
|
||||
|
|
@ -3699,8 +3698,7 @@ static int msm_snd_hw_params(struct snd_pcm_substream *substream,
|
|||
/* For <codec>_tx3 case */
|
||||
else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_1_TX)
|
||||
user_set_tx_ch = slim_tx_cfg[1].channels;
|
||||
else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_4_TX ||
|
||||
dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_TX_VI)
|
||||
else if (dai_link->be_id == MSM_BACKEND_DAI_SLIMBUS_4_TX)
|
||||
user_set_tx_ch = msm_vi_feed_tx_ch;
|
||||
else
|
||||
user_set_tx_ch = tx_ch_cnt;
|
||||
|
|
@ -5728,12 +5726,12 @@ static struct snd_soc_dai_link msm_tasha_be_dai_links[] = {
|
|||
/* Slimbus VI Recording */
|
||||
{
|
||||
.name = LPASS_BE_SLIMBUS_TX_VI,
|
||||
.stream_name = "Slimbus VI Capture",
|
||||
.cpu_dai_name = "msm-dai-q6-dev.20233",
|
||||
.stream_name = "Slimbus4 Capture",
|
||||
.cpu_dai_name = "msm-dai-q6-dev.16393",
|
||||
.platform_name = "msm-pcm-routing",
|
||||
.codec_name = "tasha_codec",
|
||||
.codec_dai_name = "tasha_vifeedback",
|
||||
.be_id = MSM_BACKEND_DAI_SLIMBUS_TX_VI,
|
||||
.be_id = MSM_BACKEND_DAI_SLIMBUS_4_TX,
|
||||
.be_hw_params_fixup = msm_be_hw_params_fixup,
|
||||
.ops = &msm_be_ops,
|
||||
.ignore_suspend = 1,
|
||||
|
|
@ -5913,16 +5911,15 @@ static struct snd_soc_dai_link msm_tavil_be_dai_links[] = {
|
|||
.ignore_pmdown_time = 1,
|
||||
.ignore_suspend = 1,
|
||||
},
|
||||
|
||||
/* Slimbus VI Recording */
|
||||
{
|
||||
.name = LPASS_BE_SLIMBUS_TX_VI,
|
||||
.stream_name = "Slimbus VI Capture",
|
||||
.cpu_dai_name = "msm-dai-q6-dev.20233",
|
||||
.stream_name = "Slimbus4 Capture",
|
||||
.cpu_dai_name = "msm-dai-q6-dev.16393",
|
||||
.platform_name = "msm-pcm-routing",
|
||||
.codec_name = "tavil_codec",
|
||||
.codec_dai_name = "tavil_vifeedback",
|
||||
.be_id = MSM_BACKEND_DAI_SLIMBUS_TX_VI,
|
||||
.be_id = MSM_BACKEND_DAI_SLIMBUS_4_TX,
|
||||
.be_hw_params_fixup = msm_be_hw_params_fixup,
|
||||
.ops = &msm_be_ops,
|
||||
.ignore_suspend = 1,
|
||||
|
|
|
|||
|
|
@ -1773,7 +1773,6 @@ static int msm_dai_q6_hw_params(struct snd_pcm_substream *substream,
|
|||
case SLIMBUS_2_TX:
|
||||
case SLIMBUS_3_TX:
|
||||
case SLIMBUS_4_TX:
|
||||
case SLIMBUS_TX_VI:
|
||||
case SLIMBUS_5_TX:
|
||||
case SLIMBUS_6_TX:
|
||||
case SLIMBUS_7_TX:
|
||||
|
|
@ -1928,7 +1927,6 @@ static int msm_dai_q6_set_channel_map(struct snd_soc_dai *dai,
|
|||
case SLIMBUS_2_TX:
|
||||
case SLIMBUS_3_TX:
|
||||
case SLIMBUS_4_TX:
|
||||
case SLIMBUS_TX_VI:
|
||||
case SLIMBUS_5_TX:
|
||||
case SLIMBUS_6_TX:
|
||||
case SLIMBUS_7_TX:
|
||||
|
|
@ -2347,9 +2345,6 @@ static const struct snd_kcontrol_new sb_config_controls[] = {
|
|||
msm_dai_q6_cal_info_get,
|
||||
msm_dai_q6_cal_info_put),
|
||||
SOC_ENUM_EXT("SLIM_2_RX Format", sb_config_enum[0],
|
||||
msm_dai_q6_sb_format_get,
|
||||
msm_dai_q6_sb_format_put),
|
||||
SOC_ENUM_EXT("SLIM_TX_VI Format", sb_config_enum[0],
|
||||
msm_dai_q6_sb_format_get,
|
||||
msm_dai_q6_sb_format_put)
|
||||
};
|
||||
|
|
@ -2409,11 +2404,6 @@ static int msm_dai_q6_dai_probe(struct snd_soc_dai *dai)
|
|||
snd_ctl_new1(&sb_config_controls[0],
|
||||
dai_data));
|
||||
break;
|
||||
case SLIMBUS_TX_VI:
|
||||
rc = snd_ctl_add(dai->component->card->snd_card,
|
||||
snd_ctl_new1(&sb_config_controls[3],
|
||||
dai_data));
|
||||
break;
|
||||
case SLIMBUS_2_RX:
|
||||
rc = snd_ctl_add(dai->component->card->snd_card,
|
||||
snd_ctl_new1(&sb_config_controls[1],
|
||||
|
|
@ -3300,25 +3290,6 @@ static struct snd_soc_dai_driver msm_dai_q6_slimbus_tx_dai[] = {
|
|||
.probe = msm_dai_q6_dai_probe,
|
||||
.remove = msm_dai_q6_dai_remove,
|
||||
},
|
||||
{
|
||||
.capture = {
|
||||
.stream_name = "Slimbus VI Capture",
|
||||
.aif_name = "SLIMBUS_TX_VI",
|
||||
.rates = SNDRV_PCM_RATE_8000_96000 |
|
||||
SNDRV_PCM_RATE_192000,
|
||||
.formats = SNDRV_PCM_FMTBIT_S16_LE |
|
||||
SNDRV_PCM_FMTBIT_S24_LE |
|
||||
SNDRV_PCM_FMTBIT_S32_LE,
|
||||
.channels_min = 1,
|
||||
.channels_max = 4,
|
||||
.rate_min = 8000,
|
||||
.rate_max = 192000,
|
||||
},
|
||||
.ops = &msm_dai_q6_ops,
|
||||
.id = SLIMBUS_TX_VI,
|
||||
.probe = msm_dai_q6_dai_probe,
|
||||
.remove = msm_dai_q6_dai_remove,
|
||||
},
|
||||
{
|
||||
.capture = {
|
||||
.stream_name = "Slimbus5 Capture",
|
||||
|
|
@ -4677,9 +4648,6 @@ register_slim_playback:
|
|||
case SLIMBUS_4_TX:
|
||||
strlcpy(stream_name, "Slimbus4 Capture", 80);
|
||||
goto register_slim_capture;
|
||||
case SLIMBUS_TX_VI:
|
||||
strlcpy(stream_name, "Slimbus VI Capture", 80);
|
||||
goto register_slim_capture;
|
||||
case SLIMBUS_5_TX:
|
||||
strlcpy(stream_name, "Slimbus5 Capture", 80);
|
||||
goto register_slim_capture;
|
||||
|
|
|
|||
|
|
@ -96,7 +96,6 @@ enum {
|
|||
#define SLIMBUS_2_TX_TEXT "SLIMBUS_2_TX"
|
||||
#define SLIMBUS_3_TX_TEXT "SLIMBUS_3_TX"
|
||||
#define SLIMBUS_4_TX_TEXT "SLIMBUS_4_TX"
|
||||
#define SLIMBUS_TX_VI_TEXT "SLIMBUS_TX_VI"
|
||||
#define SLIMBUS_5_TX_TEXT "SLIMBUS_5_TX"
|
||||
#define TERT_MI2S_TX_TEXT "TERT_MI2S_TX"
|
||||
#define QUAT_MI2S_TX_TEXT "QUAT_MI2S_TX"
|
||||
|
|
@ -109,7 +108,7 @@ static const char * const lsm_port_text[] = {
|
|||
SLIMBUS_0_TX_TEXT, SLIMBUS_1_TX_TEXT, SLIMBUS_2_TX_TEXT,
|
||||
SLIMBUS_3_TX_TEXT, SLIMBUS_4_TX_TEXT, SLIMBUS_5_TX_TEXT,
|
||||
TERT_MI2S_TX_TEXT, QUAT_MI2S_TX_TEXT, ADM_LSM_TX_TEXT,
|
||||
INT3_MI2S_TX_TEXT, SLIMBUS_TX_VI_TEXT
|
||||
INT3_MI2S_TX_TEXT
|
||||
};
|
||||
|
||||
struct msm_pcm_route_bdai_pp_params {
|
||||
|
|
@ -538,7 +537,6 @@ struct msm_pcm_routing_bdai_data msm_bedais[MSM_BACKEND_DAI_MAX] = {
|
|||
LPASS_BE_INT6_MI2S_RX},
|
||||
{ AFE_PORT_ID_INT6_MI2S_TX, 0, {0}, {0}, 0, 0, 0, 0, 0,
|
||||
LPASS_BE_INT6_MI2S_TX},
|
||||
{ SLIMBUS_TX_VI, 0, {0}, {0}, 0, 0, 0, 0, 0, LPASS_BE_SLIMBUS_TX_VI},
|
||||
};
|
||||
|
||||
/* Track ASM playback & capture sessions of DAI
|
||||
|
|
@ -5681,9 +5679,6 @@ static const struct snd_kcontrol_new mmul1_mixer_controls[] = {
|
|||
SOC_SINGLE_EXT("SLIM_4_TX", MSM_BACKEND_DAI_SLIMBUS_4_TX,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("SLIM_TX_VI", MSM_BACKEND_DAI_SLIMBUS_TX_VI,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
SOC_SINGLE_EXT("SLIM_6_TX", MSM_BACKEND_DAI_SLIMBUS_6_TX,
|
||||
MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
|
||||
msm_routing_put_audio_mixer),
|
||||
|
|
@ -10994,8 +10989,6 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
|
|||
0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_IN("SLIMBUS_4_TX", "Slimbus4 Capture",
|
||||
0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_IN("SLIMBUS_TX_VI", "Slimbus VI Capture",
|
||||
0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_IN("SENARY_TX", "Senary_mi2s Capture",
|
||||
0, 0, 0, 0),
|
||||
SND_SOC_DAPM_AIF_IN("INT5_MI2S_TX", "INT5 MI2S Capture",
|
||||
|
|
@ -11759,7 +11752,6 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|||
{"MultiMedia4 Mixer", "VOC_REC_DL", "INCALL_RECORD_RX"},
|
||||
{"MultiMedia8 Mixer", "VOC_REC_DL", "INCALL_RECORD_RX"},
|
||||
{"MultiMedia1 Mixer", "SLIM_4_TX", "SLIMBUS_4_TX"},
|
||||
{"MultiMedia1 Mixer", "SLIM_TX_VI", "SLIMBUS_TX_VI"},
|
||||
{"MultiMedia1 Mixer", "SLIM_6_TX", "SLIMBUS_6_TX"},
|
||||
{"MultiMedia1 Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"},
|
||||
{"MultiMedia1 Mixer", "SLIM_8_TX", "SLIMBUS_8_TX"},
|
||||
|
|
@ -13921,7 +13913,6 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|||
{"SLIMBUS_1_TX", NULL, "BE_IN" },
|
||||
{"SLIMBUS_3_TX", NULL, "BE_IN" },
|
||||
{"SLIMBUS_4_TX", NULL, "BE_IN" },
|
||||
{"SLIMBUS_TX_VI", NULL, "BE_IN" },
|
||||
{"SLIMBUS_5_TX", NULL, "BE_IN" },
|
||||
{"SLIMBUS_6_TX", NULL, "BE_IN" },
|
||||
{"SLIMBUS_7_TX", NULL, "BE_IN" },
|
||||
|
|
|
|||
|
|
@ -70,8 +70,8 @@
|
|||
#define LPASS_BE_SLIMBUS_3_TX "SLIMBUS_3_TX"
|
||||
#define LPASS_BE_SLIMBUS_4_RX "SLIMBUS_4_RX"
|
||||
#define LPASS_BE_SLIMBUS_4_TX "SLIMBUS_4_TX"
|
||||
#define LPASS_BE_SLIMBUS_5_RX "SLIMBUS_5_RX"
|
||||
#define LPASS_BE_SLIMBUS_TX_VI "SLIMBUS_TX_VI"
|
||||
#define LPASS_BE_SLIMBUS_5_RX "SLIMBUS_5_RX"
|
||||
#define LPASS_BE_SLIMBUS_5_TX "SLIMBUS_5_TX"
|
||||
#define LPASS_BE_SLIMBUS_6_RX "SLIMBUS_6_RX"
|
||||
#define LPASS_BE_SLIMBUS_6_TX "SLIMBUS_6_TX"
|
||||
|
|
@ -362,7 +362,6 @@ enum {
|
|||
MSM_BACKEND_DAI_INT5_MI2S_TX,
|
||||
MSM_BACKEND_DAI_INT6_MI2S_RX,
|
||||
MSM_BACKEND_DAI_INT6_MI2S_TX,
|
||||
MSM_BACKEND_DAI_SLIMBUS_TX_VI,
|
||||
MSM_BACKEND_DAI_MAX,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -547,7 +547,6 @@ int afe_get_port_type(u16 port_id)
|
|||
case SLIMBUS_2_TX:
|
||||
case SLIMBUS_3_TX:
|
||||
case SLIMBUS_4_TX:
|
||||
case SLIMBUS_TX_VI:
|
||||
case SLIMBUS_5_TX:
|
||||
case SLIMBUS_6_TX:
|
||||
case SLIMBUS_7_TX:
|
||||
|
|
@ -652,7 +651,6 @@ int afe_sizeof_cfg_cmd(u16 port_id)
|
|||
case SLIMBUS_3_TX:
|
||||
case SLIMBUS_4_RX:
|
||||
case SLIMBUS_4_TX:
|
||||
case SLIMBUS_TX_VI:
|
||||
case SLIMBUS_5_RX:
|
||||
case SLIMBUS_5_TX:
|
||||
case SLIMBUS_6_RX:
|
||||
|
|
@ -2939,13 +2937,6 @@ static int __afe_port_start(u16 port_id, union afe_port_config *afe_config,
|
|||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Virtual SLIMBUS_TX_VI shares afe port with SLIMBUS_4_TX.
|
||||
* port_id changes to physical port of SLIMBUS_4_TX.
|
||||
*/
|
||||
if (port_id == SLIMBUS_TX_VI)
|
||||
port_id = SLIMBUS_4_TX;
|
||||
|
||||
if ((port_id == RT_PROXY_DAI_001_RX) ||
|
||||
(port_id == RT_PROXY_DAI_002_TX)) {
|
||||
pr_debug("%s: before incrementing pcm_afe_instance %d"\
|
||||
|
|
@ -3132,7 +3123,6 @@ static int __afe_port_start(u16 port_id, union afe_port_config *afe_config,
|
|||
case SLIMBUS_3_TX:
|
||||
case SLIMBUS_4_RX:
|
||||
case SLIMBUS_4_TX:
|
||||
case SLIMBUS_TX_VI:
|
||||
case SLIMBUS_5_RX:
|
||||
case SLIMBUS_5_TX:
|
||||
case SLIMBUS_6_RX:
|
||||
|
|
@ -3325,7 +3315,6 @@ int afe_get_port_index(u16 port_id)
|
|||
case RT_PROXY_PORT_001_TX: return IDX_RT_PROXY_PORT_001_TX;
|
||||
case SLIMBUS_4_RX: return IDX_SLIMBUS_4_RX;
|
||||
case SLIMBUS_4_TX: return IDX_SLIMBUS_4_TX;
|
||||
case SLIMBUS_TX_VI: return IDX_SLIMBUS_4_TX;
|
||||
case SLIMBUS_5_RX: return IDX_SLIMBUS_5_RX;
|
||||
case SLIMBUS_5_TX: return IDX_SLIMBUS_5_TX;
|
||||
case SLIMBUS_6_RX: return IDX_SLIMBUS_6_RX;
|
||||
|
|
@ -5494,14 +5483,6 @@ int afe_close(int port_id)
|
|||
goto fail_cmd;
|
||||
}
|
||||
pr_debug("%s: port_id = 0x%x\n", __func__, port_id);
|
||||
|
||||
/*
|
||||
* Virtual SLIMBUS_TX_VI shares afe port with SLIMBUS_4_TX.
|
||||
* port_id changes to physical port of SLIMBUS_4_TX.
|
||||
*/
|
||||
if (port_id == SLIMBUS_TX_VI)
|
||||
port_id = SLIMBUS_4_TX;
|
||||
|
||||
if ((port_id == RT_PROXY_DAI_001_RX) ||
|
||||
(port_id == RT_PROXY_DAI_002_TX)) {
|
||||
pr_debug("%s: before decrementing pcm_afe_instance %d\n",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
|
||||
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 and
|
||||
|
|
@ -64,7 +64,6 @@ int q6audio_get_port_index(u16 port_id)
|
|||
case SLIMBUS_3_TX: return IDX_SLIMBUS_3_TX;
|
||||
case SLIMBUS_4_RX: return IDX_SLIMBUS_4_RX;
|
||||
case SLIMBUS_4_TX: return IDX_SLIMBUS_4_TX;
|
||||
case SLIMBUS_TX_VI: return IDX_SLIMBUS_4_TX;
|
||||
case SLIMBUS_5_RX: return IDX_SLIMBUS_5_RX;
|
||||
case SLIMBUS_5_TX: return IDX_SLIMBUS_5_TX;
|
||||
case SLIMBUS_6_RX: return IDX_SLIMBUS_6_RX;
|
||||
|
|
@ -312,7 +311,6 @@ int q6audio_get_port_id(u16 port_id)
|
|||
case SLIMBUS_3_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_3_TX;
|
||||
case SLIMBUS_4_RX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_4_RX;
|
||||
case SLIMBUS_4_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_4_TX;
|
||||
case SLIMBUS_TX_VI: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_4_TX;
|
||||
case SLIMBUS_5_RX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_5_RX;
|
||||
case SLIMBUS_5_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_5_TX;
|
||||
case SLIMBUS_6_RX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_6_RX;
|
||||
|
|
@ -690,7 +688,6 @@ int q6audio_validate_port(u16 port_id)
|
|||
case SLIMBUS_3_TX:
|
||||
case SLIMBUS_4_RX:
|
||||
case SLIMBUS_4_TX:
|
||||
case SLIMBUS_TX_VI:
|
||||
case SLIMBUS_5_RX:
|
||||
case SLIMBUS_5_TX:
|
||||
case SLIMBUS_6_RX:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue