[PATCH v2 0/3] dt-bindings/dts: qcom: Consolidate SDX75/Hawi/Maili MPSS onto SM8650 fallback

[PATCH v2 0/3] dt-bindings/dts: qcom: Consolidate SDX75/Hawi/Maili MPSS onto SM8650 fallback

[Mukesh Ojha]

The MPSS remoteproc block on the SDX75, Hawi, and Maili SoCs is compatible
with the SM8650 MPSS - identical interrupts, memory-region layout, and
power-domain topology. Today SDX75 and SM8650 MPSS each carry their own
standalone compatible and are repeated in every "mpss" allOf conditional.
The duplication hides the hardware relationship and grows every time a new
SoC reuses the block.

Move the three SM8650-compatible MPSS variants into a fallback items
block and drop them from the mpss memory-region and power-domain enums,
letting 'contains:' on the fallback compatible qcom,sm8650-mpss-pas
keep the constraints firing for the array form. The binding change is
split into two patches so the SoCs with no in-tree DTS yet (Hawi,
Maili) can be introduced independently of the SDX75 move, and a third
patch switches the in-tree sdx75.dtsi to the fallback array form to
match the tightened binding.

Bisect note - patches 2 and 3 are intentionally split
======================================================

Patch 2 removes qcom,sdx75-mpss-pas from the standalone MPSS enum, and
patch 3 updates sdx75.dtsi to use the fallback array form. The tree
state after patch 2 alone therefore fails dtbs_check on sdx75-idp.dtb:

  sdx75-idp.dtb: remoteproc@4080000 (qcom,sdx75-mpss-pas):
    compatible: 'oneOf' conditional failed [...]
      ['qcom,sdx75-mpss-pas'] is too short

The split is deliberate so the dt-bindings change and the arm64/dts
change can flow through their respective maintainer trees without
cross-tree dependencies. Patch 2's commit log documents the temporary
breakage in-line, and patch 3 resolves it.

The driver keeps its standalone qcom,sdx75-mpss-pas of_match entry so
already-deployed DTBs continue to probe. The binding is intentionally
stricter than the driver; pruning the driver match is a separate
cleanup once the DTB rollout is complete.

Changes in v2:
  - Intergrated two series as one
    [1] https://lore.kernel.org/lkml/20260713093237.691117-1-mukesh.ojha@oss.qualcomm.com/
    [2] https://lore.kernel.org/lkml/20260803180021.20368-1-mukesh.ojha@oss.qualcomm.com/

   - [1] was incorrect and should be fixed with this version with
     fallback.
   - Converted into 3 patches.

Link to v1: 
    [1] https://lore.kernel.org/lkml/20260713093237.691117-1-mukesh.ojha@oss.qualcomm.com/
    [2] https://lore.kernel.org/lkml/20260803180021.20368-1-mukesh.ojha@oss.qualcomm.com/

---

Mukesh Ojha (3):
  dt-bindings: remoteproc: qcom,sm8550-pas: Add Hawi and Maili MPSS as
    SM8650 fallback
  dt-bindings: remoteproc: qcom,sm8550-pas: Make SDX75 MPSS fallback to
    SM8650
  arm64: dts: qcom: sdx75: Use SM8650 MPSS as fallback compatible

 .../bindings/remoteproc/qcom,sm8550-pas.yaml  | 23 +++++++++++--------
 arch/arm64/boot/dts/qcom/sdx75.dtsi           |  3 ++-
 2 files changed, 16 insertions(+), 10 deletions(-)


base-commit: b3c71fad96372775fa36507a4dc0ed5fcb6e92fc
-- 
2.53.0

[PATCH v2 1/3] dt-bindings: remoteproc: qcom,sm8550-pas: Add Hawi and Maili MPSS as SM8650 fallback

[Mukesh Ojha]

The Hawi and Maili MPSS blocks are fully compatible with the SM8650 MPSS
with identical interrupt, memory-region, and power-domain topologies, so
they should ideally fall back to the SM8650 compatible.

Introduce a fallback items block that pairs qcom,hawi-mpss-pas and
qcom,maili-mpss-pas with qcom,sm8650-mpss-pas. Switch the mpss
memory-region and power-domain allOf blocks from enum: to contains: so the
constraints apply whether the compatible appears in the standalone form or
as part of a fallback array.

Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
---
 .../bindings/remoteproc/qcom,sm8550-pas.yaml  | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
index c58e8a6c7fe1..ae74aa4bb6cd 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
@@ -47,6 +47,11 @@ properties:
       - items:
           - const: qcom,sm8750-cdsp-pas
           - const: qcom,sm8650-cdsp-pas
+      - items:
+          - enum:
+              - qcom,hawi-mpss-pas
+              - qcom,maili-mpss-pas
+          - const: qcom,sm8650-mpss-pas
 
   reg:
     maxItems: 1
@@ -203,9 +208,10 @@ allOf:
   - if:
       properties:
         compatible:
-          enum:
-            - qcom,sdx75-mpss-pas
-            - qcom,sm8650-mpss-pas
+          contains:
+            enum:
+              - qcom,sdx75-mpss-pas
+              - qcom,sm8650-mpss-pas
     then:
       properties:
         interrupts:
@@ -253,11 +259,12 @@ allOf:
   - if:
       properties:
         compatible:
-          enum:
-            - qcom,sdx75-mpss-pas
-            - qcom,sm8550-mpss-pas
-            - qcom,sm8650-mpss-pas
-            - qcom,sm8750-mpss-pas
+          contains:
+            enum:
+              - qcom,sdx75-mpss-pas
+              - qcom,sm8550-mpss-pas
+              - qcom,sm8650-mpss-pas
+              - qcom,sm8750-mpss-pas
     then:
       properties:
         power-domains:
-- 
2.53.0

Re: [PATCH v2 1/3] dt-bindings: remoteproc: qcom,sm8550-pas: Add Hawi and Maili MPSS as SM8650 fallback

[Krzysztof Kozlowski]

On Wed, Aug 05, 2026 at 06:51:27PM +0530, Mukesh Ojha wrote:
> The Hawi and Maili MPSS blocks are fully compatible with the SM8650 MPSS
> with identical interrupt, memory-region, and power-domain topologies, so
> they should ideally fall back to the SM8650 compatible.
> 
> Introduce a fallback items block that pairs qcom,hawi-mpss-pas and
> qcom,maili-mpss-pas with qcom,sm8650-mpss-pas. Switch the mpss
> memory-region and power-domain allOf blocks from enum: to contains: so the
> constraints apply whether the compatible appears in the standalone form or
> as part of a fallback array.
> 
> Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
> ---
>  .../bindings/remoteproc/qcom,sm8550-pas.yaml  | 23 ++++++++++++-------
>  1 file changed, 15 insertions(+), 8 deletions(-)

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

Best regards,
Krzysztof

Re: [PATCH v2 1/3] dt-bindings: remoteproc: qcom,sm8550-pas: Add Hawi and Maili MPSS as SM8650 fallback

[Manivannan Sadhasivam]

On Wed, Aug 05, 2026 at 06:51:27PM +0530, Mukesh Ojha wrote:
> The Hawi and Maili MPSS blocks are fully compatible with the SM8650 MPSS
> with identical interrupt, memory-region, and power-domain topologies, so
> they should ideally fall back to the SM8650 compatible.
> 
> Introduce a fallback items block that pairs qcom,hawi-mpss-pas and
> qcom,maili-mpss-pas with qcom,sm8650-mpss-pas. Switch the mpss
> memory-region and power-domain allOf blocks from enum: to contains: so the
> constraints apply whether the compatible appears in the standalone form or
> as part of a fallback array.
> 
> Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>

Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com>

- Mani

-- 
மணிவண்ணன் சதாசிவம்

[PATCH v2 2/3] dt-bindings: remoteproc: qcom,sm8550-pas: Make SDX75 MPSS fallback to SM8650

[Mukesh Ojha]

The SDX75 MPSS is an instance of the SM8650 MPSS: same interrupts,
memory regions and power domain topology. It is currently modelled as
a standalone compatible and lives alongside sm8650 in every mpss
allOf conditional, which duplicates the constraint and hides the
hardware relationship.

Move qcom,sdx75-mpss-pas out of the standalone enum into the fallback
items block alongside Hawi and Maili, and drop it from the mpss
memory-region and power-domain conditional lists. contains: on the
fallback compatible qcom,sm8650-mpss-pas keeps the constraints firing
for the array form.

Two consequences of the tightening are worth calling out:

- qcom,sdx75-mpss-pas as a single-string compatible is no longer
  valid per the binding, so the in-tree sdx75.dtsi form fails
  dt_binding_check. That is fixed by the follow-up DTS patch which
  switches sdx75.dtsi to the fallback array form.

- The driver keeps its standalone qcom,sdx75-mpss-pas of_match entry
  so already-deployed DTBs continue to probe. The binding is
  intentionally stricter than the driver here; pruning the driver
  match is left as a separate cleanup once the DTB rollout is
  complete.

Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
---
 .../devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
index ae74aa4bb6cd..f722c55aadf4 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
@@ -18,7 +18,6 @@ properties:
     oneOf:
       - enum:
           - qcom,eliza-cdsp-pas
-          - qcom,sdx75-mpss-pas
           - qcom,sm8550-adsp-pas
           - qcom,sm8550-cdsp-pas
           - qcom,sm8550-mpss-pas
@@ -51,6 +50,7 @@ properties:
           - enum:
               - qcom,hawi-mpss-pas
               - qcom,maili-mpss-pas
+              - qcom,sdx75-mpss-pas
           - const: qcom,sm8650-mpss-pas
 
   reg:
@@ -210,7 +210,6 @@ allOf:
         compatible:
           contains:
             enum:
-              - qcom,sdx75-mpss-pas
               - qcom,sm8650-mpss-pas
     then:
       properties:
@@ -261,7 +260,6 @@ allOf:
         compatible:
           contains:
             enum:
-              - qcom,sdx75-mpss-pas
               - qcom,sm8550-mpss-pas
               - qcom,sm8650-mpss-pas
               - qcom,sm8750-mpss-pas
-- 
2.53.0

Re: [PATCH v2 2/3] dt-bindings: remoteproc: qcom,sm8550-pas: Make SDX75 MPSS fallback to SM8650

[Krzysztof Kozlowski]

On Wed, Aug 05, 2026 at 06:51:28PM +0530, Mukesh Ojha wrote:
> The SDX75 MPSS is an instance of the SM8650 MPSS: same interrupts,
> memory regions and power domain topology. It is currently modelled as
> a standalone compatible and lives alongside sm8650 in every mpss
> allOf conditional, which duplicates the constraint and hides the
> hardware relationship.
> 
> Move qcom,sdx75-mpss-pas out of the standalone enum into the fallback
> items block alongside Hawi and Maili, and drop it from the mpss
> memory-region and power-domain conditional lists. contains: on the
> fallback compatible qcom,sm8650-mpss-pas keeps the constraints firing
> for the array form.
> 
> Two consequences of the tightening are worth calling out:
> 
> - qcom,sdx75-mpss-pas as a single-string compatible is no longer
>   valid per the binding, so the in-tree sdx75.dtsi form fails
>   dt_binding_check. That is fixed by the follow-up DTS patch which
>   switches sdx75.dtsi to the fallback array form.
> 
> - The driver keeps its standalone qcom,sdx75-mpss-pas of_match entry
>   so already-deployed DTBs continue to probe. The binding is
>   intentionally stricter than the driver here; pruning the driver
>   match is left as a separate cleanup once the DTB rollout is
>   complete.
> 
> Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
> ---
>  .../devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml       | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

Best regards,
Krzysztof

Re: [PATCH v2 2/3] dt-bindings: remoteproc: qcom,sm8550-pas: Make SDX75 MPSS fallback to SM8650

[Manivannan Sadhasivam]

On Wed, Aug 05, 2026 at 06:51:28PM +0530, Mukesh Ojha wrote:
> The SDX75 MPSS is an instance of the SM8650 MPSS: same interrupts,
> memory regions and power domain topology. It is currently modelled as
> a standalone compatible and lives alongside sm8650 in every mpss
> allOf conditional, which duplicates the constraint and hides the
> hardware relationship.
> 
> Move qcom,sdx75-mpss-pas out of the standalone enum into the fallback
> items block alongside Hawi and Maili, and drop it from the mpss
> memory-region and power-domain conditional lists. contains: on the
> fallback compatible qcom,sm8650-mpss-pas keeps the constraints firing
> for the array form.
> 
> Two consequences of the tightening are worth calling out:
> 
> - qcom,sdx75-mpss-pas as a single-string compatible is no longer
>   valid per the binding, so the in-tree sdx75.dtsi form fails
>   dt_binding_check. That is fixed by the follow-up DTS patch which
>   switches sdx75.dtsi to the fallback array form.
> 
> - The driver keeps its standalone qcom,sdx75-mpss-pas of_match entry
>   so already-deployed DTBs continue to probe. The binding is
>   intentionally stricter than the driver here; pruning the driver
>   match is left as a separate cleanup once the DTB rollout is
>   complete.
> 
> Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>

Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com>

- Mani

-- 
மணிவண்ணன் சதாசிவம்

[PATCH v2 3/3] arm64: dts: qcom: sdx75: Use SM8650 MPSS as fallback compatible

[Mukesh Ojha]

Following the dt-bindings change that expresses the SDX75 MPSS PAS as
a SM8650 MPSS fallback, list the SM8650 compatible alongside the
SDX75 one so the node validates against the updated schema.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sdx75.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sdx75.dtsi b/arch/arm64/boot/dts/qcom/sdx75.dtsi
index 85cc9c6e6f83..dc9c4ed00d4b 100644
--- a/arch/arm64/boot/dts/qcom/sdx75.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdx75.dtsi
@@ -925,7 +925,8 @@ tcsr: syscon@1fc0000 {
 		};
 
 		remoteproc_mpss: remoteproc@4080000 {
-			compatible = "qcom,sdx75-mpss-pas";
+			compatible = "qcom,sdx75-mpss-pas",
+				     "qcom,sm8650-mpss-pas";
 			reg = <0 0x04080000 0 0x10000>;
 
 			interrupts-extended = <&intc GIC_SPI 250 IRQ_TYPE_EDGE_RISING>,
-- 
2.53.0

Re: [PATCH v2 3/3] arm64: dts: qcom: sdx75: Use SM8650 MPSS as fallback compatible

[Krzysztof Kozlowski]

On Wed, Aug 05, 2026 at 06:51:29PM +0530, Mukesh Ojha wrote:
> Following the dt-bindings change that expresses the SDX75 MPSS PAS as
> a SM8650 MPSS fallback, list the SM8650 compatible alongside the
> SDX75 one so the node validates against the updated schema.
> 
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
> ---
>  arch/arm64/boot/dts/qcom/sdx75.dtsi | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

Best regards,
Krzysztof

Re: [PATCH v2 3/3] arm64: dts: qcom: sdx75: Use SM8650 MPSS as fallback compatible

[Manivannan Sadhasivam]

On Wed, Aug 05, 2026 at 06:51:29PM +0530, Mukesh Ojha wrote:
> Following the dt-bindings change that expresses the SDX75 MPSS PAS as
> a SM8650 MPSS fallback, list the SM8650 compatible alongside the
> SDX75 one so the node validates against the updated schema.
> 
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com>

- Mani

-- 
மணிவண்ணன் சதாசிவம்

Re: [PATCH v2 0/3] dt-bindings/dts: qcom: Consolidate SDX75/Hawi/Maili MPSS onto SM8650 fallback

[Mukesh Ojha]

On Wed, Aug 05, 2026 at 06:51:26PM +0530, Mukesh Ojha wrote:
> The MPSS remoteproc block on the SDX75, Hawi, and Maili SoCs is compatible
> with the SM8650 MPSS - identical interrupts, memory-region layout, and
> power-domain topology. Today SDX75 and SM8650 MPSS each carry their own
> standalone compatible and are repeated in every "mpss" allOf conditional.
> The duplication hides the hardware relationship and grows every time a new
> SoC reuses the block.
> 
> Move the three SM8650-compatible MPSS variants into a fallback items
> block and drop them from the mpss memory-region and power-domain enums,
> letting 'contains:' on the fallback compatible qcom,sm8650-mpss-pas
> keep the constraints firing for the array form. The binding change is
> split into two patches so the SoCs with no in-tree DTS yet (Hawi,
> Maili) can be introduced independently of the SDX75 move, and a third
> patch switches the in-tree sdx75.dtsi to the fallback array form to
> match the tightened binding.
> 
> Bisect note - patches 2 and 3 are intentionally split
> ======================================================
> 
> Patch 2 removes qcom,sdx75-mpss-pas from the standalone MPSS enum, and
> patch 3 updates sdx75.dtsi to use the fallback array form. The tree
> state after patch 2 alone therefore fails dtbs_check on sdx75-idp.dtb:
> 
>   sdx75-idp.dtb: remoteproc@4080000 (qcom,sdx75-mpss-pas):
>     compatible: 'oneOf' conditional failed [...]
>       ['qcom,sdx75-mpss-pas'] is too short
> 
> The split is deliberate so the dt-bindings change and the arm64/dts
> change can flow through their respective maintainer trees without
> cross-tree dependencies. Patch 2's commit log documents the temporary
> breakage in-line, and patch 3 resolves it.
> 
> The driver keeps its standalone qcom,sdx75-mpss-pas of_match entry so
> already-deployed DTBs continue to probe. The binding is intentionally
> stricter than the driver; pruning the driver match is a separate
> cleanup once the DTB rollout is complete.
>

I have a series dependening on this, checking if this can be
picked.


-- 
-Mukesh Ojha

Re: [PATCH v2 0/3] dt-bindings/dts: qcom: Consolidate SDX75/Hawi/Maili MPSS onto SM8650 fallback

[Bjorn Andersson]

On Wed, 05 Aug 2026 18:51:26 +0530, Mukesh Ojha wrote:
> The MPSS remoteproc block on the SDX75, Hawi, and Maili SoCs is compatible
> with the SM8650 MPSS - identical interrupts, memory-region layout, and
> power-domain topology. Today SDX75 and SM8650 MPSS each carry their own
> standalone compatible and are repeated in every "mpss" allOf conditional.
> The duplication hides the hardware relationship and grows every time a new
> SoC reuses the block.
> 
> [...]

Applied, thanks!

[1/3] dt-bindings: remoteproc: qcom,sm8550-pas: Add Hawi and Maili MPSS as SM8650 fallback
      commit: bd79ab72b62c0e0f1466d3dca53dcb12d5a072d9
[2/3] dt-bindings: remoteproc: qcom,sm8550-pas: Make SDX75 MPSS fallback to SM8650
      commit: 96e47e798cd157d32face71551242d2b6fe42b89
[3/3] arm64: dts: qcom: sdx75: Use SM8650 MPSS as fallback compatible
      commit: 106aaacd18cdd0dc13d9e1a7d8cf8e1e5d965384

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>