From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 17 Apr 2017 12:46:42 +0000 (+0200)
Subject: arm: spear6xx: switch spear600-evb to the new flash partition DT binding
X-Git-Tag: Ubuntu-5.2.0-15.16~6908^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4e7adc294ef319d0e57e4b8638af7800be1b0a88;p=mirror_ubuntu-eoan-kernel.git

arm: spear6xx: switch spear600-evb to the new flash partition DT binding

This commit moves spear600-evb.dts to use the new flash partition Device
Tree binding documented in
Documentation/devicetree/bindings/mtd/partition.txt.

As this Device Tree binding document says: "For backwards compatibility
partitions as direct subnodes of the mtd device are supported. This use
is discouraged."

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
---

diff --git a/arch/arm/boot/dts/spear600-evb.dts b/arch/arm/boot/dts/spear600-evb.dts
index 32a44b6560f5..f36603fffbaa 100644
--- a/arch/arm/boot/dts/spear600-evb.dts
+++ b/arch/arm/boot/dts/spear600-evb.dts
@@ -58,34 +58,38 @@
 	clock-rate = <50000000>;
 
 	flash@f8000000 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		reg = <0xf8000000 0x800000>;
 		st,smi-fast-mode;
 
-		partition@0 {
-			label = "xloader";
-			reg = <0x0 0x10000>;
-		};
-		partition@10000 {
-			label = "u-boot";
-			reg = <0x10000 0x50000>;
-		};
-		partition@60000 {
-			label = "environment";
-			reg = <0x60000 0x10000>;
-		};
-		partition@70000 {
-			label = "dtb";
-			reg = <0x70000 0x10000>;
-		};
-		partition@80000 {
-			label = "linux";
-			reg = <0x80000 0x310000>;
-		};
-		partition@390000 {
-			label = "rootfs";
-			reg = <0x390000 0x0>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "xloader";
+				reg = <0x0 0x10000>;
+			};
+			partition@10000 {
+				label = "u-boot";
+				reg = <0x10000 0x50000>;
+			};
+			partition@60000 {
+				label = "environment";
+				reg = <0x60000 0x10000>;
+			};
+			partition@70000 {
+				label = "dtb";
+				reg = <0x70000 0x10000>;
+			};
+			partition@80000 {
+				label = "linux";
+				reg = <0x80000 0x310000>;
+			};
+			partition@390000 {
+				label = "rootfs";
+				reg = <0x390000 0x0>;
+			};
 		};
 	};
 };