Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dd8f01a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: remove AFE RX/TX from frontend dai"

parents 4a01fe07 9ed61ed4

asoc/msm-dai-fe.c

+0 −29
Original line number Diff line number Diff line
@@ -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",

asoc/msm-pcm-routing-v2.c

+0 −1
Original line number Diff line number Diff line
@@ -28199,7 +28199,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"},