From nobody Fri Sep 20 14:54:50 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70F77C0015E for ; Tue, 25 Jul 2023 03:53:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231202AbjGYDxU (ORCPT ); Mon, 24 Jul 2023 23:53:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229945AbjGYDxS (ORCPT ); Mon, 24 Jul 2023 23:53:18 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55E4919A1 for ; Mon, 24 Jul 2023 20:53:13 -0700 (PDT) X-UUID: c414113a2a9e11ee9cb5633481061a41-20230725 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=bkuFlQZm1wGXwCPWMA9dpYXbQ7euJCFPWKLDx347OEc=; b=ubp69JprWmDfGzxGEXavzXr/gV6AImb1kHHIUJ9FvlPUTGtj7rUOfi5zyXeu1/Rfh/9YOFRzAw48yKE2m0A0ZixM/sQ3t4nRlF2cVYj+1c54F70zacFYS+XrAEiZOpNITmT1/TFZhk4OBTOhbAIhyCKaLmCJ9uvNdZNZAN8MZb8=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.29,REQID:8df923d3-a68e-4c15-b743-df486784f5f4,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:70 X-CID-INFO: VERSION:1.1.29,REQID:8df923d3-a68e-4c15-b743-df486784f5f4,IP:0,URL :0,TC:0,Content:-25,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Spam_GS981B3D,ACTI ON:quarantine,TS:70 X-CID-META: VersionHash:e7562a7,CLOUDID:575549d2-cd77-4e67-bbfd-aa4eaace762f,B ulkID:230725115308CPP61VZA,BulkQuantity:0,Recheck:0,SF:19|48|38|29|28|17,T C:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 ,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_SDM,TF_CID_SPAM_ASC,TF_CID_SPAM_FAS, TF_CID_SPAM_FSD X-UUID: c414113a2a9e11ee9cb5633481061a41-20230725 Received: from mtkmbs14n2.mediatek.inc [(172.21.101.76)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 418060739; Tue, 25 Jul 2023 11:53:07 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by mtkmbs13n2.mediatek.inc (172.21.101.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Tue, 25 Jul 2023 11:53:06 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Tue, 25 Jul 2023 11:53:06 +0800 From: Trevor Wu To: , , , , , CC: , , , , Subject: [PATCH 1/3] ASoC: mediatek: mt8188-mt6359: support dynamic pinctrl Date: Tue, 25 Jul 2023 11:53:02 +0800 Message-ID: <20230725035304.2864-2-trevor.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20230725035304.2864-1-trevor.wu@mediatek.com> References: <20230725035304.2864-1-trevor.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To avoid power leakage, it is recommended to replace the default pinctrl state with dynamic pinctrl since certain audio pinmux functions can remain in a HIGH state even when audio is disabled. Linking pinctrl with DAPM using SND_SOC_DAPM_PINCTRL will ensure that audio pins remain in GPIO mode by default and only switch to an audio function when necessary. Signed-off-by: Trevor Wu Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek= /mt8188/mt8188-mt6359.c index 7c9e08e6a4f5..667d79f33bf2 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -246,6 +246,11 @@ static const struct snd_soc_dapm_widget mt8188_mt6359_= widgets[] =3D { SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_SINK("HDMI"), SND_SOC_DAPM_SINK("DP"), + + /* dynamic pinctrl */ + SND_SOC_DAPM_PINCTRL("ETDM_SPK_PIN", "aud_etdm_spk_on", "aud_etdm_spk_off= "), + SND_SOC_DAPM_PINCTRL("ETDM_HP_PIN", "aud_etdm_hp_on", "aud_etdm_hp_off"), + SND_SOC_DAPM_PINCTRL("MTKAIF_PIN", "aud_mtkaif_on", "aud_mtkaif_off"), }; =20 static const struct snd_kcontrol_new mt8188_mt6359_controls[] =3D { @@ -267,6 +272,7 @@ static int mt8188_mt6359_mtkaif_calibration(struct snd_= soc_pcm_runtime *rtd) snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct snd_soc_component *cmpnt_codec =3D asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_dapm_widget *pin_w =3D NULL, *w; struct mtk_base_afe *afe; struct mt8188_afe_private *afe_priv; struct mtkaif_param *param; @@ -306,6 +312,18 @@ static int mt8188_mt6359_mtkaif_calibration(struct snd= _soc_pcm_runtime *rtd) return 0; } =20 + for_each_card_widgets(rtd->card, w) { + if (!strcmp(w->name, "MTKAIF_PIN")) { + pin_w =3D w; + break; + } + } + + if (!pin_w) + dev_dbg(afe->dev, "%s(), no pinmux widget, please check if default on\n"= , __func__); + else + dapm_pinctrl_event(pin_w, NULL, SND_SOC_DAPM_PRE_PMU); + pm_runtime_get_sync(afe->dev); mt6359_mtkaif_calibration_enable(cmpnt_codec); =20 @@ -403,6 +421,9 @@ static int mt8188_mt6359_mtkaif_calibration(struct snd_= soc_pcm_runtime *rtd) for (i =3D 0; i < MT8188_MTKAIF_MISO_NUM; i++) param->mtkaif_phase_cycle[i] =3D mtkaif_phase_cycle[i]; =20 + if (pin_w) + dapm_pinctrl_event(pin_w, NULL, SND_SOC_DAPM_POST_PMD); + dev_dbg(afe->dev, "%s(), end, calibration ok %d\n", __func__, param->mtkaif_calibration_ok); =20 --=20 2.18.0 From nobody Fri Sep 20 14:54:50 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9BF5C00528 for ; Tue, 25 Jul 2023 03:53:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229802AbjGYDx1 (ORCPT ); Mon, 24 Jul 2023 23:53:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231300AbjGYDxW (ORCPT ); Mon, 24 Jul 2023 23:53:22 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25A40199F for ; Mon, 24 Jul 2023 20:53:16 -0700 (PDT) X-UUID: c41d3d142a9e11eeb20a276fd37b9834-20230725 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=fAaLTgr6h+D1sKWYDX9V6S08Z+V9P+dFrkTq+4rs0u4=; b=ClKAgkruxMTmMBBgU0+rX5FX7BHBrODIal2ey1dLLqOjDcpkiGwY3yZTJ9CTacQ3Sent+b7Cimhjs1TzsGM2NVKR001u91FXae9C15Xr8h2QaLfwfFPqVSwTck4K9hqMvibQMehhwdvWJ1svBCs423xJtSucwmcA8vUAokRkuzg=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.29,REQID:6e73019e-d668-45a1-9789-6f0e8fcc5da6,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:e7562a7,CLOUDID:3b08c0b3-a467-4aa9-9e04-f584452e3794,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO, DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: c41d3d142a9e11eeb20a276fd37b9834-20230725 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1939560042; Tue, 25 Jul 2023 11:53:07 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Tue, 25 Jul 2023 11:53:06 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Tue, 25 Jul 2023 11:53:06 +0800 From: Trevor Wu To: , , , , , CC: , , , , Subject: [PATCH 2/3] ASoC: mediatek: common: revise SOF common code Date: Tue, 25 Jul 2023 11:53:03 +0800 Message-ID: <20230725035304.2864-3-trevor.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20230725035304.2864-1-trevor.wu@mediatek.com> References: <20230725035304.2864-1-trevor.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Originally, normal dai link fixup callback is overwritten by sof fixup callback on mtk_sof_card_late_probe and it relies on the mapping defined on struct sof_conn_stream. It's not flexible. When a new hardware connection is adopted, user needs to update struct sof_conn_stream defined in machine driver which is used to specify the mapping relationship of normal BE and SOF BE. In the patch, mtk_sof_check_tplg_be_dai_link_fixup() is introduced for all normal BEs. In mtk_sof_late_probe, back up normal BE fixup if it exists and then overwrite be_hw_params_fixup by the new callback. There are two cases for FE and BE connection. case 1: SOF FE -> normal BE -> SOF_BE case 2: normal FE -> normal BE In the new fixup callback, it tries to find SOF_BE which connects to the same FE, and then reuses the fixup of SOF_BE. If no SOF_BE exists, it must be case 2, so rollback to the original fixup if it exists. As a result, the predefined relation is not needed anymore. Hardware connection can be controlled by the mixer control for AFE interconn. Then, DPCM finds the BE mapping at runtime. Signed-off-by: Trevor Wu --- .../soc/mediatek/common/mtk-dsp-sof-common.c | 106 +++++++++++++++--- .../soc/mediatek/common/mtk-dsp-sof-common.h | 8 ++ 2 files changed, 99 insertions(+), 15 deletions(-) diff --git a/sound/soc/mediatek/common/mtk-dsp-sof-common.c b/sound/soc/med= iatek/common/mtk-dsp-sof-common.c index 6fef16306f74..ef49c2c0e253 100644 --- a/sound/soc/mediatek/common/mtk-dsp-sof-common.c +++ b/sound/soc/mediatek/common/mtk-dsp-sof-common.c @@ -54,6 +54,8 @@ int mtk_sof_card_probe(struct snd_soc_card *card) { int i; struct snd_soc_dai_link *dai_link; + struct mtk_soc_card_data *soc_card_data =3D snd_soc_card_get_drvdata(card= ); + struct mtk_sof_priv *sof_priv =3D soc_card_data->sof_priv; =20 /* Set stream_name to help sof bind widgets */ for_each_card_prelinks(card, i, dai_link) { @@ -61,10 +63,74 @@ int mtk_sof_card_probe(struct snd_soc_card *card) dai_link->stream_name =3D dai_link->name; } =20 + INIT_LIST_HEAD(&sof_priv->dai_link_list); + return 0; } EXPORT_SYMBOL_GPL(mtk_sof_card_probe); =20 +/* fixup the BE DAI link to match any values from topology */ +static int mtk_sof_check_tplg_be_dai_link_fixup(struct snd_soc_pcm_runtime= *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_card *card =3D rtd->card; + struct mtk_soc_card_data *soc_card_data =3D snd_soc_card_get_drvdata(card= ); + struct mtk_sof_priv *sof_priv =3D soc_card_data->sof_priv; + struct snd_soc_pcm_runtime *fe; + struct snd_soc_pcm_runtime *be; + struct snd_soc_dai_link *sof_dai_link =3D NULL; + struct mtk_dai_link *dai_link; + struct snd_soc_dpcm *dpcm; + int i, stream; + int ret =3D 0; + + for_each_pcm_streams(stream) { + fe =3D NULL; + for_each_dpcm_fe(rtd, stream, dpcm) { + fe =3D dpcm->fe; + if (fe) + break; + } + + if (!fe) + continue; + + for_each_dpcm_be(fe, stream, dpcm) { + be =3D dpcm->be; + if (be =3D=3D rtd) + continue; + + for (i =3D 0; i < sof_priv->num_streams; i++) { + const struct sof_conn_stream *conn =3D &sof_priv->conn_streams[i]; + + if (!strcmp(be->dai_link->name, conn->sof_link)) { + sof_dai_link =3D be->dai_link; + goto FIXUP; + } + } + } + } + +FIXUP: + if (sof_dai_link) { + if (sof_priv->sof_dai_link_fixup) + ret =3D sof_priv->sof_dai_link_fixup(rtd, params); + else if (sof_dai_link->be_hw_params_fixup) + ret =3D sof_dai_link->be_hw_params_fixup(be, params); + } else { + list_for_each_entry(dai_link, &sof_priv->dai_link_list, list) { + if (strcmp(dai_link->name, rtd->dai_link->name) =3D=3D 0) { + if (dai_link->be_hw_params_fixup) + ret =3D dai_link->be_hw_params_fixup(rtd, params); + + break; + } + } + } + + return ret; +} + int mtk_sof_card_late_probe(struct snd_soc_card *card) { struct snd_soc_pcm_runtime *rtd; @@ -72,6 +138,8 @@ int mtk_sof_card_late_probe(struct snd_soc_card *card) struct mtk_soc_card_data *soc_card_data =3D snd_soc_card_get_drvdata(card); struct mtk_sof_priv *sof_priv =3D soc_card_data->sof_priv; + struct snd_soc_dai_link *dai_link; + struct mtk_dai_link *mtk_dai_link; int i; =20 /* 1. find sof component */ @@ -86,25 +154,37 @@ int mtk_sof_card_late_probe(struct snd_soc_card *card) return 0; } =20 - /* 2. add route path and fixup callback */ + /* 2. overwrite all BE fixups, and backup the existing fixup */ + for_each_card_prelinks(card, i, dai_link) { + if (dai_link->be_hw_params_fixup) { + mtk_dai_link =3D devm_kzalloc(card->dev, + sizeof(*mtk_dai_link), + GFP_KERNEL); + if (mtk_dai_link =3D=3D NULL) + return -ENOMEM; + + mtk_dai_link->be_hw_params_fixup =3D dai_link->be_hw_params_fixup; + mtk_dai_link->name =3D dai_link->name; + + list_add(&mtk_dai_link->list, &sof_priv->dai_link_list); + } + + if (dai_link->no_pcm) + dai_link->be_hw_params_fixup =3D mtk_sof_check_tplg_be_dai_link_fixup; + } + + /* 3. add route path and SOF_BE fixup callback */ for (i =3D 0; i < sof_priv->num_streams; i++) { const struct sof_conn_stream *conn =3D &sof_priv->conn_streams[i]; struct snd_soc_pcm_runtime *sof_rtd =3D NULL; - struct snd_soc_pcm_runtime *normal_rtd =3D NULL; =20 for_each_card_rtds(card, rtd) { if (!strcmp(rtd->dai_link->name, conn->sof_link)) { sof_rtd =3D rtd; - continue; - } - if (!strcmp(rtd->dai_link->name, conn->normal_link)) { - normal_rtd =3D rtd; - continue; - } - if (normal_rtd && sof_rtd) break; + } } - if (normal_rtd && sof_rtd) { + if (sof_rtd) { int j; struct snd_soc_dai *cpu_dai; =20 @@ -131,13 +211,9 @@ int mtk_sof_card_late_probe(struct snd_soc_card *card) } } =20 + /* overwrite SOF BE fixup */ sof_rtd->dai_link->be_hw_params_fixup =3D sof_comp->driver->be_hw_params_fixup; - if (sof_priv->sof_dai_link_fixup) - normal_rtd->dai_link->be_hw_params_fixup =3D - sof_priv->sof_dai_link_fixup; - else - normal_rtd->dai_link->be_hw_params_fixup =3D mtk_sof_dai_link_fixup; } } =20 diff --git a/sound/soc/mediatek/common/mtk-dsp-sof-common.h b/sound/soc/med= iatek/common/mtk-dsp-sof-common.h index dd38c4a93574..4bc5e1c0c8ed 100644 --- a/sound/soc/mediatek/common/mtk-dsp-sof-common.h +++ b/sound/soc/mediatek/common/mtk-dsp-sof-common.h @@ -18,11 +18,19 @@ struct sof_conn_stream { int stream_dir; }; =20 +struct mtk_dai_link { + const char *name; + int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params); + struct list_head list; +}; + struct mtk_sof_priv { const struct sof_conn_stream *conn_streams; int num_streams; int (*sof_dai_link_fixup)(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params); + struct list_head dai_link_list; }; =20 int mtk_sof_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, --=20 2.18.0 From nobody Fri Sep 20 14:54:50 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32C10EB64DD for ; Tue, 25 Jul 2023 03:53:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231511AbjGYDxa (ORCPT ); Mon, 24 Jul 2023 23:53:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231286AbjGYDxW (ORCPT ); Mon, 24 Jul 2023 23:53:22 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5746619A2 for ; Mon, 24 Jul 2023 20:53:14 -0700 (PDT) X-UUID: c44580c62a9e11ee9cb5633481061a41-20230725 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=gONoyYGqUthFPlaKdbJW2eC+ZSAtro5ZoEGI13r9DF4=; b=OMWeT1oJmtcW+B157FTONcMuXcPqp1/bjqyZ2wzcgfEn+aYeSgfZ3SRh7bQaGYhZvVEr31K/sLm693qtnCrbtg3eXFzjVF29t0SM+a72kgY2Zpz6hezjvF9PAMH881bWBmc1UHb+L4AJFSu3N03z7q1huU0f4lJBkIF5kaD7Cl8=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.29,REQID:242e2a4d-2b3c-4777-a6b4-9874f8d7324a,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:e7562a7,CLOUDID:3c08c0b3-a467-4aa9-9e04-f584452e3794,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO, DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: c44580c62a9e11ee9cb5633481061a41-20230725 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 175947070; Tue, 25 Jul 2023 11:53:08 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by mtkmbs11n1.mediatek.inc (172.21.101.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Tue, 25 Jul 2023 11:53:06 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Tue, 25 Jul 2023 11:53:06 +0800 From: Trevor Wu To: , , , , , CC: , , , , Subject: [PATCH 3/3] ASoC: mediatek: mt8188-mt6359: add SOF support Date: Tue, 25 Jul 2023 11:53:04 +0800 Message-ID: <20230725035304.2864-4-trevor.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20230725035304.2864-1-trevor.wu@mediatek.com> References: <20230725035304.2864-1-trevor.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" SOF is enabled when adsp phandle is assigned to "mediatek,adsp". The required callback will be assigned when SOF is enabled. Additionally, "mediatek,dai-link" is introduced to decide the supported dai links for a project, so user can reuse the machine driver regardless of dai link combination. Signed-off-by: Trevor Wu --- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 217 ++++++++++++++++++++-- 1 file changed, 205 insertions(+), 12 deletions(-) diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek= /mt8188/mt8188-mt6359.c index 667d79f33bf2..e205de2899a9 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -19,6 +19,8 @@ #include "../../codecs/mt6359.h" #include "../common/mtk-afe-platform-driver.h" #include "../common/mtk-soundcard-driver.h" +#include "../common/mtk-dsp-sof-common.h" +#include "../common/mtk-soc-card.h" =20 #define CKSYS_AUD_TOP_CFG 0x032c #define RG_TEST_ON BIT(0) @@ -45,6 +47,11 @@ */ #define NAU8825_CODEC_DAI "nau8825-hifi" =20 +#define SOF_DMA_DL2 "SOF_DMA_DL2" +#define SOF_DMA_DL3 "SOF_DMA_DL3" +#define SOF_DMA_UL4 "SOF_DMA_UL4" +#define SOF_DMA_UL5 "SOF_DMA_UL5" + /* FE */ SND_SOC_DAILINK_DEFS(playback2, DAILINK_COMP_ARRAY(COMP_CPU("DL2")), @@ -176,6 +183,49 @@ SND_SOC_DAILINK_DEFS(ul_src, "dmic-hifi")), DAILINK_COMP_ARRAY(COMP_EMPTY())); =20 +SND_SOC_DAILINK_DEFS(AFE_SOF_DL2, + DAILINK_COMP_ARRAY(COMP_CPU("SOF_DL2")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(AFE_SOF_DL3, + DAILINK_COMP_ARRAY(COMP_CPU("SOF_DL3")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(AFE_SOF_UL4, + DAILINK_COMP_ARRAY(COMP_CPU("SOF_UL4")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(AFE_SOF_UL5, + DAILINK_COMP_ARRAY(COMP_CPU("SOF_UL5")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +static const struct sof_conn_stream g_sof_conn_streams[] =3D { + { + .sof_link =3D "AFE_SOF_DL2", + .sof_dma =3D SOF_DMA_DL2, + .stream_dir =3D SNDRV_PCM_STREAM_PLAYBACK + }, + { + .sof_link =3D "AFE_SOF_DL3", + .sof_dma =3D SOF_DMA_DL3, + .stream_dir =3D SNDRV_PCM_STREAM_PLAYBACK + }, + { + .sof_link =3D "AFE_SOF_UL4", + .sof_dma =3D SOF_DMA_UL4, + .stream_dir =3D SNDRV_PCM_STREAM_CAPTURE + }, + { + .sof_link =3D "AFE_SOF_UL5", + .sof_dma =3D SOF_DMA_UL5, + .stream_dir =3D SNDRV_PCM_STREAM_CAPTURE + }, +}; + struct mt8188_mt6359_priv { struct snd_soc_jack dp_jack; struct snd_soc_jack hdmi_jack; @@ -246,6 +296,10 @@ static const struct snd_soc_dapm_widget mt8188_mt6359_= widgets[] =3D { SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_SINK("HDMI"), SND_SOC_DAPM_SINK("DP"), + SND_SOC_DAPM_MIXER(SOF_DMA_DL2, SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_MIXER(SOF_DMA_DL3, SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_MIXER(SOF_DMA_UL4, SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_MIXER(SOF_DMA_UL5, SND_SOC_NOPM, 0, 0, NULL, 0), =20 /* dynamic pinctrl */ SND_SOC_DAPM_PINCTRL("ETDM_SPK_PIN", "aud_etdm_spk_on", "aud_etdm_spk_off= "), @@ -266,6 +320,19 @@ static const struct snd_kcontrol_new mt8188_nau8825_co= ntrols[] =3D { SOC_DAPM_PIN_SWITCH("Headphone Jack"), }; =20 +static const struct snd_soc_dapm_route mt8188_mt6359_routes[] =3D { + /* SOF Uplink */ + {SOF_DMA_UL4, NULL, "O034"}, + {SOF_DMA_UL4, NULL, "O035"}, + {SOF_DMA_UL5, NULL, "O036"}, + {SOF_DMA_UL5, NULL, "O037"}, + /* SOF Downlink */ + {"I070", NULL, SOF_DMA_DL2}, + {"I071", NULL, SOF_DMA_DL2}, + {"I020", NULL, SOF_DMA_DL3}, + {"I021", NULL, SOF_DMA_DL3}, +}; + static int mt8188_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rt= d) { struct snd_soc_component *cmpnt_afe =3D @@ -471,8 +538,17 @@ enum { DAI_LINK_ETDM3_OUT_BE, DAI_LINK_PCM1_BE, DAI_LINK_UL_SRC_BE, + DAI_LINK_REGULAR_LAST =3D DAI_LINK_UL_SRC_BE, + DAI_LINK_SOF_START, + DAI_LINK_SOF_DL2_BE =3D DAI_LINK_SOF_START, + DAI_LINK_SOF_DL3_BE, + DAI_LINK_SOF_UL4_BE, + DAI_LINK_SOF_UL5_BE, + DAI_LINK_SOF_END =3D DAI_LINK_SOF_UL5_BE, }; =20 +#define DAI_LINK_REGULAR_NUM (DAI_LINK_REGULAR_LAST + 1) + static int mt8188_dptx_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -503,7 +579,8 @@ static int mt8188_dptx_hw_params_fixup(struct snd_soc_p= cm_runtime *rtd, =20 static int mt8188_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd) { - struct mt8188_mt6359_priv *priv =3D snd_soc_card_get_drvdata(rtd->card); + struct mtk_soc_card_data *soc_card_data =3D snd_soc_card_get_drvdata(rtd-= >card); + struct mt8188_mt6359_priv *priv =3D soc_card_data->mach_priv; struct snd_soc_component *component =3D asoc_rtd_to_codec(rtd, 0)->compon= ent; int ret =3D 0; =20 @@ -528,7 +605,8 @@ static int mt8188_hdmi_codec_init(struct snd_soc_pcm_ru= ntime *rtd) =20 static int mt8188_dptx_codec_init(struct snd_soc_pcm_runtime *rtd) { - struct mt8188_mt6359_priv *priv =3D snd_soc_card_get_drvdata(rtd->card); + struct mtk_soc_card_data *soc_card_data =3D snd_soc_card_get_drvdata(rtd-= >card); + struct mt8188_mt6359_priv *priv =3D soc_card_data->mach_priv; struct snd_soc_component *component =3D asoc_rtd_to_codec(rtd, 0)->compon= ent; int ret =3D 0; =20 @@ -648,7 +726,8 @@ static int mt8188_max98390_codec_init(struct snd_soc_pc= m_runtime *rtd) static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card =3D rtd->card; - struct mt8188_mt6359_priv *priv =3D snd_soc_card_get_drvdata(card); + struct mtk_soc_card_data *soc_card_data =3D snd_soc_card_get_drvdata(card= ); + struct mt8188_mt6359_priv *priv =3D soc_card_data->mach_priv; struct snd_soc_component *component =3D asoc_rtd_to_codec(rtd, 0)->compon= ent; struct snd_soc_jack *jack =3D &priv->headset_jack; int ret; @@ -733,6 +812,33 @@ static int mt8188_nau8825_hw_params(struct snd_pcm_sub= stream *substream, static const struct snd_soc_ops mt8188_nau8825_ops =3D { .hw_params =3D mt8188_nau8825_hw_params, }; + +static int mt8188_sof_be_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd =3D asoc_substream_to_rtd(substream); + struct snd_soc_component *cmpnt_afe =3D NULL; + struct snd_soc_pcm_runtime *runtime; + + /* find afe component */ + for_each_card_rtds(rtd->card, runtime) { + cmpnt_afe =3D snd_soc_rtdcom_lookup(runtime, AFE_PCM_NAME); + if (cmpnt_afe) + break; + } + + if (cmpnt_afe && !pm_runtime_active(cmpnt_afe->dev)) { + dev_err(rtd->dev, "afe pm runtime is not active!!\n"); + return -EINVAL; + } + + return 0; +} + +static const struct snd_soc_ops mt8188_sof_be_ops =3D { + .hw_params =3D mt8188_sof_be_hw_params, +}; + static struct snd_soc_dai_link mt8188_mt6359_dai_links[] =3D { /* FE */ [DAI_LINK_DL2_FE] =3D { @@ -1003,6 +1109,36 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_lin= ks[] =3D { .dpcm_capture =3D 1, SND_SOC_DAILINK_REG(ul_src), }, + + /* SOF BE */ + [DAI_LINK_SOF_DL2_BE] =3D { + .name =3D "AFE_SOF_DL2", + .no_pcm =3D 1, + .dpcm_playback =3D 1, + .ops =3D &mt8188_sof_be_ops, + SND_SOC_DAILINK_REG(AFE_SOF_DL2), + }, + [DAI_LINK_SOF_DL3_BE] =3D { + .name =3D "AFE_SOF_DL3", + .no_pcm =3D 1, + .dpcm_playback =3D 1, + .ops =3D &mt8188_sof_be_ops, + SND_SOC_DAILINK_REG(AFE_SOF_DL3), + }, + [DAI_LINK_SOF_UL4_BE] =3D { + .name =3D "AFE_SOF_UL4", + .no_pcm =3D 1, + .dpcm_capture =3D 1, + .ops =3D &mt8188_sof_be_ops, + SND_SOC_DAILINK_REG(AFE_SOF_UL4), + }, + [DAI_LINK_SOF_UL5_BE] =3D { + .name =3D "AFE_SOF_UL5", + .no_pcm =3D 1, + .dpcm_capture =3D 1, + .ops =3D &mt8188_sof_be_ops, + SND_SOC_DAILINK_REG(AFE_SOF_UL5), + }, }; =20 static struct snd_kcontrol *ctl_find(struct snd_card *card, const char *na= me) @@ -1017,7 +1153,8 @@ static struct snd_kcontrol *ctl_find(struct snd_card = *card, const char *name) =20 static void mt8188_fixup_controls(struct snd_soc_card *card) { - struct mt8188_mt6359_priv *priv =3D snd_soc_card_get_drvdata(card); + struct mtk_soc_card_data *soc_card_data =3D snd_soc_card_get_drvdata(card= ); + struct mt8188_mt6359_priv *priv =3D soc_card_data->mach_priv; struct mt8188_card_data *card_data =3D (struct mt8188_card_data *)priv->p= rivate_data; struct snd_kcontrol *kctl; =20 @@ -1045,6 +1182,8 @@ static struct snd_soc_card mt8188_mt6359_soc_card =3D= { .num_links =3D ARRAY_SIZE(mt8188_mt6359_dai_links), .dapm_widgets =3D mt8188_mt6359_widgets, .num_dapm_widgets =3D ARRAY_SIZE(mt8188_mt6359_widgets), + .dapm_routes =3D mt8188_mt6359_routes, + .num_dapm_routes =3D ARRAY_SIZE(mt8188_mt6359_routes), .controls =3D mt8188_mt6359_controls, .num_controls =3D ARRAY_SIZE(mt8188_mt6359_controls), .fixup_controls =3D mt8188_fixup_controls, @@ -1054,6 +1193,8 @@ static int mt8188_mt6359_dev_probe(struct platform_de= vice *pdev) { struct snd_soc_card *card =3D &mt8188_mt6359_soc_card; struct device_node *platform_node; + struct device_node *adsp_node; + struct mtk_soc_card_data *soc_card_data; struct mt8188_mt6359_priv *priv; struct mt8188_card_data *card_data; struct snd_soc_dai_link *dai_link; @@ -1074,21 +1215,64 @@ static int mt8188_mt6359_dev_probe(struct platform_= device *pdev) if (!card->name) card->name =3D card_data->name; =20 - priv =3D devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); - if (!priv) - return -ENOMEM; - if (of_property_read_bool(pdev->dev.of_node, "audio-routing")) { ret =3D snd_soc_of_parse_audio_routing(card, "audio-routing"); if (ret) return ret; } =20 + priv =3D devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + soc_card_data =3D devm_kzalloc(&pdev->dev, sizeof(*card_data), GFP_KERNEL= ); + if (!soc_card_data) + return -ENOMEM; + + soc_card_data->mach_priv =3D priv; + + adsp_node =3D of_parse_phandle(pdev->dev.of_node, "mediatek,adsp", 0); + if (adsp_node) { + struct mtk_sof_priv *sof_priv; + + sof_priv =3D devm_kzalloc(&pdev->dev, sizeof(*sof_priv), GFP_KERNEL); + if (!sof_priv) { + ret =3D -ENOMEM; + goto err_adsp_node; + } + sof_priv->conn_streams =3D g_sof_conn_streams; + sof_priv->num_streams =3D ARRAY_SIZE(g_sof_conn_streams); + soc_card_data->sof_priv =3D sof_priv; + card->probe =3D mtk_sof_card_probe; + card->late_probe =3D mtk_sof_card_late_probe; + if (!card->topology_shortname_created) { + snprintf(card->topology_shortname, 32, "sof-%s", card->name); + card->topology_shortname_created =3D true; + } + card->name =3D card->topology_shortname; + } + + if (of_property_read_bool(pdev->dev.of_node, "mediatek,dai-link")) { + ret =3D mtk_sof_dailink_parse_of(card, pdev->dev.of_node, + "mediatek,dai-link", + mt8188_mt6359_dai_links, + ARRAY_SIZE(mt8188_mt6359_dai_links)); + if (ret) { + dev_err_probe(&pdev->dev, ret, "Parse dai-link fail\n"); + goto err_adsp_node; + } + } else { + if (!adsp_node) + card->num_links =3D DAI_LINK_REGULAR_NUM; + } + platform_node =3D of_parse_phandle(pdev->dev.of_node, "mediatek,platform", 0); if (!platform_node) { ret =3D -EINVAL; - return dev_err_probe(&pdev->dev, ret, "Property 'platform' missing or in= valid\n"); + dev_err_probe(&pdev->dev, ret, "Property 'platform' missing or invalid\n= "); + goto err_platform_node; + } =20 ret =3D parse_dai_link_info(card); @@ -1096,8 +1280,12 @@ static int mt8188_mt6359_dev_probe(struct platform_d= evice *pdev) goto err; =20 for_each_card_prelinks(card, i, dai_link) { - if (!dai_link->platforms->name) - dai_link->platforms->of_node =3D platform_node; + if (!dai_link->platforms->name) { + if (!strncmp(dai_link->name, "AFE_SOF", strlen("AFE_SOF")) && adsp_node) + dai_link->platforms->of_node =3D adsp_node; + else + dai_link->platforms->of_node =3D platform_node; + } =20 if (strcmp(dai_link->name, "DPTX_BE") =3D=3D 0) { if (strcmp(dai_link->codecs->dai_name, "snd-soc-dummy-dai")) @@ -1140,7 +1328,7 @@ static int mt8188_mt6359_dev_probe(struct platform_de= vice *pdev) } =20 priv->private_data =3D card_data; - snd_soc_card_set_drvdata(card, priv); + snd_soc_card_set_drvdata(card, soc_card_data); =20 ret =3D devm_snd_soc_register_card(&pdev->dev, card); if (ret) @@ -1149,6 +1337,11 @@ static int mt8188_mt6359_dev_probe(struct platform_d= evice *pdev) err: of_node_put(platform_node); clean_card_reference(card); + +err_adsp_node: +err_platform_node: + of_node_put(adsp_node); + return ret; } =20 --=20 2.18.0