Skip to content

Commit 83c8fa5

Browse files
krzkbroonie
authored andcommitted
ASoC: dt-bindings: qcom,q6asm: Split to separate schema
The APR/GPR bindings with services got complicated so move out the Q6ASM service to its own binding. Previously the compatible was documented in qcom,apr.yaml. Move most of the examples from its children to this new file. Signed-off-by: Krzysztof Kozlowski <[email protected]> Reviewed-by: Rob Herring <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent f26a776 commit 83c8fa5

File tree

2 files changed

+84
-32
lines changed

2 files changed

+84
-32
lines changed

Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -73,40 +73,24 @@ additionalProperties: false
7373

7474
examples:
7575
- |
76-
#include <dt-bindings/soc/qcom,apr.h>
77-
#include <dt-bindings/sound/qcom,q6asm.h>
78-
79-
apr {
80-
compatible = "qcom,apr-v2";
81-
qcom,domain = <APR_DOMAIN_ADSP>;
76+
dais {
77+
compatible = "qcom,q6asm-dais";
78+
iommus = <&apps_smmu 0x1821 0x0>;
8279
#address-cells = <1>;
8380
#size-cells = <0>;
81+
#sound-dai-cells = <1>;
82+
83+
dai@0 {
84+
reg = <0>;
85+
};
86+
87+
dai@1 {
88+
reg = <1>;
89+
};
8490
85-
service@7 {
86-
compatible = "qcom,q6asm";
87-
reg = <APR_SVC_ASM>;
88-
qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
89-
90-
dais {
91-
compatible = "qcom,q6asm-dais";
92-
iommus = <&apps_smmu 0x1821 0x0>;
93-
#address-cells = <1>;
94-
#size-cells = <0>;
95-
#sound-dai-cells = <1>;
96-
97-
dai@0 {
98-
reg = <0>;
99-
};
100-
101-
dai@1 {
102-
reg = <1>;
103-
};
104-
105-
dai@2 {
106-
reg = <2>;
107-
is-compress-dai;
108-
direction = <1>;
109-
};
110-
};
91+
dai@2 {
92+
reg = <2>;
93+
is-compress-dai;
94+
direction = <1>;
11195
};
11296
};
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/qcom,q6asm.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Audio Stream Manager (Q6ASM)
8+
9+
maintainers:
10+
- Krzysztof Kozlowski <[email protected]>
11+
- Srinivas Kandagatla <[email protected]>
12+
13+
allOf:
14+
- $ref: /schemas/soc/qcom/qcom,apr-services.yaml#
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- qcom,q6asm
20+
21+
dais:
22+
type: object
23+
$ref: /schemas/sound/qcom,q6asm-dais.yaml#
24+
unevaluatedProperties: false
25+
description: Qualcomm DSP audio ports
26+
27+
required:
28+
- compatible
29+
- dais
30+
31+
unevaluatedProperties: false
32+
33+
examples:
34+
- |
35+
#include <dt-bindings/soc/qcom,apr.h>
36+
37+
apr {
38+
#address-cells = <1>;
39+
#size-cells = <0>;
40+
41+
service@7 {
42+
compatible = "qcom,q6asm";
43+
reg = <APR_SVC_ASM>;
44+
qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";
45+
46+
dais {
47+
compatible = "qcom,q6asm-dais";
48+
iommus = <&apps_smmu 0x1821 0x0>;
49+
#address-cells = <1>;
50+
#size-cells = <0>;
51+
#sound-dai-cells = <1>;
52+
53+
dai@0 {
54+
reg = <0>;
55+
};
56+
57+
dai@1 {
58+
reg = <1>;
59+
};
60+
61+
dai@2 {
62+
reg = <2>;
63+
is-compress-dai;
64+
direction = <1>;
65+
};
66+
};
67+
};
68+
};

0 commit comments

Comments
 (0)