From patchwork Tue Nov 15 12:02:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 20338 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2679244wru; Tue, 15 Nov 2022 04:05:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf7+Nu9BqLTaWZlVqSbcAK+WCHFyPhzANpT4yPhvXhiQQmdaf7B+B3k20hIvqzIzB/tS+Nxg X-Received: by 2002:a17:906:a181:b0:79b:f7d6:c2aa with SMTP id s1-20020a170906a18100b0079bf7d6c2aamr13346382ejy.310.1668513922070; Tue, 15 Nov 2022 04:05:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668513922; cv=none; d=google.com; s=arc-20160816; b=blT8j+bkNLNbIjpwOUp1wBLao1ZuGkSWwv7mKWIgFeue3tUiAkDaev8hRhlkvjNeXS Pwd/96XSr5MSK4g7G7p99kSOJsWysJum6YP6DqQSn38fV0gJPjmuvk8m3isqYkJfLWWY Uu83/DAfpCrv6NWvWpVKwQaH2YFQDs1Cb659DcG2q5zdfgCOd4V/3qOlo++dZFymSpgW On7072kIj3gkCx0zpr1MTXLVZ6XymZkphm+B2nK653j8AcSQgdFVj9p/RcdDrKkfBuB6 tseuTvnM6zQmcce/nIG5Tfug29PGZ7huc+k2XAq1rzpffavtwUrXYSWAyftj+HdWhwu+ YSwQ== 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=RcmcIw/aoAY1FZoJ9/HC3cRwB98JOHeI75J1MhSGCew=; b=KRaCYbfh+enBi/wiSoXhlASx4DOPbKhZqjf3ZaNsP03N5GRUTs49ujBC3bDlQBuN4A iXdDe38VrbbNnnbki6AG+1LhSVEYuvS7Ii7REfbKz9mjKhjBw+QEWKGAv+69wbB+ju88 P38+mMeebxEm4sfPdlsNepm54C+47YTPZ8v+fQVf3gmMpoRXrvPp+ePTAMkaKSYgr2GC XHUd7IP0+yNKU2S+vXLfGPmfc2cUo2fsf2Xn316YdezxCHTr2qr61cfMQqYSjHIipBi7 i9i9LB7U+Zjb8vA22ypkgS6NYCfhLEnbTXEE2jbEXHetemha7+op/hq2gB18v22cOQgd LDmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g+qfShLU; 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 w2-20020a056402268200b0046402025290si12124968edd.387.2022.11.15.04.04.57; Tue, 15 Nov 2022 04:05:22 -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=g+qfShLU; 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 S237647AbiKOMDn (ORCPT + 99 others); Tue, 15 Nov 2022 07:03:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237986AbiKOMDF (ORCPT ); Tue, 15 Nov 2022 07:03:05 -0500 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2340126111 for ; Tue, 15 Nov 2022 04:02:55 -0800 (PST) Received: by mail-lf1-x12f.google.com with SMTP id j4so24138572lfk.0 for ; Tue, 15 Nov 2022 04:02:55 -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=RcmcIw/aoAY1FZoJ9/HC3cRwB98JOHeI75J1MhSGCew=; b=g+qfShLUo2LcjPN37+QJFvvM6HOfjcpebHHs3phTNmQ++jagmE2hVKe059ZJ8eIhJo uA1SJ9LaL+Ts/TvM8zdLa4hIU4rtoha67wRcaqNCsUPRiySxf8oYdcDYyxJuxn+HdnYM WaIR/Shar2GFUkui1AzEJP+eaNZpSN0S3WQ5R6/0nuyMXydR0sINrbs42DuR0n9W7G7j WeId26+kF7e9mX7wqAfpyXIaNzW2d3HRowZRm2nFAhg6kM0wF+go8lTXnxi1ZZx9rHsu 3hiEtpHqW2tFGNu6oruAbQemBXPuINDtuCAPSmcRA5yWBI9vSgoy5y5T4/7+o5R6LvqM ishA== 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=RcmcIw/aoAY1FZoJ9/HC3cRwB98JOHeI75J1MhSGCew=; b=vwLljfC27SNskTjiBrqlNtF2AEx9jptizE4Ao0sdNywgRDeyhC28RcSVCd/34g/Zwz ozAqwdNJXWqSIWdpVNFy4AZ7TFZZ13BRAyE01ijK522/PkGAVNhZlHWBMhMv5U+cU9ah 0p72Z6APsNHQnkzDwCQRijuZHGSSTqnjW3wlXr9p7UqcEiNBOWwNltjbyuHlr3Ii3ryd 0v8ae2rtZybMQmCbox8QtoUfKLvtBZeH5NjkmZxVUC2Ipo8PqqhyZBNbNL7KtOgLTROd lyMJN1ZwKlvVxTtb1soAQnUVCoFw4wqXR6zAqof3hGNwiVPdM8l2kXmHnlIRs9QMx8Tg ckOg== X-Gm-Message-State: ANoB5pmw73vgiqUrEGLDX4ZRgQigdRoHWcNV2ee5qNyj6J/Ut96mnDuH +2btgG6mU9xlBreh79N8zw54PQ== X-Received: by 2002:a05:6512:313b:b0:4a2:27f0:46a5 with SMTP id p27-20020a056512313b00b004a227f046a5mr5943056lfd.611.1668513774167; Tue, 15 Nov 2022 04:02:54 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id i13-20020ac25d2d000000b004b0b2212315sm2176233lfb.121.2022.11.15.04.02.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 04:02:53 -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: Krzysztof Kozlowski , quic_srivasam@quicinc.com, quic_plai@quicinc.com Subject: [PATCH v2 07/11] ASoC: dt-bindings: qcom,q6asm: Split to separate schema Date: Tue, 15 Nov 2022 13:02:31 +0100 Message-Id: <20221115120235.167812-8-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115120235.167812-1-krzysztof.kozlowski@linaro.org> References: <20221115120235.167812-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?1749563654408073124?= X-GMAIL-MSGID: =?utf-8?q?1749563654408073124?= 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 Reviewed-by: Rob Herring --- Cc: quic_srivasam@quicinc.com Cc: quic_plai@quicinc.com --- .../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>; + }; + }; + }; + };