Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: dt-bindings: Add common sound card properties
Almost every board machine / sound cards has "audio-routing" and "model"
properties, so move them to common schema to have only one definition of
these properties.
For amlogic,gx-sound-card, drop the minItems: 2 from the
"audio-routing", because any limit here - lower or upper- is rather
meaningless. This will also fix `dtbs_check` warnings like:
meson-gxm-s912-libretech-pc.dtb: sound: audio-routing: ['AU2 INL', 'ACODEC LOLN', 'AU2 INR', 'ACODEC LORN', '7J4-14 LEFT', 'AU2 OUTL', '7J4-11 RIGHT', 'AU2 OUTR'] is too long
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230810063300.20151-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Krzysztof Kozlowski
and committed by
Mark Brown
a06ce12e
7ac1102b
+50
-78
+3
-12
Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.yaml
+3
-12
Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.yaml
···
9
9
maintainers:
10
10
- Jerome Brunet <jbrunet@baylibre.com>
11
11
12
+
allOf:
13
+
- $ref: sound-card-common.yaml#
14
+
12
15
properties:
13
16
compatible:
14
17
const: amlogic,axg-sound-card
···
20
17
$ref: /schemas/types.yaml#/definitions/phandle-array
21
18
description: list of auxiliary devices
22
19
23
-
audio-routing:
24
-
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
25
-
description:
26
-
A list of the connections between audio components. Each entry is a
27
-
pair of strings, the first being the connection's sink, the second
28
-
being the connection's source.
29
-
30
20
audio-widgets:
31
21
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
32
22
description:
33
23
A list off component DAPM widget. Each entry is a pair of strings,
34
24
the first being the widget type, the second being the widget name
35
-
36
-
model:
37
-
$ref: /schemas/types.yaml#/definitions/string
38
-
description: User specified audio sound card name
39
25
40
26
patternProperties:
41
27
"^dai-link-[0-9]+$":
···
100
108
- sound-dai
101
109
102
110
required:
103
-
- model
104
111
- dai-link-0
105
112
106
113
unevaluatedProperties: false
+4
-13
Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml
+4
-13
Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml
···
9
9
maintainers:
10
10
- Jerome Brunet <jbrunet@baylibre.com>
11
11
12
+
allOf:
13
+
- $ref: sound-card-common.yaml#
14
+
12
15
properties:
13
16
compatible:
14
17
items:
···
21
18
$ref: /schemas/types.yaml#/definitions/phandle-array
22
19
description: list of auxiliary devices
23
20
24
-
audio-routing:
25
-
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
26
-
minItems: 2
27
-
description: |-
28
-
A list of the connections between audio components. Each entry is a
29
-
pair of strings, the first being the connection's sink, the second
30
-
being the connection's source.
31
-
32
21
audio-widgets:
33
22
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
34
23
minItems: 2
35
24
description: |-
36
25
A list off component DAPM widget. Each entry is a pair of strings,
37
26
the first being the widget type, the second being the widget name
38
-
39
-
model:
40
-
$ref: /schemas/types.yaml#/definitions/string
41
-
description: User specified audio sound card name
42
27
43
28
patternProperties:
44
29
"^dai-link-[0-9]+$":
···
77
86
- model
78
87
- dai-link-0
79
88
80
-
additionalProperties: false
89
+
unevaluatedProperties: false
81
90
82
91
examples:
83
92
- |
+4
-13
Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml
+4
-13
Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml
···
17
17
such as SAI, MICFIL, .etc through building rpmsg channels between
18
18
Cortex-A and Cortex-M.
19
19
20
+
allOf:
21
+
- $ref: sound-card-common.yaml#
22
+
20
23
properties:
21
24
compatible:
22
25
enum:
···
29
26
- fsl,imx8mp-rpmsg-audio
30
27
- fsl,imx8ulp-rpmsg-audio
31
28
- fsl,imx93-rpmsg-audio
32
-
33
-
model:
34
-
$ref: /schemas/types.yaml#/definitions/string
35
-
description: User specified audio sound card name
36
29
37
30
clocks:
38
31
items:
···
65
66
$ref: /schemas/types.yaml#/definitions/phandle
66
67
description: The phandle to a node of audio codec
67
68
68
-
audio-routing:
69
-
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
70
-
description: |
71
-
A list of the connections between audio components. Each entry is a
72
-
pair of strings, the first being the connection's sink, the second
73
-
being the connection's source.
74
-
75
69
fsl,enable-lpa:
76
70
$ref: /schemas/types.yaml#/definitions/flag
77
71
description: enable low power audio path.
···
93
101
94
102
required:
95
103
- compatible
96
-
- model
97
104
98
-
additionalProperties: false
105
+
unevaluatedProperties: false
99
106
100
107
examples:
101
108
- |
+4
-13
Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml
+4
-13
Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml
···
13
13
description:
14
14
This binding describes the SC7180 sound card which uses LPASS for audio.
15
15
16
+
allOf:
17
+
- $ref: sound-card-common.yaml#
18
+
16
19
properties:
17
20
compatible:
18
21
enum:
19
22
- google,sc7180-trogdor
20
23
- google,sc7180-coachz
21
-
22
-
audio-routing:
23
-
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
24
-
description:
25
-
A list of the connections between audio components. Each entry is a
26
-
pair of strings, the first being the connection's sink, the second
27
-
being the connection's source.
28
-
29
-
model:
30
-
$ref: /schemas/types.yaml#/definitions/string
31
-
description: User specified audio sound card name
32
24
33
25
"#address-cells":
34
26
const: 1
···
78
86
79
87
required:
80
88
- compatible
81
-
- model
82
89
- "#address-cells"
83
90
- "#size-cells"
84
91
85
-
additionalProperties: false
92
+
unevaluatedProperties: false
86
93
87
94
examples:
88
95
+4
-13
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml
+4
-13
Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml
···
13
13
description:
14
14
This binding describes the SC7280 sound card which uses LPASS for audio.
15
15
16
+
allOf:
17
+
- $ref: sound-card-common.yaml#
18
+
16
19
properties:
17
20
compatible:
18
21
enum:
19
22
- google,sc7280-herobrine
20
-
21
-
audio-routing:
22
-
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
23
-
description:
24
-
A list of the connections between audio components. Each entry is a
25
-
pair of strings, the first being the connection's sink, the second
26
-
being the connection's source.
27
-
28
-
model:
29
-
$ref: /schemas/types.yaml#/definitions/string
30
-
description: User specified audio sound card name
31
23
32
24
"#address-cells":
33
25
const: 1
···
89
97
90
98
required:
91
99
- compatible
92
-
- model
93
100
- "#address-cells"
94
101
- "#size-cells"
95
102
96
-
additionalProperties: false
103
+
unevaluatedProperties: false
97
104
98
105
examples:
99
106
+4
-14
Documentation/devicetree/bindings/sound/imx-audio-card.yaml
+4
-14
Documentation/devicetree/bindings/sound/imx-audio-card.yaml
···
9
9
maintainers:
10
10
- Shengjiu Wang <shengjiu.wang@nxp.com>
11
11
12
+
allOf:
13
+
- $ref: sound-card-common.yaml#
14
+
12
15
properties:
13
16
compatible:
14
17
enum:
15
18
- fsl,imx-audio-card
16
-
17
-
model:
18
-
$ref: /schemas/types.yaml#/definitions/string
19
-
description: User specified audio sound card name
20
-
21
-
audio-routing:
22
-
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
23
-
description:
24
-
A list of the connections between audio components. Each entry is a
25
-
pair of strings, the first being the connection's sink, the second
26
-
being the connection's source. Valid names could be power supplies,
27
-
MicBias of codec and the jacks on the board.
28
19
29
20
patternProperties:
30
21
".*-dai-link$":
···
75
84
76
85
required:
77
86
- compatible
78
-
- model
79
87
80
-
additionalProperties: false
88
+
unevaluatedProperties: false
81
89
82
90
examples:
83
91
- |
+27
Documentation/devicetree/bindings/sound/sound-card-common.yaml
+27
Documentation/devicetree/bindings/sound/sound-card-common.yaml
···
1
+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2
+
%YAML 1.2
3
+
---
4
+
$id: http://devicetree.org/schemas/sound/sound-card-common.yaml#
5
+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6
+
7
+
title: Board Sound Card Common Properties
8
+
9
+
maintainers:
10
+
- Mark Brown <broonie@kernel.org>
11
+
12
+
properties:
13
+
audio-routing:
14
+
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
15
+
description: |
16
+
A list of the connections between audio components. Each entry is a
17
+
pair of strings, the first being the connection's sink, the second
18
+
being the connection's source.
19
+
20
+
model:
21
+
$ref: /schemas/types.yaml#/definitions/string
22
+
description: User specified audio sound card name
23
+
24
+
required:
25
+
- model
26
+
27
+
additionalProperties: true