From patchwork Tue Mar 23 16:36:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 406913 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp4609094jai; Tue, 23 Mar 2021 09:37:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFGwXhA5gwETuvFZgl3jLId+J4FuNpN7MT0Ubo3efSLGKktf2N5FbVVF47J0+UHUBY+LPu X-Received: by 2002:a17:906:753:: with SMTP id z19mr5733059ejb.447.1616517456204; Tue, 23 Mar 2021 09:37:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616517456; cv=none; d=google.com; s=arc-20160816; b=WIcyjHveDKCLlCauXruVDPd0ytJZpRYKQ4yMONjSE7Hqf8z+m1zuquNUlG72GeG8o4 VMVfidDX7sd59h6jDGOh7/2uyYUfUIjhLfr5APNyGpPjtuIiYVoQT5xPCzS3oEAR5520 ctskzSE6OXSwJ65hbgXgzmOEkkTg4bwXzY/FtDAKjGC4lbkrIY1l18quFzvnXSHHyzF5 +5R5apwY7H5Y5expTlQpac8iFejvWiCgId4MZ7GNg6OhTUJIuFzqRt1UUSeQqimB2tlp JCSoegdk432ctGv0s0Ah9oNKQRCKOR5aFHqzU92BZuHVaLYMHFG5+4kZc18T9KUCVw1G aDfQ== 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; bh=NrlmCB22DompeVVasqtI9klCHz0tWOYqgvRAg0Uh2lQ=; b=JUhio3iL4v7KGFnw7f8ZbmP6ESLF6NtFUHMQ6SMSKd5SuDdRkEcvOubiNMtutQzkZ8 ypdEIlUtmTfwCU6NzsCp6sE49KCMwS/8zpDgkOlGWVTdew3KKct9+SejviER+3LPvsMt RgcUYafZHUXwPIw3WGrUKl1Cv0fE5ejU4+C+ufoDgQyjCG0uexVO0t9kX4cUGFq1/18F b4ZyA6DEL9VbQKo66ZjtvsqMBBoWMuhO7lbL3kAYIHV3z258p7tJtXu+hHC/hCQ+sra6 JLzAOo1tEcZ54cFnWi3U+P6IfcrAEbnKA+QGBNS7hspRe/iAifJCGJeLYbAP4F/m7Os5 hFag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ga37si14306756ejc.4.2021.03.23.09.37.36; Tue, 23 Mar 2021 09:37:36 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233335AbhCWQhO (ORCPT + 6 others); Tue, 23 Mar 2021 12:37:14 -0400 Received: from mail-io1-f50.google.com ([209.85.166.50]:43894 "EHLO mail-io1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233375AbhCWQgm (ORCPT ); Tue, 23 Mar 2021 12:36:42 -0400 Received: by mail-io1-f50.google.com with SMTP id z136so18344116iof.10; Tue, 23 Mar 2021 09:36:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NrlmCB22DompeVVasqtI9klCHz0tWOYqgvRAg0Uh2lQ=; b=MwFtZrAxMJ2juEnpKVv/Ba7O7Vf9no7LZgIUVnPXTlNnvAe8WRABBepVIilwt6Gw04 kBmQ2xT1oUAbri0/CEtjphzLc3wG0vwbFjtvHC/e1oYMiJiuNj8swoH31GZNFohuWklw sGzpHPvBRa6ln19/Q3j9ljVuVIi+438ldjSJ34j3wg3Nx8w7RDmQw884sqos+winW3X9 YsNfxMQudQhQrjFxbXDGr1nJ84/jLtK4n1heeQHRtwiINX8gVEwUCeFkq2EgRJqI0Bfi ebL30CjI/J+SptWWFGdjOEZpq0Z+4dPnPYJwJip73dpJcV9MTXtbL0NhLBA9O4Q1hryT PrmA== X-Gm-Message-State: AOAM531qh01c/KMjeXoQ5TGvvW7szWnNcyaxCZmZAH4Oy/4w3fS60RQi sZnuL7Z8Zt1ccm04juIsRQ== X-Received: by 2002:a05:6638:381c:: with SMTP id i28mr5240391jav.60.1616517401903; Tue, 23 Mar 2021 09:36:41 -0700 (PDT) Received: from xps15.herring.priv ([64.188.179.253]) by smtp.googlemail.com with ESMTPSA id r18sm9771268ilj.86.2021.03.23.09.36.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:36:40 -0700 (PDT) From: Rob Herring To: Mark Brown Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, linux-tegra@vger.kernel.org, Jonathan Hunter , Kuninori Morimoto , Liam Girdwood , Lubomir Rintel , Masahiro Yamada , Sameer Pujar , Thierry Reding Subject: [PATCH 1/3] ASoC: dt-bindings: Move port/ports properties out of audio-graph-port.yaml Date: Tue, 23 Mar 2021 10:36:32 -0600 Message-Id: <20210323163634.877511-2-robh@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210323163634.877511-1-robh@kernel.org> References: <20210323163634.877511-1-robh@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Users of the audio-graph-port schema need to define how many ports and what each port is, so they need to define 'ports' and/or 'port' anyways. Let's drop 'ports' and 'port' from the schema and adjust users to reference audio-graph-port.yaml from a port property. Cc: Liam Girdwood Cc: Mark Brown Cc: Thierry Reding Cc: Jonathan Hunter Cc: Kuninori Morimoto Cc: Lubomir Rintel Cc: Sameer Pujar Cc: alsa-devel@alsa-project.org Cc: linux-tegra@vger.kernel.org Signed-off-by: Rob Herring --- .../bindings/sound/audio-graph-port.yaml | 101 ++++++++---------- .../bindings/sound/marvell,mmp-sspa.yaml | 6 +- .../bindings/sound/nvidia,tegra186-dspk.yaml | 11 +- .../sound/nvidia,tegra210-admaif.yaml | 11 +- .../bindings/sound/nvidia,tegra210-ahub.yaml | 11 +- .../bindings/sound/nvidia,tegra210-dmic.yaml | 11 +- .../bindings/sound/nvidia,tegra210-i2s.yaml | 11 +- .../bindings/sound/renesas,rsnd.yaml | 5 +- 8 files changed, 82 insertions(+), 85 deletions(-) -- 2.27.0 diff --git a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml index 766e9109b2f7..9f68142c9ae3 100644 --- a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml +++ b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml @@ -12,70 +12,59 @@ maintainers: select: false properties: - port: - description: single OF-Graph subnode + reg: + maxItems: 1 + prefix: + description: "device name prefix" + $ref: /schemas/types.yaml#/definitions/string + convert-rate: + description: CPU to Codec rate convert. + $ref: /schemas/types.yaml#/definitions/uint32 + convert-channels: + description: CPU to Codec rate channels. + $ref: /schemas/types.yaml#/definitions/uint32 +patternProperties: + "^endpoint(@[0-9a-f]+)?": type: object properties: - reg: + remote-endpoint: maxItems: 1 - prefix: - description: "device name prefix" - $ref: /schemas/types.yaml#/definitions/string + mclk-fs: + description: | + Multiplication factor between stream rate and codec mclk. + When defined, mclk-fs property defined in dai-link sub nodes are + ignored. + $ref: /schemas/types.yaml#/definitions/uint32 + frame-inversion: + description: dai-link uses frame clock inversion + $ref: /schemas/types.yaml#/definitions/flag + bitclock-inversion: + description: dai-link uses bit clock inversion + $ref: /schemas/types.yaml#/definitions/flag + frame-master: + description: Indicates dai-link frame master. + $ref: /schemas/types.yaml#/definitions/phandle + bitclock-master: + description: Indicates dai-link bit clock master + $ref: /schemas/types.yaml#/definitions/phandle + dai-format: + description: audio format. + items: + enum: + - i2s + - right_j + - left_j + - dsp_a + - dsp_b + - ac97 + - pdm + - msb + - lsb convert-rate: description: CPU to Codec rate convert. $ref: /schemas/types.yaml#/definitions/uint32 convert-channels: description: CPU to Codec rate channels. $ref: /schemas/types.yaml#/definitions/uint32 - patternProperties: - "^endpoint(@[0-9a-f]+)?": - type: object - properties: - remote-endpoint: - maxItems: 1 - mclk-fs: - description: | - Multiplication factor between stream rate and codec mclk. - When defined, mclk-fs property defined in dai-link sub nodes are - ignored. - $ref: /schemas/types.yaml#/definitions/uint32 - frame-inversion: - description: dai-link uses frame clock inversion - $ref: /schemas/types.yaml#/definitions/flag - bitclock-inversion: - description: dai-link uses bit clock inversion - $ref: /schemas/types.yaml#/definitions/flag - frame-master: - description: Indicates dai-link frame master. - $ref: /schemas/types.yaml#/definitions/phandle - bitclock-master: - description: Indicates dai-link bit clock master - $ref: /schemas/types.yaml#/definitions/phandle - dai-format: - description: audio format. - items: - enum: - - i2s - - right_j - - left_j - - dsp_a - - dsp_b - - ac97 - - pdm - - msb - - lsb - convert-rate: - description: CPU to Codec rate convert. - $ref: /schemas/types.yaml#/definitions/uint32 - convert-channels: - description: CPU to Codec rate channels. - $ref: /schemas/types.yaml#/definitions/uint32 - - ports: - description: multi OF-Graph subnode - type: object - patternProperties: - "^port(@[0-9a-f]+)?": - $ref: "#/properties/port" additionalProperties: true diff --git a/Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml b/Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml index 234f64a32184..81f266d66ec5 100644 --- a/Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml +++ b/Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml @@ -9,9 +9,6 @@ title: Marvel SSPA Digital Audio Interface Bindings maintainers: - Lubomir Rintel -allOf: - - $ref: audio-graph-port.yaml# - properties: $nodename: pattern: "^audio-controller(@.*)?$" @@ -54,7 +51,8 @@ properties: - const: rx port: - type: object + $ref: audio-graph-port.yaml# + unevaluatedProperties: false properties: endpoint: diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml index b8645d9c38ac..5f6b37c251a8 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml @@ -17,9 +17,6 @@ maintainers: - Jon Hunter - Sameer Pujar -allOf: - - $ref: audio-graph-port.yaml# - properties: $nodename: pattern: "^dspk@[0-9a-f]*$" @@ -59,14 +56,18 @@ properties: available instances on a Tegra SoC. ports: - type: object + $ref: /schemas/graph.yaml#/properties/ports properties: port@0: + $ref: audio-graph-port.yaml# + unevaluatedProperties: false description: | DSPK ACIF (Audio Client Interface) port connected to the corresponding AHUB (Audio Hub) ACIF port. port@1: + $ref: audio-graph-port.yaml# + unevaluatedProperties: false description: | DSPK DAP (Digital Audio Port) interface which can be connected to external audio codec for playback. @@ -80,7 +81,7 @@ required: - assigned-clock-parents - sound-name-prefix -unevaluatedProperties: false +additionalProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml index 7cee7722df41..19eaacc3f12a 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml @@ -17,9 +17,6 @@ maintainers: - Jon Hunter - Sameer Pujar -allOf: - - $ref: audio-graph-port.yaml# - properties: $nodename: pattern: "^admaif@[0-9a-f]*$" @@ -41,6 +38,7 @@ properties: dma-names: true ports: + $ref: /schemas/graph.yaml#/properties/ports description: | Contains list of ACIF (Audio CIF) port nodes for ADMAIF channels. The number of port nodes depends on the number of ADMAIF channels @@ -48,6 +46,11 @@ properties: in AHUB (Audio Hub). Each port is capable of data transfers in both directions. + patternProperties: + '^port@[0-9]': + $ref: audio-graph-port.yaml# + unevaluatedProperties: false + if: properties: compatible: @@ -92,7 +95,7 @@ required: - dmas - dma-names -unevaluatedProperties: false +additionalProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml index 31f3e51974bb..e568d6c7dddd 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml @@ -17,9 +17,6 @@ maintainers: - Jon Hunter - Sameer Pujar -allOf: - - $ref: audio-graph-port.yaml# - properties: $nodename: pattern: "^ahub@[0-9a-f]*$" @@ -60,12 +57,18 @@ properties: ranges: true ports: + $ref: /schemas/graph.yaml#/properties/ports description: | Contains list of ACIF (Audio CIF) port nodes for AHUB (Audio Hub). These are connected to ACIF interfaces of AHUB clients. Thus the number of port nodes depend on the number of clients that AHUB may have depending on the SoC revision. + patternProperties: + '^port@[0-9]': + $ref: audio-graph-port.yaml# + unevaluatedProperties: false + required: - compatible - reg @@ -77,7 +80,7 @@ required: - "#size-cells" - ranges -unevaluatedProperties: false +additionalProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml index 89f4f471be24..fd275a575055 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml @@ -16,9 +16,6 @@ maintainers: - Jon Hunter - Sameer Pujar -allOf: - - $ref: audio-graph-port.yaml# - properties: $nodename: pattern: "^dmic@[0-9a-f]*$" @@ -60,14 +57,18 @@ properties: on the maximum available instances on a Tegra SoC. ports: - type: object + $ref: /schemas/graph.yaml#/properties/ports properties: port@0: + $ref: audio-graph-port.yaml# + unevaluatedProperties: false description: | DMIC ACIF (Audio Client Interface) port connected to the corresponding AHUB (Audio Hub) ACIF port. port@1: + $ref: audio-graph-port.yaml# + unevaluatedProperties: false description: | DMIC DAP (Digital Audio Port) interface which can be connected to external audio codec for capture. @@ -80,7 +81,7 @@ required: - assigned-clocks - assigned-clock-parents -unevaluatedProperties: false +additionalProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml index 556460332ffb..38e52e7dbb40 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml @@ -16,9 +16,6 @@ maintainers: - Jon Hunter - Sameer Pujar -allOf: - - $ref: audio-graph-port.yaml# - properties: $nodename: pattern: "^i2s@[0-9a-f]*$" @@ -78,14 +75,18 @@ properties: on the maximum available instances on a Tegra SoC. ports: - type: object + $ref: /schemas/graph.yaml#/properties/ports properties: port@0: + $ref: audio-graph-port.yaml# + unevaluatedProperties: false description: | I2S ACIF (Audio Client Interface) port connected to the corresponding AHUB (Audio Hub) ACIF port. port@1: + $ref: audio-graph-port.yaml# + unevaluatedProperties: false description: | I2S DAP (Digital Audio Port) interface which can be connected to external audio codec for playback or capture. @@ -98,7 +99,7 @@ required: - assigned-clocks - assigned-clock-parents -unevaluatedProperties: false +additionalProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml index 2e1046513603..1e0e14e88913 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml @@ -111,7 +111,9 @@ properties: - pattern: '^dvc\.[0-1]$' - pattern: '^clk_(a|b|c|i)$' - port: true + port: + $ref: audio-graph-port.yaml# + unevaluatedProperties: false # use patternProperties to avoid naming "xxx,yyy" issue patternProperties: @@ -257,7 +259,6 @@ required: allOf: - $ref: audio-graph.yaml# - - $ref: audio-graph-port.yaml# - if: properties: compatible: From patchwork Tue Mar 23 16:36:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 406912 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp4609090jai; Tue, 23 Mar 2021 09:37:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5w+Kxlnzn7rOk/4Y7qkDhjXvuWQLM1E+ugbjO8luXGblA3nPqpphM5eY2xWzeby5RWzs4 X-Received: by 2002:a17:906:ccde:: with SMTP id ot30mr5775244ejb.550.1616517455829; Tue, 23 Mar 2021 09:37:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616517455; cv=none; d=google.com; s=arc-20160816; b=bpWTlV5H6KUCvap3ESBs//ZyRRv4FVwSMrNhHfE92H0tTpgyZO4aVXoJLkI1PNyNSY mveD8BoSq8nllZ6WWolJLuFB4a0Ng6T5JZzOyqmNP9vUPYGb1/YYX0yLmTIAWhhbU7uT YYPc3Zcv2j7YozY/fdsKCo3bmr6Mpi7Ql/xo9RwtX+mceT3ViDLecpTXABt2CCuSoZBd ZcSmalilaYKedu69zj/Zxjn/6GKfJCNWXExbVuw3Rc3cHr8kAh4hGYYrzLQZfvWIKTvx mEbo9ushxa6s6CsbLiHnyflNkybqvTYnRz9H9Rli5iVTS3/x219WQGk/exIplcMVe/t7 FCQA== 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; bh=VXRg8g46EQQdfaQQE5j+9aJCuQ11jH3qTJJtKuhoDX4=; b=zO8eMHyXjAEtCfT7JqoOv0BcmPeQjTJ6FsG/4TomXqPRSdi0KFgf04A1Nnb9E46eD0 QR4ACorB7zeD7t0dj2tXMCJ2+ZTpKevI6lsEoaAP5pF5N7GGFNDWbIGZC7xfkNuClRlV PwYPhXOH9N9KmebwtqgyI4wn3LBGOEU1Bp8OkrzbJOIpPhBCVXUmHd7hddky11J/9PGI YOnOkQRNUoTfZRU/N/bfMeYZYDiLy3cWueEss8qPW825KP4KteBQKqoI53/0lZj0kKDF goms6//O3uNvqKH0uDwTHYyY8qo7MLOJsxgjEP6TZtXZ96KSo2HzkVe4Oxkcug4GWVT4 MLgQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ga37si14306756ejc.4.2021.03.23.09.37.35; Tue, 23 Mar 2021 09:37:35 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233361AbhCWQhP (ORCPT + 6 others); Tue, 23 Mar 2021 12:37:15 -0400 Received: from mail-io1-f51.google.com ([209.85.166.51]:35552 "EHLO mail-io1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233127AbhCWQgp (ORCPT ); Tue, 23 Mar 2021 12:36:45 -0400 Received: by mail-io1-f51.google.com with SMTP id x17so7064611iog.2; Tue, 23 Mar 2021 09:36:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VXRg8g46EQQdfaQQE5j+9aJCuQ11jH3qTJJtKuhoDX4=; b=cTkIPFrgBkWDtylgnzlKjNTmGIhkf2Wa2H7I6rnmm45evBWpqIjcobIKbZPmUT0mDi 9ZF0eTOQw1Wdtoe0FOpUJW8SK0IH4sys/mOdRf3hwcGtph4B4nM6dLy3sqStycY4to1U Ik4KOqjf7IhUgfBMJ+yDlHlz0lGbbth2oVXiw+acFd01lS7B5txqsuI1JIVOv2pvm+Ol bvcFOae8WS5sXUvcXUDL+sbDRFD4GnN7FZBIWvACQ4JVD2pxnMj2tWiZ7XGdcjCcjkOK 8LCOR2xt5E+16CylP6WVCDwm178SGWkGLZeiJnX8S7fbQsMLiHGFJ3YWW4tp+/rX2axz wB4g== X-Gm-Message-State: AOAM532Lw3rYzOUBoKIA6lvMleTi6Q7Q5NdlQAohZE9XyDJN6kX/oEll ghmWYQKeCKq/KnSDEE9IbQ== X-Received: by 2002:a6b:b587:: with SMTP id e129mr5090193iof.19.1616517404673; Tue, 23 Mar 2021 09:36:44 -0700 (PDT) Received: from xps15.herring.priv ([64.188.179.253]) by smtp.googlemail.com with ESMTPSA id r18sm9771268ilj.86.2021.03.23.09.36.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:36:43 -0700 (PDT) From: Rob Herring To: Mark Brown Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, linux-tegra@vger.kernel.org, Jonathan Hunter , Kuninori Morimoto , Liam Girdwood , Lubomir Rintel , Masahiro Yamada , Sameer Pujar , Thierry Reding Subject: [PATCH 2/3] ASoC: dt-bindings: Use OF graph schema Date: Tue, 23 Mar 2021 10:36:33 -0600 Message-Id: <20210323163634.877511-3-robh@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210323163634.877511-1-robh@kernel.org> References: <20210323163634.877511-1-robh@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Now that we have an OF graph schema, let's use it for the audio-graph-port schema. Cc: Liam Girdwood Cc: Mark Brown Cc: Kuninori Morimoto Cc: alsa-devel@alsa-project.org Signed-off-by: Rob Herring --- .../devicetree/bindings/sound/audio-graph-port.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.27.0 diff --git a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml index 9f68142c9ae3..43e7f86e3b23 100644 --- a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml +++ b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml @@ -11,9 +11,10 @@ maintainers: select: false +allOf: + - $ref: /schemas/graph.yaml#/$defs/port-base + properties: - reg: - maxItems: 1 prefix: description: "device name prefix" $ref: /schemas/types.yaml#/definitions/string @@ -25,10 +26,8 @@ properties: $ref: /schemas/types.yaml#/definitions/uint32 patternProperties: "^endpoint(@[0-9a-f]+)?": - type: object + $ref: /schemas/graph.yaml#/$defs/endpoint-base properties: - remote-endpoint: - maxItems: 1 mclk-fs: description: | Multiplication factor between stream rate and codec mclk. From patchwork Tue Mar 23 16:36:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 406911 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp4609084jai; Tue, 23 Mar 2021 09:37:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxN2Fagg0877zMGdS+N/XRiOElKajW1WRu8iK0tieAK4SkZd52rCinTn+lUscyOnztFMj4r X-Received: by 2002:a17:906:4955:: with SMTP id f21mr5993766ejt.74.1616517455361; Tue, 23 Mar 2021 09:37:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616517455; cv=none; d=google.com; s=arc-20160816; b=frrLLtGdCg9jO5bx8p+orWdDuSU/1C7VNjczQBZ0f9q6tOjgbB5b0QTo02DJGRp15P 1NfTB6CDo71rTsStQKvUN2vC5LrvATaf4dBYIZxhGr0IsNPFIjGqiXcCMm5DWME6mC20 OIIuzhWOJGrjE0kmwsEkhDUKXwbRvFiTwA4LWknDlM9J0CoBkJ8NRnVt0PQrdsjHlDCJ 2d4hV1awjPOp5XtJln7QcqGAgWaKfLhEagO4jH7llAdYK8ACYUYXrngxTHjQJ3pJXORM CcXbiU4Gp//9Vk8e0SHuwfVbfMIfQ/QrmTaBu2i6ZabiD7nTNZSaZjbT1q1SxaoeXulY CDAQ== 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; bh=a5L9Gfl5bF9CWxUCr8sVjvHZWCe8RrXgbQdGFig1nYs=; b=OgWm7F5xf82yWPvBncxmKEcmSFIyOpXiO5cXr/rZNhGYt8gfuP3QcC9v91VTkIbk9X u/bhwGm6jmQbF+8WxJEJ+gq1ABgI0BSeIprwZuIL9GbW8DoDalbTHU0K6Auvf0Mhqwud UEH//tqWxUQ+IBGpPjrNOsANiWDgV6a3xaBLsuEdRIub6223VonKr8pKfT1w72Tjcb/W oQbyVr+9q9kz18pYltv71ldFA/bW5vckhViQvqt+j4J6oRrBVQnz4a5leg3z9QugD1YF hq02pg5506nCU4rAYGDeEb0pQl5+468ca7CkyKMX8VwswWQNbc2r4hNW0vD27Bc1ru6w 8qQA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ga37si14306756ejc.4.2021.03.23.09.37.35; Tue, 23 Mar 2021 09:37:35 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233364AbhCWQhQ (ORCPT + 6 others); Tue, 23 Mar 2021 12:37:16 -0400 Received: from mail-il1-f177.google.com ([209.85.166.177]:44896 "EHLO mail-il1-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233376AbhCWQgr (ORCPT ); Tue, 23 Mar 2021 12:36:47 -0400 Received: by mail-il1-f177.google.com with SMTP id t6so18727760ilp.11; Tue, 23 Mar 2021 09:36:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a5L9Gfl5bF9CWxUCr8sVjvHZWCe8RrXgbQdGFig1nYs=; b=qzz82X7MbYKXB1iaTh7ZrLqm6aQze9Jxbnb1rUKRTxNe1VZPKjSok9Hb3nN0j+pPAS HqxZKgU6Bbdm3rvFWdMJB0JYGZAv9/0zaYSPMfy4hovzY9Rnd1gnbmKN0ZSJtZcxUh5e NKS9LKbHhztYhrnocsgSJxXfb69skFSa61xeW97hBTZJpRxGhz5oMUb8O46elTsWOaxr 9DWU1WEZQALFBM4sKl8A3fm5PMH0fcCnBsMjr7Gt6yBzXxv1SOjuGZhB2FDtDwNIAHW5 lnBnF8OGjeaBTxl05L6rDjBDoMtU1mRKDPGA1fqlFFtuys692jQsd7grIJ8sSwYiH9rB OOIA== X-Gm-Message-State: AOAM532ROP9U85viZ0shD2c2tzmLxp0/PCbCMNN/iz9d48cgNDdbC9zv O0Pqvwau5KhT8R15QjVZHA== X-Received: by 2002:a92:194a:: with SMTP id e10mr5753956ilm.213.1616517406984; Tue, 23 Mar 2021 09:36:46 -0700 (PDT) Received: from xps15.herring.priv ([64.188.179.253]) by smtp.googlemail.com with ESMTPSA id r18sm9771268ilj.86.2021.03.23.09.36.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 09:36:46 -0700 (PDT) From: Rob Herring To: Mark Brown Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, linux-tegra@vger.kernel.org, Jonathan Hunter , Kuninori Morimoto , Liam Girdwood , Lubomir Rintel , Masahiro Yamada , Sameer Pujar , Thierry Reding Subject: [PATCH 3/3] ASoC: dt-bindings: socionext: Use audio-graph-port schema Date: Tue, 23 Mar 2021 10:36:34 -0600 Message-Id: <20210323163634.877511-4-robh@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210323163634.877511-1-robh@kernel.org> References: <20210323163634.877511-1-robh@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Convert the Socionext audio schemas to use audio-graph-port.yaml schema for 'port' nodes. The number and numbering of port nodes should be documented, but is not. Leave a FIXME here so others don't copy. Cc: Masahiro Yamada Cc: Liam Girdwood Cc: Mark Brown Signed-off-by: Rob Herring --- .../devicetree/bindings/sound/socionext,uniphier-aio.yaml | 8 +++----- .../bindings/sound/socionext,uniphier-evea.yaml | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) -- 2.27.0 diff --git a/Documentation/devicetree/bindings/sound/socionext,uniphier-aio.yaml b/Documentation/devicetree/bindings/sound/socionext,uniphier-aio.yaml index 4987eb91f2ab..55ae198220f4 100644 --- a/Documentation/devicetree/bindings/sound/socionext,uniphier-aio.yaml +++ b/Documentation/devicetree/bindings/sound/socionext,uniphier-aio.yaml @@ -46,11 +46,9 @@ properties: patternProperties: "^port@[0-9]$": - type: object - properties: - endpoint: true - required: - - endpoint + description: FIXME, Need to define what each port is. + $ref: audio-graph-port.yaml# + unevaluatedProperties: false additionalProperties: false diff --git a/Documentation/devicetree/bindings/sound/socionext,uniphier-evea.yaml b/Documentation/devicetree/bindings/sound/socionext,uniphier-evea.yaml index 228168f685cf..48ddfcbbcbae 100644 --- a/Documentation/devicetree/bindings/sound/socionext,uniphier-evea.yaml +++ b/Documentation/devicetree/bindings/sound/socionext,uniphier-evea.yaml @@ -40,11 +40,9 @@ properties: patternProperties: "^port@[0-9]$": - type: object - properties: - endpoint: true - required: - - endpoint + description: FIXME, Need to define what each port is. + $ref: audio-graph-port.yaml# + unevaluatedProperties: false additionalProperties: false