Skip to content

Commit 6956826

Browse files
krzkbroonie
authored andcommitted
ASoC: dt-bindings: qcom,lpass-wsa-macro: correct clocks on SM8250
SM8250 DTS uses additional "va" clock in WSA macro device node: sm8250-sony-xperia-edo-pdx203.dtb: codec@3240000: clock-names: ['mclk', 'npl', 'macro', 'dcodec', 'va', 'fsgen'] is too long Signed-off-by: Krzysztof Kozlowski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 0cbf1ec commit 6956826

File tree

1 file changed

+47
-11
lines changed

1 file changed

+47
-11
lines changed

Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ title: LPASS(Low Power Audio Subsystem) VA Macro audio codec
99
maintainers:
1010
- Srinivas Kandagatla <[email protected]>
1111

12-
allOf:
13-
- $ref: dai-common.yaml#
14-
1512
properties:
1613
compatible:
1714
enum:
@@ -30,15 +27,12 @@ properties:
3027
const: 0
3128

3229
clocks:
33-
maxItems: 5
30+
minItems: 5
31+
maxItems: 6
3432

3533
clock-names:
36-
items:
37-
- const: mclk
38-
- const: npl
39-
- const: macro
40-
- const: dcodec
41-
- const: fsgen
34+
minItems: 5
35+
maxItems: 6
4236

4337
clock-output-names:
4438
maxItems: 1
@@ -55,10 +49,51 @@ required:
5549
- reg
5650
- "#sound-dai-cells"
5751

52+
allOf:
53+
- $ref: dai-common.yaml#
54+
55+
- if:
56+
properties:
57+
compatible:
58+
enum:
59+
- qcom,sc7280-lpass-wsa-macro
60+
- qcom,sm8450-lpass-wsa-macro
61+
- qcom,sc8280xp-lpass-wsa-macro
62+
then:
63+
properties:
64+
clocks:
65+
maxItems: 5
66+
clock-names:
67+
items:
68+
- const: mclk
69+
- const: npl
70+
- const: macro
71+
- const: dcodec
72+
- const: fsgen
73+
74+
- if:
75+
properties:
76+
compatible:
77+
enum:
78+
- qcom,sm8250-lpass-wsa-macro
79+
then:
80+
properties:
81+
clocks:
82+
minItems: 6
83+
clock-names:
84+
items:
85+
- const: mclk
86+
- const: npl
87+
- const: macro
88+
- const: dcodec
89+
- const: va
90+
- const: fsgen
91+
5892
unevaluatedProperties: false
5993

6094
examples:
6195
- |
96+
#include <dt-bindings/clock/qcom,sm8250-lpass-aoncc.h>
6297
#include <dt-bindings/sound/qcom,q6afe.h>
6398
codec@3240000 {
6499
compatible = "qcom,sm8250-lpass-wsa-macro";
@@ -69,7 +104,8 @@ examples:
69104
<&audiocc 0>,
70105
<&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
71106
<&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
107+
<&aoncc LPASS_CDC_VA_MCLK>,
72108
<&vamacro>;
73-
clock-names = "mclk", "npl", "macro", "dcodec", "fsgen";
109+
clock-names = "mclk", "npl", "macro", "dcodec", "va", "fsgen";
74110
clock-output-names = "mclk";
75111
};

0 commit comments

Comments
 (0)