From nobody Sat Sep 21 00:09:51 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 64CA3C77B7E for ; Fri, 21 Apr 2023 10:09:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231742AbjDUKJY (ORCPT ); Fri, 21 Apr 2023 06:09:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231261AbjDUKJU (ORCPT ); Fri, 21 Apr 2023 06:09:20 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6745A274; Fri, 21 Apr 2023 03:09:13 -0700 (PDT) X-UUID: 8e2d942ce02c11edb6b9f13eb10bd0fe-20230421 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=zTnxtp6hN8hNECyGyeAIWXn7uB5lZFLas1G7S96mRtQ=; b=rCV3cqgnQjxmsar9+rDUtm5E3PAZoONcHmVEKpiDeYhRm2Q7mQUfFvf2s9jeVDxteKYf8AT855kZIChGKJwM3uzlBquiGKtJhGw2baHsk1umcZDZjDyiEZ7+YJQUAF1KA2WRoJgxjp7R8xwpqp+d/LYhEPVSW/3YPwQ5htVkps0=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.22,REQID:ec4bf027-5b2d-49b4-9dc1-2a1bc8260b49,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:120426c,CLOUDID:4048d284-cd9c-45f5-8134-710979e3df0e,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 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-UUID: 8e2d942ce02c11edb6b9f13eb10bd0fe-20230421 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 108993833; Fri, 21 Apr 2023 18:09:08 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by mtkmbs13n1.mediatek.inc (172.21.101.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Fri, 21 Apr 2023 18:09:07 +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.25 via Frontend Transport; Fri, 21 Apr 2023 18:09:07 +0800 From: Trevor Wu To: , , , , , , , CC: , , , , , Subject: [PATCH v2 2/7] ASoC: mediatek: mt8188: complete set_tdm_slot function Date: Fri, 21 Apr 2023 18:09:00 +0800 Message-ID: <20230421100905.28045-3-trevor.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20230421100905.28045-1-trevor.wu@mediatek.com> References: <20230421100905.28045-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" User can configures slot number of TDM mode via set_tdm_slot callback. Signed-off-by: Trevor Wu --- sound/soc/mediatek/mt8188/mt8188-dai-etdm.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/sound/soc/mediatek/mt8188/mt8188-dai-etdm.c b/sound/soc/mediat= ek/mt8188/mt8188-dai-etdm.c index 7a37752d4244..fddecf5bf7c6 100644 --- a/sound/soc/mediatek/mt8188/mt8188-dai-etdm.c +++ b/sound/soc/mediatek/mt8188/mt8188-dai-etdm.c @@ -1909,6 +1909,10 @@ static int mtk_dai_etdm_hw_params(struct snd_pcm_sub= stream *substream, if (!is_valid_etdm_dai(mst_dai_id)) return -EINVAL; =20 + mst_etdm_data =3D afe_priv->dai_priv[mst_dai_id]; + if (mst_etdm_data->slots) + channels =3D mst_etdm_data->slots; + ret =3D mtk_dai_etdm_mclk_configure(afe, mst_dai_id); if (ret) return ret; @@ -1918,7 +1922,6 @@ static int mtk_dai_etdm_hw_params(struct snd_pcm_subs= tream *substream, if (ret) return ret; =20 - mst_etdm_data =3D afe_priv->dai_priv[mst_dai_id]; for (i =3D 0; i < mst_etdm_data->cowork_slv_count; i++) { slv_dai_id =3D mst_etdm_data->cowork_slv_id[i]; ret =3D mtk_dai_etdm_configure(afe, rate, channels, @@ -1931,6 +1934,12 @@ static int mtk_dai_etdm_hw_params(struct snd_pcm_sub= stream *substream, return ret; } } else { + if (!is_valid_etdm_dai(dai->id)) + return -EINVAL; + mst_etdm_data =3D afe_priv->dai_priv[dai->id]; + if (mst_etdm_data->slots) + channels =3D mst_etdm_data->slots; + ret =3D mtk_dai_etdm_mclk_configure(afe, dai->id); if (ret) return ret; @@ -2073,10 +2082,16 @@ static int mtk_dai_etdm_set_tdm_slot(struct snd_soc= _dai *dai, struct mtk_base_afe *afe =3D snd_soc_dai_get_drvdata(dai); struct mt8188_afe_private *afe_priv =3D afe->platform_priv; struct mtk_dai_etdm_priv *etdm_data; + int dai_id; =20 - if (!is_valid_etdm_dai(dai->id)) + if (is_cowork_mode(dai)) + dai_id =3D get_etdm_cowork_master_id(dai); + else + dai_id =3D dai->id; + + if (!is_valid_etdm_dai(dai_id)) return -EINVAL; - etdm_data =3D afe_priv->dai_priv[dai->id]; + etdm_data =3D afe_priv->dai_priv[dai_id]; =20 dev_dbg(dai->dev, "%s id %d slot_width %d\n", __func__, dai->id, slot_width); --=20 2.18.0