From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=205.220.168.131 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795372929; b=mAspSAuBe3mOkefehIyqpbxhsKRA8NKKSaBTAers+zE3nwv7YZ9njQIs/jCVTan1fXnX tB1nsF4GqtdA1YX+FI2q+ZC1TdbZnHabBI2+zqqN/Lq6yxrnMPUileE8IljSJ36jmaQr3 vRFJHEBSGMjnonFp0RuMNpLaEs8ubEHMo5EJM7kfowJQW+GYazrL/sU2+YQwSmHLsME1p dT/t9isw1h5hDIoJzLiu8Y+xEAPtDnYhPcV+vuAiWiaNjPhb9vOH998UihvgzE5BHQ+8z i1w/Ii7RlAEfu/uqYaF2JE9ztoylrxeagoaM9htu6q2zS4O13ZDTdDMT/5fjxTpj6Yg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795372929; h=DMARC-Filter:Received:DKIM-Signature:Received:Received: DKIM-Signature:X-Google-DKIM-Signature:X-Forwarded-Encrypted: X-Gm-Message-State:X-Gm-Gg:X-Received:X-Received:Received:From:Date: Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer: X-Developer-Signature:X-Developer-Key:X-Proofpoint-Spam-Details-Enc: X-Proofpoint-ORIG-GUID:X-Proofpoint-Spam-Info:X-Proofpoint-GUID: X-Authority-Analysis:X-Proofpoint-Virus-Version: X-Proofpoint-Spam-Details; bh=1Ri13S7vXLNbYPy3fLjTMZ1bWa4NuIHuQ4aqbMG3u6Y=; b=yoG8HaL/X3jvIjiL6MB4whauJZNbSl1DrQUlg01e6DOHWA2xLJBjbcUR5jvpRbV9/Gea 3+KTZRAiiXC5EtiMbYedjopj3TKpz3bpyNTSrhx5aTlCTtPb5Hz0qdYfuU4SwXR/pOHRK 5j2ynbHgQVnCP99JpYY6uJz8/gRYiVApDhaed7K1PdMH19P3z4NqNJv7EkOSPgw9Is4+8 rKTpJ6INKX4JFIAKGQ95LS4W1IyWFTLs2FtSyPLfFR8j2kv8D38PKRlZraLnKbDXypACz nqX4/4Lat2aNGadD+tHg2hkahPb6m+Q4EnIRcksMYI0RQlDbg2B5v2Z6EAbz9RDyttw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass header.d=qualcomm.com header.i=@qualcomm.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=SlKPmWqw; dkim=pass header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.a=rsa-sha256 header.s=google header.b=L9I24B6Y; arc=none smtp.remote-ip=205.220.168.131 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95526606A330 for ; Sun, 22 Nov 2026 18:42:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 95526606A330 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none 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.a=rsa-sha256 header.s=qcppdkim1 header.b=SlKPmWqw; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.a=rsa-sha256 header.s=google header.b=L9I24B6Y Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6AMGUqS9686452 for ; Sun, 22 Nov 2026 18:42:08 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= 1Ri13S7vXLNbYPy3fLjTMZ1bWa4NuIHuQ4aqbMG3u6Y=; b=SlKPmWqwq2/F48RW XHVa6ySr8fg8/6vj28rmXyrXqoBNbBPkP7UoKnyodnylxQ21Co5hsW9mSpwtkqQd CHGD5yK/HxsmwFaNr4jcDuJb8Zq9sZCFyQfbMOekgILXfQ8nGxJjit4+ii8a3cIo z/K17mf7z9cNUgPv6i6WXlhC35JNegw/9CfmouJtp6Pjv/IZvdh9PoWnn1dYFM8v R+vo0K0FxjIZc35ZShxkNLVPIarCHMxsqK7b4Rl2qRq8UHM5++tTPDl9nJYPO5JI dcZFN3A+rBY9KvyV6QyjLp1ZCJVURFGJZz6PEIuTrQkJh/GHRritD0P2MI0digDN KIH/jg== Received: from mail-dy1-f198.google.com (mail-dy1-f198.google.com [74.125.82.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4j310fca5j-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 22 Nov 2026 18:42:07 +0000 (GMT) Received: by mail-dy1-f198.google.com with SMTP id 5a478bee46e88-3846d5f54c1so3364479eec.1 for ; Sun, 22 Nov 2026 10:42:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1795372927; x=1795977727; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=1Ri13S7vXLNbYPy3fLjTMZ1bWa4NuIHuQ4aqbMG3u6Y=; b=L9I24B6YSKA4dRN9r7hfqNcpyhkQ42GVxp/cST0loq0Q7BJtRboVOjRr9Jc95YvL8Q IykFcYA5PniQqv3Bgqu3m8svcoNUMNvfj2B47xwnk1cXzkqktvgXDgoXUpa/3oVcDZAj kKGqLGltuU7cJjTXvcIuf2RuBHwnFynMn92MI9p6t0+4R/8S3UCBfI7D9KkiuUBjS9ff 1qExakPoNmjRT5461GR3wUYfkHIYceO+200cDkRfbaw90odnRwFt60U2c9gSeDZr2uR7 F6rZ4ev9KnwNvmCqWxNzxTEEhkyXEMpbnhNFnuTpOdcgv70du557Z5LHhXf9k40m7suC 2I+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795372927; x=1795977727; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=1Ri13S7vXLNbYPy3fLjTMZ1bWa4NuIHuQ4aqbMG3u6Y=; b=16AZ14Dlam+dzlBOdhJ+vN/pkgi92xqO/4Iao7s/uUzQriBxzpTFEQf8ysy2Hsk9B0 LVNUZ0ZWOYK2d1RWGuijJSfi2NKgjm4cdoHi/Phr0h8w6269UF8nH9idmBWdEz5yqRxo szZNqGILIKrTbWJsnLnzZPXPF4b+q0G3ljUj5zHhuWUBGa+rrxxz8aKE0SVE6hKP3unx T/VANDEs/S+VspqjfNHs1vyKVR5164gRR+PfMa5ngYi9x4Nv0WmmWKlijbmMvj1hIUot 1t9uljQn33otImRrEVitgYdvLt7t8wL+k50fFt0iJL7JUpRB5FG2NMMjxdDO2x5YldTA DZ1Q== X-Forwarded-Encrypted: i=1; AL+hErGGO8pCf4qzBlKwuD/SMZcT4Chb3lazKItLBG/R+aOMAZ/PYDUf2/G90fcmSC+IqswzdFDlAN364QqFWrw=@vger.kernel.org X-Gm-Message-State: APuU4Z9ULna0SoWXKJS4SbjMIx6tRRF2tv0GR5T3+dErEOLloOJL0pE0 bzxggVEx/4IsvHWIC1dZ05tzpRaQbTp6+aqclktYKndNVhfFO2pw0YObEaWySndtbrkmf+4Uvjm AJPi6Iz6tRPwdy+Qb/RwCq2JKdnwUlF8j+nvOaBcSJWWrowAud/tObPGEebdxnojXZ1o= X-Gm-Gg: AZFdTZeodmWneJRytb3Kg0QDezjp5eGjeowAlpC0Y98wtd8i+joSY7BBzkYisjUQyt8 brfa9YfV0IF3GhZs/qj6/iQ/x0hIx22cqcg9H9jFSZebU12M3b8NNE9/r1zwPwIO19RUKzj772I 4x98v3ML0xGTD7ooD4whOkLjxyACHoCt567I//tTWwnSfEf7r8vn0n+9SIGrm4OQSeNSbhWwIuS bXsNf3Dd9zmQZTvBx13j0OeoSEFxMR6xTVmX6nNmK7JC0lZ4Hh8ma57yOT1UiWKuXGn+KLfoVPz pfV+SaVButwha8WOZyGtIcqobPhKeczEUjEVJRxN+iAHjvBpk8cRpENZA7Gylb8QrXT7owuRDFv qCzqYx6QkhcdjBix6rURmkEjdzS3D1zDnDkOUOnEHk6Zz27bJuw78lVpLJcExcpelpn+yWxcANs PbYC8hUozv2Q== X-Received: by 2002:a05:7301:6486:b0:378:1191:43ca with SMTP id 5a478bee46e88-3863f1355b2mr6843964eec.18.1795372926888; Sun, 22 Nov 2026 10:42:06 -0800 (PST) X-Received: by 2002:a05:7301:6486:b0:378:1191:43ca with SMTP id 5a478bee46e88-3863f1355b2mr6843939eec.18.1795372926396; Sun, 22 Nov 2026 10:42:06 -0800 (PST) Received: from hu-mohs-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-385646633d0sm48497465eec.3.2026.11.22.10.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Nov 2026 10:42:06 -0800 (PST) From: Mohammad Rafi Shaik Date: Mon, 23 Nov 2026 00:11:33 +0530 Subject: [PATCH v7 3/9] ASoC: qcom: lpass-rx-macro: Add shikra compatible X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261123-add_shikra_support-v7-3-7bf3aa089fc6@oss.qualcomm.com> References: <20261123-add_shikra_support-v7-0-7bf3aa089fc6@oss.qualcomm.com> In-Reply-To: <20261123-add_shikra_support-v7-0-7bf3aa089fc6@oss.qualcomm.com> To: Srinivas Kandagatla , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Krzysztof Kozlowski Cc: Mohammad Rafi Shaik , linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla , Ajay Kumar Nandam X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1795372903; l=4621; i=mohammad.rafi.shaik@oss.qualcomm.com; s=20260424; h=from:subject:message-id; bh=7mhieR30L/xiL5xeXVcwKKIjfcaZfWQD52FXRHeuJ0o=; b=REKC2Pahj+OpBclnAOl2sF9KL0mIRVRz6uaXRLaLUNGrUnnI+nEtoR7evIBq1KbHbjMRGi2yR 58C8ImFoeVDAwX4W6mMWkjrDWDpL9i2r89dst33q6nhxIttn4t0OBmk X-Developer-Key: i=mohammad.rafi.shaik@oss.qualcomm.com; a=ed25519; pk=KZedmYgMGYOzuTpLGv56tdrL+pTLDP8pdmfQ91xemiA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMTIyMDA3NCBTYWx0ZWRfX1msDLBTv4jLT +QoB0QKQM5HM9ZiGKUfLH/7f0S+6s2N4XQgl9THHLgttdn/z4y+KtKbdIkfGch8c8ewfuzJl1UJ +7ajZp25Q4SLRhL3Q9u5nerhNYvIvMYTzn4hAMAtYmHouY7DbkWxagB+dmqODDRj08QldjoHUpa 68KW66FSO51hB6yaT5lJTiXRcwbgN3jIf9RsUuSdpfqcBs3/J3ra6mysDjougpWIozkV8ypaCC/ 8igamLXYZz5Onrl9MoNaGjCIzAA6q9Gc+pAbiDzlgfPYQ2iim3ktrDKzb7CS7L2veNcOwJmtwZQ lm2OUDwXZhglSjwrMamlNyUFtz+MqGZEb7aWqBybePrQAuK1ecbsLqphMvkAFjRzfJk8FB7M4qk xxAR/X7iyGEKxXbXzQ4LNxDIHlAJ6Pe8GhH+ALsvJ+rtelriybcS/vuf0ybysrofxkY8sUmdJAk 2pUIgRPs1QShx+THMVA== X-Proofpoint-ORIG-GUID: EVVkKCdzU21eN8hKM1mUHmzhvoa0Z8Ar X-Proofpoint-Spam-Info: AW1haW4tMjYxMTIyMDA3NCBTYWx0ZWRfX3s4mqjCfhuwf tHqCtXPzc2x9mN/pPNfmAP55B99KVKWUAPTHEUmzx9X8ATGGHSe6PDEDPPGDEXNDcmsOQRWhVAz k32o4g6yUP6mux7bE9MT3v8iXeGMKIk= X-Proofpoint-GUID: EVVkKCdzU21eN8hKM1mUHmzhvoa0Z8Ar X-Authority-Analysis: v=2.4 cv=UN1Ijyfy c=1 sm=1 tr=0 ts=6b03377f cx=c_pps a=wEP8DlPgTf/vqF+yE6f9lg==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=zJRp6_cAMcgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=NMmcyecwr9U0xRdsPIcA:9 a=QEXdDO2ut3YA:10 a=bBxd6f-gb0O0v-kibOvt:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.138,FMLib:17.12.100.49 definitions=2026-11-22_04,2026-11-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 bulkscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2611040001 definitions=main-2611220074 Add Shikra RX macro compatible data and hook it into the LPASS codec v4.0 flow. The Shikra RX macro register layout matches the existing v2.5+ layout, so reuse the v2.5 register access helpers, controls and widgets. For shikra requires the FS counter to be bypassed before enabling it during MCLK enable. Reviewed-by: Ajay Kumar Nandam Signed-off-by: Mohammad Rafi Shaik --- sound/soc/codecs/lpass-macro-common.h | 5 +++++ sound/soc/codecs/lpass-rx-macro.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/sound/soc/codecs/lpass-macro-common.h b/sound/soc/codecs/lpass-macro-common.h index 573b2145e1c4..77933eb8c4d5 100644 --- a/sound/soc/codecs/lpass-macro-common.h +++ b/sound/soc/codecs/lpass-macro-common.h @@ -10,6 +10,8 @@ #define LPASS_MACRO_FLAG_HAS_NPL_CLOCK BIT(0) /* The soundwire block should be internally reset at probe */ #define LPASS_MACRO_FLAG_RESET_SWR BIT(1) +/* FS counter control bit[7] must be toggled*/ +#define LPASS_MACRO_FLAG_BYPASS_FS_CONTROL BIT(2) enum lpass_version { LPASS_VER_9_0_0, @@ -30,6 +32,7 @@ enum lpass_codec_version { LPASS_CODEC_VERSION_2_7, LPASS_CODEC_VERSION_2_8, LPASS_CODEC_VERSION_2_9, + LPASS_CODEC_VERSION_4_0, }; struct lpass_macro { @@ -70,6 +73,8 @@ static inline const char *lpass_macro_get_codec_version_string(int version) return "v2.8"; case LPASS_CODEC_VERSION_2_9: return "v2.9"; + case LPASS_CODEC_VERSION_4_0: + return "v4.0"; default: break; } diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 5253ad438188..b3adb32f7d33 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -59,6 +59,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) @@ -651,6 +652,7 @@ struct rx_macro { bool is_ear_mode_on; bool hph_pwr_mode; bool hph_hd2_mode; + bool fs_cnt_bypass; struct snd_soc_component *component; unsigned long active_ch_mask[RX_MACRO_MAX_DAIS]; unsigned long active_ch_cnt[RX_MACRO_MAX_DAIS]; @@ -1659,6 +1661,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_0: return rx_2_5_is_rw_register(dev, reg); default: break; @@ -2091,6 +2094,11 @@ 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); + + if (rx->fs_cnt_bypass) + regmap_set_bits(regmap, CDC_RX_CLK_RST_CTRL_FS_CNT_CONTROL, + CDC_RX_FS_CNT_BYPASS); + 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); @@ -3698,6 +3706,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_0: controls = rx_macro_2_5_snd_controls; num_controls = ARRAY_SIZE(rx_macro_2_5_snd_controls); widgets = rx_macro_2_5_dapm_widgets; @@ -3861,6 +3870,7 @@ static int rx_macro_probe(struct platform_device *pdev) return PTR_ERR(base); rx->codec_version = lpass_macro_get_codec_version(); + rx->fs_cnt_bypass = !!(flags & LPASS_MACRO_FLAG_BYPASS_FS_CONTROL); struct reg_default *reg_defaults __free(kfree) = NULL; switch (rx->codec_version) { @@ -3883,6 +3893,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_0: rx->rxn_reg_stride = 0xc0; rx->rxn_reg_stride2 = 0x0; def_count = ARRAY_SIZE(rx_defaults) + ARRAY_SIZE(rx_2_5_defaults); @@ -3989,6 +4000,10 @@ 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 | + LPASS_MACRO_FLAG_BYPASS_FS_CONTROL), }, { } }; -- 2.34.1