Skip to content

Commit 2a3a850

Browse files
committed
Merge tag 'rproc-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull remoteproc updates from Bjorn Andersson: "Support for booting the iMX remoteprocs using MMIO, instead of SMCCC is added. The iMX driver is also extended to support delivering interrupts from an arbitrary number of vdev. Support is added to the TI PRU driver, to allow GPMUX to be controlled from DeviceTree. The Qualcomm coredump collector is extended to fall back to generating a full coredump, in the case that the loaded firmware doesn't support generating minidump. The overly terse MD abbreviation of "MINIDUMP" is expanded, to make the code easier on the eye. The list of Qualcomm Sensor Low Power Island (SLPI) instances supported is cleaned up, and SDM845 is added. SDM630/636/660 support for the modem subsystem (mss) is added. All the Qualcomm drivers are transitioned to of_reserved_mem_lookup() instead of open coding the resolution of reserved-memory regions, to gain handling of error cases. A couple of drivers are transitioned to use devm_platform_ioremap_resource_byname(). The stm32 remoteproc driver's PM operations are updated to modern macros, to avoid the "unused variable"-warning in some configurations. Drivers are transitioned away from directly including of_device.h" * tag 'rproc-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux: (23 commits) remoteproc: pru: add support for configuring GPMUX based on client setup remoteproc: stm32: fix incorrect optional pointers remoteproc: imx_rproc: Switch iMX8MN/MP from SMCCC to MMIO dt-bindings: remoteproc: imx_rproc: Support i.MX8MN/P MMIO dt-bindings: remoteproc: qcom,msm8996-mss-pil: Fix 8996 clocks remoteproc: qcom: pas: add SDM845 SLPI compatible remoteproc: qcom: q6v5-mss: Add support for SDM630/636/660 dt-bindings: remoteproc: qcom,msm8996-mss-pil: Add SDM660 compatible remoteproc: qcom: Expand MD_* as MINIDUMP_* remoteproc: qcom: pas: refactor SLPI remoteproc init dt-bindings: remoteproc: qcom: adsp: add qcom,sdm845-slpi-pas compatible remoteproc: qcom: wcnss: use devm_platform_ioremap_resource_byname() remoteproc: qcom: q6v5: use devm_platform_ioremap_resource_byname() dt-bindings: remoteproc: qcom: sm6115-pas: Add QCM2290 remoteproc: qcom: Add full coredump fallback mechanism remoteproc: core: Export the rproc coredump APIs remoteproc: qcom: Use of_reserved_mem_lookup() remoteproc: imx_rproc: iterate all notifiyids in rx callback dt-bindings: remoteproc: qcom,adsp: bring back firmware-name dt-bindings: remoteproc: qcom,sm8550-pas: require memory-region ...
2 parents 3d90470 + 18cf4fc commit 2a3a850

36 files changed

+362
-173
lines changed

Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ properties:
2020
- fsl,imx7ulp-cm4
2121
- fsl,imx8mm-cm4
2222
- fsl,imx8mn-cm7
23+
- fsl,imx8mn-cm7-mmio
2324
- fsl,imx8mp-cm7
25+
- fsl,imx8mp-cm7-mmio
2426
- fsl,imx8mq-cm4
2527
- fsl,imx8qm-cm4
2628
- fsl,imx8qxp-cm4
@@ -70,6 +72,11 @@ properties:
7072
description:
7173
Specify CPU entry address for SCU enabled processor.
7274

75+
fsl,iomuxc-gpr:
76+
$ref: /schemas/types.yaml#/definitions/phandle
77+
description:
78+
Phandle to IOMUXC GPR block which provide access to CM7 CPUWAIT bit.
79+
7380
fsl,resource-id:
7481
$ref: /schemas/types.yaml#/definitions/uint32
7582
description:
@@ -79,6 +86,19 @@ properties:
7986
required:
8087
- compatible
8188

89+
allOf:
90+
- if:
91+
properties:
92+
compatible:
93+
not:
94+
contains:
95+
enum:
96+
- fsl,imx8mn-cm7-mmio
97+
- fsl,imx8mp-cm7-mmio
98+
then:
99+
properties:
100+
fsl,iomuxc-gpr: false
101+
82102
additionalProperties: false
83103

84104
examples:

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- qcom,sdm660-adsp-pas
2727
- qcom,sdm845-adsp-pas
2828
- qcom,sdm845-cdsp-pas
29+
- qcom,sdm845-slpi-pas
2930

3031
reg:
3132
maxItems: 1
@@ -44,8 +45,13 @@ properties:
4445
maxItems: 1
4546
description: Reference to the reserved-memory for the Hexagon core
4647

48+
firmware-name:
49+
maxItems: 1
50+
description: Firmware name for the Hexagon core
51+
4752
required:
4853
- compatible
54+
- memory-region
4955

5056
unevaluatedProperties: false
5157

@@ -63,6 +69,7 @@ allOf:
6369
- qcom,msm8998-adsp-pas
6470
- qcom,sdm845-adsp-pas
6571
- qcom,sdm845-cdsp-pas
72+
- qcom,sdm845-slpi-pas
6673
then:
6774
properties:
6875
clocks:
@@ -104,6 +111,7 @@ allOf:
104111
- qcom,msm8998-slpi-pas
105112
- qcom,sdm845-adsp-pas
106113
- qcom,sdm845-cdsp-pas
114+
- qcom,sdm845-slpi-pas
107115
then:
108116
properties:
109117
interrupts:
@@ -157,6 +165,22 @@ allOf:
157165
required:
158166
- px-supply
159167

168+
- if:
169+
properties:
170+
compatible:
171+
enum:
172+
- qcom,sdm845-slpi-pas
173+
then:
174+
properties:
175+
power-domains:
176+
items:
177+
- description: LCX power domain
178+
- description: LMX power domain
179+
power-domain-names:
180+
items:
181+
- const: lcx
182+
- const: lmx
183+
160184
- if:
161185
properties:
162186
compatible:

Documentation/devicetree/bindings/remoteproc/qcom,msm8996-mss-pil.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
enum:
2020
- qcom,msm8996-mss-pil
2121
- qcom,msm8998-mss-pil
22+
- qcom,sdm660-mss-pil
2223
- qcom,sdm845-mss-pil
2324

2425
reg:
@@ -215,13 +216,12 @@ allOf:
215216
- description: GCC MSS IFACE clock
216217
- description: GCC MSS BUS clock
217218
- description: GCC MSS MEM clock
218-
- description: RPMH XO clock
219+
- description: RPM XO clock
219220
- description: GCC MSS GPLL0 clock
220221
- description: GCC MSS SNOC_AXI clock
221222
- description: GCC MSS MNOC_AXI clock
222-
- description: RPMH PNOC clock
223-
- description: GCC MSS PRNG clock
224-
- description: RPMH QDSS clock
223+
- description: RPM PNOC clock
224+
- description: RPM QDSS clock
225225
clock-names:
226226
items:
227227
- const: iface
@@ -245,7 +245,9 @@ allOf:
245245
- if:
246246
properties:
247247
compatible:
248-
const: qcom,msm8998-mss-pil
248+
enum:
249+
- qcom,msm8998-mss-pil
250+
- qcom,sdm660-mss-pil
249251
then:
250252
properties:
251253
clocks:

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,sm6115-pas.yaml

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,19 @@ description:
1515

1616
properties:
1717
compatible:
18-
enum:
19-
- qcom,sm6115-adsp-pas
20-
- qcom,sm6115-cdsp-pas
21-
- qcom,sm6115-mpss-pas
18+
oneOf:
19+
- enum:
20+
- qcom,sm6115-adsp-pas
21+
- qcom,sm6115-cdsp-pas
22+
- qcom,sm6115-mpss-pas
23+
24+
- items:
25+
- const: qcom,qcm2290-adsp-pas
26+
- const: qcom,sm6115-adsp-pas
27+
28+
- items:
29+
- const: qcom,qcm2290-mpss-pas
30+
- const: qcom,sm6115-mpss-pas
2231

2332
reg:
2433
maxItems: 1
@@ -32,7 +41,7 @@ properties:
3241
- const: xo
3342

3443
memory-region:
35-
minItems: 1
44+
maxItems: 1
3645
description: Reference to the reserved-memory for the Hexagon core
3746

3847
smd-edge: false
@@ -44,15 +53,17 @@ properties:
4453
required:
4554
- compatible
4655
- reg
56+
- memory-region
4757

4858
allOf:
4959
- $ref: /schemas/remoteproc/qcom,pas-common.yaml#
5060
- if:
5161
properties:
5262
compatible:
53-
enum:
54-
- qcom,sm6115-adsp-pas
55-
- qcom,sm6115-cdsp-pas
63+
contains:
64+
enum:
65+
- qcom,sm6115-adsp-pas
66+
- qcom,sm6115-cdsp-pas
5667
then:
5768
properties:
5869
interrupts:
@@ -69,9 +80,10 @@ allOf:
6980
- if:
7081
properties:
7182
compatible:
72-
enum:
73-
- qcom,sm6115-cdsp-pas
74-
- qcom,sm6115-mpss-pas
83+
contains:
84+
enum:
85+
- qcom,sm6115-cdsp-pas
86+
- qcom,sm6115-mpss-pas
7587
then:
7688
properties:
7789
power-domains:
@@ -84,8 +96,9 @@ allOf:
8496
- if:
8597
properties:
8698
compatible:
87-
enum:
88-
- qcom,sm6115-adsp-pas
99+
contains:
100+
enum:
101+
- qcom,sm6115-adsp-pas
89102
then:
90103
properties:
91104
power-domains:

0 commit comments

Comments
 (0)