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/[email protected]/
[2]
https://lore.kernel.org/lkml/[email protected]/
- [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/[email protected]/
[2]
https://lore.kernel.org/lkml/[email protected]/
---
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
