apm821xx: use nested fixed-partitions

[openwrt/staging/pepe2k.git] / target / linux / apm821xx / dts / netgear-wndap6x0.dtsi

diff --git a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
index 910817e5edf2d28c1cd7b884ff12b12fa380e08f..8a15a78dce6ea70ed96250c80fe27449d6337965 100644 (file)
--- a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
+++ b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
@@ -28,12 +28,17 @@
        status = "okay";
 };
 
-&EBC0 {
-       ndfc@1,0 {
-               status = "okay";
-               /* 32 MiB SLC NAND Flash */
-               nand {
-                       nand-is-boot-medium;
+&ndfc {
+       status = "okay";
+       /* 32 MiB SLC NAND Flash */
+
+       nand {
+               nand-is-boot-medium;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
                        partition@0 {
                                label = "u-boot";
@@ -47,23 +52,27 @@
                                read-only;
                        };
 
-                       partition@110000,0 {
+                       partition@110000 {
                                label = "firmware";
                                reg = <0x00110000 0x01ac0000>;
-                       };
 
-                       partition@110000,1 {
-                               /*
-                                * The u-boot bootloader will look at this
-                                * offset (0x110000) for an uImage binary.
-                                */
-                               label = "kernel";
-                               reg = <0x00110000 0x005f0000>;
-                       };
-
-                       partition@700000 {
-                               label = "ubi";
-                               reg = <0x00700000 0x014d0000>;
+                               compatible = "fixed-partitions";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               partition@0 {
+                                       /*
+                                        * The u-boot bootloader will look at this
+                                        * offset (0x110000) for an uImage binary.
+                                        */
+                                       label = "kernel";
+                                       reg = <0x00000000 0x005f0000>;
+                               };
+
+                               partition@5f0000 {
+                                       label = "ubi";
+                                       reg = <0x005f0000 0x014d0000>;
+                               };
                        };
 
                        partition@1bd0000 {
@@ -207,10 +216,6 @@
        status = "okay";
 };
 
-&MSI {
-       status = "okay";
-};
-
 &IIC0 {
        status = "okay";