From patchwork Wed Mar 31 14:27:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 412880 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp538504jai; Wed, 31 Mar 2021 07:28:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxykfDq7LKRIX03OeF7iXyXOEcz+MAZaAmLjErS4pIQUjRebckPwIj+4/dBhHemWiSRM7yx X-Received: by 2002:a17:906:3544:: with SMTP id s4mr3900209eja.73.1617200919504; Wed, 31 Mar 2021 07:28:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617200919; cv=none; d=google.com; s=arc-20160816; b=C3O8jCF0IqqCsFFaFgTxmLaQZV2dCbqfOxO3wwKmenmS/LtZf1uPpYMO43K35YQBvv 3tAr7mNOthWP/Vbw56N/Gzka/9AaFojOOMDJDhmb8grVcN62Rf/0FaQ2A+GT6TkQN9dp HtWbJ2A9w+jkWmCjODEcMKsQpt4laIWtHgL4d2Si5oMwFNEz/df8fxWrG8UoV4jK2ttb FpWBdvHZDzE+ZrGm0pZuZcMrK2LNcrdQpSJh9MEcqUfKMzD/EyYnYSRkd54gmnsQc3rw RrKYuKlthN+9y1ONH70bOKF9khbqJZfMjEx/xzAvNPXlolaz5WJcUSb07sTXeT/ggNLD 7TiQ== 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=0UOao0m/Bn1YkU2jMNcSrGiOHpHxGysYjlCZm6zEeco=; b=bwaYWMv/9VH8IuNiYCerO8z37YOoT3/Bwb5zSmrhgLos7E2CHy/HcmqEGn7rsL/t+O oLclSe8BUs7HcwNHLryarx9aPbq2lKfP6yd3L2KfujVoT3aPkk+0IiK7M0hjiSOKxv6i Qjz9uuJhGRqj/zRaeWNWOBKirf0xq59y78BiXQWZBUWoDeNJWnaXGeoJaXzCA58N/Tij z2OYAEkjaIED8a4FkCr6gA1+rOvNZ3e+vVIQjoa4gqc1WHBqwdtqxDbEwk5VHEYgvgmO DY6WGLKmzOsXN4E/jNhGCgrKJYT7vF3FCPUfbXM1tQG1X90M3A5Q3WIQNXonM9Z4pJ33 BCzQ== 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 f4si1724059ejf.359.2021.03.31.07.28.39; Wed, 31 Mar 2021 07:28:39 -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 S235999AbhCaO2E (ORCPT + 6 others); Wed, 31 Mar 2021 10:28:04 -0400 Received: from mail-oi1-f180.google.com ([209.85.167.180]:39649 "EHLO mail-oi1-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235929AbhCaO1y (ORCPT ); Wed, 31 Mar 2021 10:27:54 -0400 Received: by mail-oi1-f180.google.com with SMTP id i81so20169640oif.6; Wed, 31 Mar 2021 07:27:54 -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=0UOao0m/Bn1YkU2jMNcSrGiOHpHxGysYjlCZm6zEeco=; b=MvMQ9F2UKgwH123mLSilMnonu5GyLzC8roL3EVwGt0ocWV+ixFjgwYJMwCR7jXuY/W 3UpfBk7F0w1ybT2DbLn4bjqQs+EsRvhgnjgrj3kTpgAvl1NwGsVI1+NZ886R+ZPgPJcq r8dujFlNdR2AgbqMELXFm11NaocP5pOcaBnTmq82Q4xWuA0CvadC6Z5KVqsIXqsLqYwd xQMTwpatfvWxvjLhyLpWngaZfp/S1uVlbxT9gvsnSM03+uX2jBx6GKc1nWFEMgm7/lY7 BLEKdgm+QV19QTBEfRbKrChgK/6vYerc6eom99OoUAQhDb1BllatPStZ9sH3osUr4phM nIXA== X-Gm-Message-State: AOAM532GtrwBMQGryfHoVko7j3AeTZymotDhSEdEBkCQZUots/5Xr9vv 9GdNoGMSdamVLgu8LIVVew== X-Received: by 2002:aca:1a01:: with SMTP id a1mr2474227oia.33.1617200873720; Wed, 31 Mar 2021 07:27:53 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id v136sm451146oie.15.2021.03.31.07.27.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 07:27:51 -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 v2 1/3] ASoC: dt-bindings: Move port/ports properties out of audio-graph-port.yaml Date: Wed, 31 Mar 2021 09:27:46 -0500 Message-Id: <20210331142748.2163272-2-robh@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210331142748.2163272-1-robh@kernel.org> References: <20210331142748.2163272-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 61d0c944e972..1118a9488345 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 + patternProperties: '^i2s@[0-9a-f]+$': type: object @@ -93,7 +96,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 Wed Mar 31 14:27:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 412879 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp538498jai; Wed, 31 Mar 2021 07:28:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDIv4aeNILyYjwAo3eLRKpVac6Jf7fqTPcGwc+qowE9euYyiHAIIgnhdXZhzWDaAUKY9jm X-Received: by 2002:a50:ee19:: with SMTP id g25mr4099236eds.351.1617200919045; Wed, 31 Mar 2021 07:28:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617200919; cv=none; d=google.com; s=arc-20160816; b=xry9svBWNC8mDP8jRgjXyXjh6kI7zvRH3vawkg2zgaW0CUKRipVDAZaDVXdMuLy4AO nPH+9SZZ8lxWx0y24cMel0luJEyA6XxttZ/3Ols7pn175g4pRWLVbnE1QvgDf6Ba94MD b6KcVmPnFp81mkH+PMN/h+hzGZaYsRjr86DWf0nWydgj2h2A4m72hRQ/YNb2NMsbi6pr osxCpbnxiH74hcmH3ICrc+pPnDOGv/HGwZQ7jZGCzkAVILKLUjbT0SOh5xBsDcxD5c6Q UIdzVhF3v5Cmo/+f/s6MplCrGz+1r1v/nsELOUY/2NKWV/mmJn3a/6kRcwu+9pdmxmMC LQ6w== 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=s2CxKu7xah+LA5GRCvFfDFUCBXTHIspk+3+Cyh7Hk9zqO6hocQb1CvzJqjN4+51O3h nbcfZDxNlgfqNWIGcoNqWeBY62yadqUzf/Bk0CZY3Tf5I0LhnCgVTWxZXkD/1wFv55VF 6X5VcYIYzEY5sJZNTuxWtdzoQoPXPXF7yBwoSv4Ma7DIpefrcLOmAW3+KxtVm8qttM+V U0Vl/JDLZdY8TTkxhKelsa+n01NtJvzfcHXg+YCdWMcMd4vvMRdKP/3Os2kBFNlrCDWi NR44DoQny2reva8Xt3SdnmIIsbKUBdSsrLo3prC/gvKP8Ccku7wgAG+NsqhE8BXfGBjS CjWA== 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 f4si1724059ejf.359.2021.03.31.07.28.38; Wed, 31 Mar 2021 07:28:39 -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 S236026AbhCaO2F (ORCPT + 6 others); Wed, 31 Mar 2021 10:28:05 -0400 Received: from mail-oi1-f171.google.com ([209.85.167.171]:38739 "EHLO mail-oi1-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235948AbhCaO15 (ORCPT ); Wed, 31 Mar 2021 10:27:57 -0400 Received: by mail-oi1-f171.google.com with SMTP id v25so3560257oic.5; Wed, 31 Mar 2021 07:27:57 -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=GT0N9sswpDDrCfRK/AG/XBdkm0AFlEM71K0MVOGS3wTXpXRkPB4e9tI09nvf5zVU7k uMvbgq5dwkMms7xPj+5YYtztCN8iEXp6Jstpl4nq4QpX+R2D17Sis4jKatuFfR3G8d1a zkUNh6K5WAmykHnNeGW13upFymVnJNlw0POp6D/8/HLwICYgFx9v5B7+CkyUV5ZxWrfr OjEsby3ZV2il/gltoMdzMEHQhU0tMRpRqK0NfgA7u2oBFt2FuYbPUeRYGkLrlP8Eh1Vs 9h7NlyB7RZh1VX7jpmRkEf/9SSNFMgT9cYE1diZkAW5rJ9z6UDlPPJDNyu49t2M4ZtS5 gMcQ== X-Gm-Message-State: AOAM530HJnmVKRcu6N+83aZN79686792kOVywp+dfUWhdU+5PBHnHmfv 8zYeg8OQQclNKIoA3coD0A== X-Received: by 2002:a05:6808:13d0:: with SMTP id d16mr2542244oiw.169.1617200875988; Wed, 31 Mar 2021 07:27:55 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id v136sm451146oie.15.2021.03.31.07.27.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 07:27:54 -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 v2 2/3] ASoC: dt-bindings: Use OF graph schema Date: Wed, 31 Mar 2021 09:27:47 -0500 Message-Id: <20210331142748.2163272-3-robh@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210331142748.2163272-1-robh@kernel.org> References: <20210331142748.2163272-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 Wed Mar 31 14:27:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 412881 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp538518jai; Wed, 31 Mar 2021 07:28:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+thbuXAR7iV2JnBvODoONRzFNnsfv3CGtV7rdULdB4wXwwtCnzAAWO8Il9xW/OVmPU+U2 X-Received: by 2002:aa7:dc4e:: with SMTP id g14mr4149937edu.114.1617200920869; Wed, 31 Mar 2021 07:28:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617200920; cv=none; d=google.com; s=arc-20160816; b=VJquXN86TG3AZ3fZ11z82j6BkaRbbBfxXgrOf2WmJd4wUaENlXqVqkBQEPTnwErUOO bb6+IsRqNn+ucAl+OqdqDdxYCkVqjJAlPU7PGm+M7q+b71R2cXw3tlW5E5vKO9LTEH1s +VF3C0tp4qSF8jEoqESkBGuGDVA9GKBi6/mgKh4GvIuQOYztKkuIhQc+RAlmnHmYbqpo rwClNxQOAKwClIWzLzO0tWkS8yHOLB773MgF2tAq4PlOxtvMOVdDvtUon5biIZuQ7mN/ qedHVVgizERZy0LNt/QvwJ5HUjPIrF8ABxqzS44FIM2s9+UN41x8qof94pIM8qa41PWf aHlQ== 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=Abq50/cCkYb4f8hxrSXkKNKu3hLjMIUtkdOATsnYflXoS0SKJCgtn8wxwdrGcleBtw sdZ77XPvmIVWGXuRRpt/AHMRBiKqsF9BPsOHba6zsb5p4htTZYcq2bxVJj57xxJ9csi4 JoNOoFvyBc2zkpYXRWDLPTvbyX4N3q/AvQUJ034f3xgrd2J8EG/NejN+93JhBGnUSTjT Ag15OtB2wEzYxslGFs7MgkUyjURt7ZqWO3Fgu1amTqn06YZlpAC1nClS6uroWT+OTcrM u6vI37we/J+mv2XhgINoZVvkRT1OZJ98CaRMhxKWLvT0V4zT7iL9NSbZq2wQWkqjxMqk DIhQ== 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 f4si1724059ejf.359.2021.03.31.07.28.40; Wed, 31 Mar 2021 07:28:40 -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 S236059AbhCaO2G (ORCPT + 6 others); Wed, 31 Mar 2021 10:28:06 -0400 Received: from mail-ot1-f52.google.com ([209.85.210.52]:40827 "EHLO mail-ot1-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235951AbhCaO2A (ORCPT ); Wed, 31 Mar 2021 10:28:00 -0400 Received: by mail-ot1-f52.google.com with SMTP id w31-20020a9d36220000b02901f2cbfc9743so19081306otb.7; Wed, 31 Mar 2021 07:28:00 -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=IZkJCgd74DfkKmCuO1NJUr4ju9yJqO72gePDRAHWDarScho1v1ad0rpqB9iMp9Q6UA B9cIMIGNwf4v2HLuEu4ApAjx7obeoCd6n21MzeksFs8JLawMwbZnPJkGT/mVb9J//2nk ydu3nbpHSw0Xafo4sx2vDM16wz+IbpQNuBBExq2nhgKDrufjhqUNx/H4ztGiYP7MujF3 Wnxd49HrosbxNpTkbIG7aZWWMcQvcTv1CJgCvgWENQ/IKHMtIBr+MRob+Hrxs90HHZQX FWM6QKDWq2DJvzjIS9mjn/htuyuAKnoJ6derEaRdpMVT6b/OMNtIGhRhUIyHhkkWj/Dz aY8w== X-Gm-Message-State: AOAM532mrnBLpRit1qfVv8KNeNv+yKKu4D15kU7D2Ke8+7k9Fw5BxXbx pTkB5jr2W1m0z9326CUJlupZCAToPg== X-Received: by 2002:a9d:68d7:: with SMTP id i23mr3005001oto.133.1617200879927; Wed, 31 Mar 2021 07:27:59 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id v136sm451146oie.15.2021.03.31.07.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 07:27:56 -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 v2 3/3] ASoC: dt-bindings: socionext: Use audio-graph-port schema Date: Wed, 31 Mar 2021 09:27:48 -0500 Message-Id: <20210331142748.2163272-4-robh@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210331142748.2163272-1-robh@kernel.org> References: <20210331142748.2163272-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