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 574BA443E44 for ; Mon, 14 Sep 2026 11:41:53 +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=1789386115; cv=none; b=f3Kbn4INv8Pz8p/jkpx9zsQfOTCtTD+7zWjB6MgB5Vz8gXnMmvL0mFx+OXOmhOJVsCWwvmrVi/ByZg4nI0Yc2fnVLoaX42Gb+EWnfnQL2hDorgFjx5C7/2VCHsReofhjfVLnTvrFQldaCTwyzUr3cjKhv/w0e1EF7n92mfyp4n0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789386115; c=relaxed/simple; bh=fJK3LG1t3WCTDNicjclS7oxSu1jmD+A04ytN7DJcTPI=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=vE7K+eXXiwtPaVZpKLhODiV88UbhADlKuhmaAKIt4t5L4h//wjZ2b0b3nPl/RRN70aLIkzb74eEphb+1bgIfyFE4o0f+IFWDeqcjb2A1JbvIXFnCZ22qMGnKfQ9XLnf6qfU03yZELhgP+QDNqSrek1QVmuVA5lklKdAYje4o1Mc= 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=OWj8XHq9; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Bzj4nuBB; 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="OWj8XHq9"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Bzj4nuBB" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68EAm6YH3793304 for ; Mon, 14 Sep 2026 11:41:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Q9yvh3UV8onzYbSNebfzLntMGp4qNHqagnT/EH78fvg=; b=OWj8XHq9yMc1ofTa 4LSOEdXY4fMbOQ8PcYb5nrR1N4Uu9A8rbJN8tXlzf74WZpK/7xId/Mjmo3yAWum/ weliRFKYb4b7Hm2OVRZz2WVfMzKg+pQVoPU+oAuq8UOHie6d6jN+ewT13BB6Dosx UfBIkCAvWRFFbeZzevGWusOPD8P1t1ZUNZnnhLE8lFTXqAOXhyLY4JH+9nkRgaJ/ OG3l6xXz+FyHwl/J7pDEItZBG9MDRlzE5taEXwGmJVKR+7G1dmUxEkd1dq0yd9dE FCdbVZ8oZWW4HTFNFvdLsZdfm3QJu7qD6rNBVFXFPqZ3NKe33pF5u+OWlygCt2jL sflp+A== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gpcjg0xnv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 14 Sep 2026 11:41:52 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-939062ecda9so489765485a.1 for ; Mon, 14 Sep 2026 04:41:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1789386112; x=1789990912; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Q9yvh3UV8onzYbSNebfzLntMGp4qNHqagnT/EH78fvg=; b=Bzj4nuBBELD/9KaS5QQgJU+eK8bciIoM7RxtLLrNlcNbMGZ6Wdm5SVOyYAZye1uiPc vgX2sOVHlxMQP2KXzNKk1CAh74Zzpuy6AeVuxx6TOoOD3us8QTK/OwTfhLvma1tqPvYL 2hLVN/tAmsd7DUNowjdZJyjqkJtKeS4cLrFRVVvozaKSBry96vBxEYcxiSbcgbyM5MQo dlJaoPuPT8PyLYKczRTwc7+FGrH5hNuQX6nbCuHgbD1JnLMD01TCpVr8cjYDtBxpPt+Q nmisXqx692JgU1vedLVLa1gRYXCcogq5TDC60fXdDOwrhPPHYOLFxsKvwTh+SYVi+zkE Y7YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789386112; x=1789990912; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Q9yvh3UV8onzYbSNebfzLntMGp4qNHqagnT/EH78fvg=; b=oUOf/tyHcv+LZBMW0dm9KxO2JTea6dgxjdFEUvuQk3C9uaKQGE6eDDMrWIRhxdmf8q Uw4Czks3L+sDzEsp9ATtEq9wCKC9ze3bBfWjCP1cPm/zum/8xOrSWpVMPboC2ofk/wKW 5XMJQaRt+oNmDxgyfhUWp+O6WpBiWLE+JP+qf+/qufWmXqg7/W75F5eF66mj160Q8zTb r67YS73+9CBGwYHo3GdBAzK7T3lubRj+pMAQNrv9AWyzVBmJU8wXqMHVt4iJnNG0nYrM lAWpDnsIaOR/DUa04LxBuMP3TmYdVDalifjnrUXeDNFSEiKPtMoWkaG6yhKaqJp5uMpN 4+gg== X-Forwarded-Encrypted: i=1; AKwUvBwr7oPGyljclYPwWzioV2pRseKawuAOUtGHIdIU3RBudiYHu1yNM6gEd1Cy3FtSwNn79TwzZiuQBuMln5c=@vger.kernel.org X-Gm-Message-State: AFuF++lGMIkItEm4r8hp3ZYeCGx8LmtF18hFJ4Lp0Wsu/Ef6XPUP4hI3 3MUcLZu+uTZeVAjC1OaNoDZ/GSCAt/xK+nzmIGoQz204DUWfhJYi0hL9GHKY9aXCvABToJG21EU TmpCBYEHLGILP2J/XkOHZtM87kI/ynN9k8vb8qaMOlieTAulZOT3uh9k57MvrDBCkX27zZDwY7s s= X-Gm-Gg: AYBFou0PT6xcYvIfJm/1IEeLZMem2N0FgoHlakTLSnTGg58rmAQpaZU8arPaJZULRsM 992YXmLdUW7MT+oSrI8jTBmqZwk0Pq9Nbk8433EwVtHAPlvp5rikcKh5MZ11NMeoGnigJB8D1yv NM/ihLhDdxKV/7vgGmSXrw+0xcJZUGG7tvx3YTLgA+ElspNropeMvesTP+FbRC0hNkmvVPcxu68 C2g648nVmMERp4X/+t9aRW1KvmdcFUPKo9Xb7X6Z6crm9xfse8CIw2tIdxt2fDY/93QbQv7NQfh kkiARFbsBEeOT47Y1vuYA5tQ12ha1bepzyu+Gn1iyuoXErwlElI53rECLdB8j7Pz1+Ed8983V8f t2o/l0lM6UnUAxrX5L+I4taggx7U= X-Received: by 2002:a05:620a:90d0:10b0:93a:2d2b:a5ed with SMTP id af79cd13be357-93a2d2bb71dmr152229185a.47.1789386111558; Mon, 14 Sep 2026 04:41:51 -0700 (PDT) X-Received: by 2002:a05:620a:90d0:10b0:93a:2d2b:a5ed with SMTP id af79cd13be357-93a2d2bb71dmr152226985a.47.1789386111133; Mon, 14 Sep 2026 04:41:51 -0700 (PDT) Received: from [192.168.68.120] ([5.133.47.210]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-49d26c2985dsm662678745e9.6.2026.09.14.04.41.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Sep 2026 04:41:50 -0700 (PDT) Message-ID: <16850fda-e68f-4ef4-bdd5-9ad77ac51195@oss.qualcomm.com> Date: Mon, 14 Sep 2026 12:41:49 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 4/6] ASoC: qcom: lpass-rx-macro: Add shikra compatible To: Mohammad Rafi Shaik , Srinivas Kandagatla , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai Cc: linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org References: <20260910-add_shikra_support-v2-0-fdd2129c696c@oss.qualcomm.com> <20260910-add_shikra_support-v2-4-fdd2129c696c@oss.qualcomm.com> Content-Language: en-US From: Srinivas Kandagatla In-Reply-To: <20260910-add_shikra_support-v2-4-fdd2129c696c@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Authority-Analysis: v=2.4 cv=CKa/zhrD c=1 sm=1 tr=0 ts=6aa7dd80 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=licpy54JkTNpb-QbogMA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: npT15h8i7CbYShfay1iupfD5gYTq0Xqr X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE0MDE2NiBTYWx0ZWRfXwowAPLBh63Yx XNLH2hCSI2BB6YHr6n/+Ko2WyRWzaiB1DyhXQk0xo/X9fWI0zGCoKbZSis319AKJyEMFAsesM8S va7JGQWJ6zllRnYugG37W+0NaPU3g6M= X-Proofpoint-GUID: npT15h8i7CbYShfay1iupfD5gYTq0Xqr X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE0MDE2NiBTYWx0ZWRfXxIsdiWEBXerm nvwjMbCKjI+tsYKglX1uqMJgNqY3HlEsc34E1Rx6tNDL1R01lLSpUDYZLt8wjt12BWjO2MTmw4s hlUp8yjO6HvdTVahMRDxmKq5BoGf1ZjQg1xBoTx5/9xc4jWhNwv0ujM9wbLhvCiMXAFf4OKiqVW lqAGw05k7mXbWbuMWTQ8PDbdA9Ri0mvleEwWgtiV3PoHzw3NeoSpzz6Pj5/1il3I60EDrjvUyeb n3c2b299ewthOz4JFHnVXiO3P/GD2dI+7vaXgix5iB0z92zT+QS/Hdc4CBWMdJcs2xVFpbf65IG YH2P2K09YdYw6S5tYWb4iQU9LteH7QF+dnNdEXgYQzQyisDQlm6gm0eIpir6xG5xxurgsTZTiBJ KScx6MT/kTAMj7u84pxyCjmEtrXA3NgdSldCeJwo1P/eUSN/gSSz1pjQP5Kz1tethfj1c7K3K+F Uyn01xwGDfS2axg4G5g== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-14_03,2026-09-13_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 clxscore=1015 priorityscore=1501 impostorscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609140166 On 9/10/26 10:46 AM, Mohammad Rafi Shaik wrote: > Add shikra RX macro compatible data and hook it into the existing > LPASS codec v4.1 flow. > > The RX macro register layout of LPASS codec v4.1 matches the v2.5+ > layout, so reuse the existing v2.5 register access helpers, controls > and widgets for it. > > v4.1 additionally requires the FS counter to be bypassed before it is > enabled during MCLK enable. This is a property of the codec version and > not of the board, so key it off the version detected by the VA macro > rather than off match data. > > Signed-off-by: Mohammad Rafi Shaik > --- > sound/soc/codecs/lpass-rx-macro.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c > index 2e74ec1a5..83372123c 100644 > --- a/sound/soc/codecs/lpass-rx-macro.c > +++ b/sound/soc/codecs/lpass-rx-macro.c > @@ -60,6 +60,7 @@ > #define CDC_RX_FS_MCLK_CNT_ENABLE BIT(0) > #define CDC_RX_FS_MCLK_CNT_CLR_MASK BIT(1) > #define CDC_RX_FS_MCLK_CNT_CLR BIT(1) > +#define CDC_RX_FS_CNT_BYPASS BIT(7) > #define CDC_RX_CLK_RST_CTRL_SWR_CONTROL (0x0108) > #define CDC_RX_SWR_CLK_EN_MASK BIT(0) > #define CDC_RX_SWR_RESET_MASK BIT(1) > @@ -1613,6 +1614,7 @@ static bool rx_is_rw_register(struct device *dev, unsigned int reg) > case LPASS_CODEC_VERSION_2_6: > case LPASS_CODEC_VERSION_2_7: > case LPASS_CODEC_VERSION_2_8: > + case LPASS_CODEC_VERSION_4_1: > return rx_2_5_is_rw_register(dev, reg); > default: > break; > @@ -2045,6 +2047,16 @@ static int rx_macro_mclk_enable(struct rx_macro *rx, bool mclk_enable) > CDC_RX_CLK_MCLK2_ENABLE); > regmap_update_bits(regmap, CDC_RX_CLK_RST_CTRL_FS_CNT_CONTROL, > CDC_RX_FS_MCLK_CNT_CLR_MASK, 0x00); > + > + /* > + * From LPASS codec v4.1 onwards the FS counter has to be > + * bypassed before it is enabled, otherwise the fsgen > + * output does not come up. > + */ > + if (rx->codec_version >= LPASS_CODEC_VERSION_4_1) this pattern match is fragile, > + regmap_set_bits(regmap, CDC_RX_CLK_RST_CTRL_FS_CNT_CONTROL, > + CDC_RX_FS_CNT_BYPASS); Please use this as a flag. > + > regmap_update_bits(regmap, CDC_RX_CLK_RST_CTRL_FS_CNT_CONTROL, > CDC_RX_FS_MCLK_CNT_EN_MASK, > CDC_RX_FS_MCLK_CNT_ENABLE); > @@ -3652,6 +3664,7 @@ static int rx_macro_component_probe(struct snd_soc_component *component) > case LPASS_CODEC_VERSION_2_6: > case LPASS_CODEC_VERSION_2_7: > case LPASS_CODEC_VERSION_2_8: > + case LPASS_CODEC_VERSION_4_1: > controls = rx_macro_2_5_snd_controls; > num_controls = ARRAY_SIZE(rx_macro_2_5_snd_controls); > widgets = rx_macro_2_5_dapm_widgets; > @@ -3837,6 +3850,7 @@ static int rx_macro_probe(struct platform_device *pdev) > case LPASS_CODEC_VERSION_2_6: > case LPASS_CODEC_VERSION_2_7: > case LPASS_CODEC_VERSION_2_8: > + case LPASS_CODEC_VERSION_4_1: > rx->rxn_reg_stride = 0xc0; > rx->rxn_reg_stride2 = 0x0; > def_count = ARRAY_SIZE(rx_defaults) + ARRAY_SIZE(rx_2_5_defaults); > @@ -3949,6 +3963,9 @@ static const struct of_device_id rx_macro_dt_match[] = { > }, { > .compatible = "qcom,sc8280xp-lpass-rx-macro", > .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, > + }, { > + .compatible = "qcom,shikra-lpass-rx-macro", > + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, > }, > { } > }; >