| Message ID | 20210323163634.877511-1-robh@kernel.org |
|---|---|
| Headers | show |
| Series | ASoC: dt-bindings: Rework audio-graph-port schema | expand |
On Tue, Mar 23, 2021 at 10:36 AM Rob Herring <robh@kernel.org> 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@gmail.com> > Cc: Mark Brown <broonie@kernel.org> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Jonathan Hunter <jonathanh@nvidia.com> > Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > Cc: Lubomir Rintel <lkundrak@v3.sk> > Cc: Sameer Pujar <spujar@nvidia.com> > Cc: alsa-devel@alsa-project.org > Cc: linux-tegra@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> > --- > 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@nvidia.com> > - Sameer Pujar <spujar@nvidia.com> > > -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
On Tue, Mar 23, 2021 at 10:36:32AM -0600, Rob Herring 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. This doesn't apply against current code, please check and resend: Applying: ASoC: dt-bindings: Move port/ports properties out of audio-graph-port.yaml Using index info to reconstruct a base tree... M Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml Falling back to patching base and 3-way merge... Auto-merging Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml error: Failed to merge in the changes.
On Tue, 23 Mar 2021 10:36:31 -0600, Rob Herring wrote: > This series refactors the audio-graph-port.yaml schema moving the > 'port' node out of the schema and updating to use graph.yaml schema. > This allows users to define what each 'port' node is like other graph > binding users. > > Rob > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/3] ASoC: dt-bindings: Move port/ports properties out of audio-graph-port.yaml commit: 9c1e0439ada9973ec99cc1e0887eb84fd26444b8 [2/3] ASoC: dt-bindings: Use OF graph schema commit: ec1c8302178a946986bb7b52ac7bb9ccdcdf7d92 [3/3] ASoC: dt-bindings: socionext: Use audio-graph-port schema commit: f1321c9766b2c9e79de268225e291dead0a8f969 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
This series refactors the audio-graph-port.yaml schema moving the 'port' node out of the schema and updating to use graph.yaml schema. This allows users to define what each 'port' node is like other graph binding users. Rob Cc: alsa-devel@alsa-project.org Cc: linux-tegra@vger.kernel.org Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Lubomir Rintel <lkundrak@v3.sk> Cc: Mark Brown <broonie@kernel.org> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Sameer Pujar <spujar@nvidia.com> Cc: Thierry Reding <thierry.reding@gmail.com> Rob Herring (3): ASoC: dt-bindings: Move port/ports properties out of audio-graph-port.yaml ASoC: dt-bindings: Use OF graph schema ASoC: dt-bindings: socionext: Use audio-graph-port schema .../bindings/sound/audio-graph-port.yaml | 104 ++++++++---------- .../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 +- .../sound/socionext,uniphier-aio.yaml | 8 +- .../sound/socionext,uniphier-evea.yaml | 8 +- 10 files changed, 89 insertions(+), 97 deletions(-)