* [PATCH v5 1/5] dt-bindings: ufs: qcom: Add reg-names property for ICE
2023-06-27 8:28 [PATCH v5 0/5] Fix some issues in QCOM UFS bindings Luca Weiss
@ 2023-06-27 8:28 ` Luca Weiss
2023-06-27 13:46 ` Krzysztof Kozlowski
2023-06-27 8:28 ` [PATCH v5 2/5] dt-bindings: ufs: qcom: Add sm6115 binding Luca Weiss
` (4 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Luca Weiss @ 2023-06-27 8:28 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Alim Akhtar,
Avri Altman, Bart Van Assche, Rob Herring, Krzysztof Kozlowski,
Iskren Chernev, Manivannan Sadhasivam, Conor Dooley
Cc: linux-arm-msm, linux-scsi, devicetree, linux-kernel,
~postmarketos/upstreaming, phone-devel, Luca Weiss
The code in ufs-qcom-ice.c needs the ICE reg to be named "ice". Add this
in the bindings so the existing dts can validate successfully.
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
Documentation/devicetree/bindings/ufs/qcom,ufs.yaml | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml b/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
index bdfa86a0cc98..4cc3f8f03b33 100644
--- a/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
+++ b/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
@@ -79,6 +79,11 @@ properties:
minItems: 1
maxItems: 2
+ reg-names:
+ items:
+ - const: std
+ - const: ice
+
required-opps:
maxItems: 1
@@ -134,6 +139,8 @@ allOf:
reg:
minItems: 1
maxItems: 1
+ reg-names:
+ maxItems: 1
- if:
properties:
@@ -162,6 +169,10 @@ allOf:
reg:
minItems: 2
maxItems: 2
+ reg-names:
+ minItems: 2
+ required:
+ - reg-names
- if:
properties:
@@ -190,6 +201,8 @@ allOf:
reg:
minItems: 1
maxItems: 1
+ reg-names:
+ maxItems: 1
# TODO: define clock bindings for qcom,msm8994-ufshc
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v5 1/5] dt-bindings: ufs: qcom: Add reg-names property for ICE
2023-06-27 8:28 ` [PATCH v5 1/5] dt-bindings: ufs: qcom: Add reg-names property for ICE Luca Weiss
@ 2023-06-27 13:46 ` Krzysztof Kozlowski
0 siblings, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2023-06-27 13:46 UTC (permalink / raw)
To: Luca Weiss, Andy Gross, Bjorn Andersson, Konrad Dybcio,
Alim Akhtar, Avri Altman, Bart Van Assche, Rob Herring,
Krzysztof Kozlowski, Iskren Chernev, Manivannan Sadhasivam,
Conor Dooley
Cc: linux-arm-msm, linux-scsi, devicetree, linux-kernel,
~postmarketos/upstreaming, phone-devel
On 27/06/2023 10:28, Luca Weiss wrote:
> The code in ufs-qcom-ice.c needs the ICE reg to be named "ice". Add this
> in the bindings so the existing dts can validate successfully.
>
> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
> ---
> Documentation/devicetree/bindings/ufs/qcom,ufs.yaml | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v5 2/5] dt-bindings: ufs: qcom: Add sm6115 binding
2023-06-27 8:28 [PATCH v5 0/5] Fix some issues in QCOM UFS bindings Luca Weiss
2023-06-27 8:28 ` [PATCH v5 1/5] dt-bindings: ufs: qcom: Add reg-names property for ICE Luca Weiss
@ 2023-06-27 8:28 ` Luca Weiss
2023-06-27 8:28 ` [PATCH v5 3/5] dt-bindings: ufs: qcom: Add ICE to sm8450 example Luca Weiss
` (3 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Luca Weiss @ 2023-06-27 8:28 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Alim Akhtar,
Avri Altman, Bart Van Assche, Rob Herring, Krzysztof Kozlowski,
Iskren Chernev, Manivannan Sadhasivam, Conor Dooley
Cc: linux-arm-msm, linux-scsi, devicetree, linux-kernel,
~postmarketos/upstreaming, phone-devel, Luca Weiss,
Krzysztof Kozlowski, Bhupesh Sharma, Eric Biggers, Iskren Chernev
From: Iskren Chernev <me@iskren.info>
Add SM6115 UFS to DT schema.
Signed-off-by: Iskren Chernev <iskren.chernev@gmail.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Iskren Chernev <me@iskren.info>
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
.../devicetree/bindings/ufs/qcom,ufs.yaml | 30 ++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml b/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
index 4cc3f8f03b33..2b0831622cf0 100644
--- a/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
+++ b/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
@@ -29,6 +29,7 @@ properties:
- qcom,sa8775p-ufshc
- qcom,sc8280xp-ufshc
- qcom,sdm845-ufshc
+ - qcom,sm6115-ufshc
- qcom,sm6350-ufshc
- qcom,sm8150-ufshc
- qcom,sm8250-ufshc
@@ -204,6 +205,35 @@ allOf:
reg-names:
maxItems: 1
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - qcom,sm6115-ufshc
+ then:
+ properties:
+ clocks:
+ minItems: 8
+ maxItems: 8
+ clock-names:
+ items:
+ - const: core_clk
+ - const: bus_aggr_clk
+ - const: iface_clk
+ - const: core_clk_unipro
+ - const: ref_clk
+ - const: tx_lane0_sync_clk
+ - const: rx_lane0_sync_clk
+ - const: ice_core_clk
+ reg:
+ minItems: 2
+ maxItems: 2
+ reg-names:
+ minItems: 2
+ required:
+ - reg-names
+
# TODO: define clock bindings for qcom,msm8994-ufshc
- if:
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v5 3/5] dt-bindings: ufs: qcom: Add ICE to sm8450 example
2023-06-27 8:28 [PATCH v5 0/5] Fix some issues in QCOM UFS bindings Luca Weiss
2023-06-27 8:28 ` [PATCH v5 1/5] dt-bindings: ufs: qcom: Add reg-names property for ICE Luca Weiss
2023-06-27 8:28 ` [PATCH v5 2/5] dt-bindings: ufs: qcom: Add sm6115 binding Luca Weiss
@ 2023-06-27 8:28 ` Luca Weiss
2023-06-27 9:55 ` Rob Herring
2023-06-27 14:13 ` Rob Herring
2023-06-27 8:28 ` [PATCH v5 4/5] dt-bindings: crypto: ice: Document sm8450 inline crypto engine Luca Weiss
` (2 subsequent siblings)
5 siblings, 2 replies; 14+ messages in thread
From: Luca Weiss @ 2023-06-27 8:28 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Alim Akhtar,
Avri Altman, Bart Van Assche, Rob Herring, Krzysztof Kozlowski,
Iskren Chernev, Manivannan Sadhasivam, Conor Dooley
Cc: linux-arm-msm, linux-scsi, devicetree, linux-kernel,
~postmarketos/upstreaming, phone-devel, Luca Weiss
SM8450 actually supports ICE (Inline Crypto Engine) so adjust the
example to match.
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
Documentation/devicetree/bindings/ufs/qcom,ufs.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml b/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
index 2b0831622cf0..462ead5a1cec 100644
--- a/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
+++ b/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
@@ -317,5 +317,6 @@ examples:
<0 0>,
<0 0>,
<0 0>;
+ qcom,ice = <&ice>;
};
};
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v5 3/5] dt-bindings: ufs: qcom: Add ICE to sm8450 example
2023-06-27 8:28 ` [PATCH v5 3/5] dt-bindings: ufs: qcom: Add ICE to sm8450 example Luca Weiss
@ 2023-06-27 9:55 ` Rob Herring
2023-06-27 10:07 ` Luca Weiss
2023-06-27 14:13 ` Rob Herring
1 sibling, 1 reply; 14+ messages in thread
From: Rob Herring @ 2023-06-27 9:55 UTC (permalink / raw)
To: Luca Weiss
Cc: Conor Dooley, Andy Gross, Alim Akhtar, devicetree,
Krzysztof Kozlowski, Konrad Dybcio, Rob Herring, Iskren Chernev,
Manivannan Sadhasivam, Avri Altman, linux-scsi,
~postmarketos/upstreaming, linux-arm-msm, phone-devel,
Bjorn Andersson, linux-kernel, Bart Van Assche
On Tue, 27 Jun 2023 10:28:03 +0200, Luca Weiss wrote:
> SM8450 actually supports ICE (Inline Crypto Engine) so adjust the
> example to match.
>
> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
> ---
> Documentation/devicetree/bindings/ufs/qcom,ufs.yaml | 1 +
> 1 file changed, 1 insertion(+)
>
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/ufs/qcom,ufs.example.dtb: ufs@1d84000: Unevaluated properties are not allowed ('qcom,ice' was unexpected)
from schema $id: http://devicetree.org/schemas/ufs/qcom,ufs.yaml#
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20221209-dt-binding-ufs-v5-3-c9a58c0a53f5@fairphone.com
The base for the series is generally the latest rc1. A different dependency
should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note
that DT_SCHEMA_FILES can be set to your schema file to speed up checking
your schema. However, it must be unset to test all examples with your schema.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v5 3/5] dt-bindings: ufs: qcom: Add ICE to sm8450 example
2023-06-27 9:55 ` Rob Herring
@ 2023-06-27 10:07 ` Luca Weiss
2023-06-27 11:21 ` Luca Weiss
0 siblings, 1 reply; 14+ messages in thread
From: Luca Weiss @ 2023-06-27 10:07 UTC (permalink / raw)
To: Rob Herring
Cc: Conor Dooley, Andy Gross, Alim Akhtar, devicetree,
Krzysztof Kozlowski, Konrad Dybcio, Rob Herring, Iskren Chernev,
Manivannan Sadhasivam, Avri Altman, linux-scsi,
~postmarketos/upstreaming, linux-arm-msm, phone-devel,
Bjorn Andersson, linux-kernel, Bart Van Assche
On Tue Jun 27, 2023 at 11:55 AM CEST, Rob Herring wrote:
>
> On Tue, 27 Jun 2023 10:28:03 +0200, Luca Weiss wrote:
> > SM8450 actually supports ICE (Inline Crypto Engine) so adjust the
> > example to match.
> >
> > Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
> > ---
> > Documentation/devicetree/bindings/ufs/qcom,ufs.yaml | 1 +
> > 1 file changed, 1 insertion(+)
> >
>
> My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
> on your patch (DT_CHECKER_FLAGS is new in v5.13):
>
> yamllint warnings/errors:
>
> dtschema/dtc warnings/errors:
> /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/ufs/qcom,ufs.example.dtb: ufs@1d84000: Unevaluated properties are not allowed ('qcom,ice' was unexpected)
> from schema $id: http://devicetree.org/schemas/ufs/qcom,ufs.yaml#
qcom,ice should land with v5.4
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=29a6d1215b7cd5fdff9c3c31ea26076a694ee0a3
And as mentioned in the cover letter, validation will still fail with
without the extra patch linked there (which is not in -next yet).
Regards
Luca
>
> doc reference errors (make refcheckdocs):
>
> See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20221209-dt-binding-ufs-v5-3-c9a58c0a53f5@fairphone.com
>
> The base for the series is generally the latest rc1. A different dependency
> should be noted in *this* patch.
>
> If you already ran 'make dt_binding_check' and didn't see the above
> error(s), then make sure 'yamllint' is installed and dt-schema is up to
> date:
>
> pip3 install dtschema --upgrade
>
> Please check and re-submit after running the above command yourself. Note
> that DT_SCHEMA_FILES can be set to your schema file to speed up checking
> your schema. However, it must be unset to test all examples with your schema.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v5 3/5] dt-bindings: ufs: qcom: Add ICE to sm8450 example
2023-06-27 10:07 ` Luca Weiss
@ 2023-06-27 11:21 ` Luca Weiss
0 siblings, 0 replies; 14+ messages in thread
From: Luca Weiss @ 2023-06-27 11:21 UTC (permalink / raw)
To: Luca Weiss, Rob Herring
Cc: Conor Dooley, Andy Gross, Alim Akhtar, devicetree,
Krzysztof Kozlowski, Konrad Dybcio, Rob Herring, Iskren Chernev,
Manivannan Sadhasivam, Avri Altman, linux-scsi,
~postmarketos/upstreaming, linux-arm-msm, phone-devel,
Bjorn Andersson, linux-kernel, Bart Van Assche
On Tue Jun 27, 2023 at 12:07 PM CEST, Luca Weiss wrote:
> On Tue Jun 27, 2023 at 11:55 AM CEST, Rob Herring wrote:
> >
> > On Tue, 27 Jun 2023 10:28:03 +0200, Luca Weiss wrote:
> > > SM8450 actually supports ICE (Inline Crypto Engine) so adjust the
> > > example to match.
> > >
> > > Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
> > > ---
> > > Documentation/devicetree/bindings/ufs/qcom,ufs.yaml | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> >
> > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
> > on your patch (DT_CHECKER_FLAGS is new in v5.13):
> >
> > yamllint warnings/errors:
> >
> > dtschema/dtc warnings/errors:
> > /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/ufs/qcom,ufs.example.dtb: ufs@1d84000: Unevaluated properties are not allowed ('qcom,ice' was unexpected)
> > from schema $id: http://devicetree.org/schemas/ufs/qcom,ufs.yaml#
>
> qcom,ice should land with v5.4
Sorry, obviously wrong version: I meant v6.5
>
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=29a6d1215b7cd5fdff9c3c31ea26076a694ee0a3
>
> And as mentioned in the cover letter, validation will still fail with
> without the extra patch linked there (which is not in -next yet).
>
> Regards
> Luca
>
> >
> > doc reference errors (make refcheckdocs):
> >
> > See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20221209-dt-binding-ufs-v5-3-c9a58c0a53f5@fairphone.com
> >
> > The base for the series is generally the latest rc1. A different dependency
> > should be noted in *this* patch.
> >
> > If you already ran 'make dt_binding_check' and didn't see the above
> > error(s), then make sure 'yamllint' is installed and dt-schema is up to
> > date:
> >
> > pip3 install dtschema --upgrade
> >
> > Please check and re-submit after running the above command yourself. Note
> > that DT_SCHEMA_FILES can be set to your schema file to speed up checking
> > your schema. However, it must be unset to test all examples with your schema.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v5 3/5] dt-bindings: ufs: qcom: Add ICE to sm8450 example
2023-06-27 8:28 ` [PATCH v5 3/5] dt-bindings: ufs: qcom: Add ICE to sm8450 example Luca Weiss
2023-06-27 9:55 ` Rob Herring
@ 2023-06-27 14:13 ` Rob Herring
1 sibling, 0 replies; 14+ messages in thread
From: Rob Herring @ 2023-06-27 14:13 UTC (permalink / raw)
To: Luca Weiss
Cc: linux-scsi, Krzysztof Kozlowski, Iskren Chernev, Avri Altman,
Manivannan Sadhasivam, Andy Gross, Alim Akhtar, Konrad Dybcio,
Bjorn Andersson, linux-arm-msm, devicetree, linux-kernel,
Rob Herring, Bart Van Assche, ~postmarketos/upstreaming,
phone-devel, Conor Dooley
On Tue, 27 Jun 2023 10:28:03 +0200, Luca Weiss wrote:
> SM8450 actually supports ICE (Inline Crypto Engine) so adjust the
> example to match.
>
> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
> ---
> Documentation/devicetree/bindings/ufs/qcom,ufs.yaml | 1 +
> 1 file changed, 1 insertion(+)
>
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v5 4/5] dt-bindings: crypto: ice: Document sm8450 inline crypto engine
2023-06-27 8:28 [PATCH v5 0/5] Fix some issues in QCOM UFS bindings Luca Weiss
` (2 preceding siblings ...)
2023-06-27 8:28 ` [PATCH v5 3/5] dt-bindings: ufs: qcom: Add ICE to sm8450 example Luca Weiss
@ 2023-06-27 8:28 ` Luca Weiss
2023-06-27 13:46 ` Krzysztof Kozlowski
2023-06-27 8:28 ` [PATCH v5 5/5] arm64: dts: qcom: sm8450: Use standalone ICE node for UFS Luca Weiss
2023-07-10 5:07 ` (subset) [PATCH v5 0/5] Fix some issues in QCOM UFS bindings Bjorn Andersson
5 siblings, 1 reply; 14+ messages in thread
From: Luca Weiss @ 2023-06-27 8:28 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Alim Akhtar,
Avri Altman, Bart Van Assche, Rob Herring, Krzysztof Kozlowski,
Iskren Chernev, Manivannan Sadhasivam, Conor Dooley
Cc: linux-arm-msm, linux-scsi, devicetree, linux-kernel,
~postmarketos/upstreaming, phone-devel, Luca Weiss
Document the compatible used for the inline crypto engine found on
SM8450.
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml b/Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml
index 92e1d76e29ee..7da9aa82d837 100644
--- a/Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml
+++ b/Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml
@@ -13,6 +13,7 @@ properties:
compatible:
items:
- enum:
+ - qcom,sm8450-inline-crypto-engine
- qcom,sm8550-inline-crypto-engine
- const: qcom,inline-crypto-engine
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v5 4/5] dt-bindings: crypto: ice: Document sm8450 inline crypto engine
2023-06-27 8:28 ` [PATCH v5 4/5] dt-bindings: crypto: ice: Document sm8450 inline crypto engine Luca Weiss
@ 2023-06-27 13:46 ` Krzysztof Kozlowski
0 siblings, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2023-06-27 13:46 UTC (permalink / raw)
To: Luca Weiss, Andy Gross, Bjorn Andersson, Konrad Dybcio,
Alim Akhtar, Avri Altman, Bart Van Assche, Rob Herring,
Krzysztof Kozlowski, Iskren Chernev, Manivannan Sadhasivam,
Conor Dooley
Cc: linux-arm-msm, linux-scsi, devicetree, linux-kernel,
~postmarketos/upstreaming, phone-devel
On 27/06/2023 10:28, Luca Weiss wrote:
> Document the compatible used for the inline crypto engine found on
> SM8450.
>
> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
> ---
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v5 5/5] arm64: dts: qcom: sm8450: Use standalone ICE node for UFS
2023-06-27 8:28 [PATCH v5 0/5] Fix some issues in QCOM UFS bindings Luca Weiss
` (3 preceding siblings ...)
2023-06-27 8:28 ` [PATCH v5 4/5] dt-bindings: crypto: ice: Document sm8450 inline crypto engine Luca Weiss
@ 2023-06-27 8:28 ` Luca Weiss
2023-06-27 10:50 ` Konrad Dybcio
2023-07-10 5:07 ` (subset) [PATCH v5 0/5] Fix some issues in QCOM UFS bindings Bjorn Andersson
5 siblings, 1 reply; 14+ messages in thread
From: Luca Weiss @ 2023-06-27 8:28 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Alim Akhtar,
Avri Altman, Bart Van Assche, Rob Herring, Krzysztof Kozlowski,
Iskren Chernev, Manivannan Sadhasivam, Conor Dooley
Cc: linux-arm-msm, linux-scsi, devicetree, linux-kernel,
~postmarketos/upstreaming, phone-devel, Luca Weiss
With the ICE driver now merged let's convert the ufs node to use the new
style.
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
arch/arm64/boot/dts/qcom/sm8450.dtsi | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index 5cd7296c7660..79627117a776 100644
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -4120,9 +4120,7 @@ system-cache-controller@19200000 {
ufs_mem_hc: ufshc@1d84000 {
compatible = "qcom,sm8450-ufshc", "qcom,ufshc",
"jedec,ufs-2.0";
- reg = <0 0x01d84000 0 0x3000>,
- <0 0x01d88000 0 0x8000>;
- reg-names = "std", "ice";
+ reg = <0 0x01d84000 0 0x3000>;
interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
phys = <&ufs_mem_phy_lanes>;
phy-names = "ufsphy";
@@ -4147,8 +4145,7 @@ ufs_mem_hc: ufshc@1d84000 {
"ref_clk",
"tx_lane0_sync_clk",
"rx_lane0_sync_clk",
- "rx_lane1_sync_clk",
- "ice_core_clk";
+ "rx_lane1_sync_clk";
clocks =
<&gcc GCC_UFS_PHY_AXI_CLK>,
<&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
@@ -4157,8 +4154,7 @@ ufs_mem_hc: ufshc@1d84000 {
<&rpmhcc RPMH_CXO_CLK>,
<&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>,
<&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>,
- <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>,
- <&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
+ <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>;
freq-table-hz =
<75000000 300000000>,
<0 0>,
@@ -4167,8 +4163,9 @@ ufs_mem_hc: ufshc@1d84000 {
<75000000 300000000>,
<0 0>,
<0 0>,
- <0 0>,
- <75000000 300000000>;
+ <0 0>;
+ qcom,ice = <&ice>;
+
status = "disabled";
};
@@ -4198,6 +4195,13 @@ ufs_mem_phy_lanes: phy@1d87400 {
};
};
+ ice: crypto@1d88000 {
+ compatible = "qcom,sm8450-inline-crypto-engine",
+ "qcom,inline-crypto-engine";
+ reg = <0 0x01d88000 0 0x8000>;
+ clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
+ };
+
cryptobam: dma-controller@1dc4000 {
compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
reg = <0 0x01dc4000 0 0x28000>;
--
2.41.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v5 5/5] arm64: dts: qcom: sm8450: Use standalone ICE node for UFS
2023-06-27 8:28 ` [PATCH v5 5/5] arm64: dts: qcom: sm8450: Use standalone ICE node for UFS Luca Weiss
@ 2023-06-27 10:50 ` Konrad Dybcio
0 siblings, 0 replies; 14+ messages in thread
From: Konrad Dybcio @ 2023-06-27 10:50 UTC (permalink / raw)
To: Luca Weiss, Andy Gross, Bjorn Andersson, Alim Akhtar, Avri Altman,
Bart Van Assche, Rob Herring, Krzysztof Kozlowski, Iskren Chernev,
Manivannan Sadhasivam, Conor Dooley
Cc: linux-arm-msm, linux-scsi, devicetree, linux-kernel,
~postmarketos/upstreaming, phone-devel
On 27.06.2023 10:28, Luca Weiss wrote:
> With the ICE driver now merged let's convert the ufs node to use the new
> style.
>
> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm64/boot/dts/qcom/sm8450.dtsi | 22 +++++++++++++---------
> 1 file changed, 13 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> index 5cd7296c7660..79627117a776 100644
> --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> @@ -4120,9 +4120,7 @@ system-cache-controller@19200000 {
> ufs_mem_hc: ufshc@1d84000 {
> compatible = "qcom,sm8450-ufshc", "qcom,ufshc",
> "jedec,ufs-2.0";
> - reg = <0 0x01d84000 0 0x3000>,
> - <0 0x01d88000 0 0x8000>;
> - reg-names = "std", "ice";
> + reg = <0 0x01d84000 0 0x3000>;
> interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
> phys = <&ufs_mem_phy_lanes>;
> phy-names = "ufsphy";
> @@ -4147,8 +4145,7 @@ ufs_mem_hc: ufshc@1d84000 {
> "ref_clk",
> "tx_lane0_sync_clk",
> "rx_lane0_sync_clk",
> - "rx_lane1_sync_clk",
> - "ice_core_clk";
> + "rx_lane1_sync_clk";
> clocks =
> <&gcc GCC_UFS_PHY_AXI_CLK>,
> <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
> @@ -4157,8 +4154,7 @@ ufs_mem_hc: ufshc@1d84000 {
> <&rpmhcc RPMH_CXO_CLK>,
> <&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>,
> <&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>,
> - <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>,
> - <&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
> + <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>;
> freq-table-hz =
> <75000000 300000000>,
> <0 0>,
> @@ -4167,8 +4163,9 @@ ufs_mem_hc: ufshc@1d84000 {
> <75000000 300000000>,
> <0 0>,
> <0 0>,
> - <0 0>,
> - <75000000 300000000>;
> + <0 0>;
> + qcom,ice = <&ice>;
> +
> status = "disabled";
> };
>
> @@ -4198,6 +4195,13 @@ ufs_mem_phy_lanes: phy@1d87400 {
> };
> };
>
> + ice: crypto@1d88000 {
> + compatible = "qcom,sm8450-inline-crypto-engine",
> + "qcom,inline-crypto-engine";
> + reg = <0 0x01d88000 0 0x8000>;
> + clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
> + };
> +
> cryptobam: dma-controller@1dc4000 {
> compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
> reg = <0 0x01dc4000 0 0x28000>;
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: (subset) [PATCH v5 0/5] Fix some issues in QCOM UFS bindings
2023-06-27 8:28 [PATCH v5 0/5] Fix some issues in QCOM UFS bindings Luca Weiss
` (4 preceding siblings ...)
2023-06-27 8:28 ` [PATCH v5 5/5] arm64: dts: qcom: sm8450: Use standalone ICE node for UFS Luca Weiss
@ 2023-07-10 5:07 ` Bjorn Andersson
5 siblings, 0 replies; 14+ messages in thread
From: Bjorn Andersson @ 2023-07-10 5:07 UTC (permalink / raw)
To: Andy Gross, Konrad Dybcio, Alim Akhtar, Avri Altman,
Bart Van Assche, Rob Herring, Krzysztof Kozlowski, Iskren Chernev,
Manivannan Sadhasivam, Conor Dooley, Luca Weiss
Cc: linux-arm-msm, linux-scsi, devicetree, linux-kernel,
~postmarketos/upstreaming, phone-devel, Krzysztof Kozlowski,
Bhupesh Sharma, Eric Biggers
On Tue, 27 Jun 2023 10:28:00 +0200, Luca Weiss wrote:
> This series aims to solve the dtbs_check errors from the qcom ufs
> bindings. It has changed in scope a bit since v1, so it may be a bit all
> over the place.
>
> Please note, that I have not tested the sm8450.dtsi patch since I don't
> have any hardware there. Testing would be appreciated.
>
> [...]
Applied, thanks!
[5/5] arm64: dts: qcom: sm8450: Use standalone ICE node for UFS
commit: 86b0aef435851dec9e5202d22dfbfff56da4440c
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 14+ messages in thread