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