Skip to content

Commit 82d3ec1

Browse files
pujarsbroonie
authored andcommitted
ASoC: Use schema reference for sound-name-prefix
Use schema reference for 'sound-name-prefix' property wherever necessary. Signed-off-by: Sameer Pujar <spujar@nvidia.com> Cc: Jerome Brunet <jbrunet@baylibre.com> Cc: Stephan Gerhold <stephan@gerhold.net> Cc: Rob Herring <robh+dt@kernel.org> Reviewed-by: Jerome Brunet <jbrunet@baylibre.com> Reviewed-by: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/1630686919-19495-3-git-send-email-spujar@nvidia.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 7f826da commit 82d3ec1

File tree

6 files changed

+16
-31
lines changed

6 files changed

+16
-31
lines changed

Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ maintainers:
1717
- Jon Hunter <jonathanh@nvidia.com>
1818
- Sameer Pujar <spujar@nvidia.com>
1919

20+
allOf:
21+
- $ref: name-prefix.yaml#
22+
2023
properties:
2124
$nodename:
2225
pattern: "^dspk@[0-9a-f]*$"
@@ -48,12 +51,6 @@ properties:
4851

4952
sound-name-prefix:
5053
pattern: "^DSPK[1-9]$"
51-
$ref: /schemas/types.yaml#/definitions/string
52-
description:
53-
Used as prefix for sink/source names of the component. Must be a
54-
unique string among multiple instances of the same component.
55-
The name can be "DSPK1" or "DSPKx", where x depends on the maximum
56-
available instances on a Tegra SoC.
5754

5855
ports:
5956
$ref: /schemas/graph.yaml#/properties/ports

Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ maintainers:
1616
- Jon Hunter <jonathanh@nvidia.com>
1717
- Sameer Pujar <spujar@nvidia.com>
1818

19+
allOf:
20+
- $ref: name-prefix.yaml#
21+
1922
properties:
2023
$nodename:
2124
pattern: "^dmic@[0-9a-f]*$"
@@ -49,12 +52,6 @@ properties:
4952

5053
sound-name-prefix:
5154
pattern: "^DMIC[1-9]$"
52-
$ref: /schemas/types.yaml#/definitions/string
53-
description:
54-
used as prefix for sink/source names of the component. Must be a
55-
unique string among multiple instances of the same component.
56-
The name can be "DMIC1" or "DMIC2" ... "DMICx", where x depends
57-
on the maximum available instances on a Tegra SoC.
5855

5956
ports:
6057
$ref: /schemas/graph.yaml#/properties/ports

Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ maintainers:
1616
- Jon Hunter <jonathanh@nvidia.com>
1717
- Sameer Pujar <spujar@nvidia.com>
1818

19+
allOf:
20+
- $ref: name-prefix.yaml#
21+
1922
properties:
2023
$nodename:
2124
pattern: "^i2s@[0-9a-f]*$"
@@ -65,12 +68,6 @@ properties:
6568

6669
sound-name-prefix:
6770
pattern: "^I2S[1-9]$"
68-
$ref: /schemas/types.yaml#/definitions/string
69-
description:
70-
Used as prefix for sink/source names of the component. Must be a
71-
unique string among multiple instances of the same component.
72-
The name can be "I2S1" or "I2S2" ... "I2Sx", where x depends
73-
on the maximum available instances on a Tegra SoC.
7471

7572
ports:
7673
$ref: /schemas/graph.yaml#/properties/ports

Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: NXP/Goodix TFA989X (TFA1) Audio Amplifiers
99
maintainers:
1010
- Stephan Gerhold <stephan@gerhold.net>
1111

12+
allOf:
13+
- $ref: name-prefix.yaml#
14+
1215
properties:
1316
compatible:
1417
enum:
@@ -21,12 +24,6 @@ properties:
2124
'#sound-dai-cells':
2225
const: 0
2326

24-
sound-name-prefix:
25-
$ref: /schemas/types.yaml#/definitions/string
26-
description:
27-
Used as prefix for sink/source names of the component. Must be a
28-
unique string among multiple instances of the same component.
29-
3027
vddd-supply:
3128
description: regulator phandle for the VDDD power supply.
3229

Documentation/devicetree/bindings/sound/rt5659.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Optional properties:
4242
- realtek,ldo1-en-gpios : The GPIO that controls the CODEC's LDO1_EN pin.
4343
- realtek,reset-gpios : The GPIO that controls the CODEC's RESET pin.
4444

45-
- sound-name-prefix: Please refer to name-prefix.txt
45+
- sound-name-prefix: Please refer to name-prefix.yaml
4646

4747
- ports: A Codec may have a single or multiple I2S interfaces. These
4848
interfaces on Codec side can be described under 'ports' or 'port'.

Documentation/devicetree/bindings/sound/simple-audio-mux.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ description: |
1313
Simple audio multiplexers are driven using gpios, allowing to select which of
1414
their input line is connected to the output line.
1515
16+
allOf:
17+
- $ref: name-prefix.yaml#
18+
1619
properties:
1720
compatible:
1821
const: simple-audio-mux
@@ -21,12 +24,6 @@ properties:
2124
description: |
2225
GPIOs used to select the input line.
2326
24-
sound-name-prefix:
25-
$ref: /schemas/types.yaml#/definitions/string
26-
description:
27-
Used as prefix for sink/source names of the component. Must be a
28-
unique string among multiple instances of the same component.
29-
3027
required:
3128
- compatible
3229
- mux-gpios

0 commit comments

Comments
 (0)