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

Unverified Commit 2c1a5c04 authored by Kai Chieh Chuang's avatar Kai Chieh Chuang Committed by Mark Brown
Browse files

ASoC: mt6797: add Hostless DAI 



add path for hosltess lpbk from ADDA Capture to ADDA Playback
add path for hostless phone call between ADDA DAI and PCM DAI

Signed-off-by: default avatarKaiChieh Chuang <kaichieh.chuang@mediatek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 314b355f

sound/soc/mediatek/mt6797/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ snd-soc-mt6797-afe-objs := \ 
	mt6797-afe-pcm.o \

	mt6797-afe-clk.o \

	mt6797-dai-pcm.o \

	mt6797-dai-hostless.o \

	mt6797-dai-adda.o



obj-$(CONFIG_SND_SOC_MT6797) += snd-soc-mt6797-afe.o

sound/soc/mediatek/mt6797/mt6797-afe-common.h

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ enum { 
	MT6797_DAI_ADDA = MT6797_MEMIF_NUM,

	MT6797_DAI_PCM_1,

	MT6797_DAI_PCM_2,

	MT6797_DAI_HOSTLESS_LPBK,

	MT6797_DAI_HOSTLESS_SPEECH,

	MT6797_DAI_NUM,

};
@@ -52,4 +54,5 @@ unsigned int mt6797_rate_transform(struct device *dev, 
/* dai register */

int mt6797_dai_adda_register(struct mtk_base_afe *afe);

int mt6797_dai_pcm_register(struct mtk_base_afe *afe);

int mt6797_dai_hostless_register(struct mtk_base_afe *afe);

#endif

sound/soc/mediatek/mt6797/mt6797-afe-pcm.c

+1 −0
Original line number Diff line number Diff line
@@ -820,6 +820,7 @@ static int mt6797_afe_pcm_dev_probe(struct platform_device *pdev) 


	mt6797_dai_adda_register(afe);

	mt6797_dai_pcm_register(afe);

	mt6797_dai_hostless_register(afe);



	afe->sub_dais[MT6797_MEMIF_DL1].dai_drivers = mt6797_memif_dai_driver;

	afe->sub_dais[MT6797_MEMIF_DL1].num_dai_drivers =

sound/soc/mediatek/mt6797/mt6797-dai-adda.c

+12 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ static const struct snd_kcontrol_new mtk_adda_dl_ch1_mix[] = { 
				    I_ADDA_UL_CH2, 1, 0),

	SOC_DAPM_SINGLE_AUTODISABLE("ADDA_UL_CH1", AFE_CONN3,

				    I_ADDA_UL_CH1, 1, 0),

	SOC_DAPM_SINGLE_AUTODISABLE("PCM_1_CAP_CH1", AFE_CONN3,

				    I_PCM_1_CAP_CH1, 1, 0),

	SOC_DAPM_SINGLE_AUTODISABLE("PCM_2_CAP_CH1", AFE_CONN3,

				    I_PCM_2_CAP_CH1, 1, 0),

};



static const struct snd_kcontrol_new mtk_adda_dl_ch2_mix[] = {
@@ -113,6 +117,14 @@ static const struct snd_kcontrol_new mtk_adda_dl_ch2_mix[] = { 
				    I_ADDA_UL_CH2, 1, 0),

	SOC_DAPM_SINGLE_AUTODISABLE("ADDA_UL_CH1", AFE_CONN4,

				    I_ADDA_UL_CH1, 1, 0),

	SOC_DAPM_SINGLE_AUTODISABLE("PCM_1_CAP_CH1", AFE_CONN4,

				    I_PCM_1_CAP_CH1, 1, 0),

	SOC_DAPM_SINGLE_AUTODISABLE("PCM_2_CAP_CH1", AFE_CONN4,

				    I_PCM_2_CAP_CH1, 1, 0),

	SOC_DAPM_SINGLE_AUTODISABLE("PCM_1_CAP_CH2", AFE_CONN4,

				    I_PCM_1_CAP_CH2, 1, 0),

	SOC_DAPM_SINGLE_AUTODISABLE("PCM_2_CAP_CH2", AFE_CONN4,

				    I_PCM_2_CAP_CH2, 1, 0),

};



static int mtk_adda_ul_event(struct snd_soc_dapm_widget *w,

sound/soc/mediatek/mt6797/mt6797-dai-hostless.c

0 → 100644
+112 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

//

// MediaTek ALSA SoC Audio DAI Hostless Control

//

// Copyright (c) 2018 MediaTek Inc.

// Author: KaiChieh Chuang <kaichieh.chuang@mediatek.com>



#include "mt6797-afe-common.h"



/* dai component */

static const struct snd_soc_dapm_route mtk_dai_hostless_routes[] = {

	/* Hostless ADDA Loopback */

	{"ADDA_DL_CH1", "ADDA_UL_CH1", "Hostless LPBK DL"},

	{"ADDA_DL_CH1", "ADDA_UL_CH2", "Hostless LPBK DL"},

	{"ADDA_DL_CH2", "ADDA_UL_CH1", "Hostless LPBK DL"},

	{"ADDA_DL_CH2", "ADDA_UL_CH2", "Hostless LPBK DL"},

	{"Hostless LPBK UL", NULL, "ADDA Capture"},



	/* Hostless Speech */

	{"ADDA_DL_CH1", "PCM_1_CAP_CH1", "Hostless Speech DL"},

	{"ADDA_DL_CH2", "PCM_1_CAP_CH1", "Hostless Speech DL"},

	{"ADDA_DL_CH2", "PCM_1_CAP_CH2", "Hostless Speech DL"},

	{"ADDA_DL_CH1", "PCM_2_CAP_CH1", "Hostless Speech DL"},

	{"ADDA_DL_CH2", "PCM_2_CAP_CH1", "Hostless Speech DL"},

	{"ADDA_DL_CH2", "PCM_2_CAP_CH2", "Hostless Speech DL"},

	{"PCM_1_PB_CH1", "ADDA_UL_CH1", "Hostless Speech DL"},

	{"PCM_1_PB_CH2", "ADDA_UL_CH2", "Hostless Speech DL"},

	{"PCM_2_PB_CH1", "ADDA_UL_CH1", "Hostless Speech DL"},

	{"PCM_2_PB_CH2", "ADDA_UL_CH2", "Hostless Speech DL"},



	{"Hostless Speech UL", NULL, "PCM 1 Capture"},

	{"Hostless Speech UL", NULL, "PCM 2 Capture"},

	{"Hostless Speech UL", NULL, "ADDA Capture"},

};



/* dai ops */

static int mtk_dai_hostless_startup(struct snd_pcm_substream *substream,

				    struct snd_soc_dai *dai)

{

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);



	return snd_soc_set_runtime_hwparams(substream, afe->mtk_afe_hardware);

}



static const struct snd_soc_dai_ops mtk_dai_hostless_ops = {

	.startup = mtk_dai_hostless_startup,

};



/* dai driver */

#define MTK_HOSTLESS_RATES (SNDRV_PCM_RATE_8000_48000 |\

			   SNDRV_PCM_RATE_88200 |\

			   SNDRV_PCM_RATE_96000 |\

			   SNDRV_PCM_RATE_176400 |\

			   SNDRV_PCM_RATE_192000)



#define MTK_HOSTLESS_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\

			     SNDRV_PCM_FMTBIT_S24_LE |\

			     SNDRV_PCM_FMTBIT_S32_LE)



static struct snd_soc_dai_driver mtk_dai_hostless_driver[] = {

	{

		.name = "Hostless LPBK DAI",

		.id = MT6797_DAI_HOSTLESS_LPBK,

		.playback = {

			.stream_name = "Hostless LPBK DL",

			.channels_min = 1,

			.channels_max = 2,

			.rates = MTK_HOSTLESS_RATES,

			.formats = MTK_HOSTLESS_FORMATS,

		},

		.capture = {

			.stream_name = "Hostless LPBK UL",

			.channels_min = 1,

			.channels_max = 2,

			.rates = MTK_HOSTLESS_RATES,

			.formats = MTK_HOSTLESS_FORMATS,

		},

		.ops = &mtk_dai_hostless_ops,

	},

	{

		.name = "Hostless Speech DAI",

		.id = MT6797_DAI_HOSTLESS_SPEECH,

		.playback = {

			.stream_name = "Hostless Speech DL",

			.channels_min = 1,

			.channels_max = 2,

			.rates = MTK_HOSTLESS_RATES,

			.formats = MTK_HOSTLESS_FORMATS,

		},

		.capture = {

			.stream_name = "Hostless Speech UL",

			.channels_min = 1,

			.channels_max = 2,

			.rates = MTK_HOSTLESS_RATES,

			.formats = MTK_HOSTLESS_FORMATS,

		},

		.ops = &mtk_dai_hostless_ops,

	},

};



int mt6797_dai_hostless_register(struct mtk_base_afe *afe)

{

	int id = MT6797_DAI_HOSTLESS_LPBK;



	afe->sub_dais[id].dai_drivers = mtk_dai_hostless_driver;

	afe->sub_dais[id].num_dai_drivers = ARRAY_SIZE(mtk_dai_hostless_driver);



	afe->sub_dais[id].dapm_routes = mtk_dai_hostless_routes;

	afe->sub_dais[id].num_dapm_routes = ARRAY_SIZE(mtk_dai_hostless_routes);



	return 0;

}