From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 BE3CC1E1E04 for ; Mon, 8 Jun 2026 02:30:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780885845; cv=none; b=ZI+BNZHr+tIuoGcx1lHCwnWyRMa+IHCtbCuN57K9dweplRKPas/704ADd9kPQGhLYihCiCzgsL01W2PRG8z0KGFN+9uBD16rqDmJ0fpN45zcto5utUiBvoFQZ7yHIpg3uQxUAYqLC0JeALT4q7GkIqGqGXoTz2l3nVh5nQIY37k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780885845; c=relaxed/simple; bh=BcXNi1JLPYozmk8/QHvCr0pZ/WjZCh4TPhBSo3DHPGY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IDecH2iJdpU9POeVYj/+Kg/3t+NZTaA4UHJWs/3YLwKfDfdw5/PUy5vEPWamoGT1pfGSQ8b6mZak9NZb9gF6P9BnjsTPuVtt7UlbCpTML1b7mcpcqkvqIxrn2DXRBdkFfaYb0OvRNKD7g5wbZzdVB5lWq7zIaLAU4hDmQsxkhiw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=CbFHUSvE; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=IxpF+E5b; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="CbFHUSvE"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="IxpF+E5b" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6580F7YC1577836 for ; Mon, 8 Jun 2026 02:30:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=h8Jmd3NB1Lr fDBYuQ2+LtOcZPICs044bAIaMIRNUmTE=; b=CbFHUSvEdSRUcd9hBXDA/LjattO V1RADF6VSrEYCt4zSc7x3HdnfITXqK4mWrT2ZJBQK+kKbDsooUdZnxOzdLkyOq/v DuqF9TEdm/sO+hu+lG63sjAnbiOlQv+dySzg2XdzsL+TS2dYHKtjr6TvyYaEkp2M wn8wfKuiywjDH5tzQprtlV3W6630DHbYjKjLhvZ+p5UaPvSw6OsBM8zENIOsOOOy iO5X0U12UeLMTbJOtl4TukYwcRepUDnyx0bKvbz/1Hq3jCkyLGTmx5BoSCU7Ak6e v/sGlly4c1d1CrjTA1Z7zN8Q2zJN1uebOxhsXXu/pweqjV4HDXW5Ia66IZA== Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4embs1da8f-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 08 Jun 2026 02:30:42 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-c8582b167f7so1933346a12.0 for ; Sun, 07 Jun 2026 19:30:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780885842; x=1781490642; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=h8Jmd3NB1LrfDBYuQ2+LtOcZPICs044bAIaMIRNUmTE=; b=IxpF+E5bCY2t4Ud8aUBUS9IpVUIgJs9ZN7DHYxlZEgY7lIVvlTGlV01DaHJIqosmHt +ln+9S7gKND2SAgv//DRDx6Qn7II6PUSxOMJlTr/SCJm+ktSFnUauLCF5f12tLLC7UvM mnyFBR9kEZOsWpLdjMTxgSJIlGky5Y3kSRP5XMNgNRmi/SSTNom2vH9wE/MCieX6X7DM e2qHcySobHknGb3qIG+9zCRkEkkYJUzcqxXOOYgGaTDhuIBDiTRZBhBOC/W0xQtdtpLJ GkmiJoBtorseZ83liAlMOwKKpsUj2Mmj3wlYoliF+FJ/Uh5vGTgvo1TrotWoQn7PkqK6 wvbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780885842; x=1781490642; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=h8Jmd3NB1LrfDBYuQ2+LtOcZPICs044bAIaMIRNUmTE=; b=Fiebo3ijttaSw0Tju8PDqF9X1rJPySL4V4l0OGiDxWMuogwDQXLysdO5qSerOkkmEY OanROVDVSChnHtKLl2qQTb0RNIr3El1SJX3dKswfgp8qBh8C3AaTOWKBFjHz/0QYtr7B izKVB4eRcHiDeCHdGahdeEmXQHvePTphdypoRipi2SxxZM4BpDqfMiYw53VOKopz63mp ns/I0ORJA6jsTbsB+zj0EHr5COuP/qEX8r+/UPB41GfBRwBs9HfmVZjUnAWrDaLZMgvp YYWvHbEK0waGBI9D9iuoUl/UHv7GemJvx5vO2q26bLt8rQXtgm1nUqkfiZiZEPWd60qz CMNg== X-Forwarded-Encrypted: i=1; AFNElJ/vMTisAeM39okXequG8iJALYLLCuwwO6vrtHJPn/twC+RjFmHJsPH8fUTmPuigLm8HAi4rOzZ3N9u34P4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0OKWVoXm2DjESxywBz0YcntZ0gBVWVnZP6j3Ob5qRasXXrRAW g8OdYf1OCRUadhWE4G45AurHZrHSOOn8eY+SnAYzUz//GfcxPIW4aUOdeij9jadakFCPkm9MT1c O/Q2gQWceAZQ5nM73isS1QO5wUBW9K95RxmhcqCCBxOX7yhfQZo46DbHSO3zryB4mnbw= X-Gm-Gg: Acq92OFaCoeKfnjfEKsl1mUshaMdsuAi8vv4TPFLQe6yi+ghUcLvbwjQxPCSOs7ZBIx VMq9DkGi846oIxvNcoU5WxeeZsWIakX3TGygtg4UrnVInk59WDuU8zLnhNHDfYJVz3MW6csrVHy qjj8r4gxT42Xft7Fu1GmMcSG1s//oFmhMaA9bcAbRUr/h0j7cRTWIyNCu50khMolvvipkMII0sI hKAF858OPUL3NUJrvtktoqwJiuO+UMjV0WcdWRhLFc4pehUB6ohKcJAbj37v2kxixzZxUYFNH+x LonriPdp34T+TPbvWGJ+T1KLj2vrv+jKZ+KBPCxmz/omcsd7KY50TvOyATVFN63hRPFnGZN4Yrs FQgkeZTG9YgfkfujG33ssxymEIqKoTvJMPPMn/6C2r7zyyUeddvYOOEpJY21SN4lEN2Yq X-Received: by 2002:a05:6a21:685:b0:3aa:c964:3c27 with SMTP id adf61e73a8af0-3b4cd091965mr15956832637.46.1780885842172; Sun, 07 Jun 2026 19:30:42 -0700 (PDT) X-Received: by 2002:a05:6a21:685:b0:3aa:c964:3c27 with SMTP id adf61e73a8af0-3b4cd091965mr15956799637.46.1780885841714; Sun, 07 Jun 2026 19:30:41 -0700 (PDT) Received: from hu-mohs-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c16609e0bbsm162343585ad.50.2026.06.07.19.30.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2026 19:30:41 -0700 (PDT) From: Mohammad Rafi Shaik To: Srinivas Kandagatla , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v2 2/3] ASoC: qcom: q6apm-lpass-dais: Add MI2S clock control Date: Mon, 8 Jun 2026 08:00:10 +0530 Message-Id: <20260608023011.942228-3-mohammad.rafi.shaik@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260608023011.942228-1-mohammad.rafi.shaik@oss.qualcomm.com> References: <20260608023011.942228-1-mohammad.rafi.shaik@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA4MDAyMCBTYWx0ZWRfX5A6s3S4Dur4i ryIQ74e3/eIPmEcprXh25S4tbRDNv+YhV+7A3EypFgWTtXnY4tGT5HNiAqYssG77wT2bawMAffL DysBg1WLqhJm4bXDfnobz1BvY5wx9yB8rOUp6uQEHP+pTR+DhR4T5xUzJm5Ue7CBOquuhZBNskM zfEtst4wBt3FSb9Jq8W+vdTQF21/6kZRr+mAsHF4ieGBWy4AdSVUztRDTbW3JXGXn+obQxl2H4S pu4rZe5iMbnhETOZ2xIKLfvDrS8R/ssQ4JBZ41AR+q4aZ7cXVuKVTqsZipHyFs4f1rtKfH+G9bC tInMCx8y1MNHe2dDEQBe0O4s/1NkQPJPrHNtm6wgWy5Llo7WqVysNI/MnjliYV0q6XXiEuEiG5P bngT8gtA2Q/ywJpJ8kLe++IsAmF3s552o9TyU+OX73ANRLg7oq4+JqHz36FZ8PMXJ3Ku8QtHVS5 TpOVtsxxZRZiC9L1gsw== X-Authority-Analysis: v=2.4 cv=CeY4Irrl c=1 sm=1 tr=0 ts=6a262953 cx=c_pps a=rz3CxIlbcmazkYymdCej/Q==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=A-h2Renr4JBikGDhi8kA:9 a=bFCP_H2QrGi7Okbo017w:22 X-Proofpoint-ORIG-GUID: TuzsPZKL45h-vG9ntuMhgHwRcZvZhT-W X-Proofpoint-GUID: TuzsPZKL45h-vG9ntuMhgHwRcZvZhT-W X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-08_01,2026-06-05_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 adultscore=0 priorityscore=1501 spamscore=0 malwarescore=0 phishscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606080020 Add support for MI2S clock control within q6apm-lpass DAIs, including handling of MCLK, BCLK, and ECLK via the DAI .set_sysclk callback. Each MI2S port now retrieves its clock handles from the device tree, allowing per-port clock configuration and proper enable/disable during startup and shutdown. Co-developed-by: Srinivas Kandagatla Signed-off-by: Srinivas Kandagatla Signed-off-by: Mohammad Rafi Shaik --- sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 137 +++++++++++++++++++++++- sound/soc/qcom/qdsp6/q6prm.h | 4 + 2 files changed, 139 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c b/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c index 006b28348..143750afb 100644 --- a/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c +++ b/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c @@ -2,10 +2,12 @@ // Copyright (c) 2021, Linaro Limited #include +#include #include #include #include #include +#include #include #include #include @@ -15,13 +17,22 @@ #include "q6dsp-common.h" #include "audioreach.h" #include "q6apm.h" +#include "q6prm.h" #define AUDIOREACH_BE_PCM_BASE 16 +struct q6apm_dai_priv_data { + struct clk *mclk; + struct clk *bclk; + struct clk *eclk; + bool mclk_enabled, bclk_enabled, eclk_enabled; +}; + struct q6apm_lpass_dai_data { struct q6apm_graph *graph[APM_PORT_MAX]; bool is_port_started[APM_PORT_MAX]; struct audioreach_module_config module_config[APM_PORT_MAX]; + struct q6apm_dai_priv_data priv[APM_PORT_MAX]; }; static int q6dma_set_channel_map(struct snd_soc_dai *dai, @@ -251,6 +262,70 @@ static int q6apm_lpass_dai_startup(struct snd_pcm_substream *substream, struct s return 0; } +static int q6i2s_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) +{ + return q6apm_lpass_dai_startup(substream, dai); +} + +static void q6i2s_lpass_dai_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) +{ + struct q6apm_lpass_dai_data *dai_data = dev_get_drvdata(dai->dev); + + if (dai_data->priv[dai->id].mclk_enabled) { + clk_disable_unprepare(dai_data->priv[dai->id].mclk); + dai_data->priv[dai->id].mclk_enabled = false; + } + + if (dai_data->priv[dai->id].bclk_enabled) { + clk_disable_unprepare(dai_data->priv[dai->id].bclk); + dai_data->priv[dai->id].bclk_enabled = false; + } + + if (dai_data->priv[dai->id].eclk_enabled) { + clk_disable_unprepare(dai_data->priv[dai->id].eclk); + dai_data->priv[dai->id].eclk_enabled = false; + } + q6apm_lpass_dai_shutdown(substream, dai); +} + +static int q6i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir) +{ + struct q6apm_lpass_dai_data *dai_data = dev_get_drvdata(dai->dev); + struct clk *sysclk; + bool *enabled; + int ret = 0; + + switch (clk_id) { + case LPAIF_MI2S_MCLK: + sysclk = dai_data->priv[dai->id].mclk; + enabled = &dai_data->priv[dai->id].mclk_enabled; + break; + case LPAIF_MI2S_BCLK: + sysclk = dai_data->priv[dai->id].bclk; + enabled = &dai_data->priv[dai->id].bclk_enabled; + break; + case LPAIF_MI2S_ECLK: + sysclk = dai_data->priv[dai->id].eclk; + enabled = &dai_data->priv[dai->id].eclk_enabled; + break; + default: + break; + } + + if (sysclk) { + clk_set_rate(sysclk, freq); + ret = clk_prepare_enable(sysclk); + if (ret) { + dev_err(dai->dev, "Error, Unable to prepare (%d) sysclk\n", clk_id); + return ret; + } + + *enabled = true; + } + + return ret; +} + static int q6i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { struct q6apm_lpass_dai_data *dai_data = dev_get_drvdata(dai->dev); @@ -272,11 +347,12 @@ static const struct snd_soc_dai_ops q6dma_ops = { static const struct snd_soc_dai_ops q6i2s_ops = { .prepare = q6apm_lpass_dai_prepare, - .startup = q6apm_lpass_dai_startup, - .shutdown = q6apm_lpass_dai_shutdown, + .startup = q6i2s_dai_startup, + .shutdown = q6i2s_lpass_dai_shutdown, .set_channel_map = q6dma_set_channel_map, .hw_params = q6dma_hw_params, .set_fmt = q6i2s_set_fmt, + .set_sysclk = q6i2s_set_sysclk, .trigger = q6apm_lpass_dai_trigger, }; @@ -297,6 +373,59 @@ static const struct snd_soc_component_driver q6apm_lpass_dai_component = { .remove_order = SND_SOC_COMP_ORDER_FIRST, }; +static int of_q6apm_parse_dai_data(struct device *dev, + struct q6apm_lpass_dai_data *data) +{ + struct device_node *node; + int ret; + + for_each_child_of_node(dev->of_node, node) { + struct q6apm_dai_priv_data *priv; + int id; + + ret = of_property_read_u32(node, "reg", &id); + if (ret || id < 0 || id >= APM_PORT_MAX) { + dev_err(dev, "valid dai id not found:%d\n", ret); + continue; + } + + switch (id) { + /* MI2S specific properties */ + case PRIMARY_MI2S_RX ... QUATERNARY_MI2S_TX: + case QUINARY_MI2S_RX ... QUINARY_MI2S_TX: + priv = &data->priv[id]; + priv->mclk = of_clk_get_by_name(node, "mclk"); + if (IS_ERR(priv->mclk)) { + if (PTR_ERR(priv->mclk) == -EPROBE_DEFER) + return dev_err_probe(dev, PTR_ERR(priv->mclk), + "unable to get mi2s mclk\n"); + priv->mclk = NULL; + } + + priv->bclk = of_clk_get_by_name(node, "bclk"); + if (IS_ERR(priv->bclk)) { + if (PTR_ERR(priv->bclk) == -EPROBE_DEFER) + return dev_err_probe(dev, PTR_ERR(priv->bclk), + "unable to get mi2s bclk\n"); + priv->bclk = NULL; + } + + priv->eclk = of_clk_get_by_name(node, "eclk"); + if (IS_ERR(priv->eclk)) { + if (PTR_ERR(priv->eclk) == -EPROBE_DEFER) + return dev_err_probe(dev, PTR_ERR(priv->eclk), + "unable to get mi2s eclk\n"); + priv->eclk = NULL; + } + break; + default: + break; + } + } + + return 0; +} + static int q6apm_lpass_dai_dev_probe(struct platform_device *pdev) { struct q6dsp_audio_port_dai_driver_config cfg; @@ -304,12 +433,16 @@ static int q6apm_lpass_dai_dev_probe(struct platform_device *pdev) struct snd_soc_dai_driver *dais; struct device *dev = &pdev->dev; int num_dais; + int ret; dai_data = devm_kzalloc(dev, sizeof(*dai_data), GFP_KERNEL); if (!dai_data) return -ENOMEM; dev_set_drvdata(dev, dai_data); + ret = of_q6apm_parse_dai_data(dev, dai_data); + if (ret) + return ret; memset(&cfg, 0, sizeof(cfg)); cfg.q6i2s_ops = &q6i2s_ops; diff --git a/sound/soc/qcom/qdsp6/q6prm.h b/sound/soc/qcom/qdsp6/q6prm.h index 6917e70bc..7b751486c 100644 --- a/sound/soc/qcom/qdsp6/q6prm.h +++ b/sound/soc/qcom/qdsp6/q6prm.h @@ -3,6 +3,10 @@ #ifndef __Q6PRM_H__ #define __Q6PRM_H__ +#define LPAIF_MI2S_MCLK 1 +#define LPAIF_MI2S_BCLK 2 +#define LPAIF_MI2S_ECLK 3 + /* Clock ID for Primary I2S IBIT */ #define Q6PRM_LPASS_CLK_ID_PRI_MI2S_IBIT 0x100 /* Clock ID for Primary I2S EBIT */ -- 2.34.1