Unverified Commit 825492cb authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: q6dsp: q6routing: add support to Codec DMA ports 



Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200910101732.23484-3-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 150b2e86

sound/soc/qcom/qdsp6/q6routing.c

+120 −1
Original line number Diff line number Diff line
@@ -113,7 +113,19 @@ 
	{ mix_name, "QUIN_TDM_TX_4", "QUIN_TDM_TX_4"},		\

	{ mix_name, "QUIN_TDM_TX_5", "QUIN_TDM_TX_5"},		\

	{ mix_name, "QUIN_TDM_TX_6", "QUIN_TDM_TX_6"},		\

	{ mix_name, "QUIN_TDM_TX_7", "QUIN_TDM_TX_7"}

	{ mix_name, "QUIN_TDM_TX_7", "QUIN_TDM_TX_7"},		\

	{ mix_name, "WSA_CODEC_DMA_TX_0", "WSA_CODEC_DMA_TX_0"},	\

	{ mix_name, "WSA_CODEC_DMA_TX_1", "WSA_CODEC_DMA_TX_1"},	\

	{ mix_name, "WSA_CODEC_DMA_TX_2", "WSA_CODEC_DMA_TX_2"},	\

	{ mix_name, "VA_CODEC_DMA_TX_0", "VA_CODEC_DMA_TX_0"},	\

	{ mix_name, "VA_CODEC_DMA_TX_1", "VA_CODEC_DMA_TX_1"},	\

	{ mix_name, "VA_CODEC_DMA_TX_2", "VA_CODEC_DMA_TX_2"},	\

	{ mix_name, "TX_CODEC_DMA_TX_0", "TX_CODEC_DMA_TX_0"},	\

	{ mix_name, "TX_CODEC_DMA_TX_1", "TX_CODEC_DMA_TX_1"},	\

	{ mix_name, "TX_CODEC_DMA_TX_2", "TX_CODEC_DMA_TX_2"},	\

	{ mix_name, "TX_CODEC_DMA_TX_3", "TX_CODEC_DMA_TX_3"},	\

	{ mix_name, "TX_CODEC_DMA_TX_4", "TX_CODEC_DMA_TX_4"},	\

	{ mix_name, "TX_CODEC_DMA_TX_5", "TX_CODEC_DMA_TX_5"}



#define Q6ROUTING_TX_MIXERS(id)						\

	SOC_SINGLE_EXT("PRI_MI2S_TX", PRIMARY_MI2S_TX,			\
@@ -267,6 +279,42 @@ 
		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("QUIN_TDM_TX_7", QUINARY_TDM_TX_7,		\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("WSA_CODEC_DMA_TX_0", WSA_CODEC_DMA_TX_0,	\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("WSA_CODEC_DMA_TX_1", WSA_CODEC_DMA_TX_1,	\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("WSA_CODEC_DMA_TX_2", WSA_CODEC_DMA_TX_2,	\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("VA_CODEC_DMA_TX_0", VA_CODEC_DMA_TX_0,		\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("VA_CODEC_DMA_TX_1", VA_CODEC_DMA_TX_1,		\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("VA_CODEC_DMA_TX_2", VA_CODEC_DMA_TX_2,		\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("TX_CODEC_DMA_TX_0", TX_CODEC_DMA_TX_0,		\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("TX_CODEC_DMA_TX_1", TX_CODEC_DMA_TX_1,		\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("TX_CODEC_DMA_TX_2", TX_CODEC_DMA_TX_2,		\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("TX_CODEC_DMA_TX_3", TX_CODEC_DMA_TX_3,		\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("TX_CODEC_DMA_TX_4", TX_CODEC_DMA_TX_4,		\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("TX_CODEC_DMA_TX_5", TX_CODEC_DMA_TX_5,		\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),
@@ -609,6 +657,36 @@ static const struct snd_kcontrol_new quin_tdm_rx_6_mixer_controls[] = { 
static const struct snd_kcontrol_new quin_tdm_rx_7_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(QUINARY_TDM_RX_7) };



static const struct snd_kcontrol_new wsa_codec_dma_rx_0_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(WSA_CODEC_DMA_RX_0) };



static const struct snd_kcontrol_new wsa_codec_dma_rx_1_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(WSA_CODEC_DMA_RX_1) };



static const struct snd_kcontrol_new rx_codec_dma_rx_0_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(RX_CODEC_DMA_RX_0) };



static const struct snd_kcontrol_new rx_codec_dma_rx_1_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(RX_CODEC_DMA_RX_1) };



static const struct snd_kcontrol_new rx_codec_dma_rx_2_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(RX_CODEC_DMA_RX_2) };



static const struct snd_kcontrol_new rx_codec_dma_rx_3_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(RX_CODEC_DMA_RX_3) };



static const struct snd_kcontrol_new rx_codec_dma_rx_4_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(RX_CODEC_DMA_RX_4) };



static const struct snd_kcontrol_new rx_codec_dma_rx_5_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(RX_CODEC_DMA_RX_5) };



static const struct snd_kcontrol_new rxcodec_dma_rx_6_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(RX_CODEC_DMA_RX_6) };



static const struct snd_kcontrol_new rx_codec_dma_rx_7_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(RX_CODEC_DMA_RX_7) };





static const struct snd_kcontrol_new mmul1_mixer_controls[] = {

	Q6ROUTING_TX_MIXERS(MSM_FRONTEND_DAI_MULTIMEDIA1) };
@@ -819,6 +897,37 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
	SND_SOC_DAPM_MIXER("QUIN_TDM_RX_7 Audio Mixer", SND_SOC_NOPM, 0, 0,

				quin_tdm_rx_7_mixer_controls,

				ARRAY_SIZE(quin_tdm_rx_7_mixer_controls)),



	SND_SOC_DAPM_MIXER("WSA_CODEC_DMA_RX_0 Audio Mixer", SND_SOC_NOPM, 0, 0,

		wsa_codec_dma_rx_0_mixer_controls,

		ARRAY_SIZE(wsa_codec_dma_rx_0_mixer_controls)),

	SND_SOC_DAPM_MIXER("WSA_CODEC_DMA_RX_1 Audio Mixer", SND_SOC_NOPM, 0, 0,

		wsa_codec_dma_rx_1_mixer_controls,

		ARRAY_SIZE(wsa_codec_dma_rx_1_mixer_controls)),

	SND_SOC_DAPM_MIXER("RX_CODEC_DMA_RX_0 Audio Mixer", SND_SOC_NOPM, 0, 0,

		rx_codec_dma_rx_0_mixer_controls,

		ARRAY_SIZE(rx_codec_dma_rx_0_mixer_controls)),

	SND_SOC_DAPM_MIXER("RX_CODEC_DMA_RX_1 Audio Mixer", SND_SOC_NOPM, 0, 0,

		rx_codec_dma_rx_1_mixer_controls,

		ARRAY_SIZE(rx_codec_dma_rx_1_mixer_controls)),

	SND_SOC_DAPM_MIXER("RX_CODEC_DMA_RX_2 Audio Mixer", SND_SOC_NOPM, 0, 0,

		rx_codec_dma_rx_2_mixer_controls,

		ARRAY_SIZE(rx_codec_dma_rx_2_mixer_controls)),

	SND_SOC_DAPM_MIXER("RX_CODEC_DMA_RX_3 Audio Mixer", SND_SOC_NOPM, 0, 0,

		rx_codec_dma_rx_3_mixer_controls,

		ARRAY_SIZE(rx_codec_dma_rx_3_mixer_controls)),

	SND_SOC_DAPM_MIXER("RX_CODEC_DMA_RX_4 Audio Mixer", SND_SOC_NOPM, 0, 0,

		rx_codec_dma_rx_4_mixer_controls,

		ARRAY_SIZE(rx_codec_dma_rx_4_mixer_controls)),

	SND_SOC_DAPM_MIXER("RX_CODEC_DMA_RX_5 Audio Mixer", SND_SOC_NOPM, 0, 0,

		rx_codec_dma_rx_5_mixer_controls,

		ARRAY_SIZE(rx_codec_dma_rx_5_mixer_controls)),

	SND_SOC_DAPM_MIXER("RX_CODEC_DMA_RX_6 Audio Mixer", SND_SOC_NOPM, 0, 0,

		rxcodec_dma_rx_6_mixer_controls,

		ARRAY_SIZE(rxcodec_dma_rx_6_mixer_controls)),

	SND_SOC_DAPM_MIXER("RX_CODEC_DMA_RX_7 Audio Mixer", SND_SOC_NOPM, 0, 0,

		rx_codec_dma_rx_7_mixer_controls,

		ARRAY_SIZE(rx_codec_dma_rx_7_mixer_controls)),

	SND_SOC_DAPM_MIXER("MultiMedia1 Mixer", SND_SOC_NOPM, 0, 0,

		mmul1_mixer_controls, ARRAY_SIZE(mmul1_mixer_controls)),

	SND_SOC_DAPM_MIXER("MultiMedia2 Mixer", SND_SOC_NOPM, 0, 0,
@@ -901,6 +1010,16 @@ static const struct snd_soc_dapm_route intercon[] = { 
	Q6ROUTING_RX_DAPM_ROUTE("QUIN_TDM_RX_5 Audio Mixer", "QUIN_TDM_RX_5"),

	Q6ROUTING_RX_DAPM_ROUTE("QUIN_TDM_RX_6 Audio Mixer", "QUIN_TDM_RX_6"),

	Q6ROUTING_RX_DAPM_ROUTE("QUIN_TDM_RX_7 Audio Mixer", "QUIN_TDM_RX_7"),

	Q6ROUTING_RX_DAPM_ROUTE("WSA_CODEC_DMA_RX_0 Audio Mixer", "WSA_CODEC_DMA_RX_0"),

	Q6ROUTING_RX_DAPM_ROUTE("WSA_CODEC_DMA_RX_1 Audio Mixer", "WSA_CODEC_DMA_RX_1"),

	Q6ROUTING_RX_DAPM_ROUTE("RX_CODEC_DMA_RX_0 Audio Mixer", "RX_CODEC_DMA_RX_0"),

	Q6ROUTING_RX_DAPM_ROUTE("RX_CODEC_DMA_RX_1 Audio Mixer", "RX_CODEC_DMA_RX_1"),

	Q6ROUTING_RX_DAPM_ROUTE("RX_CODEC_DMA_RX_2 Audio Mixer", "RX_CODEC_DMA_RX_2"),

	Q6ROUTING_RX_DAPM_ROUTE("RX_CODEC_DMA_RX_3 Audio Mixer", "RX_CODEC_DMA_RX_3"),

	Q6ROUTING_RX_DAPM_ROUTE("RX_CODEC_DMA_RX_4 Audio Mixer", "RX_CODEC_DMA_RX_4"),

	Q6ROUTING_RX_DAPM_ROUTE("RX_CODEC_DMA_RX_5 Audio Mixer", "RX_CODEC_DMA_RX_5"),

	Q6ROUTING_RX_DAPM_ROUTE("RX_CODEC_DMA_RX_6 Audio Mixer", "RX_CODEC_DMA_RX_6"),

	Q6ROUTING_RX_DAPM_ROUTE("RX_CODEC_DMA_RX_7 Audio Mixer", "RX_CODEC_DMA_RX_7"),

	Q6ROUTING_TX_DAPM_ROUTE("MultiMedia1 Mixer"),

	Q6ROUTING_TX_DAPM_ROUTE("MultiMedia2 Mixer"),

	Q6ROUTING_TX_DAPM_ROUTE("MultiMedia3 Mixer"),