Skip to content

Commit 1e5c693

Browse files
krzkandersson
authored andcommitted
dt-bindings: remoteproc: qcom,pas: correct memory-region constraints
Qualcomm PAS devices expect exactly one memory region, not many. Also, the memory-region is now defined in device specific binding, not in qcom,pas-common.yaml, thus also require it in the same place. Fixes: cee616c ("dt-bindings: remoteproc: qcom: adsp: move memory-region and firmware-name out of pas-common") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Rob Herring <robh@kernel.org> Link: https://lore.kernel.org/r/20230713072242.11268-2-krzysztof.kozlowski@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 3440d8d commit 1e5c693

10 files changed

Lines changed: 17 additions & 9 deletions

Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ properties:
4646

4747
required:
4848
- compatible
49+
- memory-region
4950

5051
unevaluatedProperties: false
5152

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ required:
8282
- clock-names
8383
- interrupts
8484
- interrupt-names
85-
- memory-region
8685
- qcom,smem-states
8786
- qcom,smem-state-names
8887

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ properties:
4242
smd-edge: false
4343

4444
memory-region:
45-
minItems: 1
45+
maxItems: 1
4646
description: Reference to the reserved-memory for the Hexagon core
4747

4848
firmware-name:
@@ -52,6 +52,7 @@ properties:
5252
required:
5353
- compatible
5454
- reg
55+
- memory-region
5556

5657
allOf:
5758
- $ref: /schemas/remoteproc/qcom,pas-common.yaml#

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ properties:
5151
- const: mss
5252

5353
memory-region:
54-
minItems: 1
54+
maxItems: 1
5555
description: Reference to the reserved-memory for the Hexagon core
5656

5757
qcom,qmp:
@@ -67,6 +67,7 @@ properties:
6767
required:
6868
- compatible
6969
- reg
70+
- memory-region
7071

7172
allOf:
7273
- $ref: /schemas/remoteproc/qcom,pas-common.yaml#

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ properties:
3838
smd-edge: false
3939

4040
memory-region:
41-
minItems: 1
41+
maxItems: 1
4242
description: Reference to the reserved-memory for the Hexagon core
4343

4444
firmware-name:
@@ -48,6 +48,7 @@ properties:
4848
required:
4949
- compatible
5050
- reg
51+
- memory-region
5152

5253
allOf:
5354
- $ref: /schemas/remoteproc/qcom,pas-common.yaml#

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ properties:
3838
smd-edge: false
3939

4040
memory-region:
41-
minItems: 1
41+
maxItems: 1
4242
description: Reference to the reserved-memory for the Hexagon core
4343

4444
firmware-name:
@@ -48,6 +48,7 @@ properties:
4848
required:
4949
- compatible
5050
- reg
51+
- memory-region
5152

5253
allOf:
5354
- $ref: /schemas/remoteproc/qcom,pas-common.yaml#

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ properties:
4646
- const: mss
4747

4848
memory-region:
49-
minItems: 1
49+
maxItems: 1
5050
description: Reference to the reserved-memory for the Hexagon core
5151

5252
qcom,qmp:
@@ -62,6 +62,7 @@ properties:
6262
required:
6363
- compatible
6464
- reg
65+
- memory-region
6566

6667
allOf:
6768
- $ref: /schemas/remoteproc/qcom,pas-common.yaml#

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ properties:
3636
description: Reference to the AOSS side-channel message RAM.
3737

3838
memory-region:
39-
minItems: 1
39+
maxItems: 1
4040
description: Reference to the reserved-memory for the Hexagon core
4141

4242
smd-edge: false
@@ -48,6 +48,7 @@ properties:
4848
required:
4949
- compatible
5050
- reg
51+
- memory-region
5152

5253
allOf:
5354
- $ref: /schemas/remoteproc/qcom,pas-common.yaml#

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ properties:
4040
description: Reference to the AOSS side-channel message RAM.
4141

4242
memory-region:
43-
minItems: 1
43+
maxItems: 1
4444
description: Reference to the reserved-memory for the Hexagon core
4545

4646
smd-edge: false
@@ -52,6 +52,7 @@ properties:
5252
required:
5353
- compatible
5454
- reg
55+
- memory-region
5556

5657
allOf:
5758
- $ref: /schemas/remoteproc/qcom,pas-common.yaml#

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ properties:
4343
smd-edge: false
4444

4545
memory-region:
46-
minItems: 1
46+
maxItems: 1
4747
description: Reference to the reserved-memory for the Hexagon core
4848

4949
firmware-name:
@@ -53,6 +53,7 @@ properties:
5353
required:
5454
- compatible
5555
- reg
56+
- memory-region
5657

5758
allOf:
5859
- $ref: /schemas/remoteproc/qcom,pas-common.yaml#

0 commit comments

Comments
 (0)