From patchwork Fri Nov 11 11:35:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 625781 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 77485C43217 for ; Fri, 11 Nov 2022 11:36:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233424AbiKKLgN (ORCPT ); Fri, 11 Nov 2022 06:36:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232809AbiKKLgM (ORCPT ); Fri, 11 Nov 2022 06:36:12 -0500 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79F3254B0C for ; Fri, 11 Nov 2022 03:36:11 -0800 (PST) Received: by mail-lf1-x12e.google.com with SMTP id j4so7995011lfk.0 for ; Fri, 11 Nov 2022 03:36:11 -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=DfDjuOFKuz/+4/FzdYKlkZ69vw3btOLkFXgVYX8IZ2M=; b=ZKPSdCvUfQ+4rklV7ZSQx16ScC7V9kumpSo9BjsV6LnyloCLaVJ0dngjVBxr2Hrsi9 CGxOF33E70rP/rRnCRF3ajRGc+9YR3Awm3keIdj2ZgASSdkXf+xl8sNp37DQVJoiI8tG ap1SPP0dszpnLauFUhO8RNiJK4/ulw1xjyuVcsit+/mIRq61CS3VhBuM5IN3jvBqacXC gBYEnGamrMtxDAvrv9u1+auXJglZnqICiRf2Od33ETCZf1X7eYyDmv29e1KWnUvteexq oUdS7E9y7s61aYxZX+VxcgW8PTnTjgh9oUe7om7qXU/acYbauoEfdzIdPE9sv0XiR7QM Jjgg== 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=DfDjuOFKuz/+4/FzdYKlkZ69vw3btOLkFXgVYX8IZ2M=; b=wL+WWK7G7pjQmiuG1dLgHS5uAfdA4rvG+lEA2lke/uLt0nTwX6gVrLMoy7tb/1a+zv s/XQXZqMz5CMmnWp6gwdiUfQVu56hdU75V6MK8TrYoU7QKVazk1uZhF7wzgyLbzfTqO2 +ynI51wQQgttejJsldIUHUwQBDydgMyv3rEv2+amoDYt/pfZ3nU+0gL+4cNEZG9wG1KH fVeT7REa+blnnqffZPtDwWybbYF/VMBsWupjYSwYalEGtvobiksVvIsvimBTViPpgQq3 b2P+REkL7KKUm19WBCEwR+iLQoS3/NaQzK3Fq+EbsdyyF1sfhLN76UNqzNxoWibMpTfB RoMQ== X-Gm-Message-State: ANoB5pkjX4fPSRks/L6el7INGQB7mhGndC+GCgcXNfX6ENzaljDab4jT CEXIOKYUb4b0d4r1WdbcYLkBgA== X-Google-Smtp-Source: AA0mqf7GsQcfMEHOYwYQHodGjXvbjYjvJ5JL9FA5oZ6eESNpG+IMCWd0C8dHIroXSuERvZiHyVxWaQ== X-Received: by 2002:ac2:5b5b:0:b0:4aa:148d:5168 with SMTP id i27-20020ac25b5b000000b004aa148d5168mr545004lfp.561.1668166569837; Fri, 11 Nov 2022 03:36:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:36:09 -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 01/10] ASoC: dt-bindings: qcom, apr: Add GLINK channel name for SM8450 Date: Fri, 11 Nov 2022 12:35:38 +0100 Message-Id: <20221111113547.100442-2-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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On SM8450 and SC8280XP with Qualcomm GPR, the GLINK channel name (qcom,glink-channels) for ADSP is "adsp_apps". Signed-off-by: Krzysztof Kozlowski --- .../devicetree/bindings/soc/qcom/qcom,apr.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml index f47491aab3b1..0a7a34cb2497 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml @@ -58,8 +58,7 @@ properties: qcom,glink-channels: $ref: /schemas/types.yaml#/definitions/string-array description: Channel name used for the communication - items: - - const: apr_audio_svc + maxItems: 1 qcom,intents: $ref: /schemas/types.yaml#/definitions/uint32-array @@ -203,7 +202,15 @@ allOf: - qcom,gpr then: properties: + qcom,glink-channels: + items: + - const: adsp_apps power-domains: false + else: + properties: + qcom,glink-channels: + items: + - const: apr_audio_svc - if: required: From patchwork Fri Nov 11 11:35:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 623868 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 5892FC433FE for ; Fri, 11 Nov 2022 11:36:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233276AbiKKLgO (ORCPT ); Fri, 11 Nov 2022 06:36:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229461AbiKKLgN (ORCPT ); Fri, 11 Nov 2022 06:36:13 -0500 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA2CADE84 for ; Fri, 11 Nov 2022 03:36:12 -0800 (PST) Received: by mail-lf1-x136.google.com with SMTP id a29so7897103lfj.9 for ; Fri, 11 Nov 2022 03:36:12 -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=EB4I3WqkMG0ssDPCVcZC0Ysf3XgZOuA6bOA7vE338fY=; b=DPf9pv4Blnc4lpQ5nhDMbtzrHDpDPhl3i+pMnLqzqRL5Jz1nglnLY8GehobSi+9D+z awTpJAA8Acp0z1pL5cieOf8Bp0ICe2LVVV9l5xwpAhnnrO5k+Ok0CJwSSH13bhltmqNr J6MzlKPHfsLn3n3DwFkJX306e5TmfH4cPOxoKY+uQZesUC3mEfvshqzjVZrNUZRa65ud 71iFSEhEI08KxAWlErEaul7veH7nGWnVsyCn8lZxtDgCrKWorrRBfZjvrlnfYF0XKAJb Ha+Z6G5N9kiqyOGybC26DAyvZocAm29rQD6hpXW0C0NfrGx5apy3JlH5Mm9rjWaxz54H GgDw== 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=EB4I3WqkMG0ssDPCVcZC0Ysf3XgZOuA6bOA7vE338fY=; b=UmKMPoRIRmtCv+4UJ0h7F8eair5mVJF3Nbe/q6LmoeKl9jMKMpHUVZzpdyjndf+zhV 0PEIcRvtJ8KpUsQRV87ycxVSgZyD2aSVK2Utg8Rbpu2jeHwcGlE4q6YpFXakQYN/BIhK 7cB4k4jpUFEEN0651Aj0I9qOkWl98Tcn1aKxDT/clnVl4kFOs8sAuV0r1yVKWC+G5nNh j5UVa46UsRMZM+NkLyud0tN5gldKJAHeKkLrGIljXuPXQPDjb6hPmAttiRmaaTFiQEJh Q6KZWsv4qHyIkx/fIqlKVB/teqlhxoqK4RZQMB+ViL8jMy4cvu6BnfUxQoVHOWnFszzs eKvQ== X-Gm-Message-State: ANoB5pnnbU0IBp6KgdQYPD0BCplwdof964L/uVQE5PeZ0K2ZbNEBnpVB c/BcI2lfrlXaqUSHbBbj19tHTw== X-Google-Smtp-Source: AA0mqf5oOhPgXEjn9JMms/293AHcWVE0ZsLElWgNb5bUqlb4jW7YvVdCR0Xcl91+irLXEz74dxa4zg== X-Received: by 2002:a05:6512:478:b0:4a2:3d2c:34ac with SMTP id x24-20020a056512047800b004a23d2c34acmr568409lfd.41.1668166571013; Fri, 11 Nov 2022 03:36:11 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:36:10 -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 02/10] ASoC: dt-bindings: qcom,apr: Split services to shared schema Date: Fri, 11 Nov 2022 12:35:39 +0100 Message-Id: <20221111113547.100442-3-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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The APR/GPR nodes are organized like: apr-or-gpr-device-node <- qcom,apr.yaml apr-gpr-service@[0-9] <- qcom,apr.yaml service-specific-components <- /schemas/sound/qcom,q6*.yaml The schema for services (apr-gpr-service@[0-9]) already grows considerably and is still quite not specific. It allows several incorrect combinations, like adding a clock-controller to a APM device. Restricting it would complicate the schema even more. Bringing new support for sound on Qualcomm SM8450 and SC8280XP SoC would grow it as well. Simplify the qcom,apr.yaml by splitting the services to a shared file which will be: 1. Referenced by qcom,apr.yaml with additionalProperties:true, 2. Referenced by specific bindings for services with additionalProperties:false (not yet in this commit). While moving the code, add also required 'reg' and 'qcom,protection-domain' to further constrain the bindings. Signed-off-by: Krzysztof Kozlowski --- .../bindings/soc/qcom/qcom,apr-services.yaml | 54 +++++++++ .../bindings/soc/qcom/qcom,apr.yaml | 108 +----------------- MAINTAINERS | 2 +- 3 files changed, 58 insertions(+), 106 deletions(-) create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml new file mode 100644 index 000000000000..290555426c39 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/qcom/qcom,apr-services.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm APR/GPR services shared parts + +maintainers: + - Srinivas Kandagatla + +description: + Common parts of a static service in Qualcomm APR/GPR (Asynchronous/Generic + Packet Router). + +properties: + reg: + minimum: 1 + maximum: 13 + description: | + APR Service ID + 3 = DSP Core Service + 4 = Audio Front End Service. + 5 = Voice Stream Manager Service. + 6 = Voice processing manager. + 7 = Audio Stream Manager Service. + 8 = Audio Device Manager Service. + 9 = Multimode voice manager. + 10 = Core voice stream. + 11 = Core voice processor. + 12 = Ultrasound stream manager. + 13 = Listen stream manager. + GPR Service ID + 1 = Audio Process Manager Service + 2 = Proxy Resource Manager Service. + 3 = AMDB Service. + 4 = Voice processing manager. + + qcom,protection-domain: + $ref: /schemas/types.yaml#/definitions/string-array + description: | + Protection domain service name and path for APR service + possible values are:: + "avs/audio", "msm/adsp/audio_pd". + "kernel/elf_loader", "msm/modem/wlan_pd". + "tms/servreg", "msm/adsp/audio_pd". + "tms/servreg", "msm/modem/wlan_pd". + "tms/servreg", "msm/slpi/sensor_pd". + +required: + - reg + - qcom,protection-domain + +additionalProperties: true diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml index 0a7a34cb2497..9302ffe567d6 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml @@ -80,115 +80,13 @@ properties: '#size-cells': const: 0 -#APR/GPR Services patternProperties: "^service@[1-9a-d]$": type: object + $ref: /schemas/soc/qcom/qcom,apr-services.yaml + additionalProperties: true description: - APR/GPR node's client devices use subnodes for desired static port services. - - properties: - compatible: - enum: - - qcom,q6core - - qcom,q6asm - - qcom,q6afe - - qcom,q6adm - - qcom,q6apm - - qcom,q6prm - - reg: - minimum: 1 - maximum: 13 - description: - APR Service ID - 3 = DSP Core Service - 4 = Audio Front End Service. - 5 = Voice Stream Manager Service. - 6 = Voice processing manager. - 7 = Audio Stream Manager Service. - 8 = Audio Device Manager Service. - 9 = Multimode voice manager. - 10 = Core voice stream. - 11 = Core voice processor. - 12 = Ultrasound stream manager. - 13 = Listen stream manager. - GPR Service ID - 1 = Audio Process Manager Service - 2 = Proxy Resource Manager Service. - 3 = AMDB Service. - 4 = Voice processing manager. - - clock-controller: - $ref: /schemas/sound/qcom,q6dsp-lpass-clocks.yaml# - description: Qualcomm DSP LPASS clock controller - unevaluatedProperties: false - - dais: - type: object - oneOf: - - $ref: /schemas/sound/qcom,q6apm-dai.yaml# - - $ref: /schemas/sound/qcom,q6dsp-lpass-ports.yaml# - - $ref: /schemas/sound/qcom,q6asm-dais.yaml# - unevaluatedProperties: false - description: Qualcomm DSP audio ports - - routing: - type: object - $ref: /schemas/sound/qcom,q6adm-routing.yaml# - unevaluatedProperties: false - description: Qualcomm DSP LPASS audio routing - - qcom,protection-domain: - $ref: /schemas/types.yaml#/definitions/string-array - description: protection domain service name and path for apr service - possible values are - "avs/audio", "msm/adsp/audio_pd". - "kernel/elf_loader", "msm/modem/wlan_pd". - "tms/servreg", "msm/adsp/audio_pd". - "tms/servreg", "msm/modem/wlan_pd". - "tms/servreg", "msm/slpi/sensor_pd". - - allOf: - - if: - properties: - compatible: - enum: - - qcom,q6afe - then: - properties: - dais: - properties: - compatible: - const: qcom,q6afe-dais - - - if: - properties: - compatible: - enum: - - qcom,q6apm - then: - properties: - dais: - properties: - compatible: - enum: - - qcom,q6apm-dais - - qcom,q6apm-lpass-dais - - - if: - properties: - compatible: - enum: - - qcom,q6asm - then: - properties: - dais: - properties: - compatible: - const: qcom,q6asm-dais - - additionalProperties: false + APR/GPR static port services. required: - compatible diff --git a/MAINTAINERS b/MAINTAINERS index 3df7b9a3f5ba..804e4a700477 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16893,7 +16893,7 @@ M: Srinivas Kandagatla M: Banajit Goswami L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported -F: Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml +F: Documentation/devicetree/bindings/soc/qcom/qcom,apr* F: Documentation/devicetree/bindings/sound/qcom,* F: drivers/soc/qcom/apr.c F: include/dt-bindings/sound/qcom,wcd9335.h From patchwork Fri Nov 11 11:35:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 623867 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 EDEA1C4167B for ; Fri, 11 Nov 2022 11:36:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233278AbiKKLgT (ORCPT ); Fri, 11 Nov 2022 06:36:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233491AbiKKLgQ (ORCPT ); Fri, 11 Nov 2022 06:36:16 -0500 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7EFB61B84 for ; Fri, 11 Nov 2022 03:36:13 -0800 (PST) Received: by mail-lf1-x132.google.com with SMTP id bp15so7869451lfb.13 for ; Fri, 11 Nov 2022 03:36:13 -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=64ecADi4+z7+ei9RWWqZDpGuTRxb+PiFx0FpSXFDUNU=; b=B1skD0aIiEDXoYNTZC4cNo2OPm9uTEXucEVa2PacHy0JHSrn2M+ox5xwMmXIn6nCVo TFzi5PBY9stKPEkiwbD9UFiN95jy5vJ+yxkV9TQJmEEwVar1mbjaiWbNtn1HnTjGbIrs yxspfvxtp1ppK0LsA2tI7BDu96Vw6CrD34iY705419dVOo4E7stcs2oDz0tIu0vITF7r ILpu2KY1Bc1T+hrFkyefa8/USprGzt4seQ19PGf0wtB3BVKiNyoAjBPfXmYeqC9dlQLX REKp3Gp8ZHnoVjwuCmoU/0m7FzLleezRxO21QgVofzUFkBFEKtksaSGuyta6iCQnD2PI 6arA== 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=64ecADi4+z7+ei9RWWqZDpGuTRxb+PiFx0FpSXFDUNU=; b=19LU1dgo1Je9mPFXQp/9AUnTJd70m+s2al02jXAeeHZFulqK+EcKF+KhPZ5sp1izoF y8Gm7BcalgPGqIxTn2JMc2e/mVa9bKIoCRk9nlNlp4ZJTMn/66ghv9PlxLr+AMaGCc33 WkjlnyX+O1IRIULBh1nZKONK2pf+Wy5J8HkjyCGAttDAOSUb7d/IrCUAX1lMPOal8qq2 9fQiKfNXL04mj45MMNjmJhFUoZ7H/OjBGePUbtwej81nzEoOzqFA0VsnoNv+YSaNNi8g eZ8XOBCI7bFpauACzZ3rRolTGrUBT8+IwPeUnTGXgLY6LnJOyxX9/s+islbacLlbVdIU Thsg== X-Gm-Message-State: ANoB5plAd0lX4JbyxViAat7Y6MR5NETKA5bmESrTvF0DDxrVh/uDiLFi 8Cj+X46U9tC1+kMxoIFNJbc6tQ== X-Google-Smtp-Source: AA0mqf6nL3sJR7ZROlkLXZr/JaPtxBlekOn176arXd+MeMnB7g1kMnKpchjZqBKlvQWM30pGiB+z9A== X-Received: by 2002:a05:6512:2a87:b0:4ac:5faa:654d with SMTP id dt7-20020a0565122a8700b004ac5faa654dmr525928lfb.684.1668166572207; Fri, 11 Nov 2022 03:36:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:36:11 -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 03/10] ASoC: dt-bindings: qcom, q6afe: Split to separate schema Date: Fri, 11 Nov 2022 12:35:40 +0100 Message-Id: <20221111113547.100442-4-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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The APR/GPR bindings with services got complicated so move out the Q6AFE 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 --- .../devicetree/bindings/sound/qcom,q6afe.yaml | 69 +++++++++++++++++++ .../sound/qcom,q6dsp-lpass-clocks.yaml | 40 +---------- .../sound/qcom,q6dsp-lpass-ports.yaml | 56 +++------------ 3 files changed, 81 insertions(+), 84 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6afe.yaml diff --git a/Documentation/devicetree/bindings/sound/qcom,q6afe.yaml b/Documentation/devicetree/bindings/sound/qcom,q6afe.yaml new file mode 100644 index 000000000000..45ad703d70bd --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,q6afe.yaml @@ -0,0 +1,69 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,q6afe.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Audio FrontEnd (Q6AFE) + +maintainers: + - Krzysztof Kozlowski + - Srinivas Kandagatla + +allOf: + - $ref: /schemas/soc/qcom/qcom,apr-services.yaml# + +properties: + compatible: + enum: + - qcom,q6afe + + clock-controller: + $ref: /schemas/sound/qcom,q6dsp-lpass-clocks.yaml# + unevaluatedProperties: false + description: Qualcomm DSP LPASS clock controller + + dais: + type: object + $ref: /schemas/sound/qcom,q6dsp-lpass-ports.yaml# + unevaluatedProperties: false + description: Qualcomm DSP audio ports + +required: + - compatible + - dais + +unevaluatedProperties: false + +examples: + - | + #include + #include + apr { + #address-cells = <1>; + #size-cells = <0>; + + service@4 { + compatible = "qcom,q6afe"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + + clock-controller { + compatible = "qcom,q6afe-clocks"; + #clock-cells = <2>; + }; + + dais { + compatible = "qcom,q6afe-dais"; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + + dai@22 { + reg = ; + qcom,sd-lines = <0 1 2 3>; + }; + }; + + }; + }; diff --git a/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-clocks.yaml b/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-clocks.yaml index fd567d20417d..aa6c0ecba5cf 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-clocks.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-clocks.yaml @@ -35,41 +35,7 @@ additionalProperties: false examples: - | - #include - #include - apr { - compatible = "qcom,apr-v2"; - qcom,domain = ; - #address-cells = <1>; - #size-cells = <0>; - - service@4 { - compatible = "qcom,q6afe"; - reg = ; - qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; - - clock-controller { - compatible = "qcom,q6afe-clocks"; - #clock-cells = <2>; - }; - }; - }; - - - | - #include - gpr { - compatible = "qcom,gpr"; - qcom,domain = ; - #address-cells = <1>; - #size-cells = <0>; - - service@2 { - reg = ; - compatible = "qcom,q6prm"; - - clock-controller { - compatible = "qcom,q6prm-lpass-clocks"; - #clock-cells = <2>; - }; - }; + clock-controller { + compatible = "qcom,q6afe-clocks"; + #clock-cells = <2>; }; diff --git a/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml b/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml index e53fc0960a14..b202692f1756 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml @@ -150,54 +150,16 @@ additionalProperties: false examples: - | - #include - #include - apr { - compatible = "qcom,apr-v2"; - #address-cells = <1>; - #size-cells = <0>; - qcom,domain = ; - - service@4 { - compatible = "qcom,q6afe"; - reg = ; - qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; - - dais { - compatible = "qcom,q6afe-dais"; - #address-cells = <1>; - #size-cells = <0>; - #sound-dai-cells = <1>; - - dai@22 { - reg = ; - qcom,sd-lines = <0 1 2 3>; - }; - }; - }; - }; - - | - #include - gpr { - compatible = "qcom,gpr"; + #include + + dais { + compatible = "qcom,q6afe-dais"; #address-cells = <1>; #size-cells = <0>; - qcom,domain = ; - - service@1 { - compatible = "qcom,q6apm"; - reg = ; - - dais { - compatible = "qcom,q6apm-lpass-dais"; - #address-cells = <1>; - #size-cells = <0>; - #sound-dai-cells = <1>; - - dai@22 { - reg = ; - qcom,sd-lines = <0 1 2 3>; - }; - }; + #sound-dai-cells = <1>; + + dai@22 { + reg = ; + qcom,sd-lines = <0 1 2 3>; }; }; From patchwork Fri Nov 11 11:35:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 625780 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 805F3C4332F for ; Fri, 11 Nov 2022 11:36:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233321AbiKKLgS (ORCPT ); Fri, 11 Nov 2022 06:36:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233502AbiKKLgQ (ORCPT ); Fri, 11 Nov 2022 06:36:16 -0500 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0CCE7879E for ; Fri, 11 Nov 2022 03:36:14 -0800 (PST) Received: by mail-lj1-x236.google.com with SMTP id a15so4216047ljb.7 for ; Fri, 11 Nov 2022 03:36:14 -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=iso5JkYpW6A/jFTmsvAqcjCGN6f9RRbfN9V5NFqceLU=; b=LXbPVuetFmLz/utAf11ouZCa4kV24qXPKUpeSNelWVl0B6ejXUZpjeKWSlEwluruEV BmZk9vtldLG4J9gWoE2FfuptSUoE0Yd0pjmUlU+d/DYju9SbH+tpUXp+nVWOZ3hvOox5 5kPGHAhHd5Vm6Rnl9eBkGSmnHDA2Z6OUge+sqngmG8beRQBPSdO/RtfiabGBRgS/TP20 XXdF6oSI2nI336sGhLmvjTD43e4Y/mh6M9CqS9P5CV1xtu92Fql7EsRlfEen+R9yvtVP 5mIM4LuKFazVAmQWay6FprRf3g2LJpDAmWlAic48BFqBoyNI4x0FrdhdfSvwzNJn9cP1 ahAw== 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=iso5JkYpW6A/jFTmsvAqcjCGN6f9RRbfN9V5NFqceLU=; b=d+kSKF/AtI5hZsINJs3wgWMCJJ3Ly8j0JRackBG1dXOvkOKxtQ0PxyWbBAxQR3tKR1 zH8xOiarhlKxOb2oJtdYQjqm4GT07RGKs4TBBItyjXPBJTkiiagsDz7MirsyaqJQK+Gd QGZfs0Ie+51ak1rqX6BDkjw7huEWq8ruKyyYSpimlpfL3Umcoj9/tm6qtptRSRLcIhoJ 68vsFMutpHf8DXNIUn2FzkW6tdlXnf2Db77RqPs0Xd7UbXlPJLinTaSAD9e+ywruxeeH mU5U4rpu8aCC109UOxCpoKtmb3gZ3+50KQ0oJyO4JeW4bFPTBXOX7raa2caKupwWlw3u Pz+A== X-Gm-Message-State: ANoB5plVgMnnOXXa4X2OHFC5LXzfSXZlHhzD9dd0pPm4+8tqbMZWc0E2 mJ9KcqR1Q9C08y6hpAkuM9j9sw== X-Google-Smtp-Source: AA0mqf7GKT3b2MaA1VA0vBY4OKP49a33B0Dv599vH91Aps2pvQn2vG05P5Ni1PhiEmUzPc0ZWj9yGA== X-Received: by 2002:a2e:b711:0:b0:278:a461:cb7d with SMTP id j17-20020a2eb711000000b00278a461cb7dmr507235ljo.246.1668166573304; Fri, 11 Nov 2022 03:36:13 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:36:12 -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 04/10] ASoC: dt-bindings: qcom, q6apm: Split to separate schema Date: Fri, 11 Nov 2022 12:35:41 +0100 Message-Id: <20221111113547.100442-5-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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The APR/GPR bindings with services got complicated so move out the Q6APM 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,q6apm-dai.yaml | 19 ++----- .../devicetree/bindings/sound/qcom,q6apm.yaml | 51 +++++++++++++++++++ 2 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm.yaml diff --git a/Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml b/Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml index 24f7bf2bfd95..73a4afad5a74 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml @@ -27,20 +27,7 @@ additionalProperties: false examples: - | - #include - gpr { - compatible = "qcom,gpr"; - #address-cells = <1>; - #size-cells = <0>; - qcom,domain = ; - - service@1 { - compatible = "qcom,q6apm"; - reg = <1>; - - dais { - compatible = "qcom,q6apm-dais"; - iommus = <&apps_smmu 0x1801 0x0>; - }; - }; + dais { + compatible = "qcom,q6apm-dais"; + iommus = <&apps_smmu 0x1801 0x0>; }; diff --git a/Documentation/devicetree/bindings/sound/qcom,q6apm.yaml b/Documentation/devicetree/bindings/sound/qcom,q6apm.yaml new file mode 100644 index 000000000000..7acb832aa557 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,q6apm.yaml @@ -0,0 +1,51 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,q6apm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Audio Process Manager (Q6APM) + +maintainers: + - Krzysztof Kozlowski + - Srinivas Kandagatla + +allOf: + - $ref: /schemas/soc/qcom/qcom,apr-services.yaml# + +properties: + compatible: + enum: + - qcom,q6apm + + dais: + type: object + $ref: /schemas/sound/qcom,q6apm-dai.yaml# + unevaluatedProperties: false + description: Qualcomm DSP audio ports + +required: + - compatible + - dais + +unevaluatedProperties: false + +examples: + - | + #include + + gpr { + #address-cells = <1>; + #size-cells = <0>; + + service@1 { + reg = ; + compatible = "qcom,q6apm"; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + + dais { + compatible = "qcom,q6apm-dais"; + iommus = <&apps_smmu 0x1801 0x0>; + }; + }; + }; From patchwork Fri Nov 11 11:35:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 625779 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 CF7BFC43217 for ; Fri, 11 Nov 2022 11:36:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233528AbiKKLgU (ORCPT ); Fri, 11 Nov 2022 06:36:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233493AbiKKLgQ (ORCPT ); Fri, 11 Nov 2022 06:36:16 -0500 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DACE77879C for ; Fri, 11 Nov 2022 03:36:14 -0800 (PST) Received: by mail-lf1-x12e.google.com with SMTP id d6so7889440lfs.10 for ; Fri, 11 Nov 2022 03:36:14 -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=JR2tPQi4lIHKX8Jfaq8dJOpmO3FJy3VHaO4/AEfLyyE=; b=Zen78NeH4QaZ4C37xoIvhQ+rkugOPSj2xLWQO0jMtAR10MTBxdUPddsYgqGd5Je4Oy q+dpZwHQLC+bS0QHZzF4ae0SNoC1tF+8A1ypy5On+qA53Z8VGhMdgjoAEkCocn7zUQT5 SG8rNiFwsv4cl5klZG6N4IN0xWiZO2T/E1eZm9n2v4kVTAxFJJ4vfAfNndqCCF5tLzdc MYCMX9NmUbxx3aVqY8JIHqhK9N/h24J7D0Yg8dRJPHZ536hgiiffs7Vz9XMfRa/ITYBy vb9xR1vqNVK/L0WsrgkciYhjwbAYxtFqcolcpsyYBMjC5qadFTxlhRFx1p5A8QuSpYyE dWqg== 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=JR2tPQi4lIHKX8Jfaq8dJOpmO3FJy3VHaO4/AEfLyyE=; b=iYhEdryebs5gQDcLiRZb3uyThxdWfFFQCvMTYGlmT89X/+j5lWbhCwRhr5802i0m47 f/E4aOO+d9QesdEyJhlg827CwJUVjrp3B0yRjLlZCR+8aqdWhLpHuMssviLH90r6H/dc lMjku9UW19DozT74GX+XvFeikYQzxSZ9xpDQsE50ASy5GUEBGPCrgk7efh8MmE45OSUe sigKpkSnEKrSU7vUyN64zbSjt+/QHaZ9waaExs+qFwKIqnlfOziui5xc6zUOoYbyv9MF /sdDleMQ7VsRkp4B4/+YEtM2X9osnOtrVNNwfCR0Iv6QySMPzZkZLFyMfhzDaXkemcu+ Wbqg== X-Gm-Message-State: ANoB5pm8pZ6+7ggQRGgd9P/zOFUVIeauLCt/t98g4rg1wePHKfVmPiXM +RwrAPkNoQJbZEfVwWvy8aMlsg== X-Google-Smtp-Source: AA0mqf4QA2XX4+OsUF0J/6zszV+xaUirjx/TwI/UH/2+JFmqNiYLrNcrgCMLZKVvAV+DqdiDmATXwg== X-Received: by 2002:ac2:5ccb:0:b0:4a2:4f74:f47c with SMTP id f11-20020ac25ccb000000b004a24f74f47cmr556364lfq.367.1668166574452; Fri, 11 Nov 2022 03:36:14 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:36:13 -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 05/10] ASoC: dt-bindings: qcom, q6adm: Split to separate schema Date: Fri, 11 Nov 2022 12:35:42 +0100 Message-Id: <20221111113547.100442-6-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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The APR/GPR bindings with services got complicated so move out the Q6ADM 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,q6adm-routing.yaml | 22 ++------ .../devicetree/bindings/sound/qcom,q6adm.yaml | 51 +++++++++++++++++++ 2 files changed, 54 insertions(+), 19 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.yaml diff --git a/Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml b/Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml index d0f7a79e240a..b7ed2d3f21f9 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml @@ -30,23 +30,7 @@ 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>; - }; - }; + routing { + compatible = "qcom,q6adm-routing"; + #sound-dai-cells = <0>; }; diff --git a/Documentation/devicetree/bindings/sound/qcom,q6adm.yaml b/Documentation/devicetree/bindings/sound/qcom,q6adm.yaml new file mode 100644 index 000000000000..fe14a97ea616 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,q6adm.yaml @@ -0,0 +1,51 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,q6adm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Audio Device Manager (Q6ADM) + +maintainers: + - Krzysztof Kozlowski + - Srinivas Kandagatla + +allOf: + - $ref: /schemas/soc/qcom/qcom,apr-services.yaml# + +properties: + compatible: + enum: + - qcom,q6adm + + routing: + type: object + $ref: /schemas/sound/qcom,q6adm-routing.yaml# + unevaluatedProperties: false + description: Qualcomm DSP LPASS audio routing + +required: + - compatible + - routing + +unevaluatedProperties: false + +examples: + - | + #include + + apr { + #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>; + }; + }; + }; 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: 623866 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 A6708C433FE for ; Fri, 11 Nov 2022 11:36:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233679AbiKKLgj (ORCPT ); Fri, 11 Nov 2022 06:36:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233629AbiKKLgR (ORCPT ); Fri, 11 Nov 2022 06:36:17 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EEB2C7B21D for ; Fri, 11 Nov 2022 03:36:15 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id r12so7952279lfp.1 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=2MWWM1Dnn11Jq+KUyEHaVsKB/ka70VWaKDcG46SMfhTsu2bXk51zdfrBnRhfcYy2sK lpU6b7n3DGYL/+zoj0YGfDUtwAtFxbHEi/ySR469ptO1hKuXRP0ZMlGomuh1dCCXZFTA FTnUWKedYY/DvUopGB08eSl5rzo45FefqOjI2fF6pMY/l9i7XEDWCgVaP9fEzie0Un1T JvRUi+B3mzc4jERNV3kAxUuBhYuh7toi0WqKr1wi4brwg21zSvi9Lo7rH+rbSZ7uNRiM mP2lf418JUF+PQ9W/Qp2GPoRin1IhHwzbOZk+FHHnk6XZ1H4CRwuPjGEQC9eeMVxfh63 ZFNQ== X-Gm-Message-State: ANoB5pkvaIEYPeoJCFsxUAnYGiRkkQYV0Ag+p6emjpyKpJ9VbxMXAACW h0Q6qOdPkFTzk0Gt7Q6jSg0LxnfZ01en5Q== X-Google-Smtp-Source: AA0mqf4HVcEm/1Udsx3H6f2tWIC7EjVaSIWojrY2XDxS5usQfZ7iO5evHyW0tJfWapeUrRYL7c7mYg== 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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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>; + }; + }; + }; + }; From patchwork Fri Nov 11 11:35:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 625777 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 EA86AC43217 for ; Fri, 11 Nov 2022 11:37:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233615AbiKKLhI (ORCPT ); Fri, 11 Nov 2022 06:37:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233604AbiKKLgi (ORCPT ); Fri, 11 Nov 2022 06:36:38 -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 55AEF69DD2 for ; Fri, 11 Nov 2022 03:36:18 -0800 (PST) Received: by mail-lf1-x135.google.com with SMTP id f37so7910030lfv.8 for ; Fri, 11 Nov 2022 03:36:18 -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=jF161Eg7n0UygRaLy1ADIgA+vp2I1IUSYtCaqNOSavw=; b=Ue597laUUdsvlmSluFDi0bDqOMbRTooWeh6UN8ZgrT87+FHaVXYCQwDXR5gdrnb4bc 1VqBB23tDxUYH3WxNghQdzLGxjXN/LEy+ZsBCFx7f6CRPMqQhqoosz2g02ZFldN+P9Pe BtZYZ/cuCVdx0vRKoRCsRN2RgzSmvXQimi8bxUFfompey0Mh+6j/ZI/w+dYp1+/xI1qV 3D9JzkhL+ROSx3YTROf0xLTfS+GHMrYJF3urc6lI47BjIF9Lcn2otKRecXGKG6WDL7lk jScQJbJeB24aYj3RTuxkX1mKLF1U+oG9uSeicF9aMbPJu70A9dYCHA6pYeRuL/4b186c skbw== 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=jF161Eg7n0UygRaLy1ADIgA+vp2I1IUSYtCaqNOSavw=; b=zaymEKED+2aZwGQbTOL+Iq5LRVP32dc5M2EcmDw+HwpDhV0lPXdOWFvDyCP6/YUUJ4 +97NbbIMnrnZsir1G7Oqbh8T750Qu1OtmGzYS9vGBO1LiFtdOz2OwJxtFPhNmvQ0O3Vu OCLoDUIx/ewnvp2aYlbZzStRwhIwR74R0eXlP05mc+xAZ9pa9GiWeZ4Piu0/Lh0wYpA+ oxLYwxisNyYKZh7YhaYY3FXjgFO0v1H1VzWnOj5HOK/rDAMDdNU5Sa61tH6PxCmOlHSx jj377uUNrueU4zV+SLdxuONWEtkY8JqnTkZBhjcZVNL6T1kLfcu2iUX5K9kypE2vOHrh KYJw== X-Gm-Message-State: ANoB5pmD2nRiHg4q2vOaqsC1oYztOfaUDoIcPQkhOjjFZUZnvNSMBhS4 Qq/tHUIHER40aeDEvdqrImg1Og== X-Google-Smtp-Source: AA0mqf5qlyYZMSvN0eDxF/3Qk/qPFehRkTqOyBDOfWSG28mnuUyS2f/a5pudHk2doI3/ZaSqE7dT7g== X-Received: by 2002:ac2:5396:0:b0:4a2:3a4b:5012 with SMTP id g22-20020ac25396000000b004a23a4b5012mr555125lfh.526.1668166576691; Fri, 11 Nov 2022 03:36:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:36:16 -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 07/10] ASoC: dt-bindings: qcom, q6prm: Split to separate schema Date: Fri, 11 Nov 2022 12:35:44 +0100 Message-Id: <20221111113547.100442-8-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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The APR/GPR bindings with services got complicated so move out the Q6PRM service to its own binding. Previously the compatible was documented in qcom,apr.yaml. Signed-off-by: Krzysztof Kozlowski --- .../devicetree/bindings/sound/qcom,q6prm.yaml | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6prm.yaml diff --git a/Documentation/devicetree/bindings/sound/qcom,q6prm.yaml b/Documentation/devicetree/bindings/sound/qcom,q6prm.yaml new file mode 100644 index 000000000000..f6dbb1267bfe --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,q6prm.yaml @@ -0,0 +1,50 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,q6prm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Proxy Resource Manager (Q6PRM) + +maintainers: + - Krzysztof Kozlowski + - Srinivas Kandagatla + +allOf: + - $ref: /schemas/soc/qcom/qcom,apr-services.yaml# + +properties: + compatible: + enum: + - qcom,q6prm + + clock-controller: + $ref: /schemas/sound/qcom,q6dsp-lpass-clocks.yaml# + unevaluatedProperties: false + description: Qualcomm DSP LPASS clock controller + +required: + - compatible + - clock-controller + +unevaluatedProperties: false + +examples: + - | + #include + + gpr { + #address-cells = <1>; + #size-cells = <0>; + + service@2 { + reg = ; + compatible = "qcom,q6prm"; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + + clock-controller { + compatible = "qcom,q6prm-lpass-clocks"; + #clock-cells = <2>; + }; + }; + }; From patchwork Fri Nov 11 11:35:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 625778 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 B542EC433FE for ; Fri, 11 Nov 2022 11:36:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231478AbiKKLgm (ORCPT ); Fri, 11 Nov 2022 06:36:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233481AbiKKLgV (ORCPT ); Fri, 11 Nov 2022 06:36:21 -0500 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5595C54B12 for ; Fri, 11 Nov 2022 03:36:18 -0800 (PST) Received: by mail-lj1-x234.google.com with SMTP id h12so4216412ljg.9 for ; Fri, 11 Nov 2022 03:36:18 -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=oEBoGr3X7IB7lANWmyJ0vo8TD49udt1SAuFDZMae92Y=; b=WFz3Cp9sXDJehJxF/+D7tFxIq7jlzy31R2WdUCszgtRsVgRyRjUzckqjFh4mIRrlW6 tcs8Me2SpXcBkc4YiiIM+sMTOGQEyXWMmFgvcr1ncAIFNDr8QBwQ94LrnpQrF+KED1Tc NSlMWNiVFTJ/nZz66HKF1bcXMtcvwAZXkJYqaBRqTt2K6gaNiLEiJgadwb1ne6Suv0cQ 8U+WdV6TuX+fbdycyVV1vwfEpfiuynzPeGc6JKpATl8RY2nb8BSYAsJYc/jB0UA1lM8Y c+kUWFWpwcuslThBCVXMAG8okz3wWrX0TnCaeuCXonhyZ5/90i7Ufh2NVxhZuh9locJf spKA== 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=oEBoGr3X7IB7lANWmyJ0vo8TD49udt1SAuFDZMae92Y=; b=i/uRfxbgNLbEbb2ygkod++E6g0MDblcfDFx7i740LyuC4eA7EPQS5QR2d4sJ3Dl5SJ x8fiVSi3V9lt3Y3DIbQ8A709s8zszt0vHQ6CYsAR4EbJGG5fPww2L/HAeP6mzKCHPZgf 8KxBlED1+0C2TqrRByNF3bIpNF7qtjnwwGi3F1qkyk2fgtVB7CuBOgyLM5Pz5y0Kl6fU knnKS7gOArnDzPP73OzfYIMwAJEOl99m5vxJo/18WrdpFUeKSozN8XBVBS+xXedO/OFD zFqWat3bfLjTmy7jqjOSELJoQzjWQcBMe3jsRkGXETQ+6D+9MAlXsGzTL+/sq26IwEWB naaQ== X-Gm-Message-State: ANoB5pl3vvoNUAiq1Z/BR6c1pkr09d1vosM2mOQ7QWqSw5Ntm9UHdCLn Ucgo+zq+r35A2Dj7GbiCXmWz9Q== X-Google-Smtp-Source: AA0mqf79IMhFGWeei5VfHf+fjaEoxMdTeoHoRdkihJODjwuK6Lm+qK9xpde8XmV2xJ5rMF4kDArDTA== X-Received: by 2002:a2e:b056:0:b0:278:a7de:54e6 with SMTP id d22-20020a2eb056000000b00278a7de54e6mr530694ljl.367.1668166577831; Fri, 11 Nov 2022 03:36:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:36:17 -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 08/10] ASoC: dt-bindings: qcom,q6core: Split to separate schema Date: Fri, 11 Nov 2022 12:35:45 +0100 Message-Id: <20221111113547.100442-9-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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The APR/GPR bindings with services got complicated so move out the Q6Core service to its own binding. Previously the compatible was documented in qcom,apr.yaml. Signed-off-by: Krzysztof Kozlowski --- .../bindings/sound/qcom,q6core.yaml | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6core.yaml diff --git a/Documentation/devicetree/bindings/sound/qcom,q6core.yaml b/Documentation/devicetree/bindings/sound/qcom,q6core.yaml new file mode 100644 index 000000000000..e240712de9ca --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,q6core.yaml @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,q6core.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Audio Core (Q6Core) + +maintainers: + - Krzysztof Kozlowski + - Srinivas Kandagatla + +allOf: + - $ref: /schemas/soc/qcom/qcom,apr-services.yaml# + +properties: + compatible: + enum: + - qcom,q6core + +required: + - compatible + +unevaluatedProperties: false + +examples: + - | + #include + + apr { + #address-cells = <1>; + #size-cells = <0>; + + service@3 { + compatible = "qcom,q6core"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + }; + }; From patchwork Fri Nov 11 11:35:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 623865 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 F188DC4332F for ; Fri, 11 Nov 2022 11:37:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230270AbiKKLhH (ORCPT ); Fri, 11 Nov 2022 06:37:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233689AbiKKLgk (ORCPT ); Fri, 11 Nov 2022 06:36:40 -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 DAD6B7BE59 for ; Fri, 11 Nov 2022 03:36:19 -0800 (PST) Received: by mail-lf1-x12f.google.com with SMTP id p8so7886772lfu.11 for ; Fri, 11 Nov 2022 03:36:19 -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=IE0XX0QezEMZ/aKTh/HTXAG3MFrHP8nMS3WLzX4ya5U=; b=s2gI4VxUfsIKi0pZhF8MIqrbWNCRSvmA7zTOsT2Vi56Km8Hv93CZubsQjOikGkw0Wg 9zkS5VWib0yrQg5nMWImgwH5ZCZ+biHj+ayJLw4m3VjPx+EBus/mYaPI4myaYuA89if6 qXJjpQcXUCJ6NllRC+dSxXhOSNtosHTJyFpcLrCL/frgy4GhO3SkUPLdPtHiaMDXw1cn 11Vbyx806/xRyLzJZVoVsWPcfPvtjtQJshR+HfSIG1ji0K14Bj83yf0RwySzaH3eLIQL 8xvMkBEWTz1+BPLIAAS+kd34b/wxoKW35i2yMi9GW4CCY0pHLP8hEZ06/WM0cVKqOoYj HmiQ== 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=IE0XX0QezEMZ/aKTh/HTXAG3MFrHP8nMS3WLzX4ya5U=; b=B+zidkOA+Y0XoaRMwB2R7o+GRYkkaXP4jrVVN/ZamhenLazleP/Fnd509QMxP56ZJv M/zXSOnaJupyrgYipW9VpVjw6GzS4Y7jotF6ggHi5MRuL7muU6wvl91Ma02i5GGY/J26 lnBSg9/Bs3IfOG1uhZUe6ANwq70747RhVyBIBEJ+ckm87GrzchXFVqkeJtCKAWoiLFoA oP01edAjEhNugZhmdpTraUoa+Rsz52Cml1m3LmMDWwcpi7ILyxZAKlrVufSFr6vuDGOg LNO0r/Vtl8Y0gXFnIzic3F+I5xZ9JszYJoF61xE+T/4JZgH155lWuwlVnVF+xSDLOkj2 lQVg== X-Gm-Message-State: ANoB5pkzzWUVEG8g0+ZlqlB/yQD66WNY3PyKQpwTd9P83XADIGrwAsMF 6XeIt5vozP89j+XybQUvtunh0g== X-Google-Smtp-Source: AA0mqf6AKOgt1YOV3uAwJC6iu43pL9hvefRdn2Rq9U+9FjpDIzZP5m5frQd5HcLJuLfQGTLfRaHouQ== X-Received: by 2002:ac2:5ded:0:b0:4a2:b387:8b19 with SMTP id z13-20020ac25ded000000b004a2b3878b19mr568219lfq.284.1668166578907; Fri, 11 Nov 2022 03:36:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:36:18 -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 09/10] ASoC: dt-bindings: qcom,q6apm-lpass-dais: Split to separate schema Date: Fri, 11 Nov 2022 12:35:46 +0100 Message-Id: <20221111113547.100442-10-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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The Qualcomm DSP LPASS Audio DAIs are a bit different than Qualcomm DSP Audio FrontEnd (Q6AFE) DAIs - they do not use children nodes for each DAI. None of other properties from qcom,q6dsp-lpass-ports.yaml apply here as well, so move the qcom,q6apm-lpass-dais compatible to its own binding. Signed-off-by: Krzysztof Kozlowski --- .../bindings/sound/qcom,q6apm-lpass-dais.yaml | 32 +++++++++++++++++++ .../sound/qcom,q6dsp-lpass-ports.yaml | 1 - 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm-lpass-dais.yaml diff --git a/Documentation/devicetree/bindings/sound/qcom,q6apm-lpass-dais.yaml b/Documentation/devicetree/bindings/sound/qcom,q6apm-lpass-dais.yaml new file mode 100644 index 000000000000..4b3ce779206b --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,q6apm-lpass-dais.yaml @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/qcom,q6apm-lpass-dais.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm DSP LPASS (Low Power Audio SubSystem) Audio Ports + +maintainers: + - Krzysztof Kozlowski + - Srinivas Kandagatla + +properties: + compatible: + enum: + - qcom,q6apm-lpass-dais + + '#sound-dai-cells': + const: 1 + +required: + - compatible + - '#sound-dai-cells' + +additionalProperties: false + +examples: + - | + dais { + compatible = "qcom,q6apm-lpass-dais"; + #sound-dai-cells = <1>; + }; diff --git a/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml b/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml index b202692f1756..d8ebf2e528d2 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml @@ -16,7 +16,6 @@ properties: compatible: enum: - qcom,q6afe-dais - - qcom,q6apm-lpass-dais '#sound-dai-cells': const: 1 From patchwork Fri Nov 11 11:35:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 623864 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 DB5AFC433FE for ; Fri, 11 Nov 2022 11:37:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233491AbiKKLhN (ORCPT ); Fri, 11 Nov 2022 06:37:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232583AbiKKLgm (ORCPT ); Fri, 11 Nov 2022 06:36:42 -0500 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F07A7B20D for ; Fri, 11 Nov 2022 03:36:20 -0800 (PST) Received: by mail-lf1-x12b.google.com with SMTP id be13so7938497lfb.4 for ; Fri, 11 Nov 2022 03:36:20 -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=4+DBxwlSpUyj8lGt+IYb/lufNjAzDcecLdKZpM26350=; b=xVCLNlN9wYe+LKsEBRt77PDlL/q8IAYF63JYB5lSSfMFs84t+7wF58gGCa/h9z81Xa 2U0T8RbljMgHOwvugy2GY7dPPrjnhD9j7mUacdYMcZeS7/3II5eQ/ygKB3bNAtqhLyE+ +T0VxAZoWW8T1QN6NSsd66Cz0fA8ORrYx3Hlx1x04L070iJb1LhD/bTPrpdkzUgnAJi9 lv6dvkp20qsj+JrFUekCd1oH1DCybnMVvd+GL+fzgMSPvYPKQ4A41IyqhPJJUgQnXf71 5yBDqGUTGX2ANXztXXctpT6I4yNpTr6cXL6W6IlQebPwqLWj4ZJg5dimgtf3vCbc4Pu1 TOWA== 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=4+DBxwlSpUyj8lGt+IYb/lufNjAzDcecLdKZpM26350=; b=Vc/KvZ5lgnu4WMQs35Ke/9fa879tJyOKg69jiuxAb+pHORwoa0eBl5qXijlYs8oseq 31vY/PTbjKh9fJWHULvJoiSS0x0GN+DsXFWq3f3FRYBuo2d9iBQfKAuMIe3dbHK5zP9G Kvz8YxY+jjsMI85KXd63k3p7T6xplr8Z2AGwP1rg7a1IpkVa0iPMIcli325EQ7sXi2KG fhF6FyfFGdE9+4YkO843LGXFv+HTws1P3TR1Yd/jw6eZvHv8LbZpL95KFhQu+bXzEYZr m/yfGNllvxqrKmv6y3YsFGYCrJNpvhBYi/jbzwCx3VMvTRhgvvQgqHXvjqC84YJoza+h rFyQ== X-Gm-Message-State: ANoB5pkkXDwDVVZStk/Z6Tui1KsfimI4UhVj4dqGlQ1217jgdfD/9bSD ibbYV1qG6g80lIkqWYTcch2Sfw== X-Google-Smtp-Source: AA0mqf7ZN5G00D3X6MrSb4PtP9e42Wf0Nocjk8XCHEej02zqN2gKndXuNJE3QsxPmkI8wRnr0T37pw== X-Received: by 2002:a05:6512:3e1a:b0:4b0:25f9:14e6 with SMTP id i26-20020a0565123e1a00b004b025f914e6mr577507lfv.604.1668166580125; Fri, 11 Nov 2022 03:36:20 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:36:19 -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 10/10] ASoC: dt-bindings: qcom,q6apm: Add SM8450 bedais node Date: Fri, 11 Nov 2022 12:35:47 +0100 Message-Id: <20221111113547.100442-11-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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On SM8450 and SC8280XP, the Q6APM is a bit different: 1. It is used as a platform DAI link, so it needs #sound-dai-cells. 2. It has two DAI children, so add new "bedais" node. Signed-off-by: Krzysztof Kozlowski --- .../devicetree/bindings/sound/qcom,q6apm.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/qcom,q6apm.yaml b/Documentation/devicetree/bindings/sound/qcom,q6apm.yaml index 7acb832aa557..cd434e8268ce 100644 --- a/Documentation/devicetree/bindings/sound/qcom,q6apm.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,q6apm.yaml @@ -18,14 +18,24 @@ properties: enum: - qcom,q6apm + bedais: + type: object + $ref: /schemas/sound/qcom,q6apm-lpass-dais.yaml# + unevaluatedProperties: false + description: Qualcomm DSP audio ports + dais: type: object $ref: /schemas/sound/qcom,q6apm-dai.yaml# unevaluatedProperties: false description: Qualcomm DSP audio ports + '#sound-dai-cells': + const: 0 + required: - compatible + - bedais - dais unevaluatedProperties: false @@ -41,11 +51,17 @@ examples: service@1 { reg = ; compatible = "qcom,q6apm"; + #sound-dai-cells = <0>; qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; dais { compatible = "qcom,q6apm-dais"; iommus = <&apps_smmu 0x1801 0x0>; }; + + bedais { + compatible = "qcom,q6apm-lpass-dais"; + #sound-dai-cells = <1>; + }; }; };