From: Rob Herring <robh@kernel.org> To: Sameer Pujar <spujar@nvidia.com> Cc: broonie@kernel.org, kuninori.morimoto.gx@renesas.com, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] ASoC: audio-graph-card: Refactor schema Date: Thu, 12 Nov 2020 10:06:31 -0600 [thread overview] Message-ID: <20201112160631.GA3671282@bogus> (raw) In-Reply-To: <1605097613-25301-2-git-send-email-spujar@nvidia.com> On Wed, Nov 11, 2020 at 05:56:52PM +0530, Sameer Pujar wrote: > 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. I did ack it, but it's not great that this was just applied and now it's being changed. If the submitter doesn't have time to work on it more then the maintainers shouldn't really have time to apply it. > Signed-off-by: Sameer Pujar <spujar@nvidia.com> > Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- > .../bindings/sound/audio-graph-card.yaml | 102 +------------------- > .../devicetree/bindings/sound/audio-graph.yaml | 107 +++++++++++++++++++++ > 2 files changed, 110 insertions(+), 99 deletions(-) > create mode 100644 Documentation/devicetree/bindings/sound/audio-graph.yaml > > diff --git a/Documentation/devicetree/bindings/sound/audio-graph-card.yaml b/Documentation/devicetree/bindings/sound/audio-graph-card.yaml > index 2329aeb..e047d7d 100644 > --- a/Documentation/devicetree/bindings/sound/audio-graph-card.yaml > +++ b/Documentation/devicetree/bindings/sound/audio-graph-card.yaml > @@ -9,113 +9,17 @@ title: Audio Graph Card Driver Device Tree Bindings > maintainers: > - Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > +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 This is not going to work with all the properties moved. 'additionalProperties' can't 'see' into the reference. This needs to be unevaluatedProperties instead which solves that problem. > > diff --git a/Documentation/devicetree/bindings/sound/audio-graph.yaml b/Documentation/devicetree/bindings/sound/audio-graph.yaml > new file mode 100644 > index 0000000..1e338d6 > --- /dev/null > +++ b/Documentation/devicetree/bindings/sound/audio-graph.yaml > @@ -0,0 +1,107 @@ > +# 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 Card Driver Device Tree Bindings > + > +maintainers: > + - Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > + > +allOf: > + - $ref: /schemas/graph.yaml# > + > +select: false > + > +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 > + > + port: > + description: single OF-Graph subnode > + type: object > + properties: > + 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: > + 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: > + - dais > + > +additionalProperties: true > -- > 2.7.4 >
WARNING: multiple messages have this Message-ID (diff)
From: Rob Herring <robh@kernel.org> To: Sameer Pujar <spujar@nvidia.com> Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, broonie@kernel.org, linux-kernel@vger.kernel.org, kuninori.morimoto.gx@renesas.com Subject: Re: [PATCH 1/2] ASoC: audio-graph-card: Refactor schema Date: Thu, 12 Nov 2020 10:06:31 -0600 [thread overview] Message-ID: <20201112160631.GA3671282@bogus> (raw) In-Reply-To: <1605097613-25301-2-git-send-email-spujar@nvidia.com> On Wed, Nov 11, 2020 at 05:56:52PM +0530, Sameer Pujar wrote: > 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. I did ack it, but it's not great that this was just applied and now it's being changed. If the submitter doesn't have time to work on it more then the maintainers shouldn't really have time to apply it. > Signed-off-by: Sameer Pujar <spujar@nvidia.com> > Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- > .../bindings/sound/audio-graph-card.yaml | 102 +------------------- > .../devicetree/bindings/sound/audio-graph.yaml | 107 +++++++++++++++++++++ > 2 files changed, 110 insertions(+), 99 deletions(-) > create mode 100644 Documentation/devicetree/bindings/sound/audio-graph.yaml > > diff --git a/Documentation/devicetree/bindings/sound/audio-graph-card.yaml b/Documentation/devicetree/bindings/sound/audio-graph-card.yaml > index 2329aeb..e047d7d 100644 > --- a/Documentation/devicetree/bindings/sound/audio-graph-card.yaml > +++ b/Documentation/devicetree/bindings/sound/audio-graph-card.yaml > @@ -9,113 +9,17 @@ title: Audio Graph Card Driver Device Tree Bindings > maintainers: > - Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > +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 This is not going to work with all the properties moved. 'additionalProperties' can't 'see' into the reference. This needs to be unevaluatedProperties instead which solves that problem. > > diff --git a/Documentation/devicetree/bindings/sound/audio-graph.yaml b/Documentation/devicetree/bindings/sound/audio-graph.yaml > new file mode 100644 > index 0000000..1e338d6 > --- /dev/null > +++ b/Documentation/devicetree/bindings/sound/audio-graph.yaml > @@ -0,0 +1,107 @@ > +# 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 Card Driver Device Tree Bindings > + > +maintainers: > + - Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > + > +allOf: > + - $ref: /schemas/graph.yaml# > + > +select: false > + > +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 > + > + port: > + description: single OF-Graph subnode > + type: object > + properties: > + 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: > + 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: > + - dais > + > +additionalProperties: true > -- > 2.7.4 >
next prev parent reply other threads:[~2020-11-12 16:06 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-11 12:26 [PATCH 0/2] Refactor Audio Graph schema Sameer Pujar 2020-11-11 12:26 ` Sameer Pujar 2020-11-11 12:26 ` [PATCH 1/2] ASoC: audio-graph-card: Refactor schema Sameer Pujar 2020-11-11 12:26 ` Sameer Pujar 2020-11-12 16:06 ` Rob Herring [this message] 2020-11-12 16:06 ` Rob Herring 2020-11-11 12:26 ` [PATCH 2/2] ASoC: renesas,rsnd: Update audio graph references Sameer Pujar 2020-11-11 12:26 ` Sameer Pujar 2020-11-12 16:07 ` Rob Herring 2020-11-12 16:07 ` Rob Herring 2020-11-12 16:15 ` Rob Herring 2020-11-12 16:15 ` Rob Herring 2020-11-11 23:24 ` [PATCH 0/2] Refactor Audio Graph schema Kuninori Morimoto 2020-11-11 23:24 ` Kuninori Morimoto
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201112160631.GA3671282@bogus \ --to=robh@kernel.org \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=kuninori.morimoto.gx@renesas.com \ --cc=linux-kernel@vger.kernel.org \ --cc=spujar@nvidia.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.