From 9ed61ed4a226f32b51cecc02fcf9b72a946cebd3 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Thu, 10 Sep 2020 17:14:02 +0800 Subject: [PATCH] asoc: remove AFE RX/TX from frontend dai AFE RX/TX are backend dai, not frontend dai. Remove them from msm-dai-fe.c. Change-Id: Ic24ce7e7bfcd692902f892ef8724f27f0bf59559 Signed-off-by: Meng Wang --- asoc/msm-dai-fe.c | 29 ----------------------------- asoc/msm-pcm-routing-v2.c | 1 - 2 files changed, 30 deletions(-) diff --git a/asoc/msm-dai-fe.c b/asoc/msm-dai-fe.c index a9192bb3e5ec..0f653dfc2c46 100644 --- a/asoc/msm-dai-fe.c +++ b/asoc/msm-dai-fe.c @@ -685,35 +685,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { .name = "USBAUDIO_HOSTLESS", .probe = fe_dai_probe, }, - { - .playback = { - .stream_name = "AFE Playback", - .aif_name = "PCM_RX", - .rates = (SNDRV_PCM_RATE_8000 | - SNDRV_PCM_RATE_16000 | - SNDRV_PCM_RATE_48000), - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .channels_min = 1, - .channels_max = 2, - .rate_min = 8000, - .rate_max = 48000, - }, - .capture = { - .stream_name = "AFE Capture", - .aif_name = "PCM_TX", - .rates = (SNDRV_PCM_RATE_8000 | - SNDRV_PCM_RATE_16000 | - SNDRV_PCM_RATE_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 = "AFE-PROXY", - .probe = fe_dai_probe, - }, { .playback = { .stream_name = "HDMI_HOSTLESS Playback", diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c index dd0ba09ca829..609e768ee043 100644 --- a/asoc/msm-pcm-routing-v2.c +++ b/asoc/msm-pcm-routing-v2.c @@ -28183,7 +28183,6 @@ static const struct snd_soc_dapm_route intercon[] = { {"BE_OUT", NULL, "SLIMBUS_3_RX"}, {"BE_OUT", NULL, "INT_BT_SCO_RX"}, {"BE_OUT", NULL, "INT_FM_RX"}, - {"BE_OUT", NULL, "PCM_RX"}, {"BE_OUT", NULL, "SLIMBUS_3_RX"}, {"BE_OUT", NULL, "VOICE_PLAYBACK_TX"}, {"BE_OUT", NULL, "VOICE2_PLAYBACK_TX"},