From patchwork Fri Nov 11 11:35:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 18696 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp688330wru; Fri, 11 Nov 2022 03:38:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf7VWsdmo7sW/3AksHj+Ynh9zc/ikrm8B/rK7QhsW+b6jJvJEE3sRWQPDGSFzVHlX1w0Piku X-Received: by 2002:a17:903:41c1:b0:17b:d6ad:94c8 with SMTP id u1-20020a17090341c100b0017bd6ad94c8mr2148335ple.110.1668166720292; Fri, 11 Nov 2022 03:38:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668166720; cv=none; d=google.com; s=arc-20160816; b=UL5fboxfsdZQYJYR6cdcyoy9EpQqjASwzw5QHmBDhNai7BM2ntvII51fH5naxknyUx NFlEMmKyWeeWWYKhO7CO0XbeFVxKD8DZGJpPd9f7vDiAweffBrTX77NwK7izlzcyLIon vp/R2se8pLyhRr0Mz5E312IXfaHvOcxjiccdVWLEbdXFW3U5NI/PoIqDG8hfAOmgHz+3 GEA+qwAFeYnq3VUHDjygiA2nEtPLyuf+CcpkqG8lJkYnLb81HYY2wwOtAApYkH4d1WJX xP4p/CRhRuO4MLyzd3ymIUesjUJTL+D9YZJatxN0xJmlxDB2Fd+P0LzvvxIee1N2VaSM MTpw== 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=rVPXDxLMfpz8g27snic+eN+xSUqcTU7lGiltIX5KJbs=; b=dUVXKjdwpxBqUf6BX1Vlc/92hc2c7dunUdlPAVqDCXNgqS/kn2mng11Ixnbs5bUJBJ sbJQih6aVFCvFC7fyzju1KS0cfk47EzAUIk4kRhLPtfNouUSiYZ8+/X9SSqy3q4K59No 5TOyY7aBDEvaMLOLsbMSAr34JaMNO+OeDmqqb4dGENfyQKjJ3/zFS0dd5wpZR4HK1Q2b HiA6nD3ps53fcssz3OvhG/73bUSrzwcihy/ct6fLvgyFXRz8jO5YW33BUZNleK/lpCoI HhZFwwBSG7UGIjjiEE2x7aZuepcNbEWf1SbyErgzYqkkIbaLkdXiFtrIaUEPzza0UGOH w61w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UFFAwcOs; 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 c9-20020a170902d48900b00186892f9f29si2558273plg.488.2022.11.11.03.38.25; Fri, 11 Nov 2022 03:38:40 -0800 (PST) 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=UFFAwcOs; 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 S233690AbiKKLgk (ORCPT + 99 others); Fri, 11 Nov 2022 06:36:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233628AbiKKLgR (ORCPT ); Fri, 11 Nov 2022 06:36:17 -0500 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB6E27B21A for ; Fri, 11 Nov 2022 03:36:15 -0800 (PST) Received: by mail-lf1-x135.google.com with SMTP id c1so7921044lfi.7 for ; Fri, 11 Nov 2022 03:36:15 -0800 (PST) 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 :message-id:reply-to; bh=rVPXDxLMfpz8g27snic+eN+xSUqcTU7lGiltIX5KJbs=; b=UFFAwcOs+vDUyqFQ5OFeB+zkQYPlvSThzl452QSBVB/r7V2GtVBOn5pdWYJcl3CK48 It2u3B4evYX1mwdc4wXIa1W1aNazcHRJ7ka7BzFiL6I1yCzQiwVrGdzm3Le6kXk6hxdQ 9AWPl232CZhUgPEYCe8OEjNJ+NkFv7kFWV7OCCX0ZpaD1OgdzWauwwlFqL5/WWQStXbM 3KJwrAcb/+CdE7E6dysZsM8dYzDrN6o+MuTue00mR52XNcAYYOz0CbFfoYawCT1Nqrod 5Qoc7hYuBiE3PkRPQUxiKXv1durc29aeC4+NBeJLABEukudmF9z7pIJ5p6pqd4Tja0Wn 53Jg== 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:message-id:reply-to; bh=rVPXDxLMfpz8g27snic+eN+xSUqcTU7lGiltIX5KJbs=; b=j2xQ6HC9ElFsxWjL8p1jenHoZi96TlZLM69FbKnfBGinS1mbzNsFgWo7P132x6FA/+ zKqatQ+297WnWS6f1E+rJmJlytbU9XeuGmoNFEQInT8XZJJgZvYH6URbkTyGAA9YnlCg qN/oB6E3D17fLVWZTylJebR263z6T/tIyvKXNMa8S6Gacn8pv6dRps6MxbqdKeyAoX3w o8hQkMUED7c3cGYLBXS21U7i8SiYPOfTZg+WX8tPv/Qm7qlqFOHToVR77lwvO4ZAP/ee es08UFvUYan0J/HT/qzP22CVznxkqcvITgvo+ki5ynvhssWseXF0SSUVhlVgh+z6Zrei 7W6w== X-Gm-Message-State: ANoB5pknz6LTuZthO6lCYxdx4CgqXZacAzQeSiBB3phiEbgbCymPFUlt 1a3uadXtYGD06E6aKVYvEvvt6g== X-Received: by 2002:a05:6512:b92:b0:4a7:66ba:df18 with SMTP id b18-20020a0565120b9200b004a766badf18mr581923lfv.208.1668166575518; Fri, 11 Nov 2022 03:36:15 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142199.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.199]) by smtp.gmail.com with ESMTPSA id bi30-20020a0565120e9e00b004acb2adfa1fsm274970lfb.307.2022.11.11.03.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:36:15 -0800 (PST) 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: Patrick Lai , Srinivasa Rao Mandadapu , Krzysztof Kozlowski Subject: [PATCH 06/10] ASoC: dt-bindings: qcom,q6asm: Split to separate schema Date: Fri, 11 Nov 2022 12:35:43 +0100 Message-Id: <20221111113547.100442-7-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221111113547.100442-1-krzysztof.kozlowski@linaro.org> References: <20221111113547.100442-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?1749199586822581146?= X-GMAIL-MSGID: =?utf-8?q?1749199586822581146?= The APR/GPR bindings with services got complicated so move out the Q6ASM service to its own binding. Previously the compatible was documented in qcom,apr.yaml. Move most of the examples from its children to this new file. Signed-off-by: Krzysztof Kozlowski --- .../bindings/sound/qcom,q6asm-dais.yaml | 48 +++++-------- .../devicetree/bindings/sound/qcom,q6asm.yaml | 68 +++++++++++++++++++ 2 files changed, 84 insertions(+), 32 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.yaml diff --git a/Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml b/Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml index 8deb8ffb143b..0110b38f6de9 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml @@ -73,40 +73,24 @@ additionalProperties: false examples: - | - #include - #include - - apr { - compatible = "qcom,apr-v2"; - qcom,domain = ; + dais { + compatible = "qcom,q6asm-dais"; + iommus = <&apps_smmu 0x1821 0x0>; #address-cells = <1>; #size-cells = <0>; + #sound-dai-cells = <1>; + + dai@0 { + reg = <0>; + }; + + dai@1 { + reg = <1>; + }; - service@7 { - compatible = "qcom,q6asm"; - reg = ; - qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; - - dais { - compatible = "qcom,q6asm-dais"; - iommus = <&apps_smmu 0x1821 0x0>; - #address-cells = <1>; - #size-cells = <0>; - #sound-dai-cells = <1>; - - dai@0 { - reg = <0>; - }; - - dai@1 { - reg = <1>; - }; - - dai@2 { - reg = <2>; - is-compress-dai; - direction = <1>; - }; - }; + dai@2 { + reg = <2>; + is-compress-dai; + direction = <1>; }; }; diff --git a/Documentation/devicetree/bindings/sound/qcom,q6asm.yaml b/Documentation/devicetree/bindings/sound/qcom,q6asm.yaml new file mode 100644 index 000000000000..cb49f9667cca --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,q6asm.yaml @@ -0,0 +1,68 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,q6asm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Audio Stream Manager (Q6ASM) + +maintainers: + - Krzysztof Kozlowski + - Srinivas Kandagatla + +allOf: + - $ref: /schemas/soc/qcom/qcom,apr-services.yaml# + +properties: + compatible: + enum: + - qcom,q6asm + + dais: + type: object + $ref: /schemas/sound/qcom,q6asm-dais.yaml# + unevaluatedProperties: false + description: Qualcomm DSP audio ports + +required: + - compatible + - dais + +unevaluatedProperties: false + +examples: + - | + #include + + apr { + #address-cells = <1>; + #size-cells = <0>; + + service@7 { + compatible = "qcom,q6asm"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + + dais { + compatible = "qcom,q6asm-dais"; + iommus = <&apps_smmu 0x1821 0x0>; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + + dai@0 { + reg = <0>; + }; + + dai@1 { + reg = <1>; + }; + + dai@2 { + reg = <2>; + is-compress-dai; + direction = <1>; + }; + }; + }; + };