| Message ID | 20201117013349.2458416-4-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | fd97ee45ec63759593b06be010a8ed395b299cce |
| Headers | show |
| Series | ASoC: graph card schema rework | expand |
On Mon, Nov 16, 2020 at 07:33:48PM -0600, Rob Herring wrote: > Now that we have a graph schema, reference it from the marvell,mmp-sspa > schema. > > Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: Lubomir Rintel <lkundrak@v3.sk> Thank you Lubo > --- > .../bindings/sound/marvell,mmp-sspa.yaml | 25 +++---------------- > 1 file changed, 3 insertions(+), 22 deletions(-) > > 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 <lkundrak@v3.sk> > > +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"; > }; > }; > -- > 2.25.1 >
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 <lkundrak@v3.sk> +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"; }; };
Now that we have a graph schema, reference it from the marvell,mmp-sspa schema. Signed-off-by: Rob Herring <robh@kernel.org> --- .../bindings/sound/marvell,mmp-sspa.yaml | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-)