Skip to content

Commit 472863a

Browse files
torvaldstorvalds
committed
Merge tag 'rproc-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull remoteproc updates from Bjorn Andersson: - Transition the i.MX8MP DSP remoteproc driver to use the reset framework for driving the run/stall reset bits - Add support for managing the modem remoteprocessor on the Qualcomm MSM8226, MSM8926, and SM8750 platforms * tag 'rproc-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux: (28 commits) remoteproc: qcom_q6v5_pas: Make single-PD handling more robust remoteproc: qcom_q6v5_pas: Use resource with CX PD for MSM8226 remoteproc: core: Clear table_sz when rproc_shutdown remoteproc: sysmon: Update qcom_add_sysmon_subdev() comment dt-bindings: remoteproc: Consolidate SC8180X and SM8150 PAS files irqdomain: remoteproc: Switch to of_fwnode_handle() remoteproc: qcom: pas: add minidump_id to SC7280 WPSS remoteproc: imx_dsp_rproc: Document run_stall struct member remoteproc: qcom: pas: Add SM8750 MPSS dt-bindings: remoteproc: Add SM8750 MPSS imx_dsp_rproc: Use reset controller API to control the DSP reset: imx8mp-audiomix: Add support for DSP run/stall reset: imx8mp-audiomix: Introduce active_low configuration option reset: imx8mp-audiomix: Prepare the code for more reset bits reset: imx8mp-audiomix: Add prefix for internal macro dt-bindings: dsp: fsl,dsp: Add resets property dt-bindings: reset: audiomix: Add reset ids for EARC and DSP remoteproc: qcom_wcnss: Handle platforms with only single power domain dt-bindings: remoteproc: qcom,wcnss-pil: Add support for single power-domain platforms remoteproc: qcom_q6v5_mss: Add modem support on MSM8926 ...
2 parents 7d4eca7 + e917b73 commit 472863a

18 files changed

+499
-165
lines changed

‎Documentation/devicetree/bindings/dsp/fsl,dsp.yaml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,15 @@ properties:
8282
description:
8383
Phandle to syscon block which provide access for processor enablement
8484

85+
resets:
86+
minItems: 1
87+
88+
reset-names:
89+
minItems: 1
90+
items:
91+
- const: runstall
92+
- const: softreset
93+
8594
required:
8695
- compatible
8796
- reg
@@ -164,6 +173,17 @@ allOf:
164173
- const: txdb1
165174
- const: rxdb0
166175
- const: rxdb1
176+
- if:
177+
properties:
178+
compatible:
179+
contains:
180+
enum:
181+
- fsl,imx8mp-dsp
182+
- fsl,imx8mp-hifi4
183+
then:
184+
required:
185+
- resets
186+
- reset-names
167187

168188
additionalProperties: false
169189

@@ -186,6 +206,7 @@ examples:
186206
};
187207
- |
188208
#include <dt-bindings/clock/imx8mp-clock.h>
209+
#include <dt-bindings/reset/imx8mp-reset-audiomix.h>
189210
dsp_reserved: dsp@92400000 {
190211
reg = <0x92400000 0x1000000>;
191212
no-map;
@@ -220,5 +241,6 @@ examples:
220241
<&mu2 3 0>;
221242
memory-region = <&dsp_vdev0buffer>, <&dsp_vdev0vring0>,
222243
<&dsp_vdev0vring1>, <&dsp_reserved>;
223-
fsl,dsp-ctrl = <&audio_blk_ctrl>;
244+
resets = <&audio_blk_ctrl IMX8MP_AUDIOMIX_DSP_RUNSTALL>;
245+
reset-names = "runstall";
224246
};

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

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ properties:
1717
compatible:
1818
oneOf:
1919
- enum:
20+
- qcom,msm8226-mss-pil
2021
- qcom,msm8909-mss-pil
2122
- qcom,msm8916-mss-pil
23+
- qcom,msm8926-mss-pil
2224
- qcom,msm8953-mss-pil
2325
- qcom,msm8974-mss-pil
2426

@@ -70,16 +72,18 @@ properties:
7072
items:
7173
- description: CX proxy power domain (control handed over after startup)
7274
- description: MX proxy power domain (control handed over after startup)
75+
(not valid for qcom,msm8226-mss-pil, qcom,msm8926-mss-pil
76+
and qcom,msm8974-mss-pil)
7377
- description: MSS proxy power domain (control handed over after startup)
7478
(only valid for qcom,msm8953-mss-pil)
75-
minItems: 2
79+
minItems: 1
7680

7781
power-domain-names:
7882
items:
7983
- const: cx
80-
- const: mx
84+
- const: mx # not valid for qcom,msm8226-mss-pil, qcom-msm8926-mss-pil and qcom,msm8974-mss-pil
8185
- const: mss # only valid for qcom,msm8953-mss-pil
82-
minItems: 2
86+
minItems: 1
8387

8488
pll-supply:
8589
description: PLL proxy supply (control handed over after startup)
@@ -106,6 +110,15 @@ properties:
106110
items:
107111
- const: stop
108112

113+
qcom,ext-bhs-reg:
114+
$ref: /schemas/types.yaml#/definitions/phandle-array
115+
description: External power block headswitch (BHS) register
116+
(only valid for qcom,msm8226-mss-pil)
117+
items:
118+
- items:
119+
- description: phandle to external BHS syscon region
120+
- description: offset to the external BHS register
121+
109122
qcom,halt-regs:
110123
$ref: /schemas/types.yaml#/definitions/phandle-array
111124
description:
@@ -207,17 +220,58 @@ allOf:
207220
required:
208221
- power-domains
209222
- power-domain-names
210-
else:
223+
224+
- if:
225+
properties:
226+
compatible:
227+
contains:
228+
enum:
229+
- qcom,msm8909-mss-pil
230+
- qcom,msm8916-mss-pil
231+
then:
211232
properties:
212233
power-domains:
234+
minItems: 2
213235
maxItems: 2
214236
power-domain-names:
237+
minItems: 2
215238
maxItems: 2
216239

217240
- if:
218241
properties:
219242
compatible:
220-
const: qcom,msm8974-mss-pil
243+
contains:
244+
enum:
245+
- qcom,msm8226-mss-pil
246+
- qcom,msm8926-mss-pil
247+
- qcom,msm8974-mss-pil
248+
then:
249+
properties:
250+
power-domains:
251+
maxItems: 1
252+
power-domain-names:
253+
maxItems: 1
254+
required:
255+
- mx-supply
256+
257+
- if:
258+
properties:
259+
compatible:
260+
const: qcom,msm8226-mss-pil
261+
then:
262+
required:
263+
- qcom,ext-bhs-reg
264+
else:
265+
properties:
266+
qcom,ext-bhs-reg: false
267+
268+
- if:
269+
properties:
270+
compatible:
271+
contains:
272+
enum:
273+
- qcom,msm8926-mss-pil
274+
- qcom,msm8974-mss-pil
221275
then:
222276
required:
223277
- mss-supply

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

Lines changed: 0 additions & 96 deletions
This file was deleted.

‎Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ examples:
127127
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>;
128128
clock-names = "xo";
129129
130-
firmware-name = "qcom/sm6115/adsp.mdt";
130+
firmware-name = "qcom/sm6115/adsp.mbn";
131131
132132
interrupts-extended = <&intc GIC_SPI 282 IRQ_TYPE_EDGE_RISING>,
133133
<&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ allOf:
6060
properties:
6161
compatible:
6262
enum:
63+
- qcom,sc8180x-adsp-pas
64+
- qcom,sc8180x-cdsp-pas
65+
- qcom,sc8180x-slpi-pas
6366
- qcom,sm8150-adsp-pas
6467
- qcom,sm8150-cdsp-pas
6568
- qcom,sm8150-slpi-pas
@@ -83,6 +86,8 @@ allOf:
8386
properties:
8487
compatible:
8588
enum:
89+
- qcom,sc8180x-adsp-pas
90+
- qcom,sc8180x-cdsp-pas
8691
- qcom,sm8150-adsp-pas
8792
- qcom,sm8150-cdsp-pas
8893
- qcom,sm8250-cdsp-pas
@@ -99,6 +104,7 @@ allOf:
99104
properties:
100105
compatible:
101106
enum:
107+
- qcom,sc8180x-mpss-pas
102108
- qcom,sm8150-mpss-pas
103109
then:
104110
properties:
@@ -115,6 +121,7 @@ allOf:
115121
properties:
116122
compatible:
117123
enum:
124+
- qcom,sc8180x-slpi-pas
118125
- qcom,sm8150-slpi-pas
119126
- qcom,sm8250-adsp-pas
120127
- qcom,sm8250-slpi-pas

‎Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@ properties:
2424
- qcom,sm8650-adsp-pas
2525
- qcom,sm8650-cdsp-pas
2626
- qcom,sm8650-mpss-pas
27+
- qcom,sm8750-mpss-pas
2728
- qcom,x1e80100-adsp-pas
2829
- qcom,x1e80100-cdsp-pas
2930
- items:
3031
- const: qcom,sm8750-adsp-pas
3132
- const: qcom,sm8550-adsp-pas
33+
- items:
34+
- const: qcom,sm8750-cdsp-pas
35+
- const: qcom,sm8650-cdsp-pas
3236

3337
reg:
3438
maxItems: 1
@@ -114,6 +118,23 @@ allOf:
114118
memory-region:
115119
minItems: 3
116120
maxItems: 3
121+
122+
- if:
123+
properties:
124+
compatible:
125+
contains:
126+
enum:
127+
- qcom,sm8750-cdsp-pas
128+
then:
129+
properties:
130+
interrupts:
131+
maxItems: 6
132+
interrupt-names:
133+
maxItems: 6
134+
memory-region:
135+
minItems: 3
136+
maxItems: 3
137+
117138
- if:
118139
properties:
119140
compatible:
@@ -144,6 +165,21 @@ allOf:
144165
minItems: 5
145166
maxItems: 5
146167

168+
- if:
169+
properties:
170+
compatible:
171+
enum:
172+
- qcom,sm8750-mpss-pas
173+
then:
174+
properties:
175+
interrupts:
176+
minItems: 6
177+
interrupt-names:
178+
minItems: 6
179+
memory-region:
180+
minItems: 4
181+
maxItems: 4
182+
147183
- if:
148184
properties:
149185
compatible:
@@ -171,6 +207,7 @@ allOf:
171207
- qcom,sdx75-mpss-pas
172208
- qcom,sm8550-mpss-pas
173209
- qcom,sm8650-mpss-pas
210+
- qcom,sm8750-mpss-pas
174211
then:
175212
properties:
176213
power-domains:
@@ -184,10 +221,11 @@ allOf:
184221
- if:
185222
properties:
186223
compatible:
187-
enum:
188-
- qcom,sm8550-cdsp-pas
189-
- qcom,sm8650-cdsp-pas
190-
- qcom,x1e80100-cdsp-pas
224+
contains:
225+
enum:
226+
- qcom,sm8550-cdsp-pas
227+
- qcom,sm8650-cdsp-pas
228+
- qcom,x1e80100-cdsp-pas
191229
then:
192230
properties:
193231
power-domains:

0 commit comments

Comments
 (0)