From nobody Wed Feb 11 02:09:43 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 998DFC761A6 for ; Mon, 27 Mar 2023 13:23:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232602AbjC0NXz (ORCPT ); Mon, 27 Mar 2023 09:23:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232593AbjC0NX2 (ORCPT ); Mon, 27 Mar 2023 09:23:28 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 029A955A6 for ; Mon, 27 Mar 2023 06:23:15 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id w9so36217038edc.3 for ; Mon, 27 Mar 2023 06:23:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679923393; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KL1Hi3X0orGZTBrm+1PohiZFQrgy9knLwvGCmFqK1Xc=; b=Y+QiFOvkoqdFUWtBEhtuaG3ENcUwaPQw5O/C1BVM5MnukIWz3KPjKdTbde9AGcCGbr xs4Sai9ih6pqOrwrpRgv4dXEJ9OaUVAvD5PVdyak4uqjeAoEXNJuFu0RxKZA1UYsWA8h Ct8jjVagOr2e8iROSq3X1x0os3hoaAhMOYqO01D+/0X6EOaEJOY/g8ftG+//brU22kkZ DS5H0VlnhvyWpDRjtvYqipy+zk1NlexO7XOkNmOofhGeflF7v2ECsrnWmKktKGe9DI00 zFiT5Jh0xjGOixgjwvyXc3ugZ8vqoPGsY1mOMiY+Sk+En+kFkR3PiV9wWWJYiHzL4Y1K V9fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679923393; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KL1Hi3X0orGZTBrm+1PohiZFQrgy9knLwvGCmFqK1Xc=; b=T1q55yZZEvIxt96GYeR+gLjEGBu11CNRwOGVc0FYesWNB/pxQxBH6mQLNWIpwzdXjM 0cFrQmgD9UJxaF8Si8gynfLNzasy32bTD0ovuKNnGKHlgjt3TiGKwm3x/ORwuAEqhOtG 7fSDl2d24BV2LEitFqAJDC66lVXy/Pofwt1DltDt49EqYLKEQzgl9kn3WBnCBmUiimFQ xw8e5MUsU8DhFPbnHoBRT/VINa7J6itMhvjUvILyCenhctav6r7MKv+HtgXTl/7nuC4q QsEDe1YuQLuUtwM7mrUvqh0maiq7ygw9na0Zxydh4w7Fbz0OqtiiTLkDPt++IogcHymp rguw== X-Gm-Message-State: AAQBX9fPitin7TpBwTrZiaJxRgve1VmnPYtpBkVJmIsyqqPnh+hVZNoE E7v9/ltFvQTS8skUK9vQSeFHLw== X-Google-Smtp-Source: AKy350ZfC8HTAQDloW4dKgWmhG0qTpvb72a26hXxIRE6FS5bAyc7xOdoQoKtpuE6vQm9cU/MZw8NHg== X-Received: by 2002:a17:906:6c91:b0:932:615c:33d4 with SMTP id s17-20020a1709066c9100b00932615c33d4mr12433354ejr.34.1679923393086; Mon, 27 Mar 2023 06:23:13 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:581e:789c:7616:5ee]) by smtp.gmail.com with ESMTPSA id gy24-20020a170906f25800b00930445428acsm14286814ejb.14.2023.03.27.06.23.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 06:23:12 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Jaroslav Kysela , Takashi Iwai , linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Patrick Lai , Krzysztof Kozlowski Subject: [PATCH v3 03/10] ASoC: codecs: lpass-rx-macro: add support for SM8550 Date: Mon, 27 Mar 2023 15:22:47 +0200 Message-Id: <20230327132254.147975-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327132254.147975-1-krzysztof.kozlowski@linaro.org> References: <20230327132254.147975-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add support for the RX macro codec on Qualcomm SM8550. SM8550 does not use NPL clock, thus add flags allowing to skip it. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Srinivas Kandagatla --- Changes since v1: 1. Move the flag define to common header --- sound/soc/codecs/lpass-macro-common.h | 3 +++ sound/soc/codecs/lpass-rx-macro.c | 36 +++++++++++++++++++++------ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/lpass-macro-common.h b/sound/soc/codecs/lpass= -macro-common.h index f2cbf9fe2c6e..4eb886565ea3 100644 --- a/sound/soc/codecs/lpass-macro-common.h +++ b/sound/soc/codecs/lpass-macro-common.h @@ -6,6 +6,9 @@ #ifndef __LPASS_MACRO_COMMON_H__ #define __LPASS_MACRO_COMMON_H__ =20 +/* NPL clock is expected */ +#define LPASS_MACRO_FLAG_HAS_NPL_CLOCK BIT(0) + struct lpass_macro { struct device *macro_pd; struct device *dcodec_pd; diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-= macro.c index 372bea8b3525..685ca95ef4a9 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -3491,7 +3491,10 @@ static int rx_macro_register_mclk_output(struct rx_m= acro *rx) struct clk_init_data init; int ret; =20 - parent_clk_name =3D __clk_get_name(rx->npl); + if (rx->npl) + parent_clk_name =3D __clk_get_name(rx->npl); + else + parent_clk_name =3D __clk_get_name(rx->mclk); =20 init.name =3D clk_name; init.ops =3D &swclk_gate_ops; @@ -3521,10 +3524,13 @@ static const struct snd_soc_component_driver rx_mac= ro_component_drv =3D { static int rx_macro_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; + kernel_ulong_t flags; struct rx_macro *rx; void __iomem *base; int ret; =20 + flags =3D (kernel_ulong_t)device_get_match_data(dev); + rx =3D devm_kzalloc(dev, sizeof(*rx), GFP_KERNEL); if (!rx) return -ENOMEM; @@ -3541,9 +3547,11 @@ static int rx_macro_probe(struct platform_device *pd= ev) if (IS_ERR(rx->mclk)) return PTR_ERR(rx->mclk); =20 - rx->npl =3D devm_clk_get(dev, "npl"); - if (IS_ERR(rx->npl)) - return PTR_ERR(rx->npl); + if (flags & LPASS_MACRO_FLAG_HAS_NPL_CLOCK) { + rx->npl =3D devm_clk_get(dev, "npl"); + if (IS_ERR(rx->npl)) + return PTR_ERR(rx->npl); + } =20 rx->fsgen =3D devm_clk_get(dev, "fsgen"); if (IS_ERR(rx->fsgen)) @@ -3653,10 +3661,22 @@ static void rx_macro_remove(struct platform_device = *pdev) } =20 static const struct of_device_id rx_macro_dt_match[] =3D { - { .compatible =3D "qcom,sc7280-lpass-rx-macro" }, - { .compatible =3D "qcom,sm8250-lpass-rx-macro" }, - { .compatible =3D "qcom,sm8450-lpass-rx-macro" }, - { .compatible =3D "qcom,sc8280xp-lpass-rx-macro" }, + { + .compatible =3D "qcom,sc7280-lpass-rx-macro", + .data =3D (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + + }, { + .compatible =3D "qcom,sm8250-lpass-rx-macro", + .data =3D (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { + .compatible =3D "qcom,sm8450-lpass-rx-macro", + .data =3D (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { + .compatible =3D "qcom,sm8550-lpass-rx-macro", + }, { + .compatible =3D "qcom,sc8280xp-lpass-rx-macro", + .data =3D (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { } }; MODULE_DEVICE_TABLE(of, rx_macro_dt_match); --=20 2.34.1