On Tue, Mar 23, 2021 at 10:36 AM Rob Herring <robh@xxxxxxxxxx> wrote: > > 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 <lgirdwood@xxxxxxxxx> > Cc: Mark Brown <broonie@xxxxxxxxxx> > Cc: Thierry Reding <thierry.reding@xxxxxxxxx> > Cc: Jonathan Hunter <jonathanh@xxxxxxxxxx> > Cc: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> > Cc: Lubomir Rintel <lkundrak@xxxxx> > Cc: Sameer Pujar <spujar@xxxxxxxxxx> > Cc: alsa-devel@xxxxxxxxxxxxxxxx > Cc: linux-tegra@xxxxxxxxxxxxxxx > Signed-off-by: Rob Herring <robh@xxxxxxxxxx> > --- > 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 <jonathanh@xxxxxxxxxx> > - Sameer Pujar <spujar@xxxxxxxxxx> > > -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 Adding this results in schema errors in the example, so a prerequisite patch is needed. Rob
