From patchwork Mon Mar 13 07:54:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 68674 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1059769wrd; Mon, 13 Mar 2023 01:18:04 -0700 (PDT) X-Google-Smtp-Source: AK7set+aNOSNnmwcZ2e3sXUhxzITL+RZQObvmQQ93XTvNVhIwyJ4jTmhqiRKWZcrQaOty9ExQ0Gq X-Received: by 2002:a05:6a21:999c:b0:c7:5e7a:d536 with SMTP id ve28-20020a056a21999c00b000c75e7ad536mr10090510pzb.17.1678695484249; Mon, 13 Mar 2023 01:18:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678695484; cv=none; d=google.com; s=arc-20160816; b=fK+5y0UvfrR6s9OiT/dlX2npSzKMCX4cTAYxlKTuY5YYgWWnH59xcDHORPo6lVfskY /y83V2m7+kWbrCSXOc6VOHamZ8W5vq7PQi94OAS3yqsDy4ZwfliBf+zxlg24tKgY5dXc 3UCihcMtj1pt4U0Ha3gJfn3Ylhu8Kkvv96QWFWIKNFIfIUWiFDlABKZcQe7Vcs7nQ/kG uh9odstZrshjDEB5jAtu+KwPI9HfF8IEI/ZD+uklbffSjfmFzcrRsHv8l7ATV1ZmGpvF EAFMe+6THeiBOyGPDXGrc7Y+PsgkePmptF/EuXlDC8tFZ1dTulfdS/gK48MQlbh66XIM yWFQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=BbnW+HQXXMov2YCkKGIA3Ip1jgaMjvv36rVivoZ/sxY=; b=kQmshz21nHEobe5kcI+upm8bRbVeHJ4FW/BeHcLfDhgJvxIt/DddZIBf+7Bg5Y3flF 1TZi8JW15dgI+FjeboPvfihYb8kF3xOgd+b+fH6wgqClPXRPwWN12nUBwt/z1dmymQMv r8/jlQbHz3FwRHDWed0iuxgxaXzhxdmfPFi3Okfn2XmaiUV/A3QSfnFWpQUmZLtg1IXK f3TruNKuhOoignJOV1f3GHSKPLegjKd+DylSDYgshwoK8jfmcuVhCjcmJaQu1+3W6Lh4 5VFeTGFU8SWWYd17zRlByOjhYEmnjzH4gdaHPES7Ebj/FzLAqeG1TBChj7+W4xzjp69O VaBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PZJTlA13; 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 x11-20020aa79acb000000b005e8ff4d55b3si5855056pfp.347.2023.03.13.01.17.49; Mon, 13 Mar 2023 01:18:04 -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=PZJTlA13; 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 S230365AbjCMH5X (ORCPT + 99 others); Mon, 13 Mar 2023 03:57:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229950AbjCMH4e (ORCPT ); Mon, 13 Mar 2023 03:56:34 -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 60B0C2685 for ; Mon, 13 Mar 2023 00:54:56 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id j11so44924717edq.4 for ; Mon, 13 Mar 2023 00:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678694091; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BbnW+HQXXMov2YCkKGIA3Ip1jgaMjvv36rVivoZ/sxY=; b=PZJTlA13gQWFQFIrQIYA9l4hTDVIPGJzn7hnQUc6ArNl6Jh85UndmLYxMGd06xQnKC Dl/vQKHIjeTJc9i3UAV661s6QUgZ2dtyH0KjxxxOEpAbKaK0vlpJpfmxqCFxFUjaO0cl tKZoSkW4jcECGIRosDo9sc5bjUqXy4/Ou/vcYd7dRbLOrrf+ljTR42qxbPTWxOrVs3Nx +AWqyiWKadxq1taPKevOKDueaps4JoYjLCg46IWa9ZQxN455HqIKgp5eqlOrFunrGA/B UuFnS1/jBxO9hzW+uPmxt2d5spffpWoWCLM2wFt7taAdDsT4VzdXeGzriQZLM0malsm9 566w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678694091; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BbnW+HQXXMov2YCkKGIA3Ip1jgaMjvv36rVivoZ/sxY=; b=TtJnCICEf5ld4osKZlEgEAI8UB6cufhdSPm+1Tqw937vScAcf8F3g1Nvdw+p4dfhtU w8DVMLoBqaHGBaSioC03zWiIyr1WxM8+0m0Yq6ADmoIKtH7bg8obVD4sD/Z3aHHFPfpo C/cR8qg69fWWg485jFM9/Hh0WoRG3GUzWjdr6n4IaX1851aBpCX2xwqfLNjAt5fF/crK FYgZKU+lltBLBbhzOmBAO6Bg/PSCWcF94TI4L1jBgM/JD8YivOSoSQPQzQiv755iC9WT 8+YuQmeDFqE/bfn5tXpU9ebf9CTxXc2wCuVfEy4xmNVJU55t6pf6VS65VoyuN8dQr2VH P/bA== X-Gm-Message-State: AO0yUKXt2AyU7yNL/Nq39sIII5h8ZvSnzHZRFiYODH83eBH9gKtMnJuU kVobILdBMWv18Sa4husluygAew== X-Received: by 2002:a17:907:1c1f:b0:884:930:b014 with SMTP id nc31-20020a1709071c1f00b008840930b014mr42208755ejc.6.1678694091073; Mon, 13 Mar 2023 00:54:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 00:54:50 -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 1/9] ASoC: dt-bindings: qcom,lpass-rx-macro: narrow clocks per variants Date: Mon, 13 Mar 2023 08:54:37 +0100 Message-Id: <20230313075445.17160-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 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?1760239795979596785?= X-GMAIL-MSGID: =?utf-8?q?1760239795979596785?= Currently the Qualcomm RX macro codec binding allows two different clock setups - with (for ADSP) and without macro/dcodec entries (for ADSP bypassed). With more devices coming soon, this will keep growing, thus rework the clocks/clock-names to be specific for each binding. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- .../bindings/sound/qcom,lpass-rx-macro.yaml | 58 ++++++++++++++----- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml index b0b95689d78b..8b3d617a9578 100644 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml @@ -9,9 +9,6 @@ title: LPASS(Low Power Audio Subsystem) RX Macro audio codec maintainers: - Srinivas Kandagatla -allOf: - - $ref: dai-common.yaml# - properties: compatible: enum: @@ -34,17 +31,8 @@ properties: maxItems: 5 clock-names: - oneOf: - - items: #for ADSP based platforms - - const: mclk - - const: npl - - const: macro - - const: dcodec - - const: fsgen - - items: #for ADSP bypass based platforms - - const: mclk - - const: npl - - const: fsgen + minItems: 3 + maxItems: 5 clock-output-names: maxItems: 1 @@ -62,6 +50,48 @@ required: - reg - "#sound-dai-cells" +allOf: + - $ref: dai-common.yaml# + - if: + properties: + compatible: + enum: + - qcom,sc7280-lpass-rx-macro + then: + properties: + clock-names: + oneOf: + - items: #for ADSP based platforms + - const: mclk + - const: npl + - const: macro + - const: dcodec + - const: fsgen + - items: #for ADSP bypass based platforms + - const: mclk + - const: npl + - const: fsgen + + - if: + properties: + compatible: + enum: + - qcom,sc8280xp-lpass-rx-macro + - qcom,sm8250-lpass-rx-macro + - qcom,sm8450-lpass-rx-macro + then: + properties: + clocks: + minItems: 5 + maxItems: 5 + clock-names: + items: + - const: mclk + - const: npl + - const: macro + - const: dcodec + - const: fsgen + unevaluatedProperties: false examples: From patchwork Mon Mar 13 07:54:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 68670 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1057991wrd; Mon, 13 Mar 2023 01:12:11 -0700 (PDT) X-Google-Smtp-Source: AK7set8EzUs3an6YnZaaRhEzPmknMb2kewu9xdjFYY0B4ZAFXk8Ln4WRO71kfJQxCzu21GMCQJal X-Received: by 2002:a17:902:ab4b:b0:19f:9414:97be with SMTP id ij11-20020a170902ab4b00b0019f941497bemr3416058plb.9.1678695131163; Mon, 13 Mar 2023 01:12:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678695131; cv=none; d=google.com; s=arc-20160816; b=l9yfWDXldFohUW1JJai9Lsns2LdkaN21ea6FyFnuBZNUeI6W6IL7fuGXzMGqCpNO3F PdCW+KzKORdKN2Es6ckCS+oGqMcSAD7kHR8DoqT+QJDWzjaWxokWF/KGmrs6j2i9GIKK B2YFLj3EdgglZvUntRVxciTnFWgOWjGu6k2GLvCSJPuf2YvV1bMhz1xQ2xZsYcwO1oH+ TK7mTI0FG0ptkFBPyFU/8J9sjBCenIYy6Miu1m297H45vq74Z37thhNmPLGrM7K702vf uGjkj5PyUjmhKUUtx3t6TRvriDVSzJqFjck8iFFyVHvQcWoMym5dgjYK81ZY6Ce8J6vs nHJQ== 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=AcXL6MCdOOilzj/9V8Bxhr6PgZvPsGUvEZbtUrf8CA0=; b=FEmnbQOOQj0VYM2d6TCeAyZCr5rq2zKmaTtYU2bKYm0p0FqkW2j4ba4LjAg7TMwhV5 tS2RirhcWbE6LidYX7S+rdmsRby2DbgmXtEpXV9dWpZqjk3z5Zgxv8krYvAwRwRLWLV4 CKWeyQMsPMYFTL9Nw2Zto5RVb1ywTNP7DqpffSufGVYVpHq9okx7+HxFoZ5e/CHOIQOY /Hf/6dd8IPhp88g0KGLj9u7+3BmWmCCnEz/DdwGHoIuBQ53z7TLFe3K1qZJz6GBIKy4S xgz/BgUa7bBVPNZymoyyvK2SRLB8isyYZaBPDm3fmJY8LielpJ6cFU4KRtE4Cq221tJY WlqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lLbMCDNB; 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 y21-20020a1709027c9500b0019e8c3cd415si6283259pll.260.2023.03.13.01.11.58; Mon, 13 Mar 2023 01:12:11 -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=lLbMCDNB; 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 S230233AbjCMH52 (ORCPT + 99 others); Mon, 13 Mar 2023 03:57:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230179AbjCMH4f (ORCPT ); Mon, 13 Mar 2023 03:56:35 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C11D11352B for ; Mon, 13 Mar 2023 00:54:57 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id j11so44924871edq.4 for ; Mon, 13 Mar 2023 00:54:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678694092; 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=AcXL6MCdOOilzj/9V8Bxhr6PgZvPsGUvEZbtUrf8CA0=; b=lLbMCDNB8izZF0fMR6XD6CON56cutGL+/47tYCKHA5REqfw0OHpU5thIMeGFsVNMYt 2G0eJymUZKnlJOXDMn8isJG5H3Zp5q8EcBslx3NyoV0oePVWELvAGHbBOpnij18+4vXK sKji7OnEoFB5VGB/aa2bpE5JTNOee2r9C9mEGzTNyJWGepq56pWje0dnQzTMLBMNA2gA 7oUCP/HhpyQxPtI5nw4EoTCINxCc/zTdz13pEjogkCY2hdsqjQbGgfSJzzmbJExKjvKO uC+gdGF6wBXChBD0mfvj3adWHkcIheeOyZrPZR3oEt7j7pd70fi8ARY3jyU+Gh91Cuph wsyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678694092; 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=AcXL6MCdOOilzj/9V8Bxhr6PgZvPsGUvEZbtUrf8CA0=; b=ZxvJw0ClBuwWZk4CYTsrMhaZa48lJfTM1dk9GPQHk6wyzIDRq5sfxFdt4ZCld7qril 5ek1ur2DpUMwOA+HxayA9PqzvcfRA4rCWtO4RDyiqEoJ+tSdBFDf2jzkuIgCEMKAHsWN ESVA2lb1kSIXwkfYl8CWFzZ7CIWI5bPHPyi3yEZuGLcSJwX/yb8C8+knpvqAr9ovnjnK Qv931NMce+gdO4RIzH5u0su3v2ah2UjmGJrrXAzeRkwTcV+Zn3ww3nfzek1TYPSxlX0E CO2QjZsXjDO6K5he/hen7eD8wFBc76ndO+h10VOLR0JT/AeNB/OekIB2zo0kw991gORo qxGw== X-Gm-Message-State: AO0yUKXqC/C0zxo5fPism5k8ekbC555wnOs/BId238gFDNpRwy4s3Psz jVWg6NGD7GYbvbfYJ5LiiG8+8Q== X-Received: by 2002:a17:906:8d86:b0:8f9:ed75:f962 with SMTP id ry6-20020a1709068d8600b008f9ed75f962mr36202738ejc.18.1678694092265; Mon, 13 Mar 2023 00:54:52 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 00:54:51 -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 2/9] ASoC: dt-bindings: qcom,lpass-rx-macro: Add SM8550 RX macro Date: Mon, 13 Mar 2023 08:54:38 +0100 Message-Id: <20230313075445.17160-2-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?1760239426348355853?= X-GMAIL-MSGID: =?utf-8?q?1760239426348355853?= Add the RX macro codec on Qualcomm SM8550, which comes without NPL clock exposed. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- .../bindings/sound/qcom,lpass-rx-macro.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml index 8b3d617a9578..0ae3c81abdf8 100644 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml @@ -15,6 +15,7 @@ properties: - qcom,sc7280-lpass-rx-macro - qcom,sm8250-lpass-rx-macro - qcom,sm8450-lpass-rx-macro + - qcom,sm8550-lpass-rx-macro - qcom,sc8280xp-lpass-rx-macro reg: @@ -92,6 +93,23 @@ allOf: - const: dcodec - const: fsgen + - if: + properties: + compatible: + enum: + - qcom,sm8550-lpass-rx-macro + then: + properties: + clocks: + minItems: 4 + maxItems: 4 + clock-names: + items: + - const: mclk + - const: macro + - const: dcodec + - const: fsgen + unevaluatedProperties: false examples: From patchwork Mon Mar 13 07:54:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 68678 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1060434wrd; Mon, 13 Mar 2023 01:20:20 -0700 (PDT) X-Google-Smtp-Source: AK7set8JMrCy9UZONGST8pic6VTeHKkRRN1UpJNUMlPWSemGOoztGYtR1aQSHoGio7BBEbiBvM0y X-Received: by 2002:a62:6494:0:b0:5a9:c2b0:428f with SMTP id y142-20020a626494000000b005a9c2b0428fmr23190720pfb.31.1678695620165; Mon, 13 Mar 2023 01:20:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678695620; cv=none; d=google.com; s=arc-20160816; b=DVCMmme1D7slFRn//m7KSj8jVsxCGUtp5tCgSdvAcfYiDRpI2Tme/evXCaFA5Msyr6 07MicI202Dgle7u0iRsSYo3TcRvPJMxhwtsG3BQbhjNzcQ9v9gSdeSO5FHhN2C+pulTK 37OUjk2QUhN49jrA0IVM1bolPNgm9A/K/rEC2nwhqgusykryZ2oKFmZY7KWye3q549fa umaicEHYvi1xbtCDzSWSvOLB1GSG8aKOCVj6gagQXQKZQBEJA21g/4QuJZIUyiSe3htW y9nVqz8gAYsbRKg2fdeU4rrsnJvUR5BakKoj0ICQfFWavy6sAn3j9Wa2LAxtSD6JvkYT nfNg== 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=xYNVVvk5MYQJLcGCKlZ/3nxpCpW/KOAolH/I1VmRq1M=; b=rAMIj+hUAH23S7VOZeXq1+d2zyRrI31pg+MXVKwUNb0YKTVDxaGtW/BspsiP2SksPd hgExkh1TFGAxPde3jBqNhTPDxbVB7n9vNtS9Po0YrKueZhMH+GXup3tbGkoR9hCoWe3R vk2KVSzh0zu5mMR+QhqIufi3oxS9jlvUbE+3Y0Fe5prjQb7/SngvlWJ6FyaD3CABvpVR pPuHDTgqaygDEFxQelGwP941HQnF9ZmCwhHaX4TXAIcwDomNXsd9atoMJa4zgfN2ggOu PeXAzfoOf+VzrNjaL1xXPLrwVn5RaZ/rLuMoIdBomUsOJLicwHQd5LilR5zK3hrjG4s+ o7JQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cm6jvEBY; 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 h71-20020a63834a000000b005090d17b961si4915297pge.170.2023.03.13.01.20.05; Mon, 13 Mar 2023 01:20:20 -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=cm6jvEBY; 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 S230374AbjCMH5b (ORCPT + 99 others); Mon, 13 Mar 2023 03:57:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230301AbjCMH4j (ORCPT ); Mon, 13 Mar 2023 03:56:39 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A6C61516B for ; Mon, 13 Mar 2023 00:55:02 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id y4so15454264edo.2 for ; Mon, 13 Mar 2023 00:55:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678694093; 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=xYNVVvk5MYQJLcGCKlZ/3nxpCpW/KOAolH/I1VmRq1M=; b=cm6jvEBYoy8FtI9jVa4wcNUNcS0EPBarIeNL4EtUigouIMM/5ZX6a0HCtLQzmdjsi1 GXHeXCdAWpy4ru2ygJchKm04DfdGPDOyPbo5cL7HRRp4VFvGod2wUzCWPjUBrM9nwdtc g15ylGyBV4EKeJ08kXKZOl0cmVsyS7B2OtXqbnVTBtgw0KKU6E4A/GpKsS5JwMHx0Dj8 Tj3U/JbCfpCiWjDQ1CuwUSgDxMBI+OSIJNSTAA9eTDiNxjHn7ARrhZDLmasMjPjGqsSc 19e+vdxj8Gdegq6zR9owK4F6o4WDYJ69+utN1B+fjPWJY5qNwQxAh+5oijkkRt6vVjt2 FHNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678694093; 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=xYNVVvk5MYQJLcGCKlZ/3nxpCpW/KOAolH/I1VmRq1M=; b=pMPXYyghh884hnF8XTek0iGsN96kcLfPL2sUCPwuKd78CjdG1rQOvo10mBUb2yAiL9 JPe8MPfp4gs7C3f5ZXSj3RfCLQLbRPF8bNwhIyk+IVNkjZUn0WlqJ4cWjxJvNPAh3N8b SgqHMUD0PqpHRhsPiOhCs0ZkNXePEQYWzHb1bf1FHY7fmetwCB2TryGiKEeuIvVC3hX7 F41PdZTGJN1T4g8vr+1gdJ08/6tVZkSkFjofUIjRDcT+/suJgX2zX8jx1sOhDPbzLxaI a9uhxTWpPxcpHqXd4PiMm9oz8BCooS5UoZKigiS8B8ez09+grj7Nn3heZfYla219v/24 MwyQ== X-Gm-Message-State: AO0yUKWqHI9hFYDtuFmXXXJv3wQFJ0cMKk+fxEMcNi086iMraHpVmhhE 1C56HC0SbveCfMNsonwxOFBX1g== X-Received: by 2002:a17:907:1c07:b0:920:307a:21d9 with SMTP id nc7-20020a1709071c0700b00920307a21d9mr8348837ejc.15.1678694093310; Mon, 13 Mar 2023 00:54:53 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 00:54:53 -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 3/9] ASoC: codecs: lpass-rx-macro: add support for SM8550 Date: Mon, 13 Mar 2023 08:54:39 +0100 Message-Id: <20230313075445.17160-3-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?1760239938996858395?= X-GMAIL-MSGID: =?utf-8?q?1760239938996858395?= 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__ +/* 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 a73a7d7a1c0a..8519794e36fb 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_macro *rx) struct clk_init_data init; int ret; - parent_clk_name = __clk_get_name(rx->npl); + if (rx->npl) + parent_clk_name = __clk_get_name(rx->npl); + else + parent_clk_name = __clk_get_name(rx->mclk); init.name = clk_name; init.ops = &swclk_gate_ops; @@ -3521,10 +3524,13 @@ static const struct snd_soc_component_driver rx_macro_component_drv = { static int rx_macro_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + kernel_ulong_t flags; struct rx_macro *rx; void __iomem *base; int ret; + flags = (kernel_ulong_t)device_get_match_data(dev); + rx = devm_kzalloc(dev, sizeof(*rx), GFP_KERNEL); if (!rx) return -ENOMEM; @@ -3541,9 +3547,11 @@ static int rx_macro_probe(struct platform_device *pdev) if (IS_ERR(rx->mclk)) return PTR_ERR(rx->mclk); - rx->npl = 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 = devm_clk_get(dev, "npl"); + if (IS_ERR(rx->npl)) + return PTR_ERR(rx->npl); + } rx->fsgen = devm_clk_get(dev, "fsgen"); if (IS_ERR(rx->fsgen)) @@ -3655,10 +3663,22 @@ static int rx_macro_remove(struct platform_device *pdev) } static const struct of_device_id rx_macro_dt_match[] = { - { .compatible = "qcom,sc7280-lpass-rx-macro" }, - { .compatible = "qcom,sm8250-lpass-rx-macro" }, - { .compatible = "qcom,sm8450-lpass-rx-macro" }, - { .compatible = "qcom,sc8280xp-lpass-rx-macro" }, + { + .compatible = "qcom,sc7280-lpass-rx-macro", + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + + }, { + .compatible = "qcom,sm8250-lpass-rx-macro", + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { + .compatible = "qcom,sm8450-lpass-rx-macro", + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { + .compatible = "qcom,sm8550-lpass-rx-macro", + }, { + .compatible = "qcom,sc8280xp-lpass-rx-macro", + .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, + }, { } }; MODULE_DEVICE_TABLE(of, rx_macro_dt_match); From patchwork Mon Mar 13 07:54:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 68666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1054467wrd; Mon, 13 Mar 2023 01:01:40 -0700 (PDT) X-Google-Smtp-Source: AK7set8iA0UxCEKruQ1oQq7uuu2I3PHYZJMJrQNYv6tg1XJWz6t0yi3fSXdncHBRGBzckGdDFPLH X-Received: by 2002:a17:902:d4cc:b0:19a:b033:2bb0 with SMTP id o12-20020a170902d4cc00b0019ab0332bb0mr39460517plg.46.1678694499890; Mon, 13 Mar 2023 01:01:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678694499; cv=none; d=google.com; s=arc-20160816; b=D7mD+RiZO1BGUQYNowJCqWHCwE0RzVoUs3Q9FWLACuz0ckRGSXhDIIR1hi8lxK+/g1 GqEKJHdzSKBsxFNsJtVF6BeB4r1ZqlOEEiIwuxcW2IV3QK8teCYtvBfAQN4TgxMxZ/Si a6HwW8dCs2i+4hflnBMxJ4BZhv8+UO31afPzVAF/NG5bwMldYWXWd7cN5qy0jBZ2cf88 QgO5Ovi3BLux7m750Ny17I8NhxC5phV6L1htX2t1UQXlYARCZUlTcat4bCmXNcoz9w19 /nnHEcDM/xS+luiFaP4Z2yGfhyFZ+VE2fESvYBwXzFhPrLEImVDFzhC2rBaPnyLda6B5 ToBQ== 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=6QzRJBCNcVjpu9L/kbF+2hC2cCPihdtDKgQqCKfLkPA=; b=xuaL1im+9ftfrNU4C26bS7FQTzLwlSZZzhOxTPaE5KEBNjC9BznY5NNq6H2ZduBd11 JBiYZdpL5x6/+bcGAzG8hk7vCd0jmf+2jD7jx7o1QQST5aI0lMx2a9q6Xzpl2nLw369j OuLulccYbW4pdcMySVJJOYgVr8vvriepsPMMAXqZS3LRETMBBS2Zyq7Uz4IEv9oXmhjR pd+aLWafxYdnM5m1pNuwKKIVzsFS9G6h2XOvGcUgRsLCiAdUvb2n8kDi/t6j9Ha00t9y smsfVCqbR1X2XRbavNDiXrMcOPGmmMRF2v2neyz9aLTkC2JWGzH4KAs5H0sckjYb8w6M YMNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nFUMm3+s; 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 w5-20020a1709027b8500b0019f185d6766si5951610pll.464.2023.03.13.01.01.16; Mon, 13 Mar 2023 01:01:39 -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=nFUMm3+s; 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 S229946AbjCMH6G (ORCPT + 99 others); Mon, 13 Mar 2023 03:58:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230303AbjCMH4o (ORCPT ); Mon, 13 Mar 2023 03:56:44 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A083C1F91C for ; Mon, 13 Mar 2023 00:55:05 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id k10so44809015edk.13 for ; Mon, 13 Mar 2023 00:55:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678694094; 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=6QzRJBCNcVjpu9L/kbF+2hC2cCPihdtDKgQqCKfLkPA=; b=nFUMm3+saovTQ1UzAzL/iA+LOG4XC9kJ47NHuQy1wsJnT7iQm9nR8YilPqWk/zAC6I HwVkkwvKR1REMy/iEXr8fyRAsG1DQzAzRA0EmKoFK2M4VTm2YvaTJHt16wHdZFrik0/H kp9gqK45tYjfCO4cJbL63NN5S5MQXsGybQGETqd0k124i1Vfb7eFhZ9DXJ90evkns9rv u8a8T6vfEC0GzwVQmo2KgaDdbfADZLLUgHaA4u3ViJy9WRrG7Jvi4m7jkJjp1b4BZDDg HjRwxT80oGlHsc4/funzhGpB0cnT/4+5gZ+mXh0YLFK5padc5KEyAXAhWhP5ZLWez0GB Ny+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678694094; 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=6QzRJBCNcVjpu9L/kbF+2hC2cCPihdtDKgQqCKfLkPA=; b=pvJTXvkTXNucqJ1sRrqk/dFtRvbzCp21xdSfC4Wew9ej3R92hr4pU3o+peeakvDl/S CRPbWEUc7tUSImOzdF2YAHg6YOn8TZCfWusnFLlPqwtxkKE7NSBLbYpFsTpW77gEguu0 Msih1+GJphMaI6/EP7z7cVHmaNUamRQIt1cAWfAfdyRL5MUyY3dZs0UgsrjS4iciDiQN 4D8BOz3OHSX9MT1WKX4SUNVoKzFjuBTuGp7jUktIKcAd753zQgccVElifnPK9Vd+op3a sy0VE82F0YsW4e9fDAK8x6OzGWumbp6xLLZPbHCILVvZol4r49jZCQ+wBciyP7zFZWzJ R2pQ== X-Gm-Message-State: AO0yUKULT5mBbC7L8TCt2CrIcbgWhvEBv7iSxgN7Y2nyWIZ8r5cAtODB +b8Vw3b79cFiJOdPxZh+PkGcCw== X-Received: by 2002:aa7:cd7b:0:b0:49e:4786:a0e2 with SMTP id ca27-20020aa7cd7b000000b0049e4786a0e2mr10938908edb.14.1678694094396; Mon, 13 Mar 2023 00:54:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 00:54:54 -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 4/9] ASoC: dt-bindings: qcom,lpass-tx-macro: narrow clocks per variants Date: Mon, 13 Mar 2023 08:54:40 +0100 Message-Id: <20230313075445.17160-4-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?1760238764101668588?= X-GMAIL-MSGID: =?utf-8?q?1760238764101668588?= Currently the Qualcomm TX macro codec binding allows two different clock setups - with (for ADSP) and without macro/dcodec entries (for ADSP bypassed). With more devices coming soon, this will keep growing, thus rework the clocks/clock-names to be specific for each binding. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- .../bindings/sound/qcom,lpass-tx-macro.yaml | 63 ++++++++++++++----- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml index da5f70910da5..559da2509d8d 100644 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml @@ -9,9 +9,6 @@ title: LPASS(Low Power Audio Subsystem) TX Macro audio codec maintainers: - Srinivas Kandagatla -allOf: - - $ref: dai-common.yaml# - properties: compatible: enum: @@ -30,22 +27,12 @@ properties: const: 0 clocks: - oneOf: - - maxItems: 3 - - maxItems: 5 + minItems: 3 + maxItems: 5 clock-names: - oneOf: - - items: #for ADSP based platforms - - const: mclk - - const: npl - - const: macro - - const: dcodec - - const: fsgen - - items: #for ADSP bypass based platforms - - const: mclk - - const: npl - - const: fsgen + minItems: 3 + maxItems: 5 clock-output-names: maxItems: 1 @@ -67,6 +54,48 @@ required: - reg - "#sound-dai-cells" +allOf: + - $ref: dai-common.yaml# + - if: + properties: + compatible: + enum: + - qcom,sc7280-lpass-tx-macro + then: + properties: + clock-names: + oneOf: + - items: #for ADSP based platforms + - const: mclk + - const: npl + - const: macro + - const: dcodec + - const: fsgen + - items: #for ADSP bypass based platforms + - const: mclk + - const: npl + - const: fsgen + + - if: + properties: + compatible: + enum: + - qcom,sc8280xp-lpass-tx-macro + - qcom,sm8250-lpass-tx-macro + - qcom,sm8450-lpass-tx-macro + then: + properties: + clocks: + minItems: 5 + maxItems: 5 + clock-names: + items: + - const: mclk + - const: npl + - const: macro + - const: dcodec + - const: fsgen + unevaluatedProperties: false examples: From patchwork Mon Mar 13 07:54:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 68681 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1061885wrd; Mon, 13 Mar 2023 01:25:26 -0700 (PDT) X-Google-Smtp-Source: AK7set/mVJWY4y7lWWsiDijChGTm8P+46vLCifKCItLBYdOtG6tzdUAG0ezEstYX83OKYWBOg4U1 X-Received: by 2002:a62:18c8:0:b0:622:bdec:d49 with SMTP id 191-20020a6218c8000000b00622bdec0d49mr4482567pfy.11.1678695926004; Mon, 13 Mar 2023 01:25:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678695925; cv=none; d=google.com; s=arc-20160816; b=Cdq86e/iKDW3EQ3vfi2U8Rua5hbml9QXdv3dGhavA/7dyQvjZVBQlOUip1zi1dckBz JIgJxlR7iLdduvLZdeRhuYxZsFvKnHV2peTuVdQvUtxbaRCiMh0b5iRwV93KShBcTNds 8kpJoaXeJ3svwIZ7Q7+CDtd1y3tR+E8c9s9/RiUTCsgIGCYU+6Vf7KWunD2zJtTH02H2 SfIfaTOO8bZaqwBFSTeld5DaquzS+jz7tsybnifGIo3I4KQ2fDkS0Vwq7sds+DxyLqH7 3Gt9tgC3KR4cu0d6UgnhKbViJNIjZU3BhX89MJ5ufOvCWwTQ8Q+++GF1m6agk8AIttR0 KzaA== 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=fDF0ZYXFDOllcKLsEzC0jJ5Ov6N9QuMsH10mVyhVQIQ=; b=SbfMUEQQL7gZm1ojjPxV8FBJt31433pYEccqDxBcWbA0amwS2ojhoiLwxfMw1rn39R LfVTba7pYhzFFvbyApjWK8CYkx4Cyj17qSuG50femnFKe32qbAdBCMUHLSA7RiKMaMDv E6GQ3POUp9rzIlT/uHdk5JbFsDDSb8PU5WXR52hlRMnljAA701WvOF9i8B58uuwnLq3u Z6D+6JvHUZgWeqo4s3XGRXXbywLSdwpA6nQS2/xjG67x4+lIou3d3Pol3I/5v4nQGCwK AJn8wiLJUbkAykcgpbf391Oe9KEqee2q1Kr+N4X3xJnsZZ+TzzJKI/2Q6bjJ1hHLf3/J HTyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X7IETnH6; 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 t25-20020aa78f99000000b00593ac87bbadsi5799289pfs.202.2023.03.13.01.25.11; Mon, 13 Mar 2023 01:25:25 -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=X7IETnH6; 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 S229998AbjCMH6J (ORCPT + 99 others); Mon, 13 Mar 2023 03:58:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229776AbjCMH4p (ORCPT ); Mon, 13 Mar 2023 03:56:45 -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 961362006F for ; Mon, 13 Mar 2023 00:55:08 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id cn21so14736830edb.0 for ; Mon, 13 Mar 2023 00:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678694095; 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=fDF0ZYXFDOllcKLsEzC0jJ5Ov6N9QuMsH10mVyhVQIQ=; b=X7IETnH6CFfAF+cv4+iEYutn/JFK96OrOPqlr2bDrSNLdlVGTWojg/IC4IYNp9jVhK LCp3GUK68M8n2ysNlF5WRETvc8KwayULthNs/xyTLfvIGrvH1iR+tLSiAIJZvgVv0a8a 7yKSt9Br5/Sh14bbEw5hmCUBQoB8JcKeDPU3rBv3N4ANzZzOuSqP5iY5EItjykG9QW4D TE5h8pBlUIOrUmcshxYGggFyuw7DbqtOglOkieHjrNG5X7qsUIMpDngugsOpFI1MYXTe BGpLHVVgiC15OJVvgIBW6/PH6B1RRjblT/wpciCKW23yR2YIBrhfsK5fc4f180wPCMlG ujkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678694095; 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=fDF0ZYXFDOllcKLsEzC0jJ5Ov6N9QuMsH10mVyhVQIQ=; b=BYCefgz6iJb5/r11Z/6faPAlcm/fTBcJaTgfNLxp6s4y0Ln5TWQADjqf6xOLSrCU0G VYuX/NwN/cv4MCENzI8dW+KaJ7RHMYZno5U75RWDvkx0RVhxZ2s6Lqaar/3wdEORQrES 1MRgT/gvMzfkNidg/3kJCfEVyQZEL+8HAJBMICex9bATu710sKkIb8D7JbMIPT+M7sPm w7KZawEueM46iscF+saYJHcc0WNFi0nuLz2PzYJI0c6+t0fT5D0oYEmE4SUoeR+GUhjE hIYJ8G1tt+Vmf5weKifYgmBoIi4thwbmOhdophi1dUhp2ASTKlnj4XxDUROmHUkxYhUA 3oBg== X-Gm-Message-State: AO0yUKVfVWqAqZS+VlM/1F+g7QBAOGiOBmwrw/jiXkbbQRK13nY9bbxc VTTuhYU5OLc+vRqY2CnGdxqzyw== X-Received: by 2002:a17:906:5594:b0:928:796d:71e8 with SMTP id y20-20020a170906559400b00928796d71e8mr2805289ejp.3.1678694095545; Mon, 13 Mar 2023 00:54:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 00:54:55 -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 5/9] ASoC: dt-bindings: qcom,lpass-tx-macro: Add SM8550 TX macro Date: Mon, 13 Mar 2023 08:54:41 +0100 Message-Id: <20230313075445.17160-5-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?1760240259229118304?= X-GMAIL-MSGID: =?utf-8?q?1760240259229118304?= Add the TX macro codec on Qualcomm SM8550, which comes without NPL clock exposed. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- .../bindings/sound/qcom,lpass-tx-macro.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml index 559da2509d8d..9d6e67524daf 100644 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml @@ -15,6 +15,7 @@ properties: - qcom,sc7280-lpass-tx-macro - qcom,sm8250-lpass-tx-macro - qcom,sm8450-lpass-tx-macro + - qcom,sm8550-lpass-tx-macro - qcom,sc8280xp-lpass-tx-macro reg: @@ -96,6 +97,23 @@ allOf: - const: dcodec - const: fsgen + - if: + properties: + compatible: + enum: + - qcom,sm8550-lpass-tx-macro + then: + properties: + clocks: + minItems: 4 + maxItems: 4 + clock-names: + items: + - const: mclk + - const: macro + - const: dcodec + - const: fsgen + unevaluatedProperties: false examples: 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); From patchwork Mon Mar 13 07:54:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 68667 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1055174wrd; Mon, 13 Mar 2023 01:03:19 -0700 (PDT) X-Google-Smtp-Source: AK7set/ucyk7h/a1NkunxTVaMMAQSyplr/bRrBqvuGxNJuAaRL0Sh093KZEhHtRVsDWqEvsp4Wqv X-Received: by 2002:a05:6a20:1446:b0:cc:5f8f:4f7a with SMTP id a6-20020a056a20144600b000cc5f8f4f7amr10825665pzi.27.1678694599000; Mon, 13 Mar 2023 01:03:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678694598; cv=none; d=google.com; s=arc-20160816; b=bFnQyVrTKknCU9YPfTF1MRaEFhAl45HQxRx/HitheJHYoRIXXczzvwY9vlEKIHsFs8 xKABoMjnJ0YpbM4qy6v8b7DVJlFoADpQkY/ehyL0iJLLSYuluJGbzjE0zAUt1Dgd+sFG Q+11U2VzXK96rOYzXoP97bgTWkNRbd7KwNJx6mxF/sIh8W4MZBkiYGCoP9LXE0IseTX/ 2rqgSal29IqTaKb6+yaAr8kIuDsOEZBI1N7S0uZcCkBc39ZoIycpPI8gxxnXxiZSH73W QKX07tmPsVWhPz7+/3igflA/d5ZVLg12XqDIQpUiWl4jmP0WbGeF6/KF1v+rEt+y/ToS +4Zw== 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=goKtutnQ2PFd8NfCZ2pE04cCvKUKzYAaQ26RIq4NWcQ=; b=ZKK2fszIpAqLQC3TGipxIBmiLRRjFpvFMb6JJnd43KO4d3XLKUS1DlneHeV6T9hkW8 +6+lP7apf/e3f1RotMLxP/voLdRCIOBXBDQPo7CmtJKezzTmQRq6NH5KWkTcgaAj4Lwc vDSo2HAHfwgxWgk3s3QQb5sMMNNp3uaI+LWPg7X+34DXHEu+HLeerDmjbkgVfPmkPgwS jWAGSGhHUuRWzBJtj3haaUu2RzVwa9TujGSrjPHvwR22LoUImHfzQRGkFo+twl9qYRdO wPOYfKRtKetTvUweRPcY0/338I0TOSu9xhYHhkyVn16g+gq06UTpvSKEE5oHQUxBjq7g u19g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CIJu2Isc; 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 c7-20020aa78e07000000b00576fca27d92si6053093pfr.206.2023.03.13.01.03.02; Mon, 13 Mar 2023 01:03:18 -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=CIJu2Isc; 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 S230250AbjCMH6Q (ORCPT + 99 others); Mon, 13 Mar 2023 03:58:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230008AbjCMH4u (ORCPT ); Mon, 13 Mar 2023 03:56:50 -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 45B4E23336 for ; Mon, 13 Mar 2023 00:55:12 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id cn21so14737152edb.0 for ; Mon, 13 Mar 2023 00:55:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678694097; 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=goKtutnQ2PFd8NfCZ2pE04cCvKUKzYAaQ26RIq4NWcQ=; b=CIJu2IscgcPZmgKaSTO8lOm6S+NIgoh4wZI6BpVbH51qVwz+f7WDUAZymEML4EAEzR V6P+T7sj9tBrjvcu5BIbp7/+hva8nP8/4HwdNpa03eUU1jCoTIQ6pSuiDkTC9OeG4Zq7 cdEJTXfNDxiWc9Xn1E4Pbl37APwDM3KelQUJju3HXy0WqOhRHDTWEP4cY9hKeHx4v1HL MZLMV07zKtQZSdpx96n6AvXKdKljlAFT/p5LZFhFnt2JNYHjkXIImT/xLhXIb+LGLt0Z C8+4KR53IZT3C37NjDjMU7rxY8QRLdI/nnGipqv0iITglfY3oAIuQZVmzd2kEIx99UQV degg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678694097; 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=goKtutnQ2PFd8NfCZ2pE04cCvKUKzYAaQ26RIq4NWcQ=; b=aINjSjejO2O0yUfttkP58UvleZICd8+q/gubPnFsq6op2f4LHO1R7wNoITyGQGyw+U gZzffjJhXZFkoVOyi7le5DU2Q+0FFT4fg2sFH7FV7xdzn/gLoK94nG9CBuQOfJybiJUW lk0RCJcn+HqEuQoNmyqpQiTMS/LLxtg7Bazso1Xkj8IxsCG/GwrM4XVnY2TkpBQFgH7Z Df57y9hmKbv0+mKRnoHZpKayj1mpMR0qFShs65L477k5p84CpDwzrlLueMg/XF+7xsib WoVIvz5w9wtZVfifMo97G5zsS0endqfuXX1ifDPt/kOIIsRzvwpKYLbQSr12uxpwO3fU ROUw== X-Gm-Message-State: AO0yUKVK38SLZwTeMftV5JuZacjSimG3rbKSVqxnETSghvo4l1icDIqm Qa81R2wkqe9+8Bpq6hZy3fjUrg== X-Received: by 2002:a17:907:7a86:b0:91f:f1b7:3673 with SMTP id mm6-20020a1709077a8600b0091ff1b73673mr7351226ejc.15.1678694097690; Mon, 13 Mar 2023 00:54:57 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 00:54:57 -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 7/9] ASoC: dt-bindings: qcom,lpass-va-macro: Add SM8550 VA macro Date: Mon, 13 Mar 2023 08:54:43 +0100 Message-Id: <20230313075445.17160-7-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?1760238867781513598?= X-GMAIL-MSGID: =?utf-8?q?1760238867781513598?= Add the VA macro codec on Qualcomm SM8550, which comes without NPL clock exposed. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- Depends on: https://lore.kernel.org/r/20221118071849.25506-2-srinivas.kandagatla@linaro.org --- .../bindings/sound/qcom,lpass-va-macro.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml index 528b677a439c..4a56108c444b 100644 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml @@ -15,6 +15,7 @@ properties: - qcom,sc7280-lpass-va-macro - qcom,sm8250-lpass-va-macro - qcom,sm8450-lpass-va-macro + - qcom,sm8550-lpass-va-macro - qcom,sc8280xp-lpass-va-macro reg: @@ -110,6 +111,23 @@ allOf: - const: dcodec - const: npl + - if: + properties: + compatible: + contains: + enum: + - qcom,sm8550-lpass-va-macro + then: + properties: + clocks: + minItems: 3 + maxItems: 3 + clock-names: + items: + - const: mclk + - const: macro + - const: dcodec + unevaluatedProperties: false examples: From patchwork Mon Mar 13 07:54:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 68668 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1055919wrd; Mon, 13 Mar 2023 01:05:41 -0700 (PDT) X-Google-Smtp-Source: AK7set+EPS2yOxIT0eyHNMoKBZ35K8lL0X0lgKkNI9lVfWYxaGY46ljXPsVR706s/egcpls+kMLF X-Received: by 2002:a62:1c87:0:b0:622:dd9b:e2d8 with SMTP id c129-20020a621c87000000b00622dd9be2d8mr3931724pfc.3.1678694741253; Mon, 13 Mar 2023 01:05:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678694741; cv=none; d=google.com; s=arc-20160816; b=WeHizVEs78Rh5qG3bGpGGRDt9Ibn9ewvc187Z8wkVYGYbbht/ycYO8RGYnRBqpjAId HOnnTq0fV8coA0xapPB/ZV1HIxJqoRqrpOCIiqCakiOeIUuLRAVkEiG40A8kxPCU8/1O wPPXpjBb95VWsA4fdb0Ullug9XCv0FJ8UJuuSkV8pw0DQ1F3j6R83NnsEo6QZEfRKoF0 S/iPB95m7SAfpfqBmq2N3a5S31trj7ERzwGUeBV9sHN4Ij5wztwnO5xmLq3bwo4m+Spt J/6s4VbqCR4EakryeUY1kqF4t2yt+/qwA7SmlwRxmGWst2rWlSGknoE8IybBOU2b7M+g /QYA== 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=xZM2NPsZ49ia+Dqe6wkMeZpgWpRvBEKr1bmuDVGwMmU=; b=0JPpETkwNri3t4jYoYZwbCft+oNGNt93VNYLbnfhZXSrYdqXlaV9GwVaLxUmkeeIVi dHFjZDcfxZpmv54xTAnnnWJzAJ9Q3uH7sL1mRjlXqSrdgW4LM4BNUhQRE5HPkzVGJIBl 2Q3u/nVtBZLUQ4o6+B8MO8NXjbA1YFzvpz1uPSAIykvMqNthH6lT1L+RvhggzoenKjbx acyZs7ES1e81Xpy81UXQHziC6EitJVMgGfkhAX+2K9R1mv1g/skwqLnGsVM8Pg9MAAE1 nh3fK6ni8BVwnU3lz5W/tJ40b5MW6y8K9QEl8+W7Ga7nAqczB+BGSdtaqtlTv3H7wK2N oPmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PuuKK426; 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 c7-20020aa78e07000000b00576fca27d92si6053093pfr.206.2023.03.13.01.05.26; Mon, 13 Mar 2023 01:05:41 -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=PuuKK426; 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 S229698AbjCMH6U (ORCPT + 99 others); Mon, 13 Mar 2023 03:58:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230107AbjCMH4u (ORCPT ); Mon, 13 Mar 2023 03:56:50 -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 3624129439 for ; Mon, 13 Mar 2023 00:55:14 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id x3so44852177edb.10 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=1678694099; 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=xZM2NPsZ49ia+Dqe6wkMeZpgWpRvBEKr1bmuDVGwMmU=; b=PuuKK426W4imrwcVdY2+9oec5UOV7dMbuPit+w09Q5znpU3IvnzN31Md9Jt84L3yRS qHPHUvh3ZoTJBYGGv6FbQlLSOjRFXfkXVO5SltxbeVBxlIV9Y2+en8X9iLuW7cYkbt/J CZY0anSrcerNb0evrSZ5m2L2jdiAm/CwWnJP8GYxPDHtvO5ypw5+xtUyxPx9tJzEg04+ 2p0HKI4GlxvIrgPOlXonZyBsWvcneKOEIuEdIXkzI6EUUNzmfld0SolHsLCLG7gNa/xc /o/4fUs4R9PplJSeh2FROUvJMN8N5Xh7jQz+IBD1hfNvK7pFFKabTx1pJzrLs70M31UH dY0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678694099; 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=xZM2NPsZ49ia+Dqe6wkMeZpgWpRvBEKr1bmuDVGwMmU=; b=Dbo3KDWWs8ci2bYNH7VmZaTYFBOEklur3Dv+d4kqY8hIF3ZvkiAzy0CA3a317axRMY S3BAUfQT6kTcvKpEnSSR27sVBdevaH5UeRlRCKhywm8oPNO+0ZzVWB5sbMcEK3oUaoi2 JtoJ16W7sMHTqPbgNFE1pR1mx9W+J9l7ktUblV8FJrrdveb8Fdz7hXkif6W54DimwTfJ S84u7/9SyOayzyj6AV552x9NYUJteDwwQNXMKD1+M6WZ9v4XoK/dvXVOVnjq+mv7iXIK 6vi+r0pTnpqhx6Lh4gYM8zfXPY3euh0Ss+JVe1SuAJ+UGMYPUpCGK2brENJJiZ37XvuC /+6Q== X-Gm-Message-State: AO0yUKWCr5x0EWDOvWmi945usJ6xGNFyV8g7bNfnH2Y24WSd+x2vT/0P +dxvQCQ/EC7yk47KBKGR8Y0yEQ== X-Received: by 2002:a17:907:1b1b:b0:92a:abe7:a9fe with SMTP id mp27-20020a1709071b1b00b0092aabe7a9femr1671996ejc.74.1678694099110; Mon, 13 Mar 2023 00:54:59 -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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 00:54:58 -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 8/9] ASoC: dt-bindings: qcom,lpass-wsa-macro: Add SM8550 WSA macro Date: Mon, 13 Mar 2023 08:54:44 +0100 Message-Id: <20230313075445.17160-8-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?1760239017067910691?= X-GMAIL-MSGID: =?utf-8?q?1760239017067910691?= Add the WSA macro codec on Qualcomm SM8550, which comes without NPL clock exposed. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- .../bindings/sound/qcom,lpass-wsa-macro.yaml | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml index 66cbb1f5e31a..eea7609d1b33 100644 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml @@ -15,6 +15,7 @@ properties: - qcom,sc7280-lpass-wsa-macro - qcom,sm8250-lpass-wsa-macro - qcom,sm8450-lpass-wsa-macro + - qcom,sm8550-lpass-wsa-macro - qcom,sc8280xp-lpass-wsa-macro reg: @@ -27,11 +28,11 @@ properties: const: 0 clocks: - minItems: 5 + minItems: 4 maxItems: 6 clock-names: - minItems: 5 + minItems: 4 maxItems: 6 clock-output-names: @@ -62,6 +63,7 @@ allOf: then: properties: clocks: + minItems: 5 maxItems: 5 clock-names: items: @@ -89,6 +91,23 @@ allOf: - const: va - const: fsgen + - if: + properties: + compatible: + enum: + - qcom,sm8550-lpass-wsa-macro + then: + properties: + clocks: + minItems: 4 + maxItems: 4 + clock-names: + items: + - const: mclk + - const: macro + - const: dcodec + - const: fsgen + unevaluatedProperties: false examples: 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);