[openwrt/openwrt] qualcommax: ipq50xx: backport upstreamed patch for adding ipq5018 SPI nand support
LEDE Commits
lede-commits at lists.infradead.org
Mon Sep 15 01:29:48 PDT 2025
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/c618d9f7c955396025a85c330b8638cd4c8f31de
commit c618d9f7c955396025a85c330b8638cd4c8f31de
Author: George Moussalem <george.moussalem at outlook.com>
AuthorDate: Tue Aug 19 18:05:25 2025 +0400
qualcommax: ipq50xx: backport upstreamed patch for adding ipq5018 SPI nand support
Use upstreamed patch for adding the SPI nand node.
Signed-off-by: George Moussalem <george.moussalem at outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19890
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
...m64-dts-qcom-ipq5018-Add-SPI-nand-support.patch | 64 ++++++++++++++++++++++
...-arm64-dts-qcom-ipq5018-Add-QUP3-I2C-node.patch | 6 +-
...-arm64-dts-qcom-ipq5018-Add-SPI-nand-node.patch | 52 ------------------
...6-arm64-dts-qcom-ipq5018-add-wifi-support.patch | 2 +-
4 files changed, 68 insertions(+), 56 deletions(-)
diff --git a/target/linux/qualcommax/patches-6.12/0060-v6.18-arm64-dts-qcom-ipq5018-Add-SPI-nand-support.patch b/target/linux/qualcommax/patches-6.12/0060-v6.18-arm64-dts-qcom-ipq5018-Add-SPI-nand-support.patch
new file mode 100644
index 0000000000..f9b47cdbdd
--- /dev/null
+++ b/target/linux/qualcommax/patches-6.12/0060-v6.18-arm64-dts-qcom-ipq5018-Add-SPI-nand-support.patch
@@ -0,0 +1,64 @@
+From 8d2a8e8dc448f218b36b3b9f3790c9c0dfaa2b74 Mon Sep 17 00:00:00 2001
+From: George Moussalem <george.moussalem at outlook.com>
+Date: Thu, 1 May 2025 13:20:52 +0400
+Subject: arm64: dts: qcom: ipq5018: Add SPI nand support
+
+Add QPIC SPI NAND support for IPQ5018 SoC.
+
+Signed-off-by: George Moussalem <george.moussalem at outlook.com>
+Reviewed-by: Konrad Dybcio <konrad.dybcio at oss.qualcomm.com>
+Link: https://lore.kernel.org/r/20250501-ipq5018-spi-qpic-snand-v1-2-31e01fbb606f@outlook.com
+Signed-off-by: Bjorn Andersson <andersson at kernel.org>
+---
+ arch/arm64/boot/dts/qcom/ipq5018.dtsi | 38 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 38 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
+@@ -436,6 +436,44 @@
+ status = "disabled";
+ };
+
++ qpic_bam: dma-controller at 7984000 {
++ compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
++ reg = <0x07984000 0x1c000>;
++
++ interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
++
++ clocks = <&gcc GCC_QPIC_AHB_CLK>;
++ clock-names = "bam_clk";
++
++ #dma-cells = <1>;
++ qcom,ee = <0>;
++
++ status = "disabled";
++ };
++
++ qpic_nand: spi at 79b0000 {
++ compatible = "qcom,ipq5018-snand", "qcom,ipq9574-snand";
++ reg = <0x079b0000 0x10000>;
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ clocks = <&gcc GCC_QPIC_CLK>,
++ <&gcc GCC_QPIC_AHB_CLK>,
++ <&gcc GCC_QPIC_IO_MACRO_CLK>;
++ clock-names = "core",
++ "aon",
++ "iom";
++
++ dmas = <&qpic_bam 0>,
++ <&qpic_bam 1>,
++ <&qpic_bam 2>;
++ dma-names = "tx",
++ "rx",
++ "cmd";
++
++ status = "disabled";
++ };
++
+ usb: usb at 8af8800 {
+ compatible = "qcom,ipq5018-dwc3", "qcom,dwc3";
+ reg = <0x08af8800 0x400>;
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 24acc55cdb..a3a179a5d9 100644
--- 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
@@ -27,6 +27,6 @@ Signed-off-by: George Moussalem <george.moussalem at outlook.com>
+ status = "disabled";
+ };
+
- usb: usb at 8af8800 {
- compatible = "qcom,ipq5018-dwc3", "qcom,dwc3";
- reg = <0x08af8800 0x400>;
+ qpic_bam: dma-controller at 7984000 {
+ compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
+ reg = <0x07984000 0x1c000>;
diff --git a/target/linux/qualcommax/patches-6.12/0421-arm64-dts-qcom-ipq5018-Add-SPI-nand-node.patch b/target/linux/qualcommax/patches-6.12/0421-arm64-dts-qcom-ipq5018-Add-SPI-nand-node.patch
deleted file mode 100644
index f7304f25a4..0000000000
--- a/target/linux/qualcommax/patches-6.12/0421-arm64-dts-qcom-ipq5018-Add-SPI-nand-node.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c2019f64539dd24e6e0da3cea2219d6f9e6b03e4 Mon Sep 17 00:00:00 2001
-From: Ziyang Huang <hzyitc at outlook.com>
-Date: Sun, 8 Sep 2024 16:40:11 +0800
-Subject: [PATCH] arm64: dts: qcom: ipq5018: Add SPI nand node
-
-Add SPI NAND support for IPQ5018 SoC.
-
-Signed-off-by: Ziyang Huang <hzyitc at outlook.com>
-Signed-off-by: George Moussalem <george.moussalem at outlook.com>
----
- arch/arm64/boot/dts/qcom/ipq5018.dtsi | 40 +++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
-
---- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-+++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -503,6 +503,36 @@
- status = "disabled";
- };
-
-+ qpic_bam: dma at 7984000 {
-+ compatible = "qcom,bam-v1.7.0";
-+ reg = <0x07984000 0x1c000>;
-+ interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
-+ clocks = <&gcc GCC_QPIC_AHB_CLK>;
-+ clock-names = "bam_clk";
-+ #dma-cells = <1>;
-+ qcom,ee = <0>;
-+ status = "disabled";
-+ };
-+
-+ qpic_nand: qpic-nand at 79b0000 {
-+ compatible = "qcom,ipq5018-snand", "qcom,ipq9574-snand";
-+ reg = <0x079b0000 0x10000>;
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ clocks = <&gcc GCC_QPIC_CLK>,
-+ <&gcc GCC_QPIC_AHB_CLK>,
-+ <&gcc GCC_QPIC_IO_MACRO_CLK>;
-+ clock-names = "core", "aon", "iom";
-+
-+ dmas = <&qpic_bam 0>,
-+ <&qpic_bam 1>,
-+ <&qpic_bam 2>,
-+ <&qpic_bam 3>;
-+ dma-names = "tx", "rx", "cmd", "status";
-+
-+ status = "disabled";
-+ };
-+
- usb: usb at 8af8800 {
- compatible = "qcom,ipq5018-dwc3", "qcom,dwc3";
- reg = <0x08af8800 0x400>;
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 f93bbaffc2..cde86a122c 100644
--- 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 <george.moussalem at outlook.com>
---
--- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
-@@ -700,6 +700,225 @@
+@@ -708,6 +708,225 @@
};
};
More information about the lede-commits
mailing list