From patchwork Mon Mar 13 07:54:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 68672 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1059496wrd; Mon, 13 Mar 2023 01:17:08 -0700 (PDT) X-Google-Smtp-Source: AK7set+7sHgjQLKIPByHCUovx3dQg19GNWxYf2vUUVnQkZDZ4ZSQP2OAi4YjFZ0sic7MCAcJvj0G X-Received: by 2002:a17:90a:199:b0:237:9985:30c5 with SMTP id 25-20020a17090a019900b00237998530c5mr32977222pjc.6.1678695428589; Mon, 13 Mar 2023 01:17:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678695428; cv=none; d=google.com; s=arc-20160816; b=vkD0YOycZHbCEugVNHPwjb9+9zCvmEad37LV9HVH/5v0FjTdYBDRYQvJPmsi2x6QyS v5Vpd7CNnmIxoZxFwevOH++4c8jtoaetchv7HYf/CmJ1RmCOoaDN9Hwkh1odYdsMCipR e7z6nDM58cbgSfLSOHqBFiKcM678YoLK3uHeRVTE6fTTwxUpMnD5Eoze5rweCIygeSu8 EyaOOsg9zEOTCyNuK9zVvBBOhY+qobavT4B4yWPkGLGEso/Q2TmLruEGZYgii9LImmFB uCOs8dgWG+b5vU84/K3YhCP1yhtIkEbvooMxp+PpVHJrlKPamFlAUMUODIDFF+Teu92M 1Aag== 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=aOLvETKr12gRLc+dvhlTcgF5sZT1MDYlJ7/1TcrZo+s=; b=ZClGWY3coPOnmujIYwxV8XU+kiGwDkOTndV1b3MJ/bFHREUJeLZ+rFppEuJTiyYYDC fHxDatjaoeckL9h9LDxtHFIl6J3j13TjENfXB9P53hpKllWYUlOPtsUdIBc8MbrGQntg X19pgoFBRI8lq+dTMgnEuYuWFI++4CHIQ1lELCUp/2DkJ8tmyshoffqlJaNxwDYbDJih 5ri6mIV1W6gM4LFXH/dBKDFr3z6ysPDNoYRvMtXOGUVh1o0V8lqEEq7OzIFJ4pp5Fa7U WVTh9rBHtuGSFQnYfRvAJl9T/alIfOxrzw4ShqTRXRp2zPdjGomC5xRnrOG+QN5rP/SX FmdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xX3qQEzK; 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 bm18-20020a656e92000000b004fc1fe750fasi5899609pgb.689.2023.03.13.01.16.54; Mon, 13 Mar 2023 01:17:08 -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=xX3qQEzK; 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 S230156AbjCMH6N (ORCPT + 99 others); Mon, 13 Mar 2023 03:58:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229937AbjCMH4r (ORCPT ); Mon, 13 Mar 2023 03:56:47 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A88B62332A for ; Mon, 13 Mar 2023 00:55:09 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id da10so45015316edb.3 for ; Mon, 13 Mar 2023 00:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678694096; 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=aOLvETKr12gRLc+dvhlTcgF5sZT1MDYlJ7/1TcrZo+s=; b=xX3qQEzKsx+66gUd9XUqSf+Hr3CrB+H3JRf2p/Bmux8hAn+1seNR30FiLO+tvVNjjT dYu2zDTTinQboVoKJJlwxoG7lpfTznDpl2OW10swf6CsFGfyqD9tdkAUeETVE4Khrf+T p8Y9OXF6UauCT946HCrYP9dTl+DO4Lg+mWzVzAUUtCcd07vWBo6NUMQ/POE1FTodUAXs nhSfJkJM1UtDvLRRsepvRdIBOMAblHSZNJBLnRTFwlPQEQ3gwAAF5tX5EbfyxYoVxdgi /w8joUS3ke3litcNtUppzn4mXShN2gSZ+rADO+15Lk+Ig0OX98ihAZphj13gwdounQGJ BH/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678694096; 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=aOLvETKr12gRLc+dvhlTcgF5sZT1MDYlJ7/1TcrZo+s=; b=y494Oylf6TvNhlxXvtuNETFfeIosm2NHEepAh5ix1J68Qc+zjrQgCm7LImQAw0fjTX 3k1xI8SvXz2X06PZPj9/U11G7ZLxN5K0TgLI/wka4do4+ws+ScD7oJKyfb0Z6UBNscW1 0wgEGAR/7yNNCUTYZ+E5aKtmIcgQLyhzctlo7w6RfwkzylCbdNwErLh0VGnGEK/kXWie ShOWJvwP/QELI7JY76sgzFaCZ5cSc4M0am2y6XFpTJ5oHw5fZ/RX2+em278cv2JE67yI ceHV6KcDMtah6vGdPLnLC2FHBdprkfwt1BpYh6bArWCIrwapdFKH5S7X6rVLTNkY+sBD sW8Q== X-Gm-Message-State: AO0yUKXKTwVv1uCxi+DGOTYfFKXU36O/3/3DtGBoieuxVjKQ42vo3sYN elngULsJCs9ZfMAf8ryk9TgoOg== X-Received: by 2002:a17:906:1604:b0:879:bff:55c with SMTP id m4-20020a170906160400b008790bff055cmr6271106ejd.1.1678694096626; Mon, 13 Mar 2023 00:54:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 00:54:56 -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 6/9] ASoC: codecs: lpass-tx-macro: add support for SM8550 Date: Mon, 13 Mar 2023 08:54:42 +0100 Message-Id: <20230313075445.17160-6-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=unavailable 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?1760239737331164211?= X-GMAIL-MSGID: =?utf-8?q?1760239737331164211?= Add support for the TX 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-tx-macro.c | 35 ++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index 473d3cd39554..a01a35f2e471 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -1915,7 +1915,10 @@ static int tx_macro_register_mclk_output(struct tx_macro *tx) struct clk_init_data init; int ret; - parent_clk_name = __clk_get_name(tx->npl); + if (tx->npl) + parent_clk_name = __clk_get_name(tx->npl); + else + parent_clk_name = __clk_get_name(tx->mclk); init.name = clk_name; init.ops = &swclk_gate_ops; @@ -1946,10 +1949,13 @@ static int tx_macro_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; + kernel_ulong_t flags; struct tx_macro *tx; void __iomem *base; int ret, reg; + flags = (kernel_ulong_t)device_get_match_data(dev); + tx = devm_kzalloc(dev, sizeof(*tx), GFP_KERNEL); if (!tx) return -ENOMEM; @@ -1966,9 +1972,11 @@ static int tx_macro_probe(struct platform_device *pdev) if (IS_ERR(tx->mclk)) return PTR_ERR(tx->mclk); - tx->npl = devm_clk_get(dev, "npl"); - if (IS_ERR(tx->npl)) - return PTR_ERR(tx->npl); + if (flags & LPASS_MACRO_FLAG_HAS_NPL_CLOCK) { + tx->npl = devm_clk_get(dev, "npl"); + if (IS_ERR(tx->npl)) + return PTR_ERR(tx->npl); + } tx->fsgen = devm_clk_get(dev, "fsgen"); if (IS_ERR(tx->fsgen)) @@ -2145,10 +2153,21 @@ static const struct dev_pm_ops tx_macro_pm_ops = { }; static const struct of_device_id tx_macro_dt_match[] = { - { .compatible = "qcom,sc7280-lpass-tx-macro" }, - { .compatible = "qcom,sm8250-lpass-tx-macro" }, - { .compatible = "qcom,sm8450-lpass-tx-macro" }, - { .compatible = "qcom,sc8280xp-lpass-tx-macro" }, + { + .compatible = "qcom,sc7280-lpass-tx-macro", + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { + .compatible = "qcom,sm8250-lpass-tx-macro", + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { + .compatible = "qcom,sm8450-lpass-tx-macro", + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { + .compatible = "qcom,sm8550-lpass-tx-macro", + }, { + .compatible = "qcom,sc8280xp-lpass-tx-macro", + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { } }; MODULE_DEVICE_TABLE(of, tx_macro_dt_match);