apm821xx: convert legacy nand partition layout

in order to get nvmem-cells to work on AP and routers
(Netgears WNDR4700). The nvmem-cell needs to be within
a fixed-partition dt-node.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/target/linux/apm821xx/dts/apm82181.dtsi b/target/linux/apm821xx/dts/apm82181.dtsi
index f7c4c654017d2bf3d847e9da4021dab6f9a04c3d..5f80467d748ba6b509a1d6777115e73246abd72c 100644 (file)
--- a/target/linux/apm821xx/dts/apm82181.dtsi
+++ b/target/linux/apm821xx/dts/apm82181.dtsi
@@ -251,9 +251,6 @@
                                                nand-ecc-algo = "hamming";
                                                nand-ecc-step-size = <256>;
                                                nand-ecc-strength = <1>;
-
-                                               #address-cells = <1>;
-                                               #size-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts
index a876e775110e2f447390342a1b9525bd5df4b852..4b43c683e12b82a5e2644b79837c3427be5b5005 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -38,13 +38,17 @@
        status = "okay";
 };
 
-&EBC0 {
+&ndfc {
        /* Ikarem has 32MB of NAND */
-       ndfc@1,0 {
-               status = "okay";
-               /* 32 MiB NAND Flash */
-               nand {
-                       nand-is-boot-medium;
+       status = "okay";
+
+       nand {
+               nand-is-boot-medium;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
                        partition@0 {
                                label = "u-boot";
@@ -59,10 +63,10 @@
                                 * blocks (64KiB) in order to have spares
                                 * around for bad block management
                                 */
-                               label = "u-boot-env";
-                               reg = <0x00150000 0x00010000>;
-                               read-only;
-                       };
+                                       label = "u-boot-env";
+                                       reg = <0x00150000 0x00010000>;
+                                       read-only;
+                               };
 
                        partition@160000 {
                                /*

diff --git a/target/linux/apm821xx/dts/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts
index 05274e9d42e0406a79ad546e5d8d48d0d8bad38b..79e055c2eaf26ed33aa9cf4223d399687aac4e67 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mx60.dts
+++ b/target/linux/apm821xx/dts/meraki-mx60.dts
@@ -42,12 +42,17 @@
        dr_mode = "host";
 };
 
-&EBC0 {
+&ndfc {
        /* Buckminster has 1GiB of NAND */
-       ndfc@1,0 {
-               status = "okay";
-               nand {
-                       nand-is-boot-medium;
+       status = "okay";
+
+       nand {
+               nand-is-boot-medium;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
                        partition@0 {
                                label = "u-boot";

diff --git a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
index c18c73d95672e501ea6c604c32d9f2eb83def24c..c6f112d240e07aa78e1af44cc656be3bcdfc6991 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";

diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts
index 3f93153d4da6a6a6753851183d21d84218563e14..63c96bd82a8a7d24ce4bf1fc48b3023abe05de76 100644 (file)
--- a/target/linux/apm821xx/dts/netgear-wndr4700.dts
+++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts
@@ -169,13 +169,16 @@
        dr_mode = "host";
 };
 
-&EBC0 {
-       ndfc: ndfc@1,0 {
-
-               status = "okay";
-               /* 128 MiB Nand Flash */
-               nand {
-                       nand-is-boot-medium;
+&ndfc {
+       status = "okay";
+       /* 128 MiB Nand Flash */
+       nand {
+               nand-is-boot-medium;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
                        partition@0 {
                                label = "uboot";