| Message ID | 20201117013349.2458416-3-robh@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | ASoC: graph card schema rework | expand |
On Mon, Nov 16, 2020 at 7:33 PM Rob Herring <robh@kernel.org> wrote: > > 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 <robh@kernel.org> > --- > 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(-) Hold off on applying this. I think graph.yaml is going to need some more refinement. The rest should be able to be applied without this patch. Rob
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
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 <robh@kernel.org> --- 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(-)