qualcommax: ipq50xx: backport upstreamed patch for adding ipq5018 crypto node

Use upstreamed patch for adding the crypto nodes.

Signed-off-by: George Moussalem <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/19890
Signed-off-by: Robert Marko <[email protected]>

diff --git a/target/linux/qualcommax/patches-6.12/0062-v6.18-arm64-dts-qcom-ipq5018-Add-crypto-nodes.patch b/target/linux/qualcommax/patches-6.12/0062-v6.18-arm64-dts-qcom-ipq5018-Add-crypto-nodes.patch
new file mode 100644 (file)
index 0000000..808f8ea
--- /dev/null
+++ b/target/linux/qualcommax/patches-6.12/0062-v6.18-arm64-dts-qcom-ipq5018-Add-crypto-nodes.patch
@@ -0,0 +1,58 @@
+From ed5789ba7c2ce548f01ebbdbd7488dd9cccc4513 Mon Sep 17 00:00:00 2001
+From: George Moussalem <[email protected]>
+Date: Mon, 21 Jul 2025 10:23:15 +0400
+Subject: arm64: dts: qcom: ipq5018: Add crypto nodes
+
+IPQ5018 uses Qualcomm QCE crypto engine v5.1 which is already supported.
+So let's add the dts nodes for its DMA v1.7.4 and QCE itself.
+
+Reviewed-by: Konrad Dybcio <[email protected]>
+Signed-off-by: George Moussalem <[email protected]>
+Reviewed-by: Dmitry Baryshkov <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Bjorn Andersson <[email protected]>
+---
+ arch/arm64/boot/dts/qcom/ipq5018.dtsi | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+(limited to 'arch/arm64/boot/dts/qcom/ipq5018.dtsi')
+
+--- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
++++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
+@@ -348,6 +348,36 @@
+                       #thermal-sensor-cells = <1>;
+               };
+ 
++              cryptobam: dma-controller@704000 {
++                      compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
++                      reg = <0x00704000 0x20000>;
++                      interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
++
++                      clocks = <&gcc GCC_CRYPTO_AHB_CLK>;
++                      clock-names = "bam_clk";
++
++                      #dma-cells = <1>;
++                      qcom,ee = <1>;
++                      qcom,controlled-remotely;
++              };
++
++              crypto: crypto@73a000 {
++                      compatible = "qcom,crypto-v5.1";
++                      reg = <0x0073a000 0x6000>;
++
++                      clocks = <&gcc GCC_CRYPTO_AHB_CLK>,
++                               <&gcc GCC_CRYPTO_AXI_CLK>,
++                               <&gcc GCC_CRYPTO_CLK>;
++                      clock-names = "iface",
++                                    "bus",
++                                    "core";
++
++                      dmas = <&cryptobam 2>,
++                             <&cryptobam 3>;
++                      dma-names = "rx",
++                                  "tx";
++              };
++
+               tlmm: pinctrl@1000000 {
+                       compatible = "qcom,ipq5018-tlmm";
+                       reg = <0x01000000 0x300000>;

diff --git a/target/linux/qualcommax/patches-6.12/0306-arm64-dts-qcom-ipq5018-Add-PWM-node.patch b/target/linux/qualcommax/patches-6.12/0306-arm64-dts-qcom-ipq5018-Add-PWM-node.patch
index d96142ffd3a46f558ac43a50fe341234931e09a7..42d5a4a387be921f8c20c3d39c2b44081e5b8d12 100644 (file)
--- a/target/linux/qualcommax/patches-6.12/0306-arm64-dts-qcom-ipq5018-Add-PWM-node.patch
+++ b/target/linux/qualcommax/patches-6.12/0306-arm64-dts-qcom-ipq5018-Add-PWM-node.patch
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <[email protected]>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -393,6 +393,16 @@
+@@ -423,6 +423,16 @@
                        reg = <0x01937000 0x21000>;
                };
  

diff --git a/target/linux/qualcommax/patches-6.12/0324-arm64-dts-qcom-ipq5018-Add-crypto-nodes.patch b/target/linux/qualcommax/patches-6.12/0324-arm64-dts-qcom-ipq5018-Add-crypto-nodes.patch
deleted file mode 100644 (file)
index c754bb4..0000000
--- a/target/linux/qualcommax/patches-6.12/0324-arm64-dts-qcom-ipq5018-Add-crypto-nodes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: George Moussalem <[email protected]>
-Subject: [PATCH] arm64: dts: qcom: ipq5018: Add crypto nodes
-Date: Sun, 06 Oct 2024 16:34:11 +0400
-
-Add dma controller and crypto nodes.
-
-Signed-off-by: George Moussalem <[email protected]>
----
---- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-+++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -348,6 +348,30 @@
-                       #thermal-sensor-cells = <1>;
-               };
- 
-+              cryptobam: dma-controller@704000 {
-+                      compatible = "qcom,bam-v1.7.0";
-+                      reg = <0x00704000 0x20000>;
-+                      interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
-+                      clocks = <&gcc GCC_CRYPTO_AHB_CLK>;
-+                      clock-names = "bam_clk";
-+                      #dma-cells = <1>;
-+                      qcom,ee = <1>;
-+                      qcom,controlled-remotely;
-+                      status = "disabled";
-+              };
-+
-+              crypto: crypto@73a000 {
-+                      compatible = "qcom,crypto-v5.1";
-+                      reg = <0x0073a000 0x6000>;
-+                      clocks = <&gcc GCC_CRYPTO_AHB_CLK>,
-+                               <&gcc GCC_CRYPTO_AXI_CLK>,
-+                               <&gcc GCC_CRYPTO_CLK>;
-+                      clock-names = "iface", "bus", "core";
-+                      dmas = <&cryptobam 2>, <&cryptobam 3>;
-+                      dma-names = "rx", "tx";
-+                      status = "disabled";
-+              };
-+
-               tlmm: pinctrl@1000000 {
-                       compatible = "qcom,ipq5018-tlmm";
-                       reg = <0x01000000 0x300000>;

diff --git a/target/linux/qualcommax/patches-6.12/0339-arm64-dts-qcom-ipq5018-Add-QUP1-UART2-node.patch b/target/linux/qualcommax/patches-6.12/0339-arm64-dts-qcom-ipq5018-Add-QUP1-UART2-node.patch
index 4b5fc5d32e9e177c1e3291b604e357ef082c776c..4bb0e0fd262b356a9dad934e3bdb954fe430d48f 100644 (file)
--- a/target/linux/qualcommax/patches-6.12/0339-arm64-dts-qcom-ipq5018-Add-QUP1-UART2-node.patch
+++ b/target/linux/qualcommax/patches-6.12/0339-arm64-dts-qcom-ipq5018-Add-QUP1-UART2-node.patch
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <[email protected]>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -464,6 +464,16 @@
+@@ -470,6 +470,16 @@
                        status = "disabled";
                };
  

diff --git a/target/linux/qualcommax/patches-6.12/0340-arm64-dts-qcom-ipq5018-Add-QUP3-I2C-node.patch b/target/linux/qualcommax/patches-6.12/0340-arm64-dts-qcom-ipq5018-Add-QUP3-I2C-node.patch
index a3a179a5d9f75817e96a0b1c625fc2affd774459..bc28b61985e60bc0668adb145985e5455006bfc4 100644 (file)
--- a/target/linux/qualcommax/patches-6.12/0340-arm64-dts-qcom-ipq5018-Add-QUP3-I2C-node.patch
+++ b/target/linux/qualcommax/patches-6.12/0340-arm64-dts-qcom-ipq5018-Add-QUP3-I2C-node.patch
@@ -8,7 +8,7 @@ Signed-off-by: George Moussalem <[email protected]>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -488,6 +488,21 @@
+@@ -494,6 +494,21 @@
                        status = "disabled";
                };
  

diff --git a/target/linux/qualcommax/patches-6.12/0816-arm64-dts-qcom-ipq5018-add-wifi-support.patch b/target/linux/qualcommax/patches-6.12/0816-arm64-dts-qcom-ipq5018-add-wifi-support.patch
index cde86a122c9294106c84258cde013f35dbea7a2a..239e2a8454386c30715d5160b2b6fdaa41028ae6 100644 (file)
--- a/target/linux/qualcommax/patches-6.12/0816-arm64-dts-qcom-ipq5018-add-wifi-support.patch
+++ b/target/linux/qualcommax/patches-6.12/0816-arm64-dts-qcom-ipq5018-add-wifi-support.patch
@@ -13,7 +13,7 @@ Signed-off-by: George Moussalem <[email protected]>
 ---
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -708,6 +708,225 @@
+@@ -714,6 +714,225 @@
                        };
                };