bcm53xx: backport DT changes from v6.5

[openwrt/staging/hauke.git] / target / linux / bcm53xx / patches-5.4 / 042-v6.1-0001-ARM-dts-BCM5301X-Correct-description-of-TP-Link-part.patch

diff --git a/target/linux/bcm53xx/patches-5.4/042-v6.1-0001-ARM-dts-BCM5301X-Correct-description-of-TP-Link-part.patch b/target/linux/bcm53xx/patches-5.4/042-v6.1-0001-ARM-dts-BCM5301X-Correct-description-of-TP-Link-part.patch
deleted file mode 100644 (file)
index 4c4ed03..0000000
--- a/target/linux/bcm53xx/patches-5.4/042-v6.1-0001-ARM-dts-BCM5301X-Correct-description-of-TP-Link-part.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From c8ee9f119bfb4244f76c9971c341ec06b49332cd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 8 Nov 2022 12:07:08 +0100
-Subject: [PATCH] ARM: dts: BCM5301X: Correct description of TP-Link partitions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-TP-Link routers have flash space partitioned according to the partitions
-table. It may look like fixed partitioning but those partitions can be
-actually reorganized. New can be added (or some removed), offsets and
-sizes may change.
-
-Fix DT to use binding for the TP-Link SafeLoader partitioning method.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Link: https://lore.kernel.org/r/20221108110708.13693-1-zajec5@gmail.com
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- .../boot/dts/bcm47081-tplink-archer-c5-v2.dts | 25 ++++---------------
- .../boot/dts/bcm4709-tplink-archer-c9-v1.dts  | 25 ++++---------------
- 2 files changed, 10 insertions(+), 40 deletions(-)
-
---- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
-+++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
-@@ -95,30 +95,15 @@
-       status = "okay";
- 
-       partitions {
--              compatible = "fixed-partitions";
--              #address-cells = <1>;
--              #size-cells = <1>;
-+              compatible = "tplink,safeloader-partitions";
-+              partitions-table-offset = <0xe50000>;
- 
--              boot@0 {
--                      label = "boot";
--                      reg = <0x000000 0x040000>;
--                      read-only;
--              };
--
--              os-image@100000 {
--                      label = "os-image";
--                      reg = <0x040000 0x200000>;
-+              partition-os-image {
-                       compatible = "brcm,trx";
-               };
- 
--              rootfs@240000 {
--                      label = "rootfs";
--                      reg = <0x240000 0xc00000>;
--              };
--
--              nvram@ff0000 {
--                      label = "nvram";
--                      reg = <0xff0000 0x010000>;
-+              partition-file-system {
-+                      linux,rootfs;
-               };
-       };
- };
---- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
-+++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
-@@ -104,30 +104,15 @@
-       status = "okay";
- 
-       partitions {
--              compatible = "fixed-partitions";
--              #address-cells = <1>;
--              #size-cells = <1>;
-+              compatible = "tplink,safeloader-partitions";
-+              partitions-table-offset = <0xe50000>;
- 
--              boot@0 {
--                      label = "boot";
--                      reg = <0x000000 0x040000>;
--                      read-only;
--              };
--
--              os-image@100000 {
--                      label = "os-image";
--                      reg = <0x040000 0x200000>;
-+              partition-os-image {
-                       compatible = "brcm,trx";
-               };
- 
--              rootfs@240000 {
--                      label = "rootfs";
--                      reg = <0x240000 0xc00000>;
--              };
--
--              nvram@ff0000 {
--                      label = "nvram";
--                      reg = <0xff0000 0x010000>;
-+              partition-file-system {
-+                      linux,rootfs;
-               };
-       };
- };