]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
qualcommax: ipq50xx: backport upstreamed patches for IPQ5018 TCSR support
authorGeorge Moussalem <george.moussalem@outlook.com>
Fri, 23 May 2025 08:23:57 +0000 (12:23 +0400)
committerRobert Marko <robimarko@gmail.com>
Sat, 24 May 2025 09:27:05 +0000 (11:27 +0200)
Use upstreamed v6.16 patch for IPQ5018 TCSR support and setting the
download mode.

Signed-off-by: George Moussalem <george.moussalem@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18884
Signed-off-by: Robert Marko <robimarko@gmail.com>
target/linux/qualcommax/patches-6.12/0049-v6.16-arm64-dts-qcom-ipq5018-enable-the-download-mode-supp.patch [new file with mode: 0644]
target/linux/qualcommax/patches-6.12/0154-dts-qcom-IPQ5018-add-tsens-node.patch
target/linux/qualcommax/patches-6.12/0302-arm64-dts-qcom-IPQ5018-add-TCSR-node.patch [deleted file]
target/linux/qualcommax/patches-6.12/0303-arm64-dts-qcom-IPQ5018-enable-the-download-mode-support.patch [deleted file]

diff --git a/target/linux/qualcommax/patches-6.12/0049-v6.16-arm64-dts-qcom-ipq5018-enable-the-download-mode-supp.patch b/target/linux/qualcommax/patches-6.12/0049-v6.16-arm64-dts-qcom-ipq5018-enable-the-download-mode-supp.patch
new file mode 100644 (file)
index 0000000..0820051
--- /dev/null
@@ -0,0 +1,38 @@
+From 43fefd6c71291b5793e7c4052b6e3e54d1d87715 Mon Sep 17 00:00:00 2001
+From: George Moussalem <george.moussalem@outlook.com>
+Date: Mon, 12 May 2025 18:36:47 +0400
+Subject: [PATCH] arm64: dts: qcom: ipq5018: enable the download mode support
+
+Enable support for download mode to collect RAM dumps in case of a
+system crash, allowing post mortem analysis.
+
+Signed-off-by: George Moussalem <george.moussalem@outlook.com>
+Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
+Link: https://lore.kernel.org/r/20250512-ipq5018-syscon-v1-2-eb1ad2414c3c@outlook.com
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+---
+ arch/arm64/boot/dts/qcom/ipq5018.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
++++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
+@@ -79,6 +79,7 @@
+       firmware {
+               scm {
+                       compatible = "qcom,scm-ipq5018", "qcom,scm";
++                      qcom,dload-mode = <&tcsr 0x6100>;
+                       qcom,sdi-enabled;
+               };
+       };
+@@ -221,6 +222,11 @@
+                       #hwlock-cells = <1>;
+               };
++              tcsr: syscon@1937000 {
++                      compatible = "qcom,tcsr-ipq5018", "syscon";
++                      reg = <0x01937000 0x21000>;
++              };
++
+               sdhc_1: mmc@7804000 {
+                       compatible = "qcom,ipq5018-sdhci", "qcom,sdhci-msm-v5";
+                       reg = <0x7804000 0x1000>;
index b712e9ce5d30a40d669a9dbfe2eb17e7307b6cd1..7f62590ddf3f76850d196e84c3672a6c15b03340 100644 (file)
@@ -15,7 +15,7 @@ Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com>
 
 --- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -181,6 +181,117 @@
+@@ -182,6 +182,117 @@
                        status = "disabled";
                };
  
@@ -133,7 +133,7 @@ Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com>
                tlmm: pinctrl@1000000 {
                        compatible = "qcom,ipq5018-tlmm";
                        reg = <0x01000000 0x300000>;
-@@ -624,6 +735,64 @@
+@@ -630,6 +741,64 @@
                        };
                };
        };
diff --git a/target/linux/qualcommax/patches-6.12/0302-arm64-dts-qcom-IPQ5018-add-TCSR-node.patch b/target/linux/qualcommax/patches-6.12/0302-arm64-dts-qcom-IPQ5018-add-TCSR-node.patch
deleted file mode 100644 (file)
index 7b3902d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-From: George Moussalem <george.moussalem@outlook.com>
-Subject: [PATCH] arm64: dts: qcom: ipq5018: Add TCSR node
-Date: Sun, 06 Oct 2024 16:34:11 +0400
-
-Add TCSR node.
-
-Signed-off-by: George Moussalem <george.moussalem@outlook.com>
----
---- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-+++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -332,6 +332,11 @@
-                       #hwlock-cells = <1>;
-               };
-+              tcsr: syscon@1937000 {
-+                      compatible = "qcom,tcsr-ipq5018", "syscon", "simple-mfd";
-+                      reg = <0x01937000 0x21000>;
-+              };
-+
-               sdhc_1: mmc@7804000 {
-                       compatible = "qcom,ipq5018-sdhci", "qcom,sdhci-msm-v5";
-                       reg = <0x7804000 0x1000>;
diff --git a/target/linux/qualcommax/patches-6.12/0303-arm64-dts-qcom-IPQ5018-enable-the-download-mode-support.patch b/target/linux/qualcommax/patches-6.12/0303-arm64-dts-qcom-IPQ5018-enable-the-download-mode-support.patch
deleted file mode 100644 (file)
index b4ce714..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-From: George Moussalem <george.moussalem@outlook.com>
-Subject: [PATCH] arm64: dts: qcom: ipq5018: enable the download mode support
-Date: Sun, 06 Oct 2024 16:34:11 +0400
-
-IPQ5018 also supports the download mode to collect the RAM dumps if system crashes, to perform
-the post mortem analysis. Add support for the same.
-
-Signed-off-by: George Moussalem <george.moussalem@outlook.com>
----
---- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-+++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -80,6 +80,7 @@
-               scm {
-                       compatible = "qcom,scm-ipq5018", "qcom,scm";
-                       qcom,sdi-enabled;
-+                      qcom,dload-mode = <&tcsr 0x6100>;
-               };
-       };