From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 53AF741D4F3 for ; Tue, 15 Sep 2026 12:50:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789476649; cv=none; b=pzjZ5uND11SAVTvtbWWD4wzqT01mCNwf3BO1+VK2A8HbzviDSbtYRBGWhGjkbculq82LkdZlB0Q3vURXnH8acX/fEoApgls/x+8Gz5lco7YUEokdKoxyaDWQ+e+1Hjv+McFZhvkWKr1XGA4wPFELfX91KZjOTeTLCPrpxewoRRc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789476649; c=relaxed/simple; bh=xbo00gOxGqqAUQxgPGO9vMIMMUz7Osk333IDwlJ3L5s=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=QBkyqpgM2BZjJtp66pWl8NfuwhvvxtMPOmqsXoaG586IkaLeTcshDixVmfjg+oY4cUoOIS6scleMM2kjGuBecstPcV/Rga9TGRqA1+iJ+hplwHl72vUM5JqmU+qXU5Pm8FY1eLbF/sDbpDwnNjA4e5N1hcrhDhhf7jA32glqAv0= 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=j2az10Eq; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Mr6hC3iG; arc=none smtp.client-ip=205.220.180.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="j2az10Eq"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Mr6hC3iG" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68F9hBfH3217688 for ; Tue, 15 Sep 2026 12:50:45 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= Hn033UI+u93eN0s7E1KhlfLlzklk26Hwma/EHj+HEo4=; b=j2az10EqKZ5WcnpB wDaRkjpswh0LAAluJxB1tx47NCs1JYEMLI/+pPW/1sAMBYeyBCLMlKZ8C8eWNBa9 5LfF7gkn+tAvfK2BcbB0iPxRgh5sYj+KeZmG1hONqnWIlnvZWHA72S9wdcxhrE0S upjuNV9zKpJrrgsduCRVLva4th7Hz7Qq/9oP7R66POAYnzxEUoKiKqxoxhXbOWOB g2KiUZbP4DyFnyI0SXVc9FXPJXIu2uMNsREyjXRbrwpFEu7GKsYWpiFzlyc6SUyR 2btgnkMoGHufkLfMJdAjOTlyKZwqJiTKppntM7/4fn1IaCqSdFmCMny0HbT2bqlE lr0v7g== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gq2y2gy3q-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 15 Sep 2026 12:50:45 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-52f9e903b02so13957761cf.0 for ; Tue, 15 Sep 2026 05:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1789476644; x=1790081444; 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=Hn033UI+u93eN0s7E1KhlfLlzklk26Hwma/EHj+HEo4=; b=Mr6hC3iGjleaLV5fvTnGbp25jLKV0QFiDNs1W676r2c5u9LajwoMRUP957Q/o/KiKi mOlnJJsNbgRTpqGGybNBeyDVWlLDTHUrlX+H5APcC+XlJtX60PQgHZ7I8Lk8B+ZL4/xs +0axuxDrUS6nz9BTAJNdogug+N/xaVqBAp0VfKcTb6+jBYEHedswj+VyI/65IKADTZAn /XbaF92u6IxiRlfGQ+Hws/kXBkE0QlmVFanpsNE45YDvCisEGsAQ6VOSB+XCVBd1KQk/ Y2FCg0kOyJ7s9xWy5UA9eDX6EiEE/vxabb1ASFDBmzSE33Po+/hS/kolNeQSJ/cYzl8l GiXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789476644; x=1790081444; 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=Hn033UI+u93eN0s7E1KhlfLlzklk26Hwma/EHj+HEo4=; b=Hk2zLxjzeQmZlr8RBVFStfflgzNcdG6iVwavMnRZXIFteffA0xEXX3EpfhYejR6FRd Gl1i5LJVUYOu56sbiUUXG8Hg69T/C7gCPEatOedtCVcAfMlzRjycSURD8p3GpTul3fxW uBqZsZQZQxEwjO8pVvRWzXBQB3iTA3nlwwRrsq2mD8RyifWS2T+lfHsOPvoURxEkSNZ5 0Tk+NECbFbQvF7fecOwZ6171EYhodD8nEFuqeDGOlZ4RE/qhwqkoHncYN7an3f9d5Bd/ b2xPjq649D1Q3vfC8rdBM0hPygRlSHaTtnWuWXmTivei7VojjlpPs1zt0Txxo7eTlFCU xutA== X-Forwarded-Encrypted: i=1; AKwUvByev6ZVGlbDO25IzC2pNrXRyeaG3cOc7itGbp2PdbZnYl53GVp+kOrh18kWD9d6Lwx5ZtLCblU+Kh8Ctjw=@vger.kernel.org X-Gm-Message-State: AFuF++kSfnZWc2/3Yuf77SwqE98hbKa3z6rajgthvFH1BHiQ5WGyiTz6 3yptZlbSgJMdYQ7zUtUOglVUZDv2ozvRImLw7/aHETK7XFXZorF/mHSW3f1ze1FlPCJR7pqgJxq d7yiYe3y/0mVIVmXAyzOyC/g3NIQdUBTzC8sSsWhvPOffSE/Me0UclxW6fy6ve+J0SyKVWntJBJ A= X-Gm-Gg: AYBFou0tMEKfc1xoVQpZMBEOUKq0IUPdgO4CiT2SW5Q6Q2aYvCJmy+BauItclSRVRYZ vpD4uFc5GnZMCZBB7tuYidOBpu/ZQECE+v8NL8BxoQAbs5fPUfFN6A44cYYkmYlmvkNH/uDd+5+ +cpVQollDznf3O3YslPL7odPQ1Tp8rC22rx6YeuHK7IioRVk6zCP8m5sO9OOpSIvaq6BkWpgIIf noM/+3MzFlbXtrwh+w4NsKoEJ1KJdkCm0e5Ig6UPgUYV9p2PoS6Xhb6QPD0NH56yzrHS3gIKDN3 5WZgA9yqQDXxc9loXnJ18Rh2YTgs04beW4LJJacw18ez5gNLj/LePuxSPl8qlQuy3feNpCeysc7 Eg4gnqu5Cbl9mhgejrsFIXVmGUyd0PdbTEOZUZpQ= X-Received: by 2002:a05:622a:64a:b0:530:a450:4eb5 with SMTP id d75a77b69052e-53119e77372mr46820831cf.21.1789476644341; Tue, 15 Sep 2026 05:50:44 -0700 (PDT) X-Received: by 2002:a05:622a:64a:b0:530:a450:4eb5 with SMTP id d75a77b69052e-53119e77372mr46820431cf.21.1789476643936; Tue, 15 Sep 2026 05:50:43 -0700 (PDT) Received: from [10.218.21.154] ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-530ca309989sm127737471cf.4.2026.09.15.05.50.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Sep 2026 05:50:43 -0700 (PDT) Message-ID: Date: Tue, 15 Sep 2026 18:20:35 +0530 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: Srinivas Kandagatla , 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> <16850fda-e68f-4ef4-bdd5-9ad77ac51195@oss.qualcomm.com> Content-Language: en-US From: Mohammad Rafi Shaik In-Reply-To: <16850fda-e68f-4ef4-bdd5-9ad77ac51195@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Proofpoint-ORIG-GUID: 4HV6oHsdfacgd0KF5WsS6WMcp7FwiW0J X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE1MDE4NiBTYWx0ZWRfX3abrLKwSoQiD iMFt4pJu3GdcjWeNMwJuBH4mLHpfLd0fW1mBySiOKaoIknurTK6gAu8n+d90zzGBbszxMa9YtIk 0JTx/akjPtpJTyH9Zy/ndJL03NQrD45n4mtM2cJRUjd8LHGoRpiUMzc9g1cv5JQa/TzuizQfUvy YKFHj9uZyMRMyj7t8zxVW8N5i6XwOv6L7+nF9RiNMT2YRZLej3hA8EoQ+PvpJB8I17E56nwzo/T j/MwbFFrYFNkuwzv3Xm6sPIbJaIC6lkyb0i0/NiLY5Z6V/gOXI1Yr7zeI+PH/MVTYTUv79u3mHf n/KlZygmCFT7aZfLZwkU/h6W2tQL59mZj2olr4wTtk4At7ZMzXs+3aXvXIGu1u6bFzDc59bQcqg 2MQhDc0bh4BoCZMB/iZQIKTKBVg/h782PkqoNYZGVQZJSNzu1EdqEKkJJUBM9AGwFP5yr3f02M9 VvamZnSEfmbvecIsrmQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE1MDE4NiBTYWx0ZWRfX+cAngP+jcmbQ oMUhOpKzNrYU9ajPbpX5A/qr/JDbLAWrnoiQNGxXsg1j57I5TCD/XmuCgbDtnQWMNlQdZ4m370x Q46s6sgWoepOVbHuQFhGxDAxFGOMzH4= X-Proofpoint-GUID: 4HV6oHsdfacgd0KF5WsS6WMcp7FwiW0J X-Authority-Analysis: v=2.4 cv=IcISymqa c=1 sm=1 tr=0 ts=6aa93f25 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=iI-3DXn3oscrbdy4KD8A:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 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-15_03,2026-09-14_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 impostorscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609150186 On 9/14/2026 5:11 PM, Srinivas Kandagatla wrote: > 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. Ack, Will introduce a flag or switch-case mechanism to handle this configuration. Best Regards, Rafi. >> + >> 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, >> }, >> { } >> }; >> >