Merge branches 'acpi-video' and 'acpi-hotplug'

[deliverable/linux.git] / arch / arm / boot / dts / armada-xp-lenovo-ix4-300d.dts

diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
index 58b500873bfd57f2787080a9229d58e5785acbe2..13cf69a8d0fb392b264910f014cf7ff8434f9e2b 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
+++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@ -151,42 +151,42 @@
                                marvell,nand-enable-arbiter;
                                nand-on-flash-bbt;
 
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0000000 0xe0000>;
-                                       read-only;
-                               };
-
-                               partition@e0000 {
-                                       label = "u-boot-env";
-                                       reg = <0xe0000 0x20000>;
-                                       read-only;
-                               };
-
-                               partition@100000 {
-                                       label = "u-boot-env2";
-                                       reg = <0x100000 0x20000>;
-                                       read-only;
-                               };
-
-                               partition@120000 {
-                                       label = "zImage";
-                                       reg = <0x120000 0x400000>;
-                               };
-
-                               partition@520000 {
-                                       label = "initrd";
-                                       reg = <0x520000 0x400000>;
-                               };
-
-                               partition@xE00000 {
-                                       label = "boot";
-                                       reg = <0xE00000 0x3F200000>;
-                               };
-
-                               partition@flash {
-                                       label = "flash";
-                                       reg = <0x0 0x40000000>;
+                               partitions {
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       partition@0 {
+                                               label = "u-boot";
+                                               reg = <0x00000000 0x000e0000>;
+                                               read-only;
+                                       };
+
+                                       partition@e0000 {
+                                               label = "u-boot-env";
+                                               reg = <0x000e0000 0x00020000>;
+                                               read-only;
+                                       };
+
+                                       partition@100000 {
+                                               label = "u-boot-env2";
+                                               reg = <0x00100000 0x00020000>;
+                                               read-only;
+                                       };
+
+                                       partition@120000 {
+                                               label = "zImage";
+                                               reg = <0x00120000 0x00400000>;
+                                       };
+
+                                       partition@520000 {
+                                               label = "initrd";
+                                               reg = <0x00520000 0x00400000>;
+                                       };
+
+                                       partition@e00000 {
+                                               label = "boot";
+                                               reg = <0x00e00000 0x3f200000>;
+                                       };
                                };
                        };
                };