]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
gemini: Add DTS fix from upstream kernel
authorLinus Walleij <linusw@kernel.org>
Fri, 23 Jan 2026 15:32:10 +0000 (16:32 +0100)
committerLinus Walleij <linusw@kernel.org>
Fri, 23 Jan 2026 22:49:37 +0000 (23:49 +0100)
This contains small but important DTS fixes for the
RedBoot partitions.

Link: https://github.com/openwrt/openwrt/pull/21662
Signed-off-by: Linus Walleij <linusw@kernel.org>
target/linux/gemini/patches-6.12/0001-ARM-dts-gemini-Fix-partition-offsets.patch [new file with mode: 0644]

diff --git a/target/linux/gemini/patches-6.12/0001-ARM-dts-gemini-Fix-partition-offsets.patch b/target/linux/gemini/patches-6.12/0001-ARM-dts-gemini-Fix-partition-offsets.patch
new file mode 100644 (file)
index 0000000..45cf889
--- /dev/null
@@ -0,0 +1,41 @@
+From 771db4a77c5fb6da4908825e65f500ad67f86e5f Mon Sep 17 00:00:00 2001
+From: Linus Walleij <linusw@kernel.org>
+Date: Fri, 23 Jan 2026 16:24:49 +0100
+Subject: [PATCH] ARM: dts: gemini: Fix partition offsets
+
+These FIS partition offsets were never right: the comment clearly
+states the FIS index is at 0xfe0000 and 0x7f * 0x200000 is
+0xfe0000.
+
+Tested on the iTian SQ201.
+
+Fixes: d88b11ef91b1 ("ARM: dts: Fix up SQ201 flash access")
+Fixes: b5a923f8c739 ("ARM: dts: gemini: Switch to redboot partition parsing")
+Signed-off-by: Linus Walleij <linusw@kernel.org>
+---
+ arch/arm/boot/dts/gemini/gemini-sl93512r.dts | 2 +-
+ arch/arm/boot/dts/gemini/gemini-sq201.dts    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/gemini/gemini-sl93512r.dts
++++ b/arch/arm/boot/dts/gemini/gemini-sl93512r.dts
+@@ -146,7 +146,7 @@
+                       partitions {
+                               compatible = "redboot-fis";
+                               /* Eraseblock at 0xfe0000 */
+-                              fis-index-block = <0x1fc>;
++                              fis-index-block = <0x7f>;
+                       };
+               };
+--- a/arch/arm/boot/dts/gemini/gemini-sq201.dts
++++ b/arch/arm/boot/dts/gemini/gemini-sq201.dts
+@@ -134,7 +134,7 @@
+                       partitions {
+                               compatible = "redboot-fis";
+                               /* Eraseblock at 0xfe0000 */
+-                              fis-index-block = <0x1fc>;
++                              fis-index-block = <0x7f>;
+                       };
+               };