2023-03-15 18:32:42

by Konrad Dybcio

Subject: [PATCH] dt-bindings: remoteproc: qcom: sm6115-pas: Add QCM2290

QCM2290 is more or less a fork of the same design that SM6115 is based
on. As a result, the ADSP and modem found on it are identical.

Add compatibles for the QCM2290 with SM6115 fallbacks so as not to
require any driver changes. Change the allOf:if:properties clauses
to look for the presence of SM6115 compatibles and not an exact match.

Note that QCM2290 lacks a CDSP.

Signed-off-by: Konrad Dybcio <[email protected]>
---
.../bindings/remoteproc/qcom,sm6115-pas.yaml | 36 ++++++++++++-------
1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml
index f5d1fa9f45f1..95a76b98f693 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml
@@ -15,10 +15,19 @@ description:

properties:
compatible:
- enum:
- - qcom,sm6115-adsp-pas
- - qcom,sm6115-cdsp-pas
- - qcom,sm6115-mpss-pas
+ oneOf:
+ - enum:
+ - qcom,sm6115-adsp-pas
+ - qcom,sm6115-cdsp-pas
+ - qcom,sm6115-mpss-pas
+
+ - items:
+ - const: qcom,qcm2290-adsp-pas
+ - const: qcom,sm6115-adsp-pas
+
+ - items:
+ - const: qcom,qcm2290-mpss-pas
+ - const: qcom,sm6115-mpss-pas

reg:
maxItems: 1
@@ -50,9 +59,10 @@ allOf:
- if:
properties:
compatible:
- enum:
- - qcom,sm6115-adsp-pas
- - qcom,sm6115-cdsp-pas
+ contains:
+ enum:
+ - qcom,sm6115-adsp-pas
+ - qcom,sm6115-cdsp-pas
then:
properties:
interrupts:
@@ -69,9 +79,10 @@ allOf:
- if:
properties:
compatible:
- enum:
- - qcom,sm6115-cdsp-pas
- - qcom,sm6115-mpss-pas
+ contains:
+ enum:
+ - qcom,sm6115-cdsp-pas
+ - qcom,sm6115-mpss-pas
then:
properties:
power-domains:
@@ -84,8 +95,9 @@ allOf:
- if:
properties:
compatible:
- enum:
- - qcom,sm6115-adsp-pas
+ contains:
+ enum:
+ - qcom,sm6115-adsp-pas
then:
properties:
power-domains:
--
2.39.2

2023-03-16 08:01:06

by Krzysztof Kozlowski

Subject: Re: [PATCH] dt-bindings: remoteproc: qcom: sm6115-pas: Add QCM2290

On 15/03/2023 19:32, Konrad Dybcio wrote:
> QCM2290 is more or less a fork of the same design that SM6115 is based
> on. As a result, the ADSP and modem found on it are identical.
>
> Add compatibles for the QCM2290 with SM6115 fallbacks so as not to
> require any driver changes. Change the allOf:if:properties clauses
> to look for the presence of SM6115 compatibles and not an exact match.
>
> Note that QCM2290 lacks a CDSP.
>

Reviewed-by: Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof

2023-07-15 22:11:54

by Bjorn Andersson

Subject: Re: [PATCH] dt-bindings: remoteproc: qcom: sm6115-pas: Add QCM2290

On Wed, 15 Mar 2023 19:32:31 +0100, Konrad Dybcio wrote:
> QCM2290 is more or less a fork of the same design that SM6115 is based
> on. As a result, the ADSP and modem found on it are identical.
>
> Add compatibles for the QCM2290 with SM6115 fallbacks so as not to
> require any driver changes. Change the allOf:if:properties clauses
> to look for the presence of SM6115 compatibles and not an exact match.
>
> [...]

Applied, thanks!

[1/1] dt-bindings: remoteproc: qcom: sm6115-pas: Add QCM2290
commit: b352033e19c4591df299a8f623508c5c2ce4c5b3

Best regards,
--
Bjorn Andersson <[email protected]>