aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@gmail.com>2022-01-16 20:13:24 +0100
committerChristian Lamparter <chunkeey@gmail.com>2022-02-04 21:15:17 +0100
commitf095822699cc397f86d2c24616aaaa7f814dc8d9 (patch)
tree3e4cf09d09fc733e98ef264c8ba097187353ad12 /target/linux
parent1085c4b4a72a5277a611cc4a8ac2e5742da127fc (diff)
downloadupstream-f095822699cc397f86d2c24616aaaa7f814dc8d9.tar.gz
upstream-f095822699cc397f86d2c24616aaaa7f814dc8d9.tar.bz2
upstream-f095822699cc397f86d2c24616aaaa7f814dc8d9.zip
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>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/apm821xx/dts/apm82181.dtsi3
-rw-r--r--target/linux/apm821xx/dts/meraki-mr24.dts24
-rw-r--r--target/linux/apm821xx/dts/meraki-mx60.dts15
-rw-r--r--target/linux/apm821xx/dts/netgear-wndap6x0.dtsi17
-rw-r--r--target/linux/apm821xx/dts/netgear-wndr4700.dts17
5 files changed, 45 insertions, 31 deletions
diff --git a/target/linux/apm821xx/dts/apm82181.dtsi b/target/linux/apm821xx/dts/apm82181.dtsi
index f7c4c65401..5f80467d74 100644
--- 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 a876e77511..4b43c683e1 100644
--- 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 05274e9d42..79e055c2ea 100644
--- 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 c18c73d956..c6f112d240 100644
--- 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 3f93153d4d..63c96bd82a 100644
--- 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";