From patchwork Sat Sep 10 09:14:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 604581 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CE7DC6FA82 for ; Sat, 10 Sep 2022 09:15:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229873AbiIJJPv (ORCPT ); Sat, 10 Sep 2022 05:15:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229677AbiIJJPK (ORCPT ); Sat, 10 Sep 2022 05:15:10 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 319912D1DA for ; Sat, 10 Sep 2022 02:14:52 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id f9so5976268lfr.3 for ; Sat, 10 Sep 2022 02:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=1cq2Cz6+Sy/tLxBRXynhhig1VTaXAXEwiLaRAUKokT0=; b=rDJ5SqyF0Ajf/iIhY3qigKE1/djVs2SBb1CDat7xU4E76GbX2Sxcv+F+kMXDS0Ef60 dlZ+7FMqkqNCH6/1eIjoJQf3OwEre1m/Bfs8sbPFnMJRQgVagX86tN5XbyZupxVnwB6K u+G8zCl+mXQtm4TNA85+W/scSjxyAZa4f/uX74q1bt8mc05VjprOHhWxMOO++R8t0jTs GDxD8w1vcbhussJDB7jxjqj/jKDW8BctaBatLmfv243uDAPQQiUXcklhPrqwn2AEpDwU go+VeKEMnizvem+i5XrZZqnRoRW9KFg8Wq/pYVTs5nV9GRFXe/XbIJnRoRV4nJpIwlMi kgcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=1cq2Cz6+Sy/tLxBRXynhhig1VTaXAXEwiLaRAUKokT0=; b=E6VSnL11iewzHC5qQUaev81sI4nYLu+M5iT8olDzAwmLUFZIDFu8qYvJiM7TILHf5H hFzFYk8mvldGTx3TEFHom6IaVuMzfYRXaO6HzO3d5SkuABdGA4LHbuq4J4UPdc2q2OSq qniS2MFbXDL1glsudB+NgjLXptQFdYYwaeKxzcx0WbIriMHHj0FyqClaTh3ePvbxix0j zKK89ScFrMVDuE7saCAsHGkNVRfX6QStzXo1xvvg7BghsORKOV9gp5Tv0AFLAJQM2c4G lLEQgeMfNHXa5dhlSi04UjbKXB5xgOaJCuhTSJeArHQexzrbg29tgy5GlKr9uauifBi0 y2XQ== X-Gm-Message-State: ACgBeo2dEvX+j96xeOSC4Cki2dScDj/MN4Lp4GcZCE1PBQGxZRnXj55t 7q5wwvlb1K17C0l2EaMuOruT6A== X-Google-Smtp-Source: AA6agR7RKod47U0kD5QSHRgIkY8q0SH4jTo0lBV/oMq4KCefwxXWIcDQ7tqIanhG61C70/2ETM7CGg== X-Received: by 2002:a19:520b:0:b0:498:f580:5cb5 with SMTP id m11-20020a19520b000000b00498f5805cb5mr3098607lfb.513.1662801290572; Sat, 10 Sep 2022 02:14:50 -0700 (PDT) Received: from krzk-bin.. (78-11-189-27.static.ip.netia.com.pl. [78.11.189.27]) by smtp.gmail.com with ESMTPSA id x22-20020a19e016000000b0048b26d4bb64sm201552lfg.40.2022.09.10.02.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 02:14:50 -0700 (PDT) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Liam Girdwood , Mark Brown , 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 v4 11/15] ASoC: dt-bindings: qcom,q6adm: convert to dtschema Date: Sat, 10 Sep 2022 11:14:24 +0200 Message-Id: <20220910091428.50418-12-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> References: <20220910091428.50418-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Convert Qualcomm Audio Device Manager (Q6ADM) bindings to DT schema. The original bindings documented: 1. APR service node with compatibles: "qcom,q6adm" and "qcom,q6adm-v.", 2. Routing child node with compatible "qcom,q6adm-routing". The conversion entirely drops (1) because the compatible is already documented in bindings/soc/qcom/qcom,apr.yaml. The "qcom,q6adm-v." on the other hand is not used at all - neither in existing DTS, nor in downstream sources - so versions seems to be fully auto-detectable. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- Changes since v3: 1. New patch. --- .../bindings/soc/qcom/qcom,apr.yaml | 3 +- .../bindings/sound/qcom,q6adm-routing.yaml | 52 +++++++++++++++++++ .../devicetree/bindings/sound/qcom,q6adm.txt | 39 -------------- 3 files changed, 54 insertions(+), 40 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.txt diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml index a1a8f77beef7..54328d74af85 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml @@ -112,8 +112,9 @@ patternProperties: description: Qualcomm DSP audio ports routing: - # TODO: Waiting for Documentation/devicetree/bindings/sound/qcom,q6adm.txt type: object + $ref: /schemas/sound/qcom,q6adm-routing.yaml# + unevaluatedProperties: false description: Qualcomm DSP LPASS audio routing qcom,protection-domain: diff --git a/Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml b/Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml new file mode 100644 index 000000000000..d0f7a79e240a --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml @@ -0,0 +1,52 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,q6adm-routing.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Audio Device Manager (Q6ADM) routing + +maintainers: + - Krzysztof Kozlowski + - Srinivas Kandagatla + +description: + Qualcomm Audio Device Manager (Q6ADM) routing node represents routing + specific configuration. + +properties: + compatible: + enum: + - qcom,q6adm-routing + + "#sound-dai-cells": + const: 0 + +required: + - compatible + - "#sound-dai-cells" + +additionalProperties: false + +examples: + - | + #include + #include + + apr { + compatible = "qcom,apr-v2"; + qcom,domain = ; + #address-cells = <1>; + #size-cells = <0>; + + service@8 { + compatible = "qcom,q6adm"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + + routing { + compatible = "qcom,q6adm-routing"; + #sound-dai-cells = <0>; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/sound/qcom,q6adm.txt b/Documentation/devicetree/bindings/sound/qcom,q6adm.txt deleted file mode 100644 index 15c353a20de8..000000000000 --- a/Documentation/devicetree/bindings/sound/qcom,q6adm.txt +++ /dev/null @@ -1,39 +0,0 @@ -Qualcomm Audio Device Manager (Q6ADM) binding - -Q6ADM is one of the APR audio service on Q6DSP. -Please refer to qcom,apr.txt for details of the coommon apr service bindings -used by the apr service device. - -- but must contain the following property: - -- compatible: - Usage: required - Value type: - Definition: must be "qcom,q6adm-v.". - Or "qcom,q6adm" where the version number can be queried - from DSP. - example "qcom,q6adm-v2.0" - - -= ADM routing -"routing" subnode of the ADM node represents adm routing specific configuration - -- compatible: - Usage: required - Value type: - Definition: must be "qcom,q6adm-routing". - -- #sound-dai-cells - Usage: required - Value type: - Definition: Must be 0 - -= EXAMPLE -apr-service@8 { - compatible = "qcom,q6adm"; - reg = ; - q6routing: routing { - compatible = "qcom,q6adm-routing"; - #sound-dai-cells = <0>; - }; -};