Skip to content

Commit e637b37

Browse files
committed
Merge tag 'rproc-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull remoteproc updates from Bjorn Andersson: - Add support for the compute DSP in the Qualcomm SDM660 platform, and finally fix up the way MSM8974 audio DSP remoteproc driver manages its power rails - Replace the usage of of_reserved_mem_lookup() with of_reserved_mem_region_to_resource() to clean things up across most of the drivers - Perform a variety of housekeeping and cleanup work across iMX, Mediatek, and TI remoteproc drivers * tag 'rproc-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux: (45 commits) remoteproc: qcom_q6v5_wcss: use optional reset for wcss_q6_bcr_reset remoteproc: qcom_q6v5_wcss: fix parsing of qcom,halt-regs remoteproc: qcom_wcnss: Fix NULL vs IS_ERR() bug in wcnss_alloc_memory_region() remoteproc: qcom: q6v5: Fix NULL vs IS_ERR() bug in q6v5_alloc_memory_region() remoteproc: qcom: pas: Fix a couple NULL vs IS_ERR() bugs remoteproc: qcom_q6v5_adsp: Fix a NULL vs IS_ERR() check in adsp_alloc_memory_region() remoteproc: imx_dsp_rproc: Fix NULL vs IS_ERR() bug in imx_dsp_rproc_add_carveout() remoteproc: st: Fix indexing of memory-regions remoteproc: qcom: pas: Add support for SDM660 CDSP dt-bindings: remoteproc: qcom: adsp: Add SDM660 CDSP compatible dt-bindings: remoteproc: qcom: adsp: Add missing constrains for SDM660 ADSP dt-bindings: remoteproc: qcom,sc8280xp-pas: Fix CDSP power desc remoteproc: omap: Remove redundant pm_runtime_mark_last_busy() calls remoteproc: qcom: Use of_reserved_mem_region_* functions for "memory-region" remoteproc: qcom_q6v5_pas: Use resource with CX PD for MSM8974 dt-bindings: remoteproc: qcom,adsp: Make msm8974 use CX as power domain remoteproc: Use of_reserved_mem_region_* functions for "memory-region" remoteproc: imx_dsp_rproc: Simplify start/stop error handling remoteproc: imx_rproc: Remove enum imx_rproc_method remoteproc: imx_dsp_rproc: Simplify IMX_RPROC_RESET_CONTROLLER switch case ...
2 parents eee654c + 641092c commit e637b37

18 files changed

Lines changed: 570 additions & 662 deletions

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

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,14 @@ properties:
2424
- qcom,msm8998-adsp-pas
2525
- qcom,msm8998-slpi-pas
2626
- qcom,sdm660-adsp-pas
27+
- qcom,sdm660-cdsp-pas
2728
- qcom,sdm845-adsp-pas
2829
- qcom,sdm845-cdsp-pas
2930
- qcom,sdm845-slpi-pas
3031

3132
reg:
3233
maxItems: 1
3334

34-
cx-supply:
35-
description: Phandle to the CX regulator
36-
3735
px-supply:
3836
description: Phandle to the PX regulator
3937

@@ -69,6 +67,8 @@ allOf:
6967
- qcom,msm8996-slpi-pil
7068
- qcom,msm8998-adsp-pas
7169
- qcom,msm8998-slpi-pas
70+
- qcom,sdm660-adsp-pas
71+
- qcom,sdm660-cdsp-pas
7272
- qcom,sdm845-adsp-pas
7373
- qcom,sdm845-cdsp-pas
7474
- qcom,sdm845-slpi-pas
@@ -93,6 +93,8 @@ allOf:
9393
- qcom,msm8996-slpi-pil
9494
- qcom,msm8998-adsp-pas
9595
- qcom,msm8998-slpi-pas
96+
- qcom,sdm660-adsp-pas
97+
- qcom,sdm660-cdsp-pas
9698
- qcom,sdm845-adsp-pas
9799
- qcom,sdm845-cdsp-pas
98100
- qcom,sdm845-slpi-pas
@@ -103,25 +105,18 @@ allOf:
103105
interrupt-names:
104106
maxItems: 5
105107

106-
- if:
107-
properties:
108-
compatible:
109-
contains:
110-
enum:
111-
- qcom,msm8974-adsp-pil
112-
then:
113-
required:
114-
- cx-supply
115-
116108
- if:
117109
properties:
118110
compatible:
119111
contains:
120112
enum:
121113
- qcom,msm8226-adsp-pil
122114
- qcom,msm8953-adsp-pil
115+
- qcom,msm8974-adsp-pil
123116
- qcom,msm8996-adsp-pil
124117
- qcom,msm8998-adsp-pas
118+
- qcom,sdm660-adsp-pas
119+
- qcom,sdm660-cdsp-pas
125120
then:
126121
properties:
127122
power-domains:
@@ -178,6 +173,7 @@ allOf:
178173
- qcom,msm8998-adsp-pas
179174
- qcom,msm8998-slpi-pas
180175
- qcom,sdm660-adsp-pas
176+
- qcom,sdm660-cdsp-pas
181177
then:
182178
properties:
183179
qcom,qmp: false
@@ -187,6 +183,7 @@ examples:
187183
#include <dt-bindings/clock/qcom,rpmcc.h>
188184
#include <dt-bindings/interrupt-controller/arm-gic.h>
189185
#include <dt-bindings/interrupt-controller/irq.h>
186+
#include <dt-bindings/power/qcom-rpmpd.h>
190187
adsp {
191188
compatible = "qcom,msm8974-adsp-pil";
192189
@@ -204,7 +201,8 @@ examples:
204201
clocks = <&rpmcc RPM_CXO_CLK>;
205202
clock-names = "xo";
206203
207-
cx-supply = <&pm8841_s2>;
204+
power-domains = <&rpmpd MSM8974_VDDCX>;
205+
power-domain-names = "cx";
208206
209207
memory-region = <&adsp_region>;
210208

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,13 @@ allOf:
9191
power-domains:
9292
items:
9393
- description: NSP power domain
94+
- description: CX power domain
95+
- description: MXC power domain
9496
power-domain-names:
9597
items:
9698
- const: nsp
99+
- const: cx
100+
- const: mxc
97101

98102
unevaluatedProperties: false
99103

0 commit comments

Comments
 (0)