Unverified Commit 967dad97 authored by Rob Herring's avatar Rob Herring Committed by Mark Brown
Browse files

ASoC: dt-bindings: Simplify referencing dai-params.yaml 



There's generally no need to use definitions to reference from
individual properties. All the property names are the same, and all the
defined properties are used by all the users.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20230928194126.1146622-1-robh@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b5d5c879

Documentation/devicetree/bindings/sound/audio-graph-port.yaml

+6 −14
Original line number Diff line number Diff line
@@ -13,19 +13,17 @@ select: false 


definitions:

  port-base:

    $ref: /schemas/graph.yaml#/$defs/port-base

    allOf:

      - $ref: /schemas/graph.yaml#/$defs/port-base

      - $ref: /schemas/sound/dai-params.yaml#

    properties:

      convert-rate:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate

      convert-channels:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels

      convert-sample-format:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format

      mclk-fs:

        $ref: simple-card.yaml#/definitions/mclk-fs



  endpoint-base:

    $ref: /schemas/graph.yaml#/$defs/endpoint-base

    allOf:

      - $ref: /schemas/graph.yaml#/$defs/endpoint-base

      - $ref: /schemas/sound/dai-params.yaml#

    properties:

      mclk-fs:

        $ref: simple-card.yaml#/definitions/mclk-fs
@@ -68,12 +66,6 @@ definitions: 
            - pdm

            - msb

            - lsb

      convert-rate:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate

      convert-channels:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels

      convert-sample-format:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format



      dai-tdm-slot-num:

        description: Number of slots in use.

Documentation/devicetree/bindings/sound/audio-graph.yaml

+3 −6
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: Audio Graph 
maintainers:

  - Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>



allOf:

  - $ref: /schemas/sound/dai-params.yaml#



properties:

  dais:

    $ref: /schemas/types.yaml#/definitions/phandle-array
@@ -30,12 +33,6 @@ properties: 
      widget ("Microphone", "Line", "Headphone", "Speaker"), the

      second being the machine specific name for the widget.

    $ref: /schemas/types.yaml#/definitions/non-unique-string-array

  convert-rate:

    $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate

  convert-channels:

    $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels

  convert-sample-format:

    $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format



  pa-gpios:

    maxItems: 1

Documentation/devicetree/bindings/sound/dai-params.yaml

+4 −7
Original line number Diff line number Diff line
@@ -11,15 +11,14 @@ maintainers: 


select: false



$defs:



  dai-channels:

properties:

  convert-channels:

    description: Number of audio channels used by DAI

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 1

    maximum: 32



  dai-sample-format:

  convert-sample-format:

    description: Audio sample format used by DAI

    $ref: /schemas/types.yaml#/definitions/string

    enum:
@@ -29,12 +28,10 @@ $defs: 
      - s24_3le

      - s32_le



  dai-sample-rate:

  convert-rate:

    description: Audio sample rate used by DAI

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 8000

    maximum: 192000



properties: {}



additionalProperties: true