Skip to content

Commit 199afba

Browse files
committed
Merge remote-tracking branch tech/all/dt/qcs615 into qcom-next
2 parents 2c0da2f + 0302ddd commit 199afba

File tree

4 files changed

+659
-27
lines changed

4 files changed

+659
-27
lines changed

Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,26 @@ description:
1515

1616
properties:
1717
compatible:
18-
enum:
19-
- qcom,sc8180x-adsp-pas
20-
- qcom,sc8180x-cdsp-pas
21-
- qcom,sc8180x-slpi-pas
22-
- qcom,sm8150-adsp-pas
23-
- qcom,sm8150-cdsp-pas
24-
- qcom,sm8150-mpss-pas
25-
- qcom,sm8150-slpi-pas
26-
- qcom,sm8250-adsp-pas
27-
- qcom,sm8250-cdsp-pas
28-
- qcom,sm8250-slpi-pas
18+
oneOf:
19+
- items:
20+
- enum:
21+
- qcom,qcs615-adsp-pas
22+
- const: qcom,sm8150-adsp-pas
23+
- items:
24+
- enum:
25+
- qcom,qcs615-cdsp-pas
26+
- const: qcom,sm8150-cdsp-pas
27+
- enum:
28+
- qcom,sc8180x-adsp-pas
29+
- qcom,sc8180x-cdsp-pas
30+
- qcom,sc8180x-slpi-pas
31+
- qcom,sm8150-adsp-pas
32+
- qcom,sm8150-cdsp-pas
33+
- qcom,sm8150-mpss-pas
34+
- qcom,sm8150-slpi-pas
35+
- qcom,sm8250-adsp-pas
36+
- qcom,sm8250-cdsp-pas
37+
- qcom,sm8250-slpi-pas
2938

3039
reg:
3140
maxItems: 1
@@ -62,16 +71,17 @@ allOf:
6271
- if:
6372
properties:
6473
compatible:
65-
enum:
66-
- qcom,sc8180x-adsp-pas
67-
- qcom,sc8180x-cdsp-pas
68-
- qcom,sc8180x-slpi-pas
69-
- qcom,sm8150-adsp-pas
70-
- qcom,sm8150-cdsp-pas
71-
- qcom,sm8150-slpi-pas
72-
- qcom,sm8250-adsp-pas
73-
- qcom,sm8250-cdsp-pas
74-
- qcom,sm8250-slpi-pas
74+
contains:
75+
enum:
76+
- qcom,sc8180x-adsp-pas
77+
- qcom,sc8180x-cdsp-pas
78+
- qcom,sc8180x-slpi-pas
79+
- qcom,sm8150-adsp-pas
80+
- qcom,sm8150-cdsp-pas
81+
- qcom,sm8150-slpi-pas
82+
- qcom,sm8250-adsp-pas
83+
- qcom,sm8250-cdsp-pas
84+
- qcom,sm8250-slpi-pas
7585
then:
7686
properties:
7787
interrupts:
@@ -88,12 +98,13 @@ allOf:
8898
- if:
8999
properties:
90100
compatible:
91-
enum:
92-
- qcom,sc8180x-adsp-pas
93-
- qcom,sc8180x-cdsp-pas
94-
- qcom,sm8150-adsp-pas
95-
- qcom,sm8150-cdsp-pas
96-
- qcom,sm8250-cdsp-pas
101+
contains:
102+
enum:
103+
- qcom,sc8180x-adsp-pas
104+
- qcom,sc8180x-cdsp-pas
105+
- qcom,sm8150-adsp-pas
106+
- qcom,sm8150-cdsp-pas
107+
- qcom,sm8250-cdsp-pas
97108
then:
98109
properties:
99110
power-domains:

Documentation/devicetree/bindings/sram/qcom,imem.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
- qcom,msm8974-imem
2323
- qcom,msm8976-imem
2424
- qcom,qcs404-imem
25+
- qcom,qcs615-imem
2526
- qcom,qcs8300-imem
2627
- qcom,qdu1000-imem
2728
- qcom,sa8775p-imem

0 commit comments

Comments
 (0)