From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 8EDFE46D089; Tue, 21 Jul 2026 18:19:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784657964; cv=none; b=BVVnuD/Inkn/S/Bv3CPYtfiskmxcWH29xqiwSGdt4bqaqgxwjcyxCC6EkUn46aWVR4DDRN6Tz85rwRE09Fw6qJZnbIY8DFBHoa1TOV+rEuEFsRtwtFamYMAp7kMXo04Mrfzax4dZ6MLWp5ET1zhq9x4wVFDde+6hBaKRvn/eSv8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784657964; c=relaxed/simple; bh=EOBfmhMeeyTBfK1jewA2rsyp+hVT5LC9KMuUrJfmMNE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mL3hTBU5tZIwHOGZPv2JD3Lqywoc80gn4B1ZTEpjBmqbpaQ82D6g3C80vit7ODvyCOJ1mROpl6gHVgh6ijJQaJuNONIvMvuCBjto1PJmqFVK01UFQBzfILdlXorMD/a9qs4RKBdDvzO8kGEHCw9UijgVtcLeTarSh58pmNALyA8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SBWmr8hT; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SBWmr8hT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A135A1F000E9; Tue, 21 Jul 2026 18:19:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784657963; bh=8wKvcJjF2uCQvJR40hF5C9bBlhMkWoiJtZ+YONfCsak=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SBWmr8hTxIe3PmDWTRfh5qFJh+OeigSHu4FmrfXDq6NiYE2lhzDgt1d6QxKxUKf3O UWtIQ7+TEG/EEcrRg6nutE6zGXTHsmB41bon3F8rOcU8c5XJlkspPRMcRThLOupJJY ySJhh7+Ud5wd+LsR8N1cVeCa6HcBxchwPz6Iotc8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Luca Weiss , Srinivas Kandagatla , Mark Brown , Sasha Levin Subject: [PATCH 6.18 0963/1611] ASoC: codecs: lpass-va-macro: Fix LPASS Codec Version for SC7280 Date: Tue, 21 Jul 2026 17:17:59 +0200 Message-ID: <20260721152537.055853354@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luca Weiss [ Upstream commit 0773610eef71c30df3cb4c113c8215625d2a7c23 ] According to both the static definition in downstream... yupik-audio-overlay.dtsi: qcom,bolero-version = <4>; #define BOLERO_VERSION_2_0 0x0004) and the runtime detection: CDC_VA_TOP_CSR_CORE_ID_0=0x1 CDC_VA_TOP_CSR_CORE_ID_1=0xf SC7280 has LPASS Codec Version 2.0 and not, as declared with sm8250_va_data LPASS_CODEC_VERSION_1_0. Create new va_macro_data with .version not set to use the runtime detection and correctly get .version = LPASS_CODEC_VERSION_2_0. Fixes: 77212f300bfd ("ASoC: codecs: lpass-va-macro: set the default codec version for sm8250") Signed-off-by: Luca Weiss Reviewed-by: Srinivas Kandagatla Link: https://patch.msgid.link/20260526-sc7280-va-macro-2-0-v1-1-2c1b572fa388@fairphone.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/lpass-va-macro.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c index 4e537e2f4ff18c..38e8b190d5c2f7 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -236,6 +236,11 @@ static const struct va_macro_data sm8250_va_data = { .version = LPASS_CODEC_VERSION_1_0, }; +static const struct va_macro_data sc7280_va_data = { + .has_swr_master = false, + .has_npl_clk = false, +}; + static const struct va_macro_data sm8450_va_data = { .has_swr_master = true, .has_npl_clk = true, @@ -1722,7 +1727,7 @@ static const struct dev_pm_ops va_macro_pm_ops = { }; static const struct of_device_id va_macro_dt_match[] = { - { .compatible = "qcom,sc7280-lpass-va-macro", .data = &sm8250_va_data }, + { .compatible = "qcom,sc7280-lpass-va-macro", .data = &sc7280_va_data }, { .compatible = "qcom,sm6115-lpass-va-macro", .data = &sm8450_va_data }, { .compatible = "qcom,sm8250-lpass-va-macro", .data = &sm8250_va_data }, { .compatible = "qcom,sm8450-lpass-va-macro", .data = &sm8450_va_data }, -- 2.53.0