From patchwork Mon Mar 13 07:54:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 68682 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1061975wrd; Mon, 13 Mar 2023 01:25:43 -0700 (PDT) X-Google-Smtp-Source: AK7set9h4+CJiOFsEjnUACeBb/o/Pw67F/FM3vwYpsr92p4DuIE7VzIG/V49bYvD95rOFUMKC0dW X-Received: by 2002:a05:6a20:8e07:b0:cd:d13:8a6e with SMTP id y7-20020a056a208e0700b000cd0d138a6emr38927508pzj.21.1678695942866; Mon, 13 Mar 2023 01:25:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678695942; cv=none; d=google.com; s=arc-20160816; b=l+VeE7WBypo34B+VA7roDsWydn7xLUcovfqg0aV1hjap5vae+rBipS/WWlmorZebLx ZqWCavo7OnL9FjItSpf+axYPiwhiW8+gtxDeMJo7IHcdMYLE0CavStlOIwl8mjw8LlPw ro8it0WmHtBMZbAkwzfbE9gZvhlJYBEx5/9DtlVMPZv5aPQXhNhrfbUMU/pGsc4NXKh1 Pio4fR5bEtBfYwS0EC5qieI//Ja+p8FxbkeBB0UjSZ0pEXgDgfoT2as34FeH1WTAgT6O b7EaqtvQ/rL/m6/KJAXjesdfaISeEwpFleaiRoRNSppJMkS5AGNow5nMheQj6tx0oLBl w+TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=quQo6pOhl6y8TGUcX12fIubQW+W2OiQtrC5VDkiwRuk=; b=gjiQPitzsZOk2nha44isYwCRHLq+nFWVn594zOWFHWdho1/Ry0h5ijAJv49S/VRl7v oOhIPDjyujy1F40xM+qA6csa8xslOdWPl+G88484gATFngq8Lir4gqbhu7PqOf2jjUUf uCTHtmeTszoIc2gnlzODdHxXNERPMs8X+IFmSHWNeVZX5U+wkPehGzBBzscphnLFikDG JVDeHmz9Cax6RFINOO24B3FEWaOSdv2UKCIyFKXSrPcsAwJTeeMxLmKCiXZ45YKCqLrj eH/4qCxvG25C7sBK9lv+44taia5Ug/KC7jsKYECFaHRKMgQ/4281bq4uncK9oHocLhHR edpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FOhQOPd5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q68-20020a632a47000000b004fb3845932esi6259529pgq.576.2023.03.13.01.25.30; Mon, 13 Mar 2023 01:25:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FOhQOPd5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230508AbjCMH6X (ORCPT + 99 others); Mon, 13 Mar 2023 03:58:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230319AbjCMH4v (ORCPT ); Mon, 13 Mar 2023 03:56:51 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98CB22941C for ; Mon, 13 Mar 2023 00:55:14 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id y4so15455238edo.2 for ; Mon, 13 Mar 2023 00:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678694100; 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=quQo6pOhl6y8TGUcX12fIubQW+W2OiQtrC5VDkiwRuk=; b=FOhQOPd5JL9G9LS9ORK5Tji01kJl5AJ98t96Ikcs9U/qDgDFeFkfqxrIzDQsO05JxD y3WIcezf3tcFpujDCymKjzdHTabONYch5BPxnUfO7I8gFbAZTkUnJ9umO6flB7RF7Eu3 UA4pXvDc6YXRfw9XQpYdKu8cJYvza1zsppgxR2wwX6p+CjiQrMQV+z+To24UR+SiujKA MLGBGAYgFwLi39jGNxnv//5KN5zzQgw8ZaBTZJ9Ohm3RzVQlunGvv7LzC0x55DEywziY W4y5rsIkZLUaGBPPlkCoWicOfp6ovwqFO8113JI258DA8x7wYOnNQCU+Z+da+hchLoA+ O42w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678694100; 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=quQo6pOhl6y8TGUcX12fIubQW+W2OiQtrC5VDkiwRuk=; b=pAG/r1Y+xkjiGtI0Cl6anqM/RZ8PtwynquZSo+YJhrO3DrsFud/1dHxj7zoGu9jxFo ty1AZ5J5KGNNzg+0cfDGBiqV5gS5Z+OLiI88/lD+W0Ev7GPC8OCvHosWOAhI5UHD9lVS n98n6iC/H1RREBEIkZSQR0Yecgt/6qCBKnrV5RPwfxLu1+9Ls4kKXJJWzC/UGyz49VPG U3OQ1SDmSX35G41BGwf7dz3rN7xQbzZOqHPVqpXzFY+rx59QEclb1sZMGv1jhrHNTkgk rqU5+Kq/QD5KzggEyisr6R9SPL1uazwfiMsft6Cg05Cv7myM4Ldn8JM7fkC6xwJJZJ65 jFhw== X-Gm-Message-State: AO0yUKUaOyQIOGRYfKyoIrjfGHntwlWld4RUiuJOXFSamLWQ0dqWyHGt /fWmplcqYg+WoM8RBtLB1pYeeg== X-Received: by 2002:a17:907:6e03:b0:888:a72f:1599 with SMTP id sd3-20020a1709076e0300b00888a72f1599mr40929581ejc.11.1678694100270; Mon, 13 Mar 2023 00:55:00 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:f052:f15:3f90:fcb3]) by smtp.gmail.com with ESMTPSA id g7-20020a1709061c8700b008b980c3e013sm3146943ejh.179.2023.03.13.00.54.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 00:54:59 -0700 (PDT) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Andy Gross , Bjorn Andersson , Konrad Dybcio , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 9/9] ASoC: codecs: lpass-wsa-macro: add support for SM8550 Date: Mon, 13 Mar 2023 08:54:45 +0100 Message-Id: <20230313075445.17160-9-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230313075445.17160-1-krzysztof.kozlowski@linaro.org> References: <20230313075445.17160-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760240277295617395?= X-GMAIL-MSGID: =?utf-8?q?1760240277295617395?= Add support for the WSA 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-wsa-macro.c | 37 +++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index ba7480f3831e..881b3154cc69 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -14,6 +14,8 @@ #include #include #include + +#include "lpass-macro-common.h" #include "lpass-wsa-macro.h" #define CDC_WSA_CLK_RST_CTRL_MCLK_CONTROL (0x0000) @@ -2346,7 +2348,10 @@ static int wsa_macro_register_mclk_output(struct wsa_macro *wsa) struct clk_init_data init; int ret; - parent_clk_name = __clk_get_name(wsa->npl); + if (wsa->npl) + parent_clk_name = __clk_get_name(wsa->npl); + else + parent_clk_name = __clk_get_name(wsa->mclk); init.name = "mclk"; of_property_read_string(dev_of_node(dev), "clock-output-names", @@ -2379,9 +2384,12 @@ static int wsa_macro_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct wsa_macro *wsa; + kernel_ulong_t flags; void __iomem *base; int ret; + flags = (kernel_ulong_t)device_get_match_data(dev); + wsa = devm_kzalloc(dev, sizeof(*wsa), GFP_KERNEL); if (!wsa) return -ENOMEM; @@ -2398,9 +2406,11 @@ static int wsa_macro_probe(struct platform_device *pdev) if (IS_ERR(wsa->mclk)) return PTR_ERR(wsa->mclk); - wsa->npl = devm_clk_get(dev, "npl"); - if (IS_ERR(wsa->npl)) - return PTR_ERR(wsa->npl); + if (flags & LPASS_MACRO_FLAG_HAS_NPL_CLOCK) { + wsa->npl = devm_clk_get(dev, "npl"); + if (IS_ERR(wsa->npl)) + return PTR_ERR(wsa->npl); + } wsa->fsgen = devm_clk_get(dev, "fsgen"); if (IS_ERR(wsa->fsgen)) @@ -2553,10 +2563,21 @@ static const struct dev_pm_ops wsa_macro_pm_ops = { }; static const struct of_device_id wsa_macro_dt_match[] = { - {.compatible = "qcom,sc7280-lpass-wsa-macro"}, - {.compatible = "qcom,sm8250-lpass-wsa-macro"}, - {.compatible = "qcom,sm8450-lpass-wsa-macro"}, - {.compatible = "qcom,sc8280xp-lpass-wsa-macro" }, + { + .compatible = "qcom,sc7280-lpass-wsa-macro", + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { + .compatible = "qcom,sm8250-lpass-wsa-macro", + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { + .compatible = "qcom,sm8450-lpass-wsa-macro", + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { + .compatible = "qcom,sm8550-lpass-wsa-macro", + }, { + .compatible = "qcom,sc8280xp-lpass-wsa-macro", + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, {} }; MODULE_DEVICE_TABLE(of, wsa_macro_dt_match);