From patchwork Tue Nov 17 01:33:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 324550 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3792036ils; Mon, 16 Nov 2020 17:35:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyz7+PNRP5jcg6g8PrC01txsvahmUwGduW8yRwXG7hikibN7J2VwzLoBPyw96DGnFzrQD63 X-Received: by 2002:a17:906:7698:: with SMTP id o24mr16564180ejm.447.1605576925072; Mon, 16 Nov 2020 17:35:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605576925; cv=none; d=google.com; s=arc-20160816; b=FF5GEKXVLVT7KMy5/+6EQIO+TjdgMoudt/ChLhpumiqfvLfc5Sb7iz6ptP5okiB3qb WhfVTqpOSutwqGIdNiFOACUuYr8Ck31iB94oc5c3RRCiQjKvbNxJ6E4kGyxS+PksYaLN 24ZwQjYOHrwNuzS1I9KCQCdjHjMuAWJaZwc/T8Dre/D38rFxIwoHwopswF0nY8wFgm07 ReIabUKxcRe6q+q3P8Wcwrpq3apDbvBoFgqvYh6UYKEoXBywHCQa+Yv0Q4BPvAtnBH2e l62pIl6/xoNXmB5CSu5HYmTYIwmhQ60dRnwk8FZhTLoiO0/UONIkbQBgHEeLWtodbgps hNDg== 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=qK36A5rVThIRP81jEbeCpq/j9+HO/HBCjgD8p63pIAY=; b=N3zN7lA7HRWrCJIZnXVLNINYvPzkv0fdHN+r6PY6D6LEW4nySRrA1L6uW38tlsogHX M51046Qsm1tBKfJKlmyoLcbl5mWuXxiUYeiQPXNfXva67yBtbkLaOUxjwazTq1AiwQFi 18T7TOqSr81llzA1SMbEzsx3bi43eXezkxGmg9yWfNJKkMHp9Ux6GTjyWE6TLkdYcYH4 ci0M/J1LugPrWijAEaHRLu7ZUlzvFOAzwlKRAt8EsOEVrfvPxE/xGQiKat+9dQqqgRX9 h/ii9c12oo5FHS7DiEOkaS3FKNxSgtWb/prr6J997gSsk9GChiCWyWOwjVXwtVPgAuvM bp3w== 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 y10si13139170ejq.401.2020.11.16.17.35.24; Mon, 16 Nov 2020 17:35:25 -0800 (PST) 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 S1726086AbgKQBdz (ORCPT + 6 others); Mon, 16 Nov 2020 20:33:55 -0500 Received: from mail-oo1-f54.google.com ([209.85.161.54]:34192 "EHLO mail-oo1-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725554AbgKQBdy (ORCPT ); Mon, 16 Nov 2020 20:33:54 -0500 Received: by mail-oo1-f54.google.com with SMTP id q28so4384249oof.1 for ; Mon, 16 Nov 2020 17:33:52 -0800 (PST) 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=qK36A5rVThIRP81jEbeCpq/j9+HO/HBCjgD8p63pIAY=; b=aVDiJRoHDjcVNWqkzZaMosqQNpokVA3MvyozHJLhIjOTk9vU3PiUtbK2dvPNdmbrZ1 exFxQLlSfYITAcbge8Hzy3yJuRQoIAGzu10wl2I8hADd6PzqdPfb66TvJyA3zPNWAlzz RwR8toJ6fOlUMnXuBf7oBDpSBzd98ROdREn0tZsetok6k2fpUElQRpH6n0Z+PiIa2NQX sVlSLhzpfJf94g4GwqWkBDNjmOZrm58/ZrLk61zsbZi0F4qnlIAVwS90THky2R7qN13n hbBLk9dQvXtdtNfa161DiRVg6Tin56rk3HHFVrtaXjczckmx+ykBod8G/uGiLCgheagi eWJA== X-Gm-Message-State: AOAM533RkgLR9kK+dY1mBSU3xYUKIYLPrIaly3KigkzzQdjbstQR/930 hlX10T8CrrxX0DxsBR6NgfStTG3iqg== X-Received: by 2002:a4a:e09a:: with SMTP id w26mr1528078oos.18.1605576831640; Mon, 16 Nov 2020 17:33:51 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id j9sm3861325oij.44.2020.11.16.17.33.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 17:33:51 -0800 (PST) From: Rob Herring To: Mark Brown Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Liam Girdwood , Kuninori Morimoto , Lubomir Rintel , Sameer Pujar Subject: [PATCH 1/4] ASoC: audio-graph-card: Refactor schema Date: Mon, 16 Nov 2020 19:33:46 -0600 Message-Id: <20201117013349.2458416-2-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201117013349.2458416-1-robh@kernel.org> References: <20201117013349.2458416-1-robh@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Sameer Pujar There can be customized sound cards which are based on generic audio graph. In such cases most of the stuff is reused from generic audio graph. To facilitate this, refactor audio graph schema into multiple files and the base schema can be reused for specific sound cards. The graph card nodes and port nodes are separate entities, so they should be separate schemas. Signed-off-by: Sameer Pujar Cc: Kuninori Morimoto [robh: Split out port schema. Add graph.yaml in subsequent commit] Signed-off-by: Rob Herring --- .../bindings/sound/audio-graph-card.yaml | 106 +----------------- .../bindings/sound/audio-graph-port.yaml | 86 ++++++++++++++ .../bindings/sound/audio-graph.yaml | 45 ++++++++ .../bindings/sound/renesas,rsnd.yaml | 12 +- 4 files changed, 141 insertions(+), 108 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-port.yaml create mode 100644 Documentation/devicetree/bindings/sound/audio-graph.yaml -- 2.25.1 Acked-by: Sameer Pujar diff --git a/Documentation/devicetree/bindings/sound/audio-graph-card.yaml b/Documentation/devicetree/bindings/sound/audio-graph-card.yaml index 2329aeb91db7..109e55f9e597 100644 --- a/Documentation/devicetree/bindings/sound/audio-graph-card.yaml +++ b/Documentation/devicetree/bindings/sound/audio-graph-card.yaml @@ -4,120 +4,24 @@ $id: http://devicetree.org/schemas/sound/audio-graph-card.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Audio Graph Card Driver Device Tree Bindings +title: Audio Graph Card Device Tree Bindings maintainers: - Kuninori Morimoto +allOf: + - $ref: /schemas/sound/audio-graph.yaml# + properties: compatible: enum: - audio-graph-card - audio-graph-scu-card - dais: - $ref: /schemas/types.yaml#/definitions/phandle-array - label: - maxItems: 1 - prefix: - description: "device name prefix" - $ref: /schemas/types.yaml#/definitions/string - routing: - description: | - A list of the connections between audio components. - Each entry is a pair of strings, the first being the - connection's sink, the second being the connection's source. - $ref: /schemas/types.yaml#/definitions/non-unique-string-array - widgets: - description: User specified audio sound widgets. - $ref: /schemas/types.yaml#/definitions/non-unique-string-array - 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 - pa-gpios: - maxItems: 1 - hp-det-gpio: - maxItems: 1 - mic-det-gpio: - maxItems: 1 - - port: - description: single OF-Graph subnode - type: object - properties: - 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: - 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-array - maxItems: 1 - bitclock-master: - description: Indicates dai-link bit clock master - $ref: /schemas/types.yaml#/definitions/phandle-array - maxItems: 1 - 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 - required: - - remote-endpoint - - ports: - description: multi OF-Graph subnode - type: object - patternProperties: - "^port(@[0-9a-f]+)?": - $ref: "#/properties/port" - required: - compatible - - dais -additionalProperties: false +unevaluatedProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml new file mode 100644 index 000000000000..9db19d4edc6a --- /dev/null +++ b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml @@ -0,0 +1,86 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/audio-graph-port.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Audio Graph Card 'port' Node Bindings + +maintainers: + - Kuninori Morimoto + +select: false + +properties: + port: + description: single OF-Graph subnode + type: object + properties: + 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: + 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-array + maxItems: 1 + bitclock-master: + description: Indicates dai-link bit clock master + $ref: /schemas/types.yaml#/definitions/phandle-array + maxItems: 1 + 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 + + required: + - remote-endpoint + + 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/audio-graph.yaml b/Documentation/devicetree/bindings/sound/audio-graph.yaml new file mode 100644 index 000000000000..4b46794e5153 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/audio-graph.yaml @@ -0,0 +1,45 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/audio-graph.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Audio Graph Device Tree Bindings + +maintainers: + - Kuninori Morimoto + +properties: + dais: + $ref: /schemas/types.yaml#/definitions/phandle-array + label: + maxItems: 1 + prefix: + description: "device name prefix" + $ref: /schemas/types.yaml#/definitions/string + routing: + description: | + A list of the connections between audio components. + Each entry is a pair of strings, the first being the + connection's sink, the second being the connection's source. + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + widgets: + description: User specified audio sound widgets. + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + 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 + pa-gpios: + maxItems: 1 + hp-det-gpio: + maxItems: 1 + mic-det-gpio: + maxItems: 1 + +required: + - dais + +additionalProperties: true diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml index 51f4dcaa970d..cbfd5914b432 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml @@ -9,6 +9,10 @@ title: Renesas R-Car Sound Driver Device Tree Bindings maintainers: - Kuninori Morimoto +allOf: + - $ref: audio-graph.yaml# + - $ref: audio-graph-port.yaml# + properties: compatible: @@ -111,13 +115,7 @@ properties: - pattern: '^dvc\.[0-1]$' - pattern: '^clk_(a|b|c|i)$' - port: - description: OF-Graph subnode - $ref: "audio-graph-card.yaml#/properties/port" - - ports: - description: multi OF-Graph subnode - $ref: "audio-graph-card.yaml#/properties/ports" + port: true # use patternProperties to avoid naming "xxx,yyy" issue patternProperties: From patchwork Tue Nov 17 01:33:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 324551 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3792039ils; Mon, 16 Nov 2020 17:35:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvjNyPH42d+g1FXgMUDaR2d/eEIo1PWWuCAcRINW2PxspdM5CW/CPeJbyBshewfc8awfbO X-Received: by 2002:a17:906:13d0:: with SMTP id g16mr16854378ejc.327.1605576925435; Mon, 16 Nov 2020 17:35:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605576925; cv=none; d=google.com; s=arc-20160816; b=Cf38Vw9z77sTcINtiZXIm5ayVnPxK0W7hmAuReUu2CeA9S6c/qIMIc7mtJZSZxUW7R wZ7K37XKuGuG4wkFhpXj83TKLnVwLtKEBkELIu0OjMtyTmuRW11+JjFYOUj+JjCi7s7M awqPkrk73IlAwEq+mRkVTYEZ4CliU2pjA6xQLvoUj7KXvCjbPs02AhKzyC46M4doOGNq UhP27Y8YcwoUsz4sz9wgMcx41rzM8Y0CkTJ84cGvFqqQdvJG7v0u8/c7P9dQ+Q+2YmNe Xn4+Gnu8Xw6/xKYyWunHQtV4XDczObJQTZHoL64qutV8E0jN75lpUFzwxq4LnFX6Gb89 MeWQ== 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=spsmauWvc5A5SYudUomXMMzn+PeDbEjuioZTNAq65wc=; b=SSOUvDz8W63iLOX2zCb/BbMDnKI6+sR7++m+9K29+v8ZZnbpLBR5fOAYrfwvBBfjhJ H21XRFGV/vihRnUVflusxhrxPJoobHFt/Y9Lh7hZ0ewQRoD970dUiFBb3MzImWFwgjbT 05DNkVMi2ZuVPqq781Aa7uSwS8Dl7x+kai2lyi68RAKtBQsE1t/a+9MG0RZVsUN2nH23 MrBokt6tWnt/dScuZcyO0b3+7GbhZwcYqgSkg3gIUfPCJIg7ZICCo/TbVqc6OQL1/pPG rjXudymMXiV7dwMcODI3vWJDE9q/DwXemDg60+1MuVDJBJokFCvgl92VaRcHC4hdPiXP 1s/A== 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 y10si13139170ejq.401.2020.11.16.17.35.25; Mon, 16 Nov 2020 17:35:25 -0800 (PST) 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 S1725554AbgKQBdz (ORCPT + 6 others); Mon, 16 Nov 2020 20:33:55 -0500 Received: from mail-oi1-f196.google.com ([209.85.167.196]:33162 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725764AbgKQBdz (ORCPT ); Mon, 16 Nov 2020 20:33:55 -0500 Received: by mail-oi1-f196.google.com with SMTP id k26so20981141oiw.0 for ; Mon, 16 Nov 2020 17:33:53 -0800 (PST) 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=spsmauWvc5A5SYudUomXMMzn+PeDbEjuioZTNAq65wc=; b=chSW+a7s6EDVNtJRtItM2JmE1I4hlMlgSfnFw6C+sZWLKNBmy7NkIj2RHYAWU9dnxi aKHBQhuGX/ASdLc/BdWMD9L7jGJtYXFbxzB/J0AZtk1F8njWfpXS+YA7eRwZxEYq3dX/ y4NuSS6FhybOb71oSy3ks6UHFxEs5kEC681WG7Nip+uQ5muWoACIlVuYJCVTlAQVlnP2 ADytPXEmpJ/HMESfkuEMb0GAbvrHG6AfQjg9dSbjuk8s1VX/YEp/xep7g6G6q9NcaRUo vx3Jlnwi6dSKYVfnHxdauEU7iPzDHZHQ08kSjVnE43dz75lHSGc2Uky0xTi59d5iR/Ll t3kg== X-Gm-Message-State: AOAM532BZlFn5DPbT2Wsfi9SUaVGJ4CsN0rXo/6jQRJbZsL3UxtHsVQL rEc7RBSPVDddvpxw/HEeLX7e0Mlc+w== X-Received: by 2002:aca:fcd5:: with SMTP id a204mr970460oii.161.1605576832729; Mon, 16 Nov 2020 17:33:52 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id j9sm3861325oij.44.2020.11.16.17.33.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 17:33:52 -0800 (PST) From: Rob Herring To: Mark Brown Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Liam Girdwood , Kuninori Morimoto , Lubomir Rintel , Sameer Pujar Subject: [PATCH 2/4] ASoC: dt-bindings: Use OF graph schema Date: Mon, 16 Nov 2020 19:33:47 -0600 Message-Id: <20201117013349.2458416-3-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201117013349.2458416-1-robh@kernel.org> References: <20201117013349.2458416-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. There's no need to define 'ports' nodes as specific bindings must define that and port numbering of the child 'port' nodes. Signed-off-by: Rob Herring --- Note that graph.yaml is part of dtschema now intead of the kernel tree. --- .../bindings/sound/audio-graph-port.yaml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) -- 2.25.1 diff --git a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml index 9db19d4edc6a..c05d5643b10e 100644 --- a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml +++ b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml @@ -13,11 +13,9 @@ select: false properties: port: - description: single OF-Graph subnode + $ref: /schemas/graph.yaml#/properties/port type: object properties: - reg: - maxItems: 1 prefix: description: "device name prefix" $ref: /schemas/types.yaml#/definitions/string @@ -31,8 +29,6 @@ properties: "^endpoint(@[0-9a-f]+)?": type: object properties: - remote-endpoint: - maxItems: 1 mclk-fs: description: | Multiplication factor between stream rate and codec mclk. @@ -73,14 +69,6 @@ properties: description: CPU to Codec rate channels. $ref: /schemas/types.yaml#/definitions/uint32 - required: - - remote-endpoint - - ports: - description: multi OF-Graph subnode - type: object - patternProperties: - "^port(@[0-9a-f]+)?": - $ref: "#/properties/port" + additionalProperties: false additionalProperties: true From patchwork Tue Nov 17 01:33:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 324549 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3792032ils; Mon, 16 Nov 2020 17:35:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/JYP6esc7UEgrtEYkocoLz9NSJkjkh3FcIofNs53eVorpAj18qlatG1bzDpgifVbcbt/p X-Received: by 2002:a50:e087:: with SMTP id f7mr6222246edl.29.1605576924720; Mon, 16 Nov 2020 17:35:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605576924; cv=none; d=google.com; s=arc-20160816; b=ErXk+6lbj2gVeEGPhmBYdh+NdWC4UD3bjIrwneW3XjzCgR7o8wM9LutGGcikQPeIl3 6u8DjvqQ/oWGglq4boAVUNK8TeSZQzpZ+3kDabeHh4QcI2lJlQzw9a1V/QhJibDzI8zl nojYhvjHDw5TXgGDpSYpmT+Mx7Tk7dom7x6IlHm8PlqYS0JGLF7ncv1QtYrAs5WryPdQ Mdo0z8uNwlqeH7bHihDxUKD6xM14bjczp3k3zua4xflx9ijTxhe77O2KHANp+IxdgMWY cJIoVh150CC2etudbLpKBSthWhIymVKgAjVEshC8k4dpjxrZrLSBZ76VHA7XnX61ZcFt H/OA== 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=wNb4ssqi6GnjfKnwrQ0BaPlK7z2Z97OJHzDNpZ85994=; b=CbidB/E8LqmBD/JOUGbw70qQtBtXIb40EWZQZfRmsvuFJ6qbE5CI1pcOctY6NQrFEM 216to9WJnMaxeSmBnce6UVhiHlZvSWtzQeWWJwNYy5sBQoaHIoKwODXC1tNS6sydx7xx X+x1qa6nuMU8/4seoj8CiBHdhJObaRA7ucOKFQ115S4iP1HBzx9xwRd6+mdfKP+b/F67 lmdH/e50oC+lCUEOrLsFA15dTFVXurxB5ULNP+9AhelIolUepr92j4gNupyVwWDZtpYE ndUXZbH7lhhsVq48q7HbWhU6rFrtuinXKGFR21VBWX7iGXjwe2Ikfn4cCC3KGjNnVTWw 0t8g== 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 y10si13139170ejq.401.2020.11.16.17.35.24; Mon, 16 Nov 2020 17:35:24 -0800 (PST) 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 S1725901AbgKQBdz (ORCPT + 6 others); Mon, 16 Nov 2020 20:33:55 -0500 Received: from mail-oi1-f193.google.com ([209.85.167.193]:36194 "EHLO mail-oi1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725730AbgKQBdy (ORCPT ); Mon, 16 Nov 2020 20:33:54 -0500 Received: by mail-oi1-f193.google.com with SMTP id d9so20942509oib.3 for ; Mon, 16 Nov 2020 17:33:54 -0800 (PST) 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=wNb4ssqi6GnjfKnwrQ0BaPlK7z2Z97OJHzDNpZ85994=; b=h4BlmDhJpDrJn0FTVc1gNJkJFh7pXxdDu53wEc4sfIlHyaXwv+oF+hxT/DFxjbjdD6 aWvG0Nt0ni5gMw+f33bi3sDHDY8wZd5NNvHaluUhAiunxMlWg0oFM74Rwhj1TO2WVTCD DenAUn5AcC/U0QC19Hp03XzJJ4IzDNbmqz3Gj+mNSOoYbDL4thzK55C3ieEvb0tdpN1b vGhPqTe9ZodUZQqSVsd6Q72e+85rQrhAxVd9wL+Q8iYcRPdXv31VMdC1K6c+unawsekA dBzKNgu1ecUv71AqwpRbI6VZ4DY7kcsLtty5Vq9cEI+E4MeIamysvWq8TMBXHr0Bp5Xs yvVA== X-Gm-Message-State: AOAM5315GpodZ/pMl8zTGuoPUwO9iEL8Ipru/04/WCfskOwd5TQ+VTo1 AjkJlRIZDSGLDK5fs1qnuw== X-Received: by 2002:aca:cd17:: with SMTP id d23mr917590oig.171.1605576833830; Mon, 16 Nov 2020 17:33:53 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id j9sm3861325oij.44.2020.11.16.17.33.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 17:33:53 -0800 (PST) From: Rob Herring To: Mark Brown Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Liam Girdwood , Kuninori Morimoto , Lubomir Rintel , Sameer Pujar Subject: [PATCH 3/4] ASoC: dt-bindings: marvell, mmp-sspa: Use audio-graph-port schema Date: Mon, 16 Nov 2020 19:33:48 -0600 Message-Id: <20201117013349.2458416-4-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201117013349.2458416-1-robh@kernel.org> References: <20201117013349.2458416-1-robh@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Now that we have a graph schema, reference it from the marvell,mmp-sspa schema. Signed-off-by: Rob Herring --- .../bindings/sound/marvell,mmp-sspa.yaml | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) -- 2.25.1 Acked-by: Lubomir Rintel diff --git a/Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml b/Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml index 6d20a24a2ae9..234f64a32184 100644 --- a/Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml +++ b/Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml @@ -9,6 +9,9 @@ title: Marvel SSPA Digital Audio Interface Bindings maintainers: - Lubomir Rintel +allOf: + - $ref: audio-graph-port.yaml# + properties: $nodename: pattern: "^audio-controller(@.*)?$" @@ -58,29 +61,9 @@ properties: type: object properties: - remote-endpoint: true - - frame-master: - type: boolean - description: SoC generates the frame clock - - bitclock-master: - type: boolean - description: SoC generates the bit clock - dai-format: - $ref: /schemas/types.yaml#/definitions/string - description: The digital audio format const: i2s - required: - - remote-endpoint - - required: - - endpoint - - additionalProperties: false - required: - "#sound-dai-cells" - compatible @@ -112,8 +95,6 @@ examples: port { endpoint { remote-endpoint = <&rt5631_0>; - frame-master; - bitclock-master; dai-format = "i2s"; }; }; From patchwork Tue Nov 17 01:33:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 324552 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3792043ils; Mon, 16 Nov 2020 17:35:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDTcSmUwS5JUICLk03imej7LXQScLD1+4/+Oc4fFvsr0GmOmqwN2p9eHKb9wN6cb+akjJo X-Received: by 2002:a17:906:7cc:: with SMTP id m12mr17175886ejc.365.1605576925795; Mon, 16 Nov 2020 17:35:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605576925; cv=none; d=google.com; s=arc-20160816; b=tH7oyPpeY41wjS2xJTf4IDhqW9eI03rhpCRU2NfvqU9Ubr2WxqR6fMchXf7HJUdHwN 7JhNejEd7NxeVT9PvvmxoKE61xwRVK75W4z84a2dvmmPZTS34uNuM9to+cAJCj7WHJLj YoHKwohXrJ1a/SY1DC4v1uvuuWrNB2or3cCwk+d7eQqcI8AWuMSz9h543nOaiALvtkee Jn4NoB63u4xL1zePBvedjS6/jDtPK5ylHXs6b87EHrS3UWT0GunfqC91cwGJR/6KrUyA CIvRBc/kCci57aY8DAFYEHjuY7N0HAr6gbDLDRbDvcrJbcn2gBC+FwHHTFiXCWjZJg6f ZUug== 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=7v83U4ZReYBGAfYOQtO/dOb1BUnzpl5ihuyBngAA7CU=; b=fH603FHsWgtT8YDMii6fjbnmILnYt9fcnr5Uh4srgZ8phqLKXb8NoIagpt7SPO9RJM VsaLsOGm5vmSDd0OHui+XbIOEVYs+AhQvAA1wWiBJihdwWllIIZxKg237wd12Z0HDj/E sf8KPmE2+VBrwDOFinKwHA692EdWjPMvm9YLOJm0303BsUS6jow7Tbyt18Im9f5+mfxM Bh64/uYx8QtdiyUtITn2RKw+avwXOh6cEZtMBKVQ5sv+JhGpxpc0Nx8OdcqoSSroEGSJ fbnI7Ro3RwbbKbnGjmVqud1nBAqA5pP9fCvFK12jCKYKNJXjv/ATSJmEubGqz8khmRmU bPRg== 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 y10si13139170ejq.401.2020.11.16.17.35.25; Mon, 16 Nov 2020 17:35:25 -0800 (PST) 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 S1725764AbgKQBd4 (ORCPT + 6 others); Mon, 16 Nov 2020 20:33:56 -0500 Received: from mail-oi1-f194.google.com ([209.85.167.194]:34331 "EHLO mail-oi1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725730AbgKQBd4 (ORCPT ); Mon, 16 Nov 2020 20:33:56 -0500 Received: by mail-oi1-f194.google.com with SMTP id w188so20947876oib.1 for ; Mon, 16 Nov 2020 17:33:55 -0800 (PST) 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=7v83U4ZReYBGAfYOQtO/dOb1BUnzpl5ihuyBngAA7CU=; b=EecZlb3J7Pto7goRpE5JD871h9MQ3gvbyhqIG2QZaFgXfkh6yG3Ep0iX0TXoscSlHY bBVVpzga8M4bXPCt6uUmeg+Uwl9G1E7iTjNuiCx7e7dN3KG0G0Q75PbS2dw5dN1Sfd62 ZsQWPtozmoxWDYlSFKoSCBYBgo6+0lhw0oIF+NjMHIziJ32yARFFCY13+NHdjCNRjG/P 9t8FNz/KXDYwH4/7t77Kj6MizqAfMKr8sQ4Y5miKPEsJ/TvNojOTT4spwYjQFCXwVkCm dKUNMzW2rIHmyZbcTQWmzUlGJRc+Uw1EfwrPew9SPeeADZS5EH3ANs9Nw8tVUXuZHjH3 fDQg== X-Gm-Message-State: AOAM533lYjs//jWNRLwxyrWEB+DAbafQ8Hbo9useV5ZXR69dbnK+Yf5m xJPLg0E4/5TBKD1nii9L5g== X-Received: by 2002:aca:486:: with SMTP id 128mr997880oie.19.1605576834952; Mon, 16 Nov 2020 17:33:54 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id j9sm3861325oij.44.2020.11.16.17.33.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 17:33:54 -0800 (PST) From: Rob Herring To: Mark Brown Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Liam Girdwood , Kuninori Morimoto , Lubomir Rintel , Sameer Pujar Subject: [PATCH 4/4] ASoC: dt-bindings: Refine 'frame-master' and 'bitclock-master' type Date: Mon, 16 Nov 2020 19:33:49 -0600 Message-Id: <20201117013349.2458416-5-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201117013349.2458416-1-robh@kernel.org> References: <20201117013349.2458416-1-robh@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 'frame-master' and 'bitclock-master' are only a single phandle, so use the more specific 'phandle' type definition instead. Signed-off-by: Rob Herring --- .../devicetree/bindings/sound/audio-graph-port.yaml | 6 ++---- Documentation/devicetree/bindings/sound/simple-card.yaml | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) -- 2.25.1 Acked-by: Sameer Pujar diff --git a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml index c05d5643b10e..7c13ca41d41f 100644 --- a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml +++ b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml @@ -43,12 +43,10 @@ properties: $ref: /schemas/types.yaml#/definitions/flag frame-master: description: Indicates dai-link frame master. - $ref: /schemas/types.yaml#/definitions/phandle-array - maxItems: 1 + $ref: /schemas/types.yaml#/definitions/phandle bitclock-master: description: Indicates dai-link bit clock master - $ref: /schemas/types.yaml#/definitions/phandle-array - maxItems: 1 + $ref: /schemas/types.yaml#/definitions/phandle dai-format: description: audio format. items: diff --git a/Documentation/devicetree/bindings/sound/simple-card.yaml b/Documentation/devicetree/bindings/sound/simple-card.yaml index 35e669020296..45fd9fd9eb54 100644 --- a/Documentation/devicetree/bindings/sound/simple-card.yaml +++ b/Documentation/devicetree/bindings/sound/simple-card.yaml @@ -13,13 +13,11 @@ definitions: frame-master: description: Indicates dai-link frame master. - $ref: /schemas/types.yaml#/definitions/phandle-array - maxItems: 1 + $ref: /schemas/types.yaml#/definitions/phandle bitclock-master: description: Indicates dai-link bit clock master - $ref: /schemas/types.yaml#/definitions/phandle-array - maxItems: 1 + $ref: /schemas/types.yaml#/definitions/phandle frame-inversion: description: dai-link uses frame clock inversion