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 3A95428641E; Tue, 21 Jul 2026 19:45:10 +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=1784663111; cv=none; b=jinxPqTBlKy6QXsHYRmsDbvU5KqUYAL3wL/mcf+NA+18oLiy9zVwQq2Lgg+EMX60psdSBTVxQdTJLasAMrELjkLqWP/DWKKo7R7kDqvEaLh3W641Dv14pigR9dav6g3Z9Sg0uYxug3E5fqyD6b608Rt6nGdxtXACz0/78THrs64= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784663111; c=relaxed/simple; bh=pGPp5ViHrYCy1XFwN34c4wKoKNiRA3E5+/bQ11HOiek=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FnEDx3q9Vc8Z5JIqvORjMe8VQ/RDzjxsBDKk5Zcr1RvlT2v+3IBD5SSUuAr9EqeU3LbBmK8mZrPf9xSwxrkdwbivx5ZvAzyl5WTJXEE0YMSsoT24jm8ScdIneVnZs/M62lzhZkbJANnF9UF3gKapdFF2SHV6FsUf44+s8HEeL9k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0al6DqDh; 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="0al6DqDh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F25D1F000E9; Tue, 21 Jul 2026 19:45:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784663110; bh=ilc97p/BTOW3uowrhUgHy4L9eTEOIxLMZFOygbY4D1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=0al6DqDhosWrT//3pNj31hGBiUUbIjgBYqK3GFNmZB/qRvqRIdrKz2WYNy54gaDrB RhtIwyEPMHhdp11ZvZwNjd1vwRZTlByKAuRMPCX3gCbo97ldbskZpTOaXJGNU6SaU3 rg15zI6QiOW/sUOVHDKA4Bs0lqG8x8AwchTLAo+M= 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.12 0700/1276] ASoC: codecs: lpass-va-macro: Fix LPASS Codec Version for SC7280 Date: Tue, 21 Jul 2026 17:19:03 +0200 Message-ID: <20260721152501.762402779@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152446.065700225@linuxfoundation.org> References: <20260721152446.065700225@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.12-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 29260cb9187d75..8d28e3721ca3fe 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -237,6 +237,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, @@ -1721,7 +1726,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