Skip to content

Commit 494475e

Browse files
Sheetaltiwai
authored andcommitted
dt-bindings: Update Tegra194 and Tegra234 HDA bindings
- Tegra194 and Tegra234 HDA is not compatible with Tegra30, hence update them as standalone compatibles. Also, add necessary logic to the binding doc as HDA clocks and resets for Tegra194 and Tegra234 are different from Tegra30. This fixes below dtbs_check errors: - compatible: 'oneOf' conditional failed, one must be fixed: ['nvidia,tegra194-hda'] is too short 'nvidia,tegra30-hda' was expected 'nvidia,tegra132-hda' was expected - compatible: 'oneOf' conditional failed, one must be fixed: ['nvidia,tegra234-hda'] is too short 'nvidia,tegra30-hda' was expected 'nvidia,tegra132-hda' was expected - hda@3510000: clock-names:1: 'hda2hdmi' was expected - hda@3510000: reset-names:1: 'hda2hdmi' was expected Signed-off-by: Sheetal <[email protected]> Reviewed-by: Rob Herring (Arm) <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent eef5bcc commit 494475e

File tree

1 file changed

+72
-11
lines changed

1 file changed

+72
-11
lines changed

Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml

Lines changed: 72 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ properties:
2020

2121
compatible:
2222
oneOf:
23-
- const: nvidia,tegra30-hda
23+
- enum:
24+
- nvidia,tegra30-hda
25+
- nvidia,tegra194-hda
26+
- nvidia,tegra234-hda
2427
- items:
2528
- enum:
26-
- nvidia,tegra234-hda
27-
- nvidia,tegra194-hda
2829
- nvidia,tegra186-hda
2930
- nvidia,tegra210-hda
3031
- nvidia,tegra124-hda
@@ -48,21 +49,15 @@ properties:
4849

4950
clock-names:
5051
minItems: 2
51-
items:
52-
- const: hda
53-
- const: hda2hdmi
54-
- const: hda2codec_2x
52+
maxItems: 3
5553

5654
resets:
5755
minItems: 2
5856
maxItems: 3
5957

6058
reset-names:
6159
minItems: 2
62-
items:
63-
- const: hda
64-
- const: hda2hdmi
65-
- const: hda2codec_2x
60+
maxItems: 3
6661

6762
power-domains:
6863
maxItems: 1
@@ -93,6 +88,72 @@ required:
9388

9489
additionalProperties: false
9590

91+
allOf:
92+
- if:
93+
properties:
94+
compatible:
95+
contains:
96+
enum:
97+
- nvidia,tegra30-hda
98+
then:
99+
properties:
100+
clocks:
101+
minItems: 3
102+
clock-names:
103+
items:
104+
- const: hda
105+
- const: hda2hdmi
106+
- const: hda2codec_2x
107+
resets:
108+
minItems: 3
109+
reset-names:
110+
items:
111+
- const: hda
112+
- const: hda2hdmi
113+
- const: hda2codec_2x
114+
- if:
115+
properties:
116+
compatible:
117+
contains:
118+
enum:
119+
- nvidia,tegra194-hda
120+
then:
121+
properties:
122+
clocks:
123+
minItems: 3
124+
clock-names:
125+
items:
126+
- const: hda
127+
- const: hda2hdmi
128+
- const: hda2codec_2x
129+
resets:
130+
maxItems: 2
131+
reset-names:
132+
items:
133+
- const: hda
134+
- const: hda2hdmi
135+
- if:
136+
properties:
137+
compatible:
138+
contains:
139+
enum:
140+
- nvidia,tegra234-hda
141+
then:
142+
properties:
143+
clocks:
144+
minItems: 2
145+
maxItems: 2
146+
clock-names:
147+
items:
148+
- const: hda
149+
- const: hda2codec_2x
150+
resets:
151+
maxItems: 2
152+
reset-names:
153+
items:
154+
- const: hda
155+
- const: hda2codec_2x
156+
96157
examples:
97158
- |
98159
#include<dt-bindings/clock/tegra124-car-common.h>

0 commit comments

Comments
 (0)