ASoC: dt-bindings: Centralize the 'sound-dai' definition

'sound-dai' is a common property, but has duplicate type definitions.
Create a new common definition to define the type and then update all
the other occurrences to just define how many entries there are just
like other phandle+arg properties.

The constraints on the number of entries is based on the examples and
could be wrong.

Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Jerome Brunet <jbrunet@baylibre.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220126231427.1638089-1-robh@kernel.org
This commit is contained in:
Rob Herring 2022-01-26 17:14:27 -06:00
parent d7f17b661f
commit 97709d365b
8 changed files with 42 additions and 21 deletions

View File

@ -57,7 +57,7 @@ patternProperties:
rate
sound-dai:
$ref: /schemas/types.yaml#/definitions/phandle-array
maxItems: 1
description: phandle of the CPU DAI
patternProperties:
@ -71,7 +71,7 @@ patternProperties:
properties:
sound-dai:
$ref: /schemas/types.yaml#/definitions/phandle-array
maxItems: 1
description: phandle of the codec DAI
required:

View File

@ -62,13 +62,15 @@ patternProperties:
description: Holds subnode which indicates cpu dai.
type: object
properties:
sound-dai: true
sound-dai:
maxItems: 1
codec:
description: Holds subnode which indicates codec dai.
type: object
properties:
sound-dai: true
sound-dai:
maxItems: 1
required:
- link-name

View File

@ -59,13 +59,16 @@ patternProperties:
description: Holds subnode which indicates cpu dai.
type: object
properties:
sound-dai: true
sound-dai:
maxItems: 1
codec:
description: Holds subnode which indicates codec dai.
type: object
properties:
sound-dai: true
sound-dai:
minItems: 1
maxItems: 2
fsl,mclk-equal-bclk:
description: Indicates mclk can be equal to bclk, especially for sai interface

View File

@ -69,19 +69,23 @@ patternProperties:
description: Holds subnode which indicates cpu dai.
type: object
properties:
sound-dai: true
sound-dai:
maxItems: 1
platform:
description: Holds subnode which indicates platform dai.
type: object
properties:
sound-dai: true
sound-dai:
maxItems: 1
codec:
description: Holds subnode which indicates codec dai.
type: object
properties:
sound-dai: true
sound-dai:
minItems: 1
maxItems: 4
required:
- link-name

View File

@ -27,9 +27,6 @@ properties:
sound-dai:
minItems: 2
maxItems: 2
items:
maxItems: 1
$ref: /schemas/types.yaml#/definitions/phandle-array
description: |
phandles to the I2S controller and bluetooth codec,
in that order
@ -38,7 +35,7 @@ properties:
type: object
properties:
sound-dai:
$ref: /schemas/types.yaml#/definitions/phandle-array
maxItems: 1
description: phandle to the WM8994 CODEC
samsung,audio-routing:

View File

@ -21,7 +21,6 @@ properties:
type: object
properties:
sound-dai:
$ref: /schemas/types.yaml#/definitions/phandle-array
maxItems: 1
description: phandle to the I2S controller
required:
@ -31,7 +30,6 @@ properties:
type: object
properties:
sound-dai:
$ref: /schemas/types.yaml#/definitions/phandle-array
maxItems: 1
description: phandle to the WM1811 CODEC
required:

View File

@ -37,18 +37,15 @@ properties:
type: object
properties:
sound-dai:
$ref: /schemas/types.yaml#/definitions/phandle-array
description: phandles to the I2S controllers
codec:
type: object
properties:
sound-dai:
$ref: /schemas/types.yaml#/definitions/phandle-array
description: |
List of phandles to the CODEC nodes,
first entry must be corresponding to the MAX98090 CODEC and
the second entry must be the phandle of the HDMI IP block node.
items:
- description: phandle of the MAX98090 CODEC
- description: phandle of the HDMI IP block node
samsung,audio-routing:
$ref: /schemas/types.yaml#/definitions/non-unique-string-array

View File

@ -0,0 +1,20 @@
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/sound/sound-dai.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Digital Audio Interface consumer Device Tree Bindings
maintainers:
- Rob Herring <robh@kernel.org>
select: true
properties:
sound-dai:
$ref: /schemas/types.yaml#/definitions/phandle-array
description: A phandle plus args to digital audio interface provider(s)
additionalProperties: true
...