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 <[email protected]> --- .../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
