[openwrt/openwrt] ath79: use the new DT fixed partitions syntax
LEDE Commits
lede-commits at lists.infradead.org
Mon May 7 03:59:03 PDT 2018
blogic pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/4edd4cb2b3a55962a6d3fa4611c7f2bc393eb902
commit 4edd4cb2b3a55962a6d3fa4611c7f2bc393eb902
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Mon May 7 10:35:51 2018 +0200
ath79: use the new DT fixed partitions syntax
This new syntax is slightly better designed & uses "compatible" string.
For details see Documentation/devicetree/bindings/mtd/partition.txt .
Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
target/linux/ath79/dts/ar7161_netgear_wndr3800.dts | 40 +++++++------
target/linux/ath79/dts/ar7241_ubnt-unifi.dts | 68 ++++++++++++----------
target/linux/ath79/dts/ar7241_ubnt-xm.dtsi | 68 ++++++++++++----------
target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts | 34 ++++++-----
target/linux/ath79/dts/ar9330_gl_ar150.dts | 46 ++++++++-------
target/linux/ath79/dts/ar9331_ew_dorin.dts | 46 ++++++++-------
target/linux/ath79/dts/qca9558_om5p_ac.dts | 46 ++++++++-------
7 files changed, 195 insertions(+), 153 deletions(-)
diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
index ba6e9ae..a175fd7 100644
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts
@@ -139,26 +139,32 @@
reg = <0>;
spi-max-frequency = <25000000>;
- partition at 0 {
- label = "u-boot";
- reg = <0x000000 0x050000>;
- read-only;
- };
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x000000 0x050000>;
+ read-only;
+ };
- partition at 1 {
- label = "u-boot-env";
- reg = <0x050000 0x020000>;
- };
+ partition at 1 {
+ label = "u-boot-env";
+ reg = <0x050000 0x020000>;
+ };
- partition at 2 {
- label = "firmware";
- reg = <0x70000 0xf80000>;
- };
+ partition at 2 {
+ label = "firmware";
+ reg = <0x70000 0xf80000>;
+ };
- partition at 3 {
- label = "art";
- reg = <0xff0000 0x010000>;
- read-only;
+ partition at 3 {
+ label = "art";
+ reg = <0xff0000 0x010000>;
+ read-only;
+ };
};
};
};
diff --git a/target/linux/ath79/dts/ar7241_ubnt-unifi.dts b/target/linux/ath79/dts/ar7241_ubnt-unifi.dts
index aaafb08..1fa2d82 100644
--- a/target/linux/ath79/dts/ar7241_ubnt-unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt-unifi.dts
@@ -68,37 +68,43 @@
reg = <0>;
spi-max-frequency = <25000000>;
- partition at 0 {
- label = "u-boot";
- reg = <0x000000 0x040000>;
- };
-
- partition at 1 {
- label = "u-boot-env";
- reg = <0x040000 0x010000>;
- };
-
- partition at 2 {
- label = "firmware";
- reg = <0x050000 0x750000>;
- };
-
- partition at 3 {
- label = "board_config";
- reg = <0x7a0000 0x010000>;
- read-only;
- };
-
- partition at 4 {
- label = "cfg";
- reg = <0x7b0000 0x040000>;
- read-only;
- };
-
- art: partition at 5 {
- label = "art";
- reg = <0x7f0000 0x010000>;
- read-only;
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x000000 0x040000>;
+ };
+
+ partition at 1 {
+ label = "u-boot-env";
+ reg = <0x040000 0x010000>;
+ };
+
+ partition at 2 {
+ label = "firmware";
+ reg = <0x050000 0x750000>;
+ };
+
+ partition at 3 {
+ label = "board_config";
+ reg = <0x7a0000 0x010000>;
+ read-only;
+ };
+
+ partition at 4 {
+ label = "cfg";
+ reg = <0x7b0000 0x040000>;
+ read-only;
+ };
+
+ art: partition at 5 {
+ label = "art";
+ reg = <0x7f0000 0x010000>;
+ read-only;
+ };
};
};
};
diff --git a/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi
index cd7da20..ac0a79d 100644
--- a/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi
@@ -77,37 +77,43 @@
reg = <0>;
spi-max-frequency = <25000000>;
- partition at 0 {
- label = "u-boot";
- reg = <0x000000 0x040000>;
- };
-
- partition at 1 {
- label = "u-boot-env";
- reg = <0x040000 0x010000>;
- };
-
- partition at 2 {
- label = "firmware";
- reg = <0x050000 0x750000>;
- };
-
- partition at 3 {
- label = "board_config";
- reg = <0x7a0000 0x010000>;
- read-only;
- };
-
- partition at 4 {
- label = "cfg";
- reg = <0x7b0000 0x040000>;
- read-only;
- };
-
- art: partition at 5 {
- label = "art";
- reg = <0x7f0000 0x010000>;
- read-only;
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x000000 0x040000>;
+ };
+
+ partition at 1 {
+ label = "u-boot-env";
+ reg = <0x040000 0x010000>;
+ };
+
+ partition at 2 {
+ label = "firmware";
+ reg = <0x050000 0x750000>;
+ };
+
+ partition at 3 {
+ label = "board_config";
+ reg = <0x7a0000 0x010000>;
+ read-only;
+ };
+
+ partition at 4 {
+ label = "cfg";
+ reg = <0x7b0000 0x040000>;
+ read-only;
+ };
+
+ art: partition at 5 {
+ label = "art";
+ reg = <0x7f0000 0x010000>;
+ read-only;
+ };
};
};
};
diff --git a/target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts b/target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts
index 0999412..0ad865b 100644
--- a/target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts
+++ b/target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts
@@ -94,20 +94,26 @@
reg = <0>;
spi-max-frequency = <25000000>;
- partition at 0 {
- label = "u-boot";
- reg = <0x000000 0x020000>;
- };
-
- partition at 1 {
- label = "firmware";
- reg = <0x020000 0x7D0000>;
- };
-
- partition at 2 {
- label = "art";
- reg = <0x7F0000 0x010000>;
- read-only;
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x000000 0x020000>;
+ };
+
+ partition at 1 {
+ label = "firmware";
+ reg = <0x020000 0x7D0000>;
+ };
+
+ partition at 2 {
+ label = "art";
+ reg = <0x7F0000 0x010000>;
+ read-only;
+ };
};
};
};
diff --git a/target/linux/ath79/dts/ar9330_gl_ar150.dts b/target/linux/ath79/dts/ar9330_gl_ar150.dts
index a41799f..97beab1 100644
--- a/target/linux/ath79/dts/ar9330_gl_ar150.dts
+++ b/target/linux/ath79/dts/ar9330_gl_ar150.dts
@@ -96,26 +96,32 @@
spi-max-frequency = <104000000>;
reg = <0>;
- partition at 0 {
- label = "u-boot";
- reg = <0x000000 0x040000>;
- read-only;
- };
-
- partition at 1 {
- label = "u-boot-env";
- reg = <0x040000 0x010000>;
- };
-
- partition at 2 {
- label = "firmware";
- reg = <0x050000 0xfa0000>;
- };
-
- art: partition at 3 {
- label = "ART";
- reg = <0xff0000 0x010000>;
- read-only;
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x000000 0x040000>;
+ read-only;
+ };
+
+ partition at 1 {
+ label = "u-boot-env";
+ reg = <0x040000 0x010000>;
+ };
+
+ partition at 2 {
+ label = "firmware";
+ reg = <0x050000 0xfa0000>;
+ };
+
+ art: partition at 3 {
+ label = "ART";
+ reg = <0xff0000 0x010000>;
+ read-only;
+ };
};
};
};
diff --git a/target/linux/ath79/dts/ar9331_ew_dorin.dts b/target/linux/ath79/dts/ar9331_ew_dorin.dts
index 3c2a1b2..fd18593 100644
--- a/target/linux/ath79/dts/ar9331_ew_dorin.dts
+++ b/target/linux/ath79/dts/ar9331_ew_dorin.dts
@@ -77,26 +77,32 @@
spi-max-frequency = <104000000>;
reg = <0>;
- partition at 0 {
- label = "u-boot";
- reg = <0x000000 0x040000>;
- read-only;
- };
-
- partition at 1 {
- label = "u-boot-env";
- reg = <0x040000 0x010000>;
- };
-
- partition at 2 {
- label = "firmware";
- reg = <0x050000 0xfa0000>;
- };
-
- art: partition at 3 {
- label = "ART";
- reg = <0xff0000 0x010000>;
- read-only;
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x000000 0x040000>;
+ read-only;
+ };
+
+ partition at 1 {
+ label = "u-boot-env";
+ reg = <0x040000 0x010000>;
+ };
+
+ partition at 2 {
+ label = "firmware";
+ reg = <0x050000 0xfa0000>;
+ };
+
+ art: partition at 3 {
+ label = "ART";
+ reg = <0xff0000 0x010000>;
+ read-only;
+ };
};
};
};
diff --git a/target/linux/ath79/dts/qca9558_om5p_ac.dts b/target/linux/ath79/dts/qca9558_om5p_ac.dts
index 517bc17..974b1c6 100644
--- a/target/linux/ath79/dts/qca9558_om5p_ac.dts
+++ b/target/linux/ath79/dts/qca9558_om5p_ac.dts
@@ -113,26 +113,32 @@
reg = <0>;
spi-max-frequency = <25000000>;
- partition at 0 {
- label = "u-boot";
- reg = <0x000000 0x040000>;
- read-only;
- };
-
- partition at 1 {
- label = "u-boot-env";
- reg = <0x040000 0x010000>;
- };
-
- partition at 2 {
- label = "firmware";
- reg = <0x850000 0x7a0000>;
- };
-
- partition at 3 {
- label = "ART";
- reg = <0xff0000 0x010000>;
- read-only;
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x000000 0x040000>;
+ read-only;
+ };
+
+ partition at 1 {
+ label = "u-boot-env";
+ reg = <0x040000 0x010000>;
+ };
+
+ partition at 2 {
+ label = "firmware";
+ reg = <0x850000 0x7a0000>;
+ };
+
+ partition at 3 {
+ label = "ART";
+ reg = <0xff0000 0x010000>;
+ read-only;
+ };
};
};
};
More information about the lede-commits
mailing list