From 6dd94c2781b79ffd20f1a57a48fa2314d67ee190 Mon Sep 17 00:00:00 2001
From: Mathias Kresin <dev@kresin.me>
Date: Fri, 3 Aug 2018 20:14:49 +0200
Subject: [PATCH] ramips: unify partition node names in dts files

Use partition@ as name for all partition nodes. Add a label where
necessary.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---
 target/linux/ramips/dts/AR670W.dts |  6 +++---
 target/linux/ramips/dts/AR725W.dts |  8 ++++----
 target/linux/ramips/dts/K2G.dts    | 15 ++++++++++-----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/target/linux/ramips/dts/AR670W.dts b/target/linux/ramips/dts/AR670W.dts
index cc15317b853..9e12ffc374e 100644
--- a/target/linux/ramips/dts/AR670W.dts
+++ b/target/linux/ramips/dts/AR670W.dts
@@ -20,19 +20,19 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		u-boot@0 {
+		partition@0 {
 			reg = <0x0 0x30000>;
 			label = "u-boot";
 			read-only;
 		};
 
-		factory: factory@30000 {
+		factory: partition@30000 {
 			reg = <0x30000 0x10000>;
 			label = "factory";
 			read-only;
 		};
 
-		firmware@40000 {
+		partition@40000 {
 			reg = <0x40000 0x3c0000>;
 			label = "firmware";
 		};
diff --git a/target/linux/ramips/dts/AR725W.dts b/target/linux/ramips/dts/AR725W.dts
index 3c459aa2fcd..52b1520418d 100644
--- a/target/linux/ramips/dts/AR725W.dts
+++ b/target/linux/ramips/dts/AR725W.dts
@@ -20,24 +20,24 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		u-boot@0 {
+		partition@0 {
 			reg = <0x0 0x30000>;
 			label = "u-boot";
 			read-only;
 		};
 
-		u-boot-env@30000 {
+		partition@30000 {
 			reg = <0x30000 0x10000>;
 			label = "u-boot-env";
 		};
 
-		factory: factory@40000 {
+		factory: partition@40000 {
 			reg = <0x40000 0x10000>;
 			label = "factory";
 			read-only;
 		};
 
-		firmware@50000 {
+		partition@50000 {
 			reg = <0x50000 0x3B0000>;
 			label = "firmware";
 		};
diff --git a/target/linux/ramips/dts/K2G.dts b/target/linux/ramips/dts/K2G.dts
index bd5d960fef3..891b089980e 100644
--- a/target/linux/ramips/dts/K2G.dts
+++ b/target/linux/ramips/dts/K2G.dts
@@ -58,28 +58,33 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			u-boot@0 {
+			partition@0 {
 				reg = <0x0 0x30000>;
+				label = "u-boot";
 				read-only;
 			};
 
-			u-boot-env@30000 {
+			partition@30000 {
 				reg = <0x30000 0x10000>;
+				label = "u-boot-env";
 				read-only;
 			};
 
-			factory: factory@40000 {
+			factory: partition@40000 {
 				reg = <0x40000 0x10000>;
+				label = "factory";
 				read-only;
 			};
 
-			permanent_config@50000 {
+			partition@50000 {
 				reg = <0x50000 0x50000>;
+				label = "permanent_config";
 				read-only;
 			};
 
-			firmware@a0000 {
+			partition@a0000 {
 				reg = <0xa0000 0x760000>;
+				label = "firmware";
 			};
 		};
 	};
-- 
2.30.2