kernel: move patch from mpc85xx to pending
authorPawel Dembicki <paweldembicki@gmail.com>
Fri, 9 Jan 2026 08:37:01 +0000 (09:37 +0100)
committerStijn Tintel <stijn@linux-ipv6.be>
Fri, 9 Jan 2026 16:45:02 +0000 (18:45 +0200)
The patch "Revert "powerpc: dts: mpc85xx: remove "simple-bus" compatible
from ifc node" has been sent upstream [0].

It is also required for qoriq target and in this commit it is moved to
the generic/pending folder.

[0] https://patchwork.ozlabs.org/project/linuxppc-dev/patch/20251105205524.17362-1-rosenp@gmail.com/

Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/10941
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
target/linux/generic/pending-6.12/303-Revert-powerpc-dts-mpc85xx-remove-simple-bus-compatible-from-ifc-node.patch [new file with mode: 0644]
target/linux/mpc85xx/patches-6.12/002-Revert-powerpc-dts-mpc85xx-remove-simple-bus-compatible-from-ifc-node.patch [deleted file]

diff --git a/target/linux/generic/pending-6.12/303-Revert-powerpc-dts-mpc85xx-remove-simple-bus-compatible-from-ifc-node.patch b/target/linux/generic/pending-6.12/303-Revert-powerpc-dts-mpc85xx-remove-simple-bus-compatible-from-ifc-node.patch
new file mode 100644 (file)
index 0000000..31f15a5
--- /dev/null
@@ -0,0 +1,125 @@
+From patchwork Wed Nov  5 20:55:24 2025
+From: Rosen Penev <rosenp@gmail.com>
+Subject: [PATCH] Revert "powerpc: dts: mpc85xx: remove "simple-bus" compatible
+ from ifc node"
+Date: Wed,  5 Nov 2025 12:55:24 -0800
+
+This reverts commit 0bf51cc9e9e57a751b4c5dacbfa499ba5cd8bd72.
+
+simple-bus is needed for legacy platforms such as P1010 so that nodes
+are populated properly.
+
+Fixes fsl,ifc-nand probing under at least P1010.
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+---
+ arch/powerpc/boot/dts/fsl/b4si-post.dtsi      | 2 +-
+ arch/powerpc/boot/dts/fsl/bsc9131si-post.dtsi | 2 +-
+ arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi | 2 +-
+ arch/powerpc/boot/dts/fsl/c293si-post.dtsi    | 2 +-
+ arch/powerpc/boot/dts/fsl/p1010si-post.dtsi   | 2 +-
+ arch/powerpc/boot/dts/fsl/t1023si-post.dtsi   | 2 +-
+ arch/powerpc/boot/dts/fsl/t1040si-post.dtsi   | 2 +-
+ arch/powerpc/boot/dts/fsl/t2081si-post.dtsi   | 2 +-
+ arch/powerpc/boot/dts/fsl/t4240si-post.dtsi   | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
++++ b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
+@@ -50,7 +50,7 @@
+ &ifc {
+       #address-cells = <2>;
+       #size-cells = <1>;
+-      compatible = "fsl,ifc";
++      compatible = "fsl,ifc", "simple-bus";
+       interrupts = <25 2 0 0>;
+ };
+--- a/arch/powerpc/boot/dts/fsl/bsc9131si-post.dtsi
++++ b/arch/powerpc/boot/dts/fsl/bsc9131si-post.dtsi
+@@ -35,7 +35,7 @@
+ &ifc {
+       #address-cells = <2>;
+       #size-cells = <1>;
+-      compatible = "fsl,ifc";
++      compatible = "fsl,ifc", "simple-bus";
+       interrupts = <16 2 0 0 20 2 0 0>;
+ };
+--- a/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
++++ b/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
+@@ -35,7 +35,7 @@
+ &ifc {
+       #address-cells = <2>;
+       #size-cells = <1>;
+-      compatible = "fsl,ifc";
++      compatible = "fsl,ifc", "simple-bus";
+       /* FIXME: Test whether interrupts are split */
+       interrupts = <16 2 0 0 20 2 0 0>;
+ };
+--- a/arch/powerpc/boot/dts/fsl/c293si-post.dtsi
++++ b/arch/powerpc/boot/dts/fsl/c293si-post.dtsi
+@@ -35,7 +35,7 @@
+ &ifc {
+       #address-cells = <2>;
+       #size-cells = <1>;
+-      compatible = "fsl,ifc";
++      compatible = "fsl,ifc", "simple-bus";
+       interrupts = <19 2 0 0>;
+ };
+--- a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
++++ b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
+@@ -35,7 +35,7 @@
+ &ifc {
+       #address-cells = <2>;
+       #size-cells = <1>;
+-      compatible = "fsl,ifc";
++      compatible = "fsl,ifc", "simple-bus";
+       interrupts = <16 2 0 0 19 2 0 0>;
+ };
+--- a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
++++ b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
+@@ -52,7 +52,7 @@
+ &ifc {
+       #address-cells = <2>;
+       #size-cells = <1>;
+-      compatible = "fsl,ifc";
++      compatible = "fsl,ifc", "simple-bus";
+       interrupts = <25 2 0 0>;
+ };
+--- a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
++++ b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
+@@ -52,7 +52,7 @@
+ &ifc {
+       #address-cells = <2>;
+       #size-cells = <1>;
+-      compatible = "fsl,ifc";
++      compatible = "fsl,ifc", "simple-bus";
+       interrupts = <25 2 0 0>;
+ };
+--- a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
++++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
+@@ -50,7 +50,7 @@
+ &ifc {
+       #address-cells = <2>;
+       #size-cells = <1>;
+-      compatible = "fsl,ifc";
++      compatible = "fsl,ifc", "simple-bus";
+       interrupts = <25 2 0 0>;
+ };
+--- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
++++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
+@@ -50,7 +50,7 @@
+ &ifc {
+       #address-cells = <2>;
+       #size-cells = <1>;
+-      compatible = "fsl,ifc";
++      compatible = "fsl,ifc", "simple-bus";
+       interrupts = <25 2 0 0>;
+ };
diff --git a/target/linux/mpc85xx/patches-6.12/002-Revert-powerpc-dts-mpc85xx-remove-simple-bus-compatible-from-ifc-node.patch b/target/linux/mpc85xx/patches-6.12/002-Revert-powerpc-dts-mpc85xx-remove-simple-bus-compatible-from-ifc-node.patch
deleted file mode 100644 (file)
index 31f15a5..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-From patchwork Wed Nov  5 20:55:24 2025
-From: Rosen Penev <rosenp@gmail.com>
-Subject: [PATCH] Revert "powerpc: dts: mpc85xx: remove "simple-bus" compatible
- from ifc node"
-Date: Wed,  5 Nov 2025 12:55:24 -0800
-
-This reverts commit 0bf51cc9e9e57a751b4c5dacbfa499ba5cd8bd72.
-
-simple-bus is needed for legacy platforms such as P1010 so that nodes
-are populated properly.
-
-Fixes fsl,ifc-nand probing under at least P1010.
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
----
- arch/powerpc/boot/dts/fsl/b4si-post.dtsi      | 2 +-
- arch/powerpc/boot/dts/fsl/bsc9131si-post.dtsi | 2 +-
- arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi | 2 +-
- arch/powerpc/boot/dts/fsl/c293si-post.dtsi    | 2 +-
- arch/powerpc/boot/dts/fsl/p1010si-post.dtsi   | 2 +-
- arch/powerpc/boot/dts/fsl/t1023si-post.dtsi   | 2 +-
- arch/powerpc/boot/dts/fsl/t1040si-post.dtsi   | 2 +-
- arch/powerpc/boot/dts/fsl/t2081si-post.dtsi   | 2 +-
- arch/powerpc/boot/dts/fsl/t4240si-post.dtsi   | 2 +-
- 9 files changed, 9 insertions(+), 9 deletions(-)
-
---- a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
-@@ -50,7 +50,7 @@
- &ifc {
-       #address-cells = <2>;
-       #size-cells = <1>;
--      compatible = "fsl,ifc";
-+      compatible = "fsl,ifc", "simple-bus";
-       interrupts = <25 2 0 0>;
- };
---- a/arch/powerpc/boot/dts/fsl/bsc9131si-post.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/bsc9131si-post.dtsi
-@@ -35,7 +35,7 @@
- &ifc {
-       #address-cells = <2>;
-       #size-cells = <1>;
--      compatible = "fsl,ifc";
-+      compatible = "fsl,ifc", "simple-bus";
-       interrupts = <16 2 0 0 20 2 0 0>;
- };
---- a/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
-@@ -35,7 +35,7 @@
- &ifc {
-       #address-cells = <2>;
-       #size-cells = <1>;
--      compatible = "fsl,ifc";
-+      compatible = "fsl,ifc", "simple-bus";
-       /* FIXME: Test whether interrupts are split */
-       interrupts = <16 2 0 0 20 2 0 0>;
- };
---- a/arch/powerpc/boot/dts/fsl/c293si-post.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/c293si-post.dtsi
-@@ -35,7 +35,7 @@
- &ifc {
-       #address-cells = <2>;
-       #size-cells = <1>;
--      compatible = "fsl,ifc";
-+      compatible = "fsl,ifc", "simple-bus";
-       interrupts = <19 2 0 0>;
- };
---- a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
-@@ -35,7 +35,7 @@
- &ifc {
-       #address-cells = <2>;
-       #size-cells = <1>;
--      compatible = "fsl,ifc";
-+      compatible = "fsl,ifc", "simple-bus";
-       interrupts = <16 2 0 0 19 2 0 0>;
- };
---- a/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
-@@ -52,7 +52,7 @@
- &ifc {
-       #address-cells = <2>;
-       #size-cells = <1>;
--      compatible = "fsl,ifc";
-+      compatible = "fsl,ifc", "simple-bus";
-       interrupts = <25 2 0 0>;
- };
---- a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
-@@ -52,7 +52,7 @@
- &ifc {
-       #address-cells = <2>;
-       #size-cells = <1>;
--      compatible = "fsl,ifc";
-+      compatible = "fsl,ifc", "simple-bus";
-       interrupts = <25 2 0 0>;
- };
---- a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
-@@ -50,7 +50,7 @@
- &ifc {
-       #address-cells = <2>;
-       #size-cells = <1>;
--      compatible = "fsl,ifc";
-+      compatible = "fsl,ifc", "simple-bus";
-       interrupts = <25 2 0 0>;
- };
---- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
-+++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
-@@ -50,7 +50,7 @@
- &ifc {
-       #address-cells = <2>;
-       #size-cells = <1>;
--      compatible = "fsl,ifc";
-+      compatible = "fsl,ifc", "simple-bus";
-       interrupts = <25 2 0 0>;
- };