From 8f90dbfd1ff0b0c67a11d3960ca3c2b4384c4abc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibaut=20VAR=C3=88NE?= <hacks@slashdirt.org>
Date: Sat, 21 Mar 2020 13:07:23 +0100
Subject: [PATCH] ath79/mikrotik: use routerbootpart partitions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable routerbootpart partitions on MikroTik devices.

Tested-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
---
 ...56_mikrotik_routerboard-wap-g-5hact2hnd.dts | 18 +++++++-----------
 ...558_mikrotik_routerboard-922uags-5hpacd.dts | 17 +++++------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
index 74cf1315b6..a0190760fb 100644
--- a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
+++ b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
@@ -84,37 +84,33 @@
 				label = "RouterBoot";
 				reg = <0x0 0x20000>;
 				read-only;
-				compatible = "fixed-partitions";
+				compatible = "mikrotik,routerboot-partitions";
 				#address-cells = <1>;
 				#size-cells = <1>;
 
 				partition@0 {
 					label = "bootloader1";
-					reg = <0x0 0xe000>;
+					reg = <0x0 0x0>;
 					read-only;
 				};
 
-				hard_config: partition@e000 {
-					label = "hard_config";
-					reg = <0xe000 0x1000>;
+				hard_config: hard_config {
 					read-only;
 				};
 
-				partition@f000 {
-					label = "bios";
-					reg = <0xf000 0x1000>;
+				bios {
+					size = <0x1000>;
 					read-only;
 				};
 
 				partition@10000 {
 					label = "bootloader2";
-					reg = <0x10000 0xf000>;
+					reg = <0x10000 0x0>;
 					read-only;
 				};
 
-				partition@1f000 {
+				soft_config {
 					label = "soft_config";
-					reg = <0x1f000 0x1000>;
 				};
 			};
 
diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
index dd4d523368..7377953f78 100644
--- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
+++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
@@ -99,32 +99,25 @@
 		spi-max-frequency = <25000000>;
 
 		partitions {
-			compatible = "fixed-partitions";
+			compatible = "mikrotik,routerboot-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
 			partition@0 {
 				label = "routerboot";
-				reg = <0x0000000 0x000c000>;
+				reg = <0x0 0x0>;
 				read-only;
 			};
 
-			hard_config: partition@c000 {
-				label = "hard_config";
-				reg = <0x000c000 0x0001000>;
+			hard_config: hard_config {
 				read-only;
 			};
 
-			partition@d000 {
-				label = "bios";
-				reg = <0x000d000 0x0001000>;
+			bios {
 				read-only;
 			};
 
-			partition@e000 {
-				label = "soft_config";
-				reg = <0x000e000 0x0001000>;
-				read-only;
+			soft_config {
 			};
 		};
 	};