From nobody Fri Sep 20 04:13:50 2024 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64A4A3F9CE; Wed, 13 Mar 2024 11:02:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710327728; cv=none; b=NEFSVJtv7jvNdCYX3TiAFV6oJSvkkV4lSua3UqOS+XnVZ/XtoB9zcpKmVLuZxqggGz1PoaBBsXpRY2fPLrFFRXCeKOv8iMQ0MN0AbW5qQT+DU6uz+YqW86MbhclN58FeYwu3MWOwzUs1TP8Av3lOBOfV2vLFehptkpg600klDQA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710327728; c=relaxed/simple; bh=a9JEFvUwTVuwqjXH9zivYh52MX7RhbBCVDFOk812vYw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iHkftt4wL8QvHBpDeiAlta04+RyAaVofGdCOwlvyy750YBy1U5GggRVaWWzLZwy/eY3tki6Bu/pU9YEco/pQzW7QURFTLgxsMHMVwD3m7onSZbOGMIdbr54MsZgPtPiUJgBG8oXBKOppOqB3Xi1Oi4uBOwDK/Bv+j61290nJKro= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=rK5JIqLg; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="rK5JIqLg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1710327724; bh=a9JEFvUwTVuwqjXH9zivYh52MX7RhbBCVDFOk812vYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rK5JIqLgLTnJtYAsZNzSyksBmLpFmSk5/WZBG02jbiJKPOybCnXW00fLgh6u0oaPn 7oQGROqbUFinPCKsfnenrNo0hj+xND1NpJvHrYPNxm2COCldyLCBXrkzegxYxVpLkv /LsNSxCuYux5q39GVo53nDXnADBulGYz9TFtSnXZXm9MNjh4+FmulphHBOUep53Dwi oCki5ILVwfW289aEbo1xlo9I1gpsy+48s/nottc7PF7jtqFu5q7YNfUG/BUYckkd2R q7jun4d4zSZK/kCecNRMDbEklVkRwTb2EINMVLgvV/e8W43B3xEwHlpupffKQRNd9F SIMTfuKMsBBcw== Received: from IcarusMOD.eternityproject.eu (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 7BB8637820C6; Wed, 13 Mar 2024 11:02:02 +0000 (UTC) From: AngeloGioacchino Del Regno To: broonie@kernel.org Cc: wenst@chromium.org, lgirdwood@gmail.com, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, matthias.bgg@gmail.com, perex@perex.cz, tiwai@suse.com, trevor.wu@mediatek.com, maso.huang@mediatek.com, xiazhengqiao@huaqin.corp-partner.google.com, arnd@arndb.de, kuninori.morimoto.gx@renesas.com, shraash@google.com, amergnat@baylibre.com, nicolas.ferre@microchip.com, u.kleine-koenig@pengutronix.de, dianders@chromium.org, frank.li@vivo.com, allen-kh.cheng@mediatek.com, eugen.hristev@collabora.com, claudiu.beznea@tuxon.dev, jarkko.nikula@bitmer.com, jiaxin.yu@mediatek.com, alpernebiyasak@gmail.com, ckeepax@opensource.cirrus.com, zhourui@huaqin.corp-partner.google.com, nfraprado@collabora.com, alsa-devel@alsa-project.org, shane.chien@mediatek.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, AngeloGioacchino Del Regno Subject: [PATCH v3 03/22] ASoC: mediatek: Commonize ADDA rate transform functions and enums Date: Wed, 13 Mar 2024 12:01:28 +0100 Message-ID: <20240313110147.1267793-4-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240313110147.1267793-1-angelogioacchino.delregno@collabora.com> References: <20240313110147.1267793-1-angelogioacchino.delregno@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Both the enumerations for UL/DL rates, delay data and the functions adda_{dl,ul}_rate_transform were duplicated for each MediaTek SoC dai-adda driver: move the common bits to a new mtk-dai-adda-common file and its header. While at it, also add the "mtk_" prefix to the exported functions. Signed-off-by: AngeloGioacchino Del Regno --- sound/soc/mediatek/common/Makefile | 2 + .../soc/mediatek/common/mtk-dai-adda-common.c | 70 ++++++++++++++ .../soc/mediatek/common/mtk-dai-adda-common.h | 45 +++++++++ sound/soc/mediatek/mt6797/mt6797-dai-adda.c | 85 +---------------- sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 90 +----------------- sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 92 +------------------ sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 89 +----------------- sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 90 +----------------- sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 90 +----------------- 9 files changed, 135 insertions(+), 518 deletions(-) create mode 100644 sound/soc/mediatek/common/mtk-dai-adda-common.c create mode 100644 sound/soc/mediatek/common/mtk-dai-adda-common.h diff --git a/sound/soc/mediatek/common/Makefile b/sound/soc/mediatek/common= /Makefile index 42e636c10c1e..363cc258a3d5 100644 --- a/sound/soc/mediatek/common/Makefile +++ b/sound/soc/mediatek/common/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 # platform driver snd-soc-mtk-common-objs :=3D mtk-afe-platform-driver.o mtk-afe-fe-dai.o mt= k-dsp-sof-common.o mtk-soundcard-driver.o +snd-soc-mtk-common-objs +=3D mtk-dai-adda-common.o + obj-$(CONFIG_SND_SOC_MEDIATEK) +=3D snd-soc-mtk-common.o =20 obj-$(CONFIG_SND_SOC_MTK_BTCVSD) +=3D mtk-btcvsd.o diff --git a/sound/soc/mediatek/common/mtk-dai-adda-common.c b/sound/soc/me= diatek/common/mtk-dai-adda-common.c new file mode 100644 index 000000000000..4dc1412489d6 --- /dev/null +++ b/sound/soc/mediatek/common/mtk-dai-adda-common.c @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * MediaTek ALSA SoC Audio DAI ADDA Common + * + * Copyright (c) 2021 MediaTek Inc. + * Copyright (c) 2024 Collabora Ltd. + * AngeloGioacchino Del Regno + */ + +#include +#include + +#include "mtk-base-afe.h" +#include "mtk-dai-adda-common.h" + +unsigned int mtk_adda_dl_rate_transform(struct mtk_base_afe *afe, u32 rate) +{ + switch (rate) { + case 8000: + return MTK_AFE_ADDA_DL_RATE_8K; + case 11025: + return MTK_AFE_ADDA_DL_RATE_11K; + case 12000: + return MTK_AFE_ADDA_DL_RATE_12K; + case 16000: + return MTK_AFE_ADDA_DL_RATE_16K; + case 22050: + return MTK_AFE_ADDA_DL_RATE_22K; + case 24000: + return MTK_AFE_ADDA_DL_RATE_24K; + case 32000: + return MTK_AFE_ADDA_DL_RATE_32K; + case 44100: + return MTK_AFE_ADDA_DL_RATE_44K; + case 48000: + return MTK_AFE_ADDA_DL_RATE_48K; + case 96000: + return MTK_AFE_ADDA_DL_RATE_96K; + case 192000: + return MTK_AFE_ADDA_DL_RATE_192K; + default: + dev_info(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", + __func__, rate); + return MTK_AFE_ADDA_DL_RATE_48K; + } +} +EXPORT_SYMBOL_GPL(mtk_adda_dl_rate_transform); + +unsigned int mtk_adda_ul_rate_transform(struct mtk_base_afe *afe, u32 rate) +{ + switch (rate) { + case 8000: + return MTK_AFE_ADDA_UL_RATE_8K; + case 16000: + return MTK_AFE_ADDA_UL_RATE_16K; + case 32000: + return MTK_AFE_ADDA_UL_RATE_32K; + case 48000: + return MTK_AFE_ADDA_UL_RATE_48K; + case 96000: + return MTK_AFE_ADDA_UL_RATE_96K; + case 192000: + return MTK_AFE_ADDA_UL_RATE_192K; + default: + dev_info(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", + __func__, rate); + return MTK_AFE_ADDA_UL_RATE_48K; + } +} +EXPORT_SYMBOL_GPL(mtk_adda_ul_rate_transform); diff --git a/sound/soc/mediatek/common/mtk-dai-adda-common.h b/sound/soc/me= diatek/common/mtk-dai-adda-common.h new file mode 100644 index 000000000000..208b0dd89f57 --- /dev/null +++ b/sound/soc/mediatek/common/mtk-dai-adda-common.h @@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2021 MediaTek Inc. + * Copyright (c) 2024 Collabora Ltd. + * AngeloGioacchino Del Regno + */ + +#ifndef _MTK_DAI_ADDA_COMMON_H_ +#define _MTK_DAI_ADDA_COMMON_H_ + +struct mtk_base_afe; + +enum adda_input_mode_rate { + MTK_AFE_ADDA_DL_RATE_8K =3D 0, + MTK_AFE_ADDA_DL_RATE_11K =3D 1, + MTK_AFE_ADDA_DL_RATE_12K =3D 2, + MTK_AFE_ADDA_DL_RATE_16K =3D 3, + MTK_AFE_ADDA_DL_RATE_22K =3D 4, + MTK_AFE_ADDA_DL_RATE_24K =3D 5, + MTK_AFE_ADDA_DL_RATE_32K =3D 6, + MTK_AFE_ADDA_DL_RATE_44K =3D 7, + MTK_AFE_ADDA_DL_RATE_48K =3D 8, + MTK_AFE_ADDA_DL_RATE_96K =3D 9, + MTK_AFE_ADDA_DL_RATE_192K =3D 10, +}; + +enum adda_voice_mode_rate { + MTK_AFE_ADDA_UL_RATE_8K =3D 0, + MTK_AFE_ADDA_UL_RATE_16K =3D 1, + MTK_AFE_ADDA_UL_RATE_32K =3D 2, + MTK_AFE_ADDA_UL_RATE_48K =3D 3, + MTK_AFE_ADDA_UL_RATE_96K =3D 4, + MTK_AFE_ADDA_UL_RATE_192K =3D 5, + MTK_AFE_ADDA_UL_RATE_48K_HD =3D 6, +}; + +enum adda_rxif_delay_data { + DELAY_DATA_MISO1 =3D 0, + DELAY_DATA_MISO0 =3D 1, + DELAY_DATA_MISO2 =3D 1, +}; + +unsigned int mtk_adda_dl_rate_transform(struct mtk_base_afe *afe, u32 rate= ); +unsigned int mtk_adda_ul_rate_transform(struct mtk_base_afe *afe, u32 rate= ); +#endif diff --git a/sound/soc/mediatek/mt6797/mt6797-dai-adda.c b/sound/soc/mediat= ek/mt6797/mt6797-dai-adda.c index 0ac6409c6d61..78f3ad758c12 100644 --- a/sound/soc/mediatek/mt6797/mt6797-dai-adda.c +++ b/sound/soc/mediatek/mt6797/mt6797-dai-adda.c @@ -10,86 +10,7 @@ #include "mt6797-afe-common.h" #include "mt6797-interconnection.h" #include "mt6797-reg.h" - -enum { - MTK_AFE_ADDA_DL_RATE_8K =3D 0, - MTK_AFE_ADDA_DL_RATE_11K =3D 1, - MTK_AFE_ADDA_DL_RATE_12K =3D 2, - MTK_AFE_ADDA_DL_RATE_16K =3D 3, - MTK_AFE_ADDA_DL_RATE_22K =3D 4, - MTK_AFE_ADDA_DL_RATE_24K =3D 5, - MTK_AFE_ADDA_DL_RATE_32K =3D 6, - MTK_AFE_ADDA_DL_RATE_44K =3D 7, - MTK_AFE_ADDA_DL_RATE_48K =3D 8, - MTK_AFE_ADDA_DL_RATE_96K =3D 9, - MTK_AFE_ADDA_DL_RATE_192K =3D 10, -}; - -enum { - MTK_AFE_ADDA_UL_RATE_8K =3D 0, - MTK_AFE_ADDA_UL_RATE_16K =3D 1, - MTK_AFE_ADDA_UL_RATE_32K =3D 2, - MTK_AFE_ADDA_UL_RATE_48K =3D 3, - MTK_AFE_ADDA_UL_RATE_96K =3D 4, - MTK_AFE_ADDA_UL_RATE_192K =3D 5, - MTK_AFE_ADDA_UL_RATE_48K_HD =3D 6, -}; - -static unsigned int adda_dl_rate_transform(struct mtk_base_afe *afe, - unsigned int rate) -{ - switch (rate) { - case 8000: - return MTK_AFE_ADDA_DL_RATE_8K; - case 11025: - return MTK_AFE_ADDA_DL_RATE_11K; - case 12000: - return MTK_AFE_ADDA_DL_RATE_12K; - case 16000: - return MTK_AFE_ADDA_DL_RATE_16K; - case 22050: - return MTK_AFE_ADDA_DL_RATE_22K; - case 24000: - return MTK_AFE_ADDA_DL_RATE_24K; - case 32000: - return MTK_AFE_ADDA_DL_RATE_32K; - case 44100: - return MTK_AFE_ADDA_DL_RATE_44K; - case 48000: - return MTK_AFE_ADDA_DL_RATE_48K; - case 96000: - return MTK_AFE_ADDA_DL_RATE_96K; - case 192000: - return MTK_AFE_ADDA_DL_RATE_192K; - default: - dev_warn(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", - __func__, rate); - return MTK_AFE_ADDA_DL_RATE_48K; - } -} - -static unsigned int adda_ul_rate_transform(struct mtk_base_afe *afe, - unsigned int rate) -{ - switch (rate) { - case 8000: - return MTK_AFE_ADDA_UL_RATE_8K; - case 16000: - return MTK_AFE_ADDA_UL_RATE_16K; - case 32000: - return MTK_AFE_ADDA_UL_RATE_32K; - case 48000: - return MTK_AFE_ADDA_UL_RATE_48K; - case 96000: - return MTK_AFE_ADDA_UL_RATE_96K; - case 192000: - return MTK_AFE_ADDA_UL_RATE_192K; - default: - dev_warn(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", - __func__, rate); - return MTK_AFE_ADDA_UL_RATE_48K; - } -} +#include "../common/mtk-dai-adda-common.h" =20 /* dai component */ static const struct snd_kcontrol_new mtk_adda_dl_ch1_mix[] =3D { @@ -246,7 +167,7 @@ static int mtk_dai_adda_hw_params(struct snd_pcm_substr= eam *substream, regmap_write(afe->regmap, AFE_ADDA_PREDIS_CON1, 0); =20 /* set input sampling rate */ - dl_src2_con0 =3D adda_dl_rate_transform(afe, rate) << 28; + dl_src2_con0 =3D mtk_adda_dl_rate_transform(afe, rate) << 28; =20 /* set output mode */ switch (rate) { @@ -296,7 +217,7 @@ static int mtk_dai_adda_hw_params(struct snd_pcm_substr= eam *substream, 0x1 << 0, 0x0 << 0); =20 - voice_mode =3D adda_ul_rate_transform(afe, rate); + voice_mode =3D mtk_adda_ul_rate_transform(afe, rate); =20 ul_src_con0 |=3D (voice_mode << 17) & (0x7 << 17); =20 diff --git a/sound/soc/mediatek/mt8183/mt8183-dai-adda.c b/sound/soc/mediat= ek/mt8183/mt8183-dai-adda.c index 5b8a274419ed..be69bcea2a78 100644 --- a/sound/soc/mediatek/mt8183/mt8183-dai-adda.c +++ b/sound/soc/mediatek/mt8183/mt8183-dai-adda.c @@ -10,6 +10,7 @@ #include "mt8183-afe-common.h" #include "mt8183-interconnection.h" #include "mt8183-reg.h" +#include "../common/mtk-dai-adda-common.h" =20 enum { AUDIO_SDM_LEVEL_MUTE =3D 0, @@ -18,91 +19,6 @@ enum { /* you need to change formula of hp impedance and dc trim too */ }; =20 -enum { - DELAY_DATA_MISO1 =3D 0, - DELAY_DATA_MISO2, -}; - -enum { - MTK_AFE_ADDA_DL_RATE_8K =3D 0, - MTK_AFE_ADDA_DL_RATE_11K =3D 1, - MTK_AFE_ADDA_DL_RATE_12K =3D 2, - MTK_AFE_ADDA_DL_RATE_16K =3D 3, - MTK_AFE_ADDA_DL_RATE_22K =3D 4, - MTK_AFE_ADDA_DL_RATE_24K =3D 5, - MTK_AFE_ADDA_DL_RATE_32K =3D 6, - MTK_AFE_ADDA_DL_RATE_44K =3D 7, - MTK_AFE_ADDA_DL_RATE_48K =3D 8, - MTK_AFE_ADDA_DL_RATE_96K =3D 9, - MTK_AFE_ADDA_DL_RATE_192K =3D 10, -}; - -enum { - MTK_AFE_ADDA_UL_RATE_8K =3D 0, - MTK_AFE_ADDA_UL_RATE_16K =3D 1, - MTK_AFE_ADDA_UL_RATE_32K =3D 2, - MTK_AFE_ADDA_UL_RATE_48K =3D 3, - MTK_AFE_ADDA_UL_RATE_96K =3D 4, - MTK_AFE_ADDA_UL_RATE_192K =3D 5, - MTK_AFE_ADDA_UL_RATE_48K_HD =3D 6, -}; - -static unsigned int adda_dl_rate_transform(struct mtk_base_afe *afe, - unsigned int rate) -{ - switch (rate) { - case 8000: - return MTK_AFE_ADDA_DL_RATE_8K; - case 11025: - return MTK_AFE_ADDA_DL_RATE_11K; - case 12000: - return MTK_AFE_ADDA_DL_RATE_12K; - case 16000: - return MTK_AFE_ADDA_DL_RATE_16K; - case 22050: - return MTK_AFE_ADDA_DL_RATE_22K; - case 24000: - return MTK_AFE_ADDA_DL_RATE_24K; - case 32000: - return MTK_AFE_ADDA_DL_RATE_32K; - case 44100: - return MTK_AFE_ADDA_DL_RATE_44K; - case 48000: - return MTK_AFE_ADDA_DL_RATE_48K; - case 96000: - return MTK_AFE_ADDA_DL_RATE_96K; - case 192000: - return MTK_AFE_ADDA_DL_RATE_192K; - default: - dev_warn(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", - __func__, rate); - return MTK_AFE_ADDA_DL_RATE_48K; - } -} - -static unsigned int adda_ul_rate_transform(struct mtk_base_afe *afe, - unsigned int rate) -{ - switch (rate) { - case 8000: - return MTK_AFE_ADDA_UL_RATE_8K; - case 16000: - return MTK_AFE_ADDA_UL_RATE_16K; - case 32000: - return MTK_AFE_ADDA_UL_RATE_32K; - case 48000: - return MTK_AFE_ADDA_UL_RATE_48K; - case 96000: - return MTK_AFE_ADDA_UL_RATE_96K; - case 192000: - return MTK_AFE_ADDA_UL_RATE_192K; - default: - dev_warn(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", - __func__, rate); - return MTK_AFE_ADDA_UL_RATE_48K; - } -} - /* dai component */ static const struct snd_kcontrol_new mtk_adda_dl_ch1_mix[] =3D { SOC_DAPM_SINGLE_AUTODISABLE("DL1_CH1", AFE_CONN3, I_DL1_CH1, 1, 0), @@ -369,7 +285,7 @@ static int mtk_dai_adda_hw_params(struct snd_pcm_substr= eam *substream, regmap_write(afe->regmap, AFE_ADDA_PREDIS_CON1, 0); =20 /* set sampling rate */ - dl_src2_con0 =3D adda_dl_rate_transform(afe, rate) << 28; + dl_src2_con0 =3D mtk_adda_dl_rate_transform(afe, rate) << 28; =20 /* set output mode */ switch (rate) { @@ -420,7 +336,7 @@ static int mtk_dai_adda_hw_params(struct snd_pcm_substr= eam *substream, 0x1 << 0, 0x0 << 0); =20 - voice_mode =3D adda_ul_rate_transform(afe, rate); + voice_mode =3D mtk_adda_ul_rate_transform(afe, rate); =20 ul_src_con0 |=3D (voice_mode << 17) & (0x7 << 17); =20 diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c b/sound/soc/mediat= ek/mt8186/mt8186-dai-adda.c index ad6d4b5cf697..dbd157d1a1ea 100644 --- a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c +++ b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c @@ -11,6 +11,7 @@ #include "mt8186-afe-common.h" #include "mt8186-afe-gpio.h" #include "mt8186-interconnection.h" +#include "../common/mtk-dai-adda-common.h" =20 enum { UL_IIR_SW =3D 0, @@ -33,35 +34,6 @@ enum { AUDIO_SDM_3RD, }; =20 -enum { - DELAY_DATA_MISO1 =3D 0, - DELAY_DATA_MISO2, -}; - -enum { - MTK_AFE_ADDA_DL_RATE_8K =3D 0, - MTK_AFE_ADDA_DL_RATE_11K =3D 1, - MTK_AFE_ADDA_DL_RATE_12K =3D 2, - MTK_AFE_ADDA_DL_RATE_16K =3D 3, - MTK_AFE_ADDA_DL_RATE_22K =3D 4, - MTK_AFE_ADDA_DL_RATE_24K =3D 5, - MTK_AFE_ADDA_DL_RATE_32K =3D 6, - MTK_AFE_ADDA_DL_RATE_44K =3D 7, - MTK_AFE_ADDA_DL_RATE_48K =3D 8, - MTK_AFE_ADDA_DL_RATE_96K =3D 9, - MTK_AFE_ADDA_DL_RATE_192K =3D 10, -}; - -enum { - MTK_AFE_ADDA_UL_RATE_8K =3D 0, - MTK_AFE_ADDA_UL_RATE_16K =3D 1, - MTK_AFE_ADDA_UL_RATE_32K =3D 2, - MTK_AFE_ADDA_UL_RATE_48K =3D 3, - MTK_AFE_ADDA_UL_RATE_96K =3D 4, - MTK_AFE_ADDA_UL_RATE_192K =3D 5, - MTK_AFE_ADDA_UL_RATE_48K_HD =3D 6, -}; - #define SDM_AUTO_RESET_THRESHOLD 0x190000 =20 struct mtk_afe_adda_priv { @@ -83,64 +55,6 @@ static struct mtk_afe_adda_priv *get_adda_priv_by_name(s= truct mtk_base_afe *afe, return afe_priv->dai_priv[dai_id]; } =20 -static unsigned int adda_dl_rate_transform(struct mtk_base_afe *afe, - unsigned int rate) -{ - switch (rate) { - case 8000: - return MTK_AFE_ADDA_DL_RATE_8K; - case 11025: - return MTK_AFE_ADDA_DL_RATE_11K; - case 12000: - return MTK_AFE_ADDA_DL_RATE_12K; - case 16000: - return MTK_AFE_ADDA_DL_RATE_16K; - case 22050: - return MTK_AFE_ADDA_DL_RATE_22K; - case 24000: - return MTK_AFE_ADDA_DL_RATE_24K; - case 32000: - return MTK_AFE_ADDA_DL_RATE_32K; - case 44100: - return MTK_AFE_ADDA_DL_RATE_44K; - case 48000: - return MTK_AFE_ADDA_DL_RATE_48K; - case 96000: - return MTK_AFE_ADDA_DL_RATE_96K; - case 192000: - return MTK_AFE_ADDA_DL_RATE_192K; - default: - dev_dbg(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", - __func__, rate); - } - - return MTK_AFE_ADDA_DL_RATE_48K; -} - -static unsigned int adda_ul_rate_transform(struct mtk_base_afe *afe, - unsigned int rate) -{ - switch (rate) { - case 8000: - return MTK_AFE_ADDA_UL_RATE_8K; - case 16000: - return MTK_AFE_ADDA_UL_RATE_16K; - case 32000: - return MTK_AFE_ADDA_UL_RATE_32K; - case 48000: - return MTK_AFE_ADDA_UL_RATE_48K; - case 96000: - return MTK_AFE_ADDA_UL_RATE_96K; - case 192000: - return MTK_AFE_ADDA_UL_RATE_192K; - default: - dev_dbg(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", - __func__, rate); - } - - return MTK_AFE_ADDA_UL_RATE_48K; -} - /* dai component */ static const struct snd_kcontrol_new mtk_adda_dl_ch1_mix[] =3D { SOC_DAPM_SINGLE_AUTODISABLE("DL1_CH1 Switch", AFE_CONN3, I_DL1_CH1, 1, 0), @@ -658,7 +572,7 @@ static int mtk_dai_adda_hw_params(struct snd_pcm_substr= eam *substream, adda_priv->dl_rate =3D rate; =20 /* set sampling rate */ - dl_src2_con0 =3D adda_dl_rate_transform(afe, rate) << + dl_src2_con0 =3D mtk_adda_dl_rate_transform(afe, rate) << DL_2_INPUT_MODE_CTL_SFT; =20 /* set output mode, UP_SAMPLING_RATE_X8 */ @@ -721,7 +635,7 @@ static int mtk_dai_adda_hw_params(struct snd_pcm_substr= eam *substream, } } else { unsigned int ul_src_con0 =3D 0; - unsigned int voice_mode =3D adda_ul_rate_transform(afe, rate); + unsigned int voice_mode =3D mtk_adda_ul_rate_transform(afe, rate); =20 adda_priv->ul_rate =3D rate; ul_src_con0 |=3D (voice_mode << 17) & (0x7 << 17); diff --git a/sound/soc/mediatek/mt8188/mt8188-dai-adda.c b/sound/soc/mediat= ek/mt8188/mt8188-dai-adda.c index 7dc029f2b428..8a17d1935c48 100644 --- a/sound/soc/mediatek/mt8188/mt8188-dai-adda.c +++ b/sound/soc/mediatek/mt8188/mt8188-dai-adda.c @@ -14,6 +14,7 @@ #include "mt8188-afe-clk.h" #include "mt8188-afe-common.h" #include "mt8188-reg.h" +#include "../common/mtk-dai-adda-common.h" =20 #define ADDA_HIRES_THRES 48000 =20 @@ -24,94 +25,10 @@ enum { SUPPLY_SEQ_ADDA_AFE_ON, }; =20 -enum { - MTK_AFE_ADDA_DL_RATE_8K =3D 0, - MTK_AFE_ADDA_DL_RATE_11K =3D 1, - MTK_AFE_ADDA_DL_RATE_12K =3D 2, - MTK_AFE_ADDA_DL_RATE_16K =3D 3, - MTK_AFE_ADDA_DL_RATE_22K =3D 4, - MTK_AFE_ADDA_DL_RATE_24K =3D 5, - MTK_AFE_ADDA_DL_RATE_32K =3D 6, - MTK_AFE_ADDA_DL_RATE_44K =3D 7, - MTK_AFE_ADDA_DL_RATE_48K =3D 8, - MTK_AFE_ADDA_DL_RATE_96K =3D 9, - MTK_AFE_ADDA_DL_RATE_192K =3D 10, -}; - -enum { - MTK_AFE_ADDA_UL_RATE_8K =3D 0, - MTK_AFE_ADDA_UL_RATE_16K =3D 1, - MTK_AFE_ADDA_UL_RATE_32K =3D 2, - MTK_AFE_ADDA_UL_RATE_48K =3D 3, - MTK_AFE_ADDA_UL_RATE_96K =3D 4, - MTK_AFE_ADDA_UL_RATE_192K =3D 5, -}; - -enum { - DELAY_DATA_MISO1 =3D 0, - DELAY_DATA_MISO0 =3D 1, -}; - struct mtk_dai_adda_priv { bool hires_required; }; =20 -static unsigned int afe_adda_dl_rate_transform(struct mtk_base_afe *afe, - unsigned int rate) -{ - switch (rate) { - case 8000: - return MTK_AFE_ADDA_DL_RATE_8K; - case 11025: - return MTK_AFE_ADDA_DL_RATE_11K; - case 12000: - return MTK_AFE_ADDA_DL_RATE_12K; - case 16000: - return MTK_AFE_ADDA_DL_RATE_16K; - case 22050: - return MTK_AFE_ADDA_DL_RATE_22K; - case 24000: - return MTK_AFE_ADDA_DL_RATE_24K; - case 32000: - return MTK_AFE_ADDA_DL_RATE_32K; - case 44100: - return MTK_AFE_ADDA_DL_RATE_44K; - case 48000: - return MTK_AFE_ADDA_DL_RATE_48K; - case 96000: - return MTK_AFE_ADDA_DL_RATE_96K; - case 192000: - return MTK_AFE_ADDA_DL_RATE_192K; - default: - dev_info(afe->dev, "%s(), rate %u invalid, use 48kHz!!!\n", - __func__, rate); - return MTK_AFE_ADDA_DL_RATE_48K; - } -} - -static unsigned int afe_adda_ul_rate_transform(struct mtk_base_afe *afe, - unsigned int rate) -{ - switch (rate) { - case 8000: - return MTK_AFE_ADDA_UL_RATE_8K; - case 16000: - return MTK_AFE_ADDA_UL_RATE_16K; - case 32000: - return MTK_AFE_ADDA_UL_RATE_32K; - case 48000: - return MTK_AFE_ADDA_UL_RATE_48K; - case 96000: - return MTK_AFE_ADDA_UL_RATE_96K; - case 192000: - return MTK_AFE_ADDA_UL_RATE_192K; - default: - dev_info(afe->dev, "%s(), rate %u invalid, use 48kHz!!!\n", - __func__, rate); - return MTK_AFE_ADDA_UL_RATE_48K; - } -} - static int mt8188_adda_mtkaif_init(struct mtk_base_afe *afe) { struct mt8188_afe_private *afe_priv =3D afe->platform_priv; @@ -440,7 +357,7 @@ static int mtk_dai_da_configure(struct mtk_base_afe *af= e, /* set sampling rate */ mask |=3D DL_2_INPUT_MODE_CTL_MASK; val |=3D FIELD_PREP(DL_2_INPUT_MODE_CTL_MASK, - afe_adda_dl_rate_transform(afe, rate)); + mtk_adda_dl_rate_transform(afe, rate)); =20 /* turn off saturation */ mask |=3D DL_2_CH1_SATURATION_EN_CTL; @@ -474,7 +391,7 @@ static int mtk_dai_ad_configure(struct mtk_base_afe *af= e, =20 mask =3D UL_VOICE_MODE_CTL_MASK; val =3D FIELD_PREP(UL_VOICE_MODE_CTL_MASK, - afe_adda_ul_rate_transform(afe, rate)); + mtk_adda_ul_rate_transform(afe, rate)); =20 regmap_update_bits(afe->regmap, AFE_ADDA_UL_SRC_CON0, mask, val); diff --git a/sound/soc/mediatek/mt8192/mt8192-dai-adda.c b/sound/soc/mediat= ek/mt8192/mt8192-dai-adda.c index 36d33032a37a..99de85b87643 100644 --- a/sound/soc/mediatek/mt8192/mt8192-dai-adda.c +++ b/sound/soc/mediatek/mt8192/mt8192-dai-adda.c @@ -13,6 +13,7 @@ #include "mt8192-afe-common.h" #include "mt8192-afe-gpio.h" #include "mt8192-interconnection.h" +#include "../common/mtk-dai-adda-common.h" =20 enum { UL_IIR_SW =3D 0, @@ -35,93 +36,8 @@ enum { AUDIO_SDM_3RD, }; =20 -enum { - DELAY_DATA_MISO1 =3D 0, - DELAY_DATA_MISO2, -}; - -enum { - MTK_AFE_ADDA_DL_RATE_8K =3D 0, - MTK_AFE_ADDA_DL_RATE_11K =3D 1, - MTK_AFE_ADDA_DL_RATE_12K =3D 2, - MTK_AFE_ADDA_DL_RATE_16K =3D 3, - MTK_AFE_ADDA_DL_RATE_22K =3D 4, - MTK_AFE_ADDA_DL_RATE_24K =3D 5, - MTK_AFE_ADDA_DL_RATE_32K =3D 6, - MTK_AFE_ADDA_DL_RATE_44K =3D 7, - MTK_AFE_ADDA_DL_RATE_48K =3D 8, - MTK_AFE_ADDA_DL_RATE_96K =3D 9, - MTK_AFE_ADDA_DL_RATE_192K =3D 10, -}; - -enum { - MTK_AFE_ADDA_UL_RATE_8K =3D 0, - MTK_AFE_ADDA_UL_RATE_16K =3D 1, - MTK_AFE_ADDA_UL_RATE_32K =3D 2, - MTK_AFE_ADDA_UL_RATE_48K =3D 3, - MTK_AFE_ADDA_UL_RATE_96K =3D 4, - MTK_AFE_ADDA_UL_RATE_192K =3D 5, - MTK_AFE_ADDA_UL_RATE_48K_HD =3D 6, -}; - #define SDM_AUTO_RESET_THRESHOLD 0x190000 =20 -static unsigned int adda_dl_rate_transform(struct mtk_base_afe *afe, - unsigned int rate) -{ - switch (rate) { - case 8000: - return MTK_AFE_ADDA_DL_RATE_8K; - case 11025: - return MTK_AFE_ADDA_DL_RATE_11K; - case 12000: - return MTK_AFE_ADDA_DL_RATE_12K; - case 16000: - return MTK_AFE_ADDA_DL_RATE_16K; - case 22050: - return MTK_AFE_ADDA_DL_RATE_22K; - case 24000: - return MTK_AFE_ADDA_DL_RATE_24K; - case 32000: - return MTK_AFE_ADDA_DL_RATE_32K; - case 44100: - return MTK_AFE_ADDA_DL_RATE_44K; - case 48000: - return MTK_AFE_ADDA_DL_RATE_48K; - case 96000: - return MTK_AFE_ADDA_DL_RATE_96K; - case 192000: - return MTK_AFE_ADDA_DL_RATE_192K; - default: - dev_warn(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", - __func__, rate); - return MTK_AFE_ADDA_DL_RATE_48K; - } -} - -static unsigned int adda_ul_rate_transform(struct mtk_base_afe *afe, - unsigned int rate) -{ - switch (rate) { - case 8000: - return MTK_AFE_ADDA_UL_RATE_8K; - case 16000: - return MTK_AFE_ADDA_UL_RATE_16K; - case 32000: - return MTK_AFE_ADDA_UL_RATE_32K; - case 48000: - return MTK_AFE_ADDA_UL_RATE_48K; - case 96000: - return MTK_AFE_ADDA_UL_RATE_96K; - case 192000: - return MTK_AFE_ADDA_UL_RATE_192K; - default: - dev_warn(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", - __func__, rate); - return MTK_AFE_ADDA_UL_RATE_48K; - } -} - /* dai component */ static const struct snd_kcontrol_new mtk_adda_dl_ch1_mix[] =3D { SOC_DAPM_SINGLE_AUTODISABLE("DL1_CH1", AFE_CONN3, I_DL1_CH1, 1, 0), @@ -1156,7 +1072,7 @@ static int mtk_dai_adda_hw_params(struct snd_pcm_subs= tream *substream, unsigned int dl_src2_con1 =3D 0; =20 /* set sampling rate */ - dl_src2_con0 =3D adda_dl_rate_transform(afe, rate) << + dl_src2_con0 =3D mtk_adda_dl_rate_transform(afe, rate) << DL_2_INPUT_MODE_CTL_SFT; =20 /* set output mode, UP_SAMPLING_RATE_X8 */ @@ -1246,7 +1162,7 @@ static int mtk_dai_adda_hw_params(struct snd_pcm_subs= tream *substream, unsigned int voice_mode =3D 0; unsigned int ul_src_con0 =3D 0; /* default value */ =20 - voice_mode =3D adda_ul_rate_transform(afe, rate); + voice_mode =3D mtk_adda_ul_rate_transform(afe, rate); =20 ul_src_con0 |=3D (voice_mode << 17) & (0x7 << 17); =20 diff --git a/sound/soc/mediatek/mt8195/mt8195-dai-adda.c b/sound/soc/mediat= ek/mt8195/mt8195-dai-adda.c index 0dd35255066b..8da1587128cc 100644 --- a/sound/soc/mediatek/mt8195/mt8195-dai-adda.c +++ b/sound/soc/mediatek/mt8195/mt8195-dai-adda.c @@ -12,6 +12,7 @@ #include "mt8195-afe-clk.h" #include "mt8195-afe-common.h" #include "mt8195-reg.h" +#include "../common/mtk-dai-adda-common.h" =20 #define ADDA_DL_GAIN_LOOPBACK 0x1800 #define ADDA_HIRES_THRES 48000 @@ -25,35 +26,6 @@ enum { SUPPLY_SEQ_ADDA_AFE_ON, }; =20 -enum { - MTK_AFE_ADDA_DL_RATE_8K =3D 0, - MTK_AFE_ADDA_DL_RATE_11K =3D 1, - MTK_AFE_ADDA_DL_RATE_12K =3D 2, - MTK_AFE_ADDA_DL_RATE_16K =3D 3, - MTK_AFE_ADDA_DL_RATE_22K =3D 4, - MTK_AFE_ADDA_DL_RATE_24K =3D 5, - MTK_AFE_ADDA_DL_RATE_32K =3D 6, - MTK_AFE_ADDA_DL_RATE_44K =3D 7, - MTK_AFE_ADDA_DL_RATE_48K =3D 8, - MTK_AFE_ADDA_DL_RATE_96K =3D 9, - MTK_AFE_ADDA_DL_RATE_192K =3D 10, -}; - -enum { - MTK_AFE_ADDA_UL_RATE_8K =3D 0, - MTK_AFE_ADDA_UL_RATE_16K =3D 1, - MTK_AFE_ADDA_UL_RATE_32K =3D 2, - MTK_AFE_ADDA_UL_RATE_48K =3D 3, - MTK_AFE_ADDA_UL_RATE_96K =3D 4, - MTK_AFE_ADDA_UL_RATE_192K =3D 5, -}; - -enum { - DELAY_DATA_MISO1 =3D 0, - DELAY_DATA_MISO0 =3D 1, - DELAY_DATA_MISO2 =3D 1, -}; - enum { MTK_AFE_ADDA, MTK_AFE_ADDA6, @@ -63,62 +35,6 @@ struct mtk_dai_adda_priv { bool hires_required; }; =20 -static unsigned int afe_adda_dl_rate_transform(struct mtk_base_afe *afe, - unsigned int rate) -{ - switch (rate) { - case 8000: - return MTK_AFE_ADDA_DL_RATE_8K; - case 11025: - return MTK_AFE_ADDA_DL_RATE_11K; - case 12000: - return MTK_AFE_ADDA_DL_RATE_12K; - case 16000: - return MTK_AFE_ADDA_DL_RATE_16K; - case 22050: - return MTK_AFE_ADDA_DL_RATE_22K; - case 24000: - return MTK_AFE_ADDA_DL_RATE_24K; - case 32000: - return MTK_AFE_ADDA_DL_RATE_32K; - case 44100: - return MTK_AFE_ADDA_DL_RATE_44K; - case 48000: - return MTK_AFE_ADDA_DL_RATE_48K; - case 96000: - return MTK_AFE_ADDA_DL_RATE_96K; - case 192000: - return MTK_AFE_ADDA_DL_RATE_192K; - default: - dev_info(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", - __func__, rate); - return MTK_AFE_ADDA_DL_RATE_48K; - } -} - -static unsigned int afe_adda_ul_rate_transform(struct mtk_base_afe *afe, - unsigned int rate) -{ - switch (rate) { - case 8000: - return MTK_AFE_ADDA_UL_RATE_8K; - case 16000: - return MTK_AFE_ADDA_UL_RATE_16K; - case 32000: - return MTK_AFE_ADDA_UL_RATE_32K; - case 48000: - return MTK_AFE_ADDA_UL_RATE_48K; - case 96000: - return MTK_AFE_ADDA_UL_RATE_96K; - case 192000: - return MTK_AFE_ADDA_UL_RATE_192K; - default: - dev_info(afe->dev, "%s(), rate %d invalid, use 48kHz!!!\n", - __func__, rate); - return MTK_AFE_ADDA_UL_RATE_48K; - } -} - static int mt8195_adda_mtkaif_init(struct mtk_base_afe *afe) { struct mt8195_afe_private *afe_priv =3D afe->platform_priv; @@ -644,7 +560,7 @@ static int mtk_dai_da_configure(struct mtk_base_afe *af= e, =20 /* set sampling rate */ mask |=3D DL_2_INPUT_MODE_CTL_MASK; - val |=3D DL_2_INPUT_MODE_CTL(afe_adda_dl_rate_transform(afe, rate)); + val |=3D DL_2_INPUT_MODE_CTL(mtk_adda_dl_rate_transform(afe, rate)); =20 /* turn off saturation */ mask |=3D DL_2_CH1_SATURATION_EN_CTL; @@ -681,7 +597,7 @@ static int mtk_dai_ad_configure(struct mtk_base_afe *af= e, unsigned int mask =3D 0; =20 mask |=3D UL_VOICE_MODE_CTL_MASK; - val |=3D UL_VOICE_MODE_CTL(afe_adda_ul_rate_transform(afe, rate)); + val |=3D UL_VOICE_MODE_CTL(mtk_adda_ul_rate_transform(afe, rate)); =20 switch (id) { case MT8195_AFE_IO_UL_SRC1: --=20 2.44.0