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 32a44b6560f54e012139a3ef6219dedf1286254a..f36603fffbaa71a30d15005c2896ee9ceab7254d 100644 (file)
--- a/arch/arm/boot/dts/spear600-evb.dts
+++ b/arch/arm/boot/dts/spear600-evb.dts
@@ -58,34 +58,38 @@ &smi {
        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>;
+                       };
                };
        };
 };