From 76fabe22c3814d238263eca3b8674ca9d1ad7021 Mon Sep 17 00:00:00 2001 From: Kuldeep Singh Date: Thu, 10 Sep 2026 19:29:09 +0530 Subject: [PATCH 1/2] FROMLIST: dt-bindings: crypto: Adjust Shikra compatible hierarchy Shikra reuses the same QCE integration as Agatti and should follow the corresponding binding requirements too. Move the Shikra compatible to the appropriate binding hierarchy (matching qcom,qcm2290-qce) to reflect the underlying hardware description. Fixes: 45834ff ("dt-bindings: crypto: qcom-qce: Document the Shikra crypto engine") Signed-off-by: Kuldeep Singh Link: https://lore.kernel.org/linux-arm-msm/CAMRc=MckdJyEvOq73Fi+Q-sr1aoL6QzvHsNq-3k62RSi9sy08A@mail.gmail.com/ Signed-off-by: Roopak Houji Signed-off-by: Abhinaba Rakshit --- Documentation/devicetree/bindings/crypto/qcom-qce.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/crypto/qcom-qce.yaml b/Documentation/devicetree/bindings/crypto/qcom-qce.yaml index 198538aefb7dc..f662f04d2fc21 100644 --- a/Documentation/devicetree/bindings/crypto/qcom-qce.yaml +++ b/Documentation/devicetree/bindings/crypto/qcom-qce.yaml @@ -39,6 +39,7 @@ properties: - qcom,msm8996-qce - qcom,qcm2290-qce - qcom,sdm845-qce + - qcom,shikra-qce - qcom,sm6115-qce - const: qcom,ipq4019-qce - const: qcom,qce @@ -49,7 +50,6 @@ properties: - qcom,qcs8300-qce - qcom,sa8775p-qce - qcom,sc7280-qce - - qcom,shikra-qce - qcom,sm6350-qce - qcom,sm8250-qce - qcom,sm8350-qce @@ -128,6 +128,7 @@ allOf: contains: enum: - qcom,qcm2290-qce + - qcom,shikra-qce - qcom,sm6115-qce then: properties: From 61a279f4dfd2d36237afc020e0d17d7e8b77b7e4 Mon Sep 17 00:00:00 2001 From: Kuldeep Singh Date: Thu, 10 Sep 2026 19:32:35 +0530 Subject: [PATCH 2/2] FROMLIST: arm64: dts: qcom: shikra: Correct QCE node configuration Shikra is derived from Agatti and uses the same QCE integration. Update the QCE node to match the underlying hardware implementation by adjusting the fallback compatible and related properties, including clocks and clock-names. Signed-off-by: Kuldeep Singh Link: https://lore.kernel.org/linux-arm-msm/20260907-b4-shikra_crypto_changse-v6-2-0676f61894b3@oss.qualcomm.com/ Signed-off-by: Roopak Houji Signed-off-by: Abhinaba Rakshit --- arch/arm64/boot/dts/qcom/shikra.dtsi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/shikra.dtsi b/arch/arm64/boot/dts/qcom/shikra.dtsi index 4509a1f6c8ef8..9b140c8179f96 100644 --- a/arch/arm64/boot/dts/qcom/shikra.dtsi +++ b/arch/arm64/boot/dts/qcom/shikra.dtsi @@ -1343,10 +1343,12 @@ qcom,controlled-remotely; num-channels = <16>; qcom,num-ees = <4>; + clocks = <&rpmcc RPM_SMD_CE1_CLK>; + clock-names = "bam_clk"; }; crypto: crypto@1b3a000 { - compatible = "qcom,shikra-qce", "qcom,sm8150-qce", "qcom,qce"; + compatible = "qcom,shikra-qce", "qcom,ipq4019-qce", "qcom,qce"; reg = <0x0 0x01b3a000 0x0 0x6000>; dmas = <&cryptobam 4>, <&cryptobam 5>; dma-names = "rx", "tx"; @@ -1357,9 +1359,8 @@ <&apps_smmu 0x96 0x0011>, <&apps_smmu 0x98 0x0001>, <&apps_smmu 0x9f 0x0>; - interconnects = <&system_noc MASTER_CRYPTO_CORE0 0 - &mc_virt SLAVE_EBI_CH0 0>; - interconnect-names = "memory"; + clocks = <&rpmcc RPM_SMD_CE1_CLK>; + clock-names = "core"; }; qfprom: efuse@1b44000 {