diff for duplicates of <20171018143629.29302-10-miquel.raynal@free-electrons.com>
diff --git a/a/content_digest b/N1/content_digest
index c41f8f3..a2876dc 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -33,34 +33,16 @@
" linux-arm-kernel\@lists.infradead.org",
" linux-kernel\@vger.kernel.org",
" linux-mediatek\@lists.infradead.org",
- " linux-mtd\@lists.infradead.org",
- " Marc Gonzalez <marc_gonzalez\@sigmadesigns.com>",
- " Marek Vasut <marek.vasut\@gmail.com>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Masahiro Yamada <yamada.masahiro\@socionext.com>",
- " Matthias Brugger <matthias.bgg\@gmail.com>",
- " Maxime Ripard <maxime.ripard\@free-electrons.com>",
- " Maxim Levitsky <maximlevitsky\@gmail.com>",
- " Richard Weinberger <richard\@nod.at>",
- " Robert Jarzmik <robert.jarzmik\@free.fr>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Russell King <linux\@armlinux.org.uk>",
- " Sebastian Hesselbarth <sebastian.hesselbarth\@gmail.com>",
- " Stefan Agner <stefan\@agner.ch>",
- " Sylvain Lemieux <slemieux.tyco\@gmail.com>",
- " Vladimir Zapolskiy <vz\@mleia.com>",
- " Wenyou Yang <wenyou.yang\@atmel.com>",
- " Will Deacon <will.deacon\@arm.com>\0"
+ " linux-mtd\@lists.infradead.org\0"
]
[
- "Cc\0Thomas Petazzoni <thomas.petazzoni\@free-electrons.com>",
+ "Cc\0Hanna Hawa <hannah\@marvell.com>",
" Antoine Tenart <antoine.tenart\@free-electrons.com>",
- " Miquel Raynal <miquel.raynal\@free-electrons.com>",
- " Igor Grinberg <grinberg\@compulab.co.il>",
" Nadav Haklai <nadavh\@marvell.com>",
- " Ofer Heifetz <oferh\@marvell.com>",
" Neta Zur Hershkovits <neta\@marvell.com>",
- " Hanna Hawa <hannah\@marvell.com>\0"
+ " Igor Grinberg <grinberg\@compulab.co.il>",
+ " Miquel Raynal <miquel.raynal\@free-electrons.com>",
+ " Ofer Heifetz <oferh\@marvell.com>\0"
]
[
"\0000:1\0"
@@ -861,4 +843,4 @@
"2.11.0"
]
-3363614304c8d075292a04da71075e5b3ec3af82d8c8eae3d0b7f26b2d697b5b
+0f26e05e4ca9f4828c81c2f196d34b1630eed79d66a59894980ca09d886785e3
diff --git a/a/1.txt b/N2/1.txt
index 942d43c..1bb0ab2 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -26,7 +26,7 @@ index 25d2d720dc0e..625691196acb 100644
status = "okay";
};
-- nfc: flash@d0000 {
+- nfc: flash at d0000 {
- status = "okay";
- num-cs = <1>;
- nand-ecc-strength = <4>;
@@ -40,26 +40,26 @@ index 25d2d720dc0e..625691196acb 100644
- #address-cells = <1>;
- #size-cells = <1>;
-
-- partition@0 {
+- partition at 0 {
- label = "U-Boot";
- reg = <0x00000000 0x00800000>;
- read-only;
- };
-
-- partition@800000 {
+- partition at 800000 {
- label = "uImage";
- reg = <0x00800000 0x00400000>;
- read-only;
- };
-
-- partition@c00000 {
+- partition at c00000 {
- label = "Root";
- reg = <0x00c00000 0x3f400000>;
- };
- };
- };
-
- usb3@f0000 {
+ usb3 at f0000 {
status = "okay";
usb-phy = <&usb3_phy>;
@@ -263,3 +230,38 @@
@@ -70,7 +70,7 @@ index 25d2d720dc0e..625691196acb 100644
+&nand_controller {
+ status = "okay";
+
-+ nand@0 {
++ nand at 0 {
+ reg = <0>;
+ marvell,rb = <0>;
+ nand-on-flash-bbt;
@@ -82,19 +82,19 @@ index 25d2d720dc0e..625691196acb 100644
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ partition@0 {
++ partition at 0 {
+ label = "U-Boot";
+ reg = <0x00000000 0x00800000>;
+ read-only;
+ };
+
-+ partition@800000 {
++ partition at 800000 {
+ label = "uImage";
+ reg = <0x00800000 0x00400000>;
+ read-only;
+ };
+
-+ partition@c00000 {
++ partition at c00000 {
+ label = "Root";
+ reg = <0x00c00000 0x3f400000>;
+ };
@@ -110,46 +110,46 @@ index ee669ae61011..e769bcf7a9d1 100644
&nand {
/* 128MiB */
-
-- partition@0 {
+- partition at 0 {
- label = "u-boot";
- reg = <0x0000000 0x200000>; /* 2MiB */
- read-only;
- };
-
-- partition@100000 {
+- partition at 100000 {
- label = "u_env";
- reg = <0x200000 0x40000>; /* 256KiB */
- };
-
-- partition@140000 {
+- partition at 140000 {
- label = "s_env";
- reg = <0x240000 0x40000>; /* 256KiB */
- };
-
-- partition@900000 {
+- partition at 900000 {
- label = "devinfo";
- reg = <0x900000 0x100000>; /* 1MiB */
- read-only;
- };
-
- /* kernel1 overlaps with rootfs1 by design */
-- partition@a00000 {
+- partition at a00000 {
- label = "kernel1";
- reg = <0xa00000 0x2800000>; /* 40MiB */
- };
-
-- partition@1000000 {
+- partition at 1000000 {
- label = "rootfs1";
- reg = <0x1000000 0x2200000>; /* 34MiB */
- };
-
- /* kernel2 overlaps with rootfs2 by design */
-- partition@3200000 {
+- partition at 3200000 {
- label = "kernel2";
- reg = <0x3200000 0x2800000>; /* 40MiB */
- };
-
-- partition@3800000 {
+- partition at 3800000 {
- label = "rootfs2";
- reg = <0x3800000 0x2200000>; /* 34MiB */
- };
@@ -157,7 +157,7 @@ index ee669ae61011..e769bcf7a9d1 100644
- /*
- * 38MiB, last MiB is for the BBT, not writable
- */
-- partition@5a00000 {
+- partition at 5a00000 {
- label = "syscfg";
- reg = <0x5a00000 0x2600000>;
- };
@@ -168,7 +168,7 @@ index ee669ae61011..e769bcf7a9d1 100644
- * partitions would break the bootloader
- * supplied bootargs
- */
-- partition@180000 {
+- partition at 180000 {
- label = "unused_area";
- reg = <0x280000 0x680000>; /* 6.5MiB */
+ partitions {
@@ -176,46 +176,46 @@ index ee669ae61011..e769bcf7a9d1 100644
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ partition@0 {
++ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x200000>; /* 2MiB */
+ read-only;
+ };
+
-+ partition@100000 {
++ partition at 100000 {
+ label = "u_env";
+ reg = <0x200000 0x40000>; /* 256KiB */
+ };
+
-+ partition@140000 {
++ partition at 140000 {
+ label = "s_env";
+ reg = <0x240000 0x40000>; /* 256KiB */
+ };
+
-+ partition@900000 {
++ partition at 900000 {
+ label = "devinfo";
+ reg = <0x900000 0x100000>; /* 1MiB */
+ read-only;
+ };
+
+ /* kernel1 overlaps with rootfs1 by design */
-+ partition@a00000 {
++ partition at a00000 {
+ label = "kernel1";
+ reg = <0xa00000 0x2800000>; /* 40MiB */
+ };
+
-+ partition@1000000 {
++ partition at 1000000 {
+ label = "rootfs1";
+ reg = <0x1000000 0x2200000>; /* 34MiB */
+ };
+
+ /* kernel2 overlaps with rootfs2 by design */
-+ partition@3200000 {
++ partition at 3200000 {
+ label = "kernel2";
+ reg = <0x3200000 0x2800000>; /* 40MiB */
+ };
+
-+ partition@3800000 {
++ partition at 3800000 {
+ label = "rootfs2";
+ reg = <0x3800000 0x2200000>; /* 34MiB */
+ };
@@ -223,7 +223,7 @@ index ee669ae61011..e769bcf7a9d1 100644
+ /*
+ * 38MiB, last MiB is for the BBT, not writable
+ */
-+ partition@5a00000 {
++ partition at 5a00000 {
+ label = "syscfg";
+ reg = <0x5a00000 0x2600000>;
+ };
@@ -234,7 +234,7 @@ index ee669ae61011..e769bcf7a9d1 100644
+ * partitions would break the bootloader
+ * supplied bootargs
+ */
-+ partition@180000 {
++ partition at 180000 {
+ label = "unused_area";
+ reg = <0x280000 0x680000>; /* 6.5MiB */
+ };
@@ -249,46 +249,46 @@ index 5169ca89c55a..690be217838c 100644
&nand {
/* 128MiB */
-
-- partition@0 {
+- partition at 0 {
- label = "u-boot";
- reg = <0x0000000 0x200000>; /* 2MiB */
- read-only;
- };
-
-- partition@100000 {
+- partition at 100000 {
- label = "u_env";
- reg = <0x200000 0x40000>; /* 256KiB */
- };
-
-- partition@140000 {
+- partition at 140000 {
- label = "s_env";
- reg = <0x240000 0x40000>; /* 256KiB */
- };
-
-- partition@900000 {
+- partition at 900000 {
- label = "devinfo";
- reg = <0x900000 0x100000>; /* 1MiB */
- read-only;
- };
-
- /* kernel1 overlaps with rootfs1 by design */
-- partition@a00000 {
+- partition at a00000 {
- label = "kernel1";
- reg = <0xa00000 0x2800000>; /* 40MiB */
- };
-
-- partition@1000000 {
+- partition at 1000000 {
- label = "rootfs1";
- reg = <0x1000000 0x2200000>; /* 34MiB */
- };
-
- /* kernel2 overlaps with rootfs2 by design */
-- partition@3200000 {
+- partition at 3200000 {
- label = "kernel2";
- reg = <0x3200000 0x2800000>; /* 40MiB */
- };
-
-- partition@3800000 {
+- partition at 3800000 {
- label = "rootfs2";
- reg = <0x3800000 0x2200000>; /* 34MiB */
- };
@@ -296,7 +296,7 @@ index 5169ca89c55a..690be217838c 100644
- /*
- * 38MiB, last MiB is for the BBT, not writable
- */
-- partition@5a00000 {
+- partition at 5a00000 {
- label = "syscfg";
- reg = <0x5a00000 0x2600000>;
- };
@@ -307,7 +307,7 @@ index 5169ca89c55a..690be217838c 100644
- * partitions would break the bootloader
- * supplied bootargs
- */
-- partition@180000 {
+- partition at 180000 {
- label = "unused_area";
- reg = <0x280000 0x680000>; /* 6.5MiB */
+ partitions {
@@ -315,46 +315,46 @@ index 5169ca89c55a..690be217838c 100644
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ partition@0 {
++ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x200000>; /* 2MiB */
+ read-only;
+ };
+
-+ partition@100000 {
++ partition at 100000 {
+ label = "u_env";
+ reg = <0x200000 0x40000>; /* 256KiB */
+ };
+
-+ partition@140000 {
++ partition at 140000 {
+ label = "s_env";
+ reg = <0x240000 0x40000>; /* 256KiB */
+ };
+
-+ partition@900000 {
++ partition at 900000 {
+ label = "devinfo";
+ reg = <0x900000 0x100000>; /* 1MiB */
+ read-only;
+ };
+
+ /* kernel1 overlaps with rootfs1 by design */
-+ partition@a00000 {
++ partition at a00000 {
+ label = "kernel1";
+ reg = <0xa00000 0x2800000>; /* 40MiB */
+ };
+
-+ partition@1000000 {
++ partition at 1000000 {
+ label = "rootfs1";
+ reg = <0x1000000 0x2200000>; /* 34MiB */
+ };
+
+ /* kernel2 overlaps with rootfs2 by design */
-+ partition@3200000 {
++ partition at 3200000 {
+ label = "kernel2";
+ reg = <0x3200000 0x2800000>; /* 40MiB */
+ };
+
-+ partition@3800000 {
++ partition at 3800000 {
+ label = "rootfs2";
+ reg = <0x3800000 0x2200000>; /* 34MiB */
+ };
@@ -362,7 +362,7 @@ index 5169ca89c55a..690be217838c 100644
+ /*
+ * 38MiB, last MiB is for the BBT, not writable
+ */
-+ partition@5a00000 {
++ partition at 5a00000 {
+ label = "syscfg";
+ reg = <0x5a00000 0x2600000>;
+ };
@@ -373,7 +373,7 @@ index 5169ca89c55a..690be217838c 100644
+ * partitions would break the bootloader
+ * supplied bootargs
+ */
-+ partition@180000 {
++ partition at 180000 {
+ label = "unused_area";
+ reg = <0x280000 0x680000>; /* 6.5MiB */
+ };
@@ -388,52 +388,52 @@ index da8a0f3d432b..93570c6bfe85 100644
&nand {
/* AMD/Spansion S34ML02G2 256MiB, OEM Layout */
-
-- partition@0 {
+- partition at 0 {
- label = "u-boot";
- reg = <0x0000000 0x200000>; /* 2MiB */
- read-only;
- };
-
-- partition@200000 {
+- partition at 200000 {
- label = "u_env";
- reg = <0x200000 0x20000>; /* 128KiB */
- };
-
-- partition@220000 {
+- partition at 220000 {
- label = "s_env";
- reg = <0x220000 0x40000>; /* 256KiB */
- };
-
-- partition@7e0000 {
+- partition at 7e0000 {
- label = "devinfo";
- reg = <0x7e0000 0x40000>; /* 256KiB */
- read-only;
- };
-
-- partition@820000 {
+- partition at 820000 {
- label = "sysdiag";
- reg = <0x820000 0x1e0000>; /* 1920KiB */
- read-only;
- };
-
- /* kernel1 overlaps with rootfs1 by design */
-- partition@a00000 {
+- partition at a00000 {
- label = "kernel1";
- reg = <0xa00000 0x5000000>; /* 80MiB */
- };
-
-- partition@1000000 {
+- partition at 1000000 {
- label = "rootfs1";
- reg = <0x1000000 0x4a00000>; /* 74MiB */
- };
-
- /* kernel2 overlaps with rootfs2 by design */
-- partition@5a00000 {
+- partition at 5a00000 {
- label = "kernel2";
- reg = <0x5a00000 0x5000000>; /* 80MiB */
- };
-
-- partition@6000000 {
+- partition at 6000000 {
- label = "rootfs2";
- reg = <0x6000000 0x4a00000>; /* 74MiB */
- };
@@ -441,7 +441,7 @@ index da8a0f3d432b..93570c6bfe85 100644
- /*
- * 86MiB, last MiB is for the BBT, not writable
- */
-- partition@aa00000 {
+- partition at aa00000 {
- label = "syscfg";
- reg = <0xaa00000 0x5600000>;
- };
@@ -452,7 +452,7 @@ index da8a0f3d432b..93570c6bfe85 100644
- * partitions would break the bootloader
- * supplied bootargs
- */
-- partition@180000 {
+- partition at 180000 {
- label = "unused_area";
- reg = <0x260000 0x5c0000>; /* 5.75MiB */
+ partitions {
@@ -460,52 +460,52 @@ index da8a0f3d432b..93570c6bfe85 100644
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ partition@0 {
++ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x200000>; /* 2MiB */
+ read-only;
+ };
+
-+ partition@200000 {
++ partition at 200000 {
+ label = "u_env";
+ reg = <0x200000 0x20000>; /* 128KiB */
+ };
+
-+ partition@220000 {
++ partition at 220000 {
+ label = "s_env";
+ reg = <0x220000 0x40000>; /* 256KiB */
+ };
+
-+ partition@7e0000 {
++ partition at 7e0000 {
+ label = "devinfo";
+ reg = <0x7e0000 0x40000>; /* 256KiB */
+ read-only;
+ };
+
-+ partition@820000 {
++ partition at 820000 {
+ label = "sysdiag";
+ reg = <0x820000 0x1e0000>; /* 1920KiB */
+ read-only;
+ };
+
+ /* kernel1 overlaps with rootfs1 by design */
-+ partition@a00000 {
++ partition at a00000 {
+ label = "kernel1";
+ reg = <0xa00000 0x5000000>; /* 80MiB */
+ };
+
-+ partition@1000000 {
++ partition at 1000000 {
+ label = "rootfs1";
+ reg = <0x1000000 0x4a00000>; /* 74MiB */
+ };
+
+ /* kernel2 overlaps with rootfs2 by design */
-+ partition@5a00000 {
++ partition at 5a00000 {
+ label = "kernel2";
+ reg = <0x5a00000 0x5000000>; /* 80MiB */
+ };
+
-+ partition@6000000 {
++ partition at 6000000 {
+ label = "rootfs2";
+ reg = <0x6000000 0x4a00000>; /* 74MiB */
+ };
@@ -513,7 +513,7 @@ index da8a0f3d432b..93570c6bfe85 100644
+ /*
+ * 86MiB, last MiB is for the BBT, not writable
+ */
-+ partition@aa00000 {
++ partition at aa00000 {
+ label = "syscfg";
+ reg = <0xaa00000 0x5600000>;
+ };
@@ -524,7 +524,7 @@ index da8a0f3d432b..93570c6bfe85 100644
+ * partitions would break the bootloader
+ * supplied bootargs
+ */
-+ partition@180000 {
++ partition at 180000 {
+ label = "unused_area";
+ reg = <0x260000 0x5c0000>; /* 5.75MiB */
+ };
@@ -540,46 +540,46 @@ index 94aa35bc0bff..4694556700ff 100644
&nand {
/* 128MiB */
-
-- partition@0 {
+- partition at 0 {
- label = "u-boot";
- reg = <0x0000000 0x200000>; /* 2MiB */
- read-only;
- };
-
-- partition@100000 {
+- partition at 100000 {
- label = "u_env";
- reg = <0x200000 0x40000>; /* 256KiB */
- };
-
-- partition@140000 {
+- partition at 140000 {
- label = "s_env";
- reg = <0x240000 0x40000>; /* 256KiB */
- };
-
-- partition@900000 {
+- partition at 900000 {
- label = "devinfo";
- reg = <0x900000 0x100000>; /* 1MiB */
- read-only;
- };
-
- /* kernel1 overlaps with rootfs1 by design */
-- partition@a00000 {
+- partition at a00000 {
- label = "kernel1";
- reg = <0xa00000 0x2800000>; /* 40MiB */
- };
-
-- partition@1000000 {
+- partition at 1000000 {
- label = "rootfs1";
- reg = <0x1000000 0x2200000>; /* 34MiB */
- };
-
- /* kernel2 overlaps with rootfs2 by design */
-- partition@3200000 {
+- partition at 3200000 {
- label = "kernel2";
- reg = <0x3200000 0x2800000>; /* 40MiB */
- };
-
-- partition@3800000 {
+- partition at 3800000 {
- label = "rootfs2";
- reg = <0x3800000 0x2200000>; /* 34MiB */
- };
@@ -587,7 +587,7 @@ index 94aa35bc0bff..4694556700ff 100644
- /*
- * 38MiB, last MiB is for the BBT, not writable
- */
-- partition@5a00000 {
+- partition at 5a00000 {
- label = "syscfg";
- reg = <0x5a00000 0x2600000>;
- };
@@ -598,7 +598,7 @@ index 94aa35bc0bff..4694556700ff 100644
- * partitions would break the bootloader
- * supplied bootargs
- */
-- partition@180000 {
+- partition at 180000 {
- label = "unused_area";
- reg = <0x280000 0x680000>; /* 6.5MiB */
+ partitions {
@@ -606,46 +606,46 @@ index 94aa35bc0bff..4694556700ff 100644
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ partition@0 {
++ partition at 0 {
+ label = "u-boot";
+ reg = <0x0000000 0x200000>; /* 2MiB */
+ read-only;
+ };
+
-+ partition@100000 {
++ partition at 100000 {
+ label = "u_env";
+ reg = <0x200000 0x40000>; /* 256KiB */
+ };
+
-+ partition@140000 {
++ partition at 140000 {
+ label = "s_env";
+ reg = <0x240000 0x40000>; /* 256KiB */
+ };
+
-+ partition@900000 {
++ partition at 900000 {
+ label = "devinfo";
+ reg = <0x900000 0x100000>; /* 1MiB */
+ read-only;
+ };
+
+ /* kernel1 overlaps with rootfs1 by design */
-+ partition@a00000 {
++ partition at a00000 {
+ label = "kernel1";
+ reg = <0xa00000 0x2800000>; /* 40MiB */
+ };
+
-+ partition@1000000 {
++ partition at 1000000 {
+ label = "rootfs1";
+ reg = <0x1000000 0x2200000>; /* 34MiB */
+ };
+
+ /* kernel2 overlaps with rootfs2 by design */
-+ partition@3200000 {
++ partition at 3200000 {
+ label = "kernel2";
+ reg = <0x3200000 0x2800000>; /* 40MiB */
+ };
+
-+ partition@3800000 {
++ partition at 3800000 {
+ label = "rootfs2";
+ reg = <0x3800000 0x2200000>; /* 34MiB */
+ };
@@ -653,7 +653,7 @@ index 94aa35bc0bff..4694556700ff 100644
+ /*
+ * 38MiB, last MiB is for the BBT, not writable
+ */
-+ partition@5a00000 {
++ partition at 5a00000 {
+ label = "syscfg";
+ reg = <0x5a00000 0x2600000>;
+ };
@@ -664,7 +664,7 @@ index 94aa35bc0bff..4694556700ff 100644
+ * partitions would break the bootloader
+ * supplied bootargs
+ */
-+ partition@180000 {
++ partition at 180000 {
+ label = "unused_area";
+ reg = <0x280000 0x680000>; /* 6.5MiB */
+ };
@@ -689,7 +689,7 @@ index e1f355ffc8f7..358b17e921bb 100644
+ #address-cells = <1>;
+ #size-cells = <0>;
+
-+ nand: nand@0 {
++ nand: nand at 0 {
+ reg = <0>;
+ marvell,rb = <0>;
+ marvell,nand-keep-config;
@@ -706,7 +706,7 @@ index a4ec1fa37529..0c020d7afcc1 100644
status = "okay";
};
-- flash@d0000 {
+- flash at d0000 {
- status = "okay";
- num-cs = <1>;
- marvell,nand-keep-config;
@@ -715,21 +715,21 @@ index a4ec1fa37529..0c020d7afcc1 100644
- nand-ecc-strength = <4>;
- nand-ecc-step-size = <512>;
-
-- partition@0 {
+- partition at 0 {
- label = "U-Boot";
- reg = <0 0x800000>;
- };
-- partition@800000 {
+- partition at 800000 {
- label = "Linux";
- reg = <0x800000 0x800000>;
- };
-- partition@1000000 {
+- partition at 1000000 {
- label = "Filesystem";
- reg = <0x1000000 0x3f000000>;
- };
- };
-
- sdhci@d8000 {
+ sdhci at d8000 {
broken-cd;
wp-inverted;
@@ -202,3 +179,34 @@
@@ -739,7 +739,7 @@ index a4ec1fa37529..0c020d7afcc1 100644
+&nand_controller {
+ status = "okay";
+
-+ nand@0 {
++ nand at 0 {
+ reg = <0>;
+ marvell,rb = <0>;
+ marvell,nand-keep-config;
@@ -752,15 +752,15 @@ index a4ec1fa37529..0c020d7afcc1 100644
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ partition@0 {
++ partition at 0 {
+ label = "U-Boot";
+ reg = <0 0x800000>;
+ };
-+ partition@800000 {
++ partition at 800000 {
+ label = "Linux";
+ reg = <0x800000 0x800000>;
+ };
-+ partition@1000000 {
++ partition at 1000000 {
+ label = "Filesystem";
+ reg = <0x1000000 0x3f000000>;
+ };
@@ -775,9 +775,9 @@ index 7ff0811e61db..764fcf08ef53 100644
status = "okay";
};
-- nand: flash@d0000 {
+- nand: flash at d0000 {
- compatible = "marvell,armada370-nand";
-+ nand_controller: nand-controller@d0000 {
++ nand_controller: nand-controller at d0000 {
+ compatible = "marvell,armada370-nand-controller";
reg = <0xd0000 0x54>;
#address-cells = <1>;
diff --git a/a/content_digest b/N2/content_digest
index c41f8f3..a2d5725 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\00020171018143629.29302-1-miquel.raynal\@free-electrons.com\0"
]
[
- "From\0Miquel Raynal <miquel.raynal\@free-electrons.com>\0"
+ "From\0miquel.raynal\@free-electrons.com (Miquel Raynal)\0"
]
[
"Subject\0[RFC 09/12] ARM: dts: armada-38x: use reworked NAND controller driver\0"
@@ -11,56 +11,7 @@
"Date\0Wed, 18 Oct 2017 16:36:26 +0200\0"
]
[
- "To\0Andrew Lunn <andrew\@lunn.ch>",
- " bcm-kernel-feedback-list\@broadcom.com",
- " Boris Brezillon <boris.brezillon\@free-electrons.com>",
- " Brian Norris <computersforpeace\@gmail.com>",
- " Catalin Marinas <catalin.marinas\@arm.com>",
- " Chen-Yu Tsai <wens\@csie.org>",
- " Cyrille Pitchen <cyrille.pitchen\@wedev4u.fr>",
- " Daniel Mack <daniel\@zonque.org>",
- " David Woodhouse <dwmw2\@infradead.org>",
- " devel\@driverdev.osuosl.org",
- " devicetree\@vger.kernel.org",
- " Ezequiel Garcia <ezequiel.garcia\@free-electrons.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " Gregory Clement <gregory.clement\@free-electrons.com>",
- " Han Xu <han.xu\@nxp.com>",
- " Haojian Zhuang <haojian.zhuang\@gmail.com>",
- " Jason Cooper <jason\@lakedaemon.net>",
- " Josh Wu <rainyfeeling\@outlook.com>",
- " Kamal Dasu <kdasu.kdev\@gmail.com>",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org",
- " linux-mediatek\@lists.infradead.org",
- " linux-mtd\@lists.infradead.org",
- " Marc Gonzalez <marc_gonzalez\@sigmadesigns.com>",
- " Marek Vasut <marek.vasut\@gmail.com>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Masahiro Yamada <yamada.masahiro\@socionext.com>",
- " Matthias Brugger <matthias.bgg\@gmail.com>",
- " Maxime Ripard <maxime.ripard\@free-electrons.com>",
- " Maxim Levitsky <maximlevitsky\@gmail.com>",
- " Richard Weinberger <richard\@nod.at>",
- " Robert Jarzmik <robert.jarzmik\@free.fr>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Russell King <linux\@armlinux.org.uk>",
- " Sebastian Hesselbarth <sebastian.hesselbarth\@gmail.com>",
- " Stefan Agner <stefan\@agner.ch>",
- " Sylvain Lemieux <slemieux.tyco\@gmail.com>",
- " Vladimir Zapolskiy <vz\@mleia.com>",
- " Wenyou Yang <wenyou.yang\@atmel.com>",
- " Will Deacon <will.deacon\@arm.com>\0"
-]
-[
- "Cc\0Thomas Petazzoni <thomas.petazzoni\@free-electrons.com>",
- " Antoine Tenart <antoine.tenart\@free-electrons.com>",
- " Miquel Raynal <miquel.raynal\@free-electrons.com>",
- " Igor Grinberg <grinberg\@compulab.co.il>",
- " Nadav Haklai <nadavh\@marvell.com>",
- " Ofer Heifetz <oferh\@marvell.com>",
- " Neta Zur Hershkovits <neta\@marvell.com>",
- " Hanna Hawa <hannah\@marvell.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -97,7 +48,7 @@
" \t\t\t\tstatus = \"okay\";\n",
" \t\t\t};\n",
" \n",
- "-\t\t\tnfc: flash\@d0000 {\n",
+ "-\t\t\tnfc: flash at d0000 {\n",
"-\t\t\t\tstatus = \"okay\";\n",
"-\t\t\t\tnum-cs = <1>;\n",
"-\t\t\t\tnand-ecc-strength = <4>;\n",
@@ -111,26 +62,26 @@
"-\t\t\t\t\t#address-cells = <1>;\n",
"-\t\t\t\t\t#size-cells = <1>;\n",
"-\n",
- "-\t\t\t\t\tpartition\@0 {\n",
+ "-\t\t\t\t\tpartition at 0 {\n",
"-\t\t\t\t\t\tlabel = \"U-Boot\";\n",
"-\t\t\t\t\t\treg = <0x00000000 0x00800000>;\n",
"-\t\t\t\t\t\tread-only;\n",
"-\t\t\t\t\t};\n",
"-\n",
- "-\t\t\t\t\tpartition\@800000 {\n",
+ "-\t\t\t\t\tpartition at 800000 {\n",
"-\t\t\t\t\t\tlabel = \"uImage\";\n",
"-\t\t\t\t\t\treg = <0x00800000 0x00400000>;\n",
"-\t\t\t\t\t\tread-only;\n",
"-\t\t\t\t\t};\n",
"-\n",
- "-\t\t\t\t\tpartition\@c00000 {\n",
+ "-\t\t\t\t\tpartition at c00000 {\n",
"-\t\t\t\t\t\tlabel = \"Root\";\n",
"-\t\t\t\t\t\treg = <0x00c00000 0x3f400000>;\n",
"-\t\t\t\t\t};\n",
"-\t\t\t\t};\n",
"-\t\t\t};\n",
"-\n",
- " \t\t\tusb3\@f0000 {\n",
+ " \t\t\tusb3 at f0000 {\n",
" \t\t\t\tstatus = \"okay\";\n",
" \t\t\t\tusb-phy = <&usb3_phy>;\n",
"\@\@ -263,3 +230,38 \@\@\n",
@@ -141,7 +92,7 @@
"+&nand_controller {\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\tnand\@0 {\n",
+ "+\tnand at 0 {\n",
"+\t\treg = <0>;\n",
"+\t\tmarvell,rb = <0>;\n",
"+\t\tnand-on-flash-bbt;\n",
@@ -153,19 +104,19 @@
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\t\tpartition\@0 {\n",
+ "+\t\t\tpartition at 0 {\n",
"+\t\t\t\tlabel = \"U-Boot\";\n",
"+\t\t\t\treg = <0x00000000 0x00800000>;\n",
"+\t\t\t\tread-only;\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tpartition\@800000 {\n",
+ "+\t\t\tpartition at 800000 {\n",
"+\t\t\t\tlabel = \"uImage\";\n",
"+\t\t\t\treg = <0x00800000 0x00400000>;\n",
"+\t\t\t\tread-only;\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tpartition\@c00000 {\n",
+ "+\t\t\tpartition at c00000 {\n",
"+\t\t\t\tlabel = \"Root\";\n",
"+\t\t\t\treg = <0x00c00000 0x3f400000>;\n",
"+\t\t\t};\n",
@@ -181,46 +132,46 @@
" &nand {\n",
" \t/* 128MiB */\n",
"-\n",
- "-\tpartition\@0 {\n",
+ "-\tpartition at 0 {\n",
"-\t\tlabel = \"u-boot\";\n",
"-\t\treg = <0x0000000 0x200000>; /* 2MiB */\n",
"-\t\tread-only;\n",
"-\t};\n",
"-\n",
- "-\tpartition\@100000 {\n",
+ "-\tpartition at 100000 {\n",
"-\t\tlabel = \"u_env\";\n",
"-\t\treg = <0x200000 0x40000>; /* 256KiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@140000 {\n",
+ "-\tpartition at 140000 {\n",
"-\t\tlabel = \"s_env\";\n",
"-\t\treg = <0x240000 0x40000>; /* 256KiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@900000 {\n",
+ "-\tpartition at 900000 {\n",
"-\t\tlabel = \"devinfo\";\n",
"-\t\treg = <0x900000 0x100000>; /* 1MiB */\n",
"-\t\tread-only;\n",
"-\t};\n",
"-\n",
"-\t/* kernel1 overlaps with rootfs1 by design */\n",
- "-\tpartition\@a00000 {\n",
+ "-\tpartition at a00000 {\n",
"-\t\tlabel = \"kernel1\";\n",
"-\t\treg = <0xa00000 0x2800000>; /* 40MiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@1000000 {\n",
+ "-\tpartition at 1000000 {\n",
"-\t\tlabel = \"rootfs1\";\n",
"-\t\treg = <0x1000000 0x2200000>; /* 34MiB */\n",
"-\t};\n",
"-\n",
"-\t/* kernel2 overlaps with rootfs2 by design */\n",
- "-\tpartition\@3200000 {\n",
+ "-\tpartition at 3200000 {\n",
"-\t\tlabel = \"kernel2\";\n",
"-\t\treg = <0x3200000 0x2800000>; /* 40MiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@3800000 {\n",
+ "-\tpartition at 3800000 {\n",
"-\t\tlabel = \"rootfs2\";\n",
"-\t\treg = <0x3800000 0x2200000>; /* 34MiB */\n",
"-\t};\n",
@@ -228,7 +179,7 @@
"-\t/*\n",
"-\t * 38MiB, last MiB is for the BBT, not writable\n",
"-\t */\n",
- "-\tpartition\@5a00000 {\n",
+ "-\tpartition at 5a00000 {\n",
"-\t\tlabel = \"syscfg\";\n",
"-\t\treg = <0x5a00000 0x2600000>;\n",
"-\t};\n",
@@ -239,7 +190,7 @@
"-\t * partitions would break the bootloader\n",
"-\t * supplied bootargs\n",
"-\t */\n",
- "-\tpartition\@180000 {\n",
+ "-\tpartition at 180000 {\n",
"-\t\tlabel = \"unused_area\";\n",
"-\t\treg = <0x280000 0x680000>; /* 6.5MiB */\n",
"+\tpartitions {\n",
@@ -247,46 +198,46 @@
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\tpartition\@0 {\n",
+ "+\t\tpartition at 0 {\n",
"+\t\t\tlabel = \"u-boot\";\n",
"+\t\t\treg = <0x0000000 0x200000>; /* 2MiB */\n",
"+\t\t\tread-only;\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@100000 {\n",
+ "+\t\tpartition at 100000 {\n",
"+\t\t\tlabel = \"u_env\";\n",
"+\t\t\treg = <0x200000 0x40000>; /* 256KiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@140000 {\n",
+ "+\t\tpartition at 140000 {\n",
"+\t\t\tlabel = \"s_env\";\n",
"+\t\t\treg = <0x240000 0x40000>; /* 256KiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@900000 {\n",
+ "+\t\tpartition at 900000 {\n",
"+\t\t\tlabel = \"devinfo\";\n",
"+\t\t\treg = <0x900000 0x100000>; /* 1MiB */\n",
"+\t\t\tread-only;\n",
"+\t\t};\n",
"+\n",
"+\t\t/* kernel1 overlaps with rootfs1 by design */\n",
- "+\t\tpartition\@a00000 {\n",
+ "+\t\tpartition at a00000 {\n",
"+\t\t\tlabel = \"kernel1\";\n",
"+\t\t\treg = <0xa00000 0x2800000>; /* 40MiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@1000000 {\n",
+ "+\t\tpartition at 1000000 {\n",
"+\t\t\tlabel = \"rootfs1\";\n",
"+\t\t\treg = <0x1000000 0x2200000>; /* 34MiB */\n",
"+\t\t};\n",
"+\n",
"+\t\t/* kernel2 overlaps with rootfs2 by design */\n",
- "+\t\tpartition\@3200000 {\n",
+ "+\t\tpartition at 3200000 {\n",
"+\t\t\tlabel = \"kernel2\";\n",
"+\t\t\treg = <0x3200000 0x2800000>; /* 40MiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@3800000 {\n",
+ "+\t\tpartition at 3800000 {\n",
"+\t\t\tlabel = \"rootfs2\";\n",
"+\t\t\treg = <0x3800000 0x2200000>; /* 34MiB */\n",
"+\t\t};\n",
@@ -294,7 +245,7 @@
"+\t\t/*\n",
"+\t\t * 38MiB, last MiB is for the BBT, not writable\n",
"+\t\t */\n",
- "+\t\tpartition\@5a00000 {\n",
+ "+\t\tpartition at 5a00000 {\n",
"+\t\t\tlabel = \"syscfg\";\n",
"+\t\t\treg = <0x5a00000 0x2600000>;\n",
"+\t\t};\n",
@@ -305,7 +256,7 @@
"+\t\t * partitions would break the bootloader\n",
"+\t\t * supplied bootargs\n",
"+\t\t */\n",
- "+\t\tpartition\@180000 {\n",
+ "+\t\tpartition at 180000 {\n",
"+\t\t\tlabel = \"unused_area\";\n",
"+\t\t\treg = <0x280000 0x680000>; /* 6.5MiB */\n",
"+\t\t};\n",
@@ -320,46 +271,46 @@
" &nand {\n",
" \t/* 128MiB */\n",
"-\n",
- "-\tpartition\@0 {\n",
+ "-\tpartition at 0 {\n",
"-\t\tlabel = \"u-boot\";\n",
"-\t\treg = <0x0000000 0x200000>; /* 2MiB */\n",
"-\t\tread-only;\n",
"-\t};\n",
"-\n",
- "-\tpartition\@100000 {\n",
+ "-\tpartition at 100000 {\n",
"-\t\tlabel = \"u_env\";\n",
"-\t\treg = <0x200000 0x40000>; /* 256KiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@140000 {\n",
+ "-\tpartition at 140000 {\n",
"-\t\tlabel = \"s_env\";\n",
"-\t\treg = <0x240000 0x40000>; /* 256KiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@900000 {\n",
+ "-\tpartition at 900000 {\n",
"-\t\tlabel = \"devinfo\";\n",
"-\t\treg = <0x900000 0x100000>; /* 1MiB */\n",
"-\t\tread-only;\n",
"-\t};\n",
"-\n",
"-\t/* kernel1 overlaps with rootfs1 by design */\n",
- "-\tpartition\@a00000 {\n",
+ "-\tpartition at a00000 {\n",
"-\t\tlabel = \"kernel1\";\n",
"-\t\treg = <0xa00000 0x2800000>; /* 40MiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@1000000 {\n",
+ "-\tpartition at 1000000 {\n",
"-\t\tlabel = \"rootfs1\";\n",
"-\t\treg = <0x1000000 0x2200000>; /* 34MiB */\n",
"-\t};\n",
"-\n",
"-\t/* kernel2 overlaps with rootfs2 by design */\n",
- "-\tpartition\@3200000 {\n",
+ "-\tpartition at 3200000 {\n",
"-\t\tlabel = \"kernel2\";\n",
"-\t\treg = <0x3200000 0x2800000>; /* 40MiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@3800000 {\n",
+ "-\tpartition at 3800000 {\n",
"-\t\tlabel = \"rootfs2\";\n",
"-\t\treg = <0x3800000 0x2200000>; /* 34MiB */\n",
"-\t};\n",
@@ -367,7 +318,7 @@
"-\t/*\n",
"-\t * 38MiB, last MiB is for the BBT, not writable\n",
"-\t */\n",
- "-\tpartition\@5a00000 {\n",
+ "-\tpartition at 5a00000 {\n",
"-\t\tlabel = \"syscfg\";\n",
"-\t\treg = <0x5a00000 0x2600000>;\n",
"-\t};\n",
@@ -378,7 +329,7 @@
"-\t * partitions would break the bootloader\n",
"-\t * supplied bootargs\n",
"-\t */\n",
- "-\tpartition\@180000 {\n",
+ "-\tpartition at 180000 {\n",
"-\t\tlabel = \"unused_area\";\n",
"-\t\treg = <0x280000 0x680000>; /* 6.5MiB */\n",
"+\tpartitions {\n",
@@ -386,46 +337,46 @@
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\tpartition\@0 {\n",
+ "+\t\tpartition at 0 {\n",
"+\t\t\tlabel = \"u-boot\";\n",
"+\t\t\treg = <0x0000000 0x200000>; /* 2MiB */\n",
"+\t\t\tread-only;\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@100000 {\n",
+ "+\t\tpartition at 100000 {\n",
"+\t\t\tlabel = \"u_env\";\n",
"+\t\t\treg = <0x200000 0x40000>; /* 256KiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@140000 {\n",
+ "+\t\tpartition at 140000 {\n",
"+\t\t\tlabel = \"s_env\";\n",
"+\t\t\treg = <0x240000 0x40000>; /* 256KiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@900000 {\n",
+ "+\t\tpartition at 900000 {\n",
"+\t\t\tlabel = \"devinfo\";\n",
"+\t\t\treg = <0x900000 0x100000>; /* 1MiB */\n",
"+\t\t\tread-only;\n",
"+\t\t};\n",
"+\n",
"+\t\t/* kernel1 overlaps with rootfs1 by design */\n",
- "+\t\tpartition\@a00000 {\n",
+ "+\t\tpartition at a00000 {\n",
"+\t\t\tlabel = \"kernel1\";\n",
"+\t\t\treg = <0xa00000 0x2800000>; /* 40MiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@1000000 {\n",
+ "+\t\tpartition at 1000000 {\n",
"+\t\t\tlabel = \"rootfs1\";\n",
"+\t\t\treg = <0x1000000 0x2200000>; /* 34MiB */\n",
"+\t\t};\n",
"+\n",
"+\t\t/* kernel2 overlaps with rootfs2 by design */\n",
- "+\t\tpartition\@3200000 {\n",
+ "+\t\tpartition at 3200000 {\n",
"+\t\t\tlabel = \"kernel2\";\n",
"+\t\t\treg = <0x3200000 0x2800000>; /* 40MiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@3800000 {\n",
+ "+\t\tpartition at 3800000 {\n",
"+\t\t\tlabel = \"rootfs2\";\n",
"+\t\t\treg = <0x3800000 0x2200000>; /* 34MiB */\n",
"+\t\t};\n",
@@ -433,7 +384,7 @@
"+\t\t/*\n",
"+\t\t * 38MiB, last MiB is for the BBT, not writable\n",
"+\t\t */\n",
- "+\t\tpartition\@5a00000 {\n",
+ "+\t\tpartition at 5a00000 {\n",
"+\t\t\tlabel = \"syscfg\";\n",
"+\t\t\treg = <0x5a00000 0x2600000>;\n",
"+\t\t};\n",
@@ -444,7 +395,7 @@
"+\t\t * partitions would break the bootloader\n",
"+\t\t * supplied bootargs\n",
"+\t\t */\n",
- "+\t\tpartition\@180000 {\n",
+ "+\t\tpartition at 180000 {\n",
"+\t\t\tlabel = \"unused_area\";\n",
"+\t\t\treg = <0x280000 0x680000>; /* 6.5MiB */\n",
"+\t\t};\n",
@@ -459,52 +410,52 @@
" &nand {\n",
" \t/* AMD/Spansion S34ML02G2 256MiB, OEM Layout */\n",
"-\n",
- "-\tpartition\@0 {\n",
+ "-\tpartition at 0 {\n",
"-\t\tlabel = \"u-boot\";\n",
"-\t\treg = <0x0000000 0x200000>; /* 2MiB */\n",
"-\t\tread-only;\n",
"-\t};\n",
"-\n",
- "-\tpartition\@200000 {\n",
+ "-\tpartition at 200000 {\n",
"-\t\tlabel = \"u_env\";\n",
"-\t\treg = <0x200000 0x20000>; /* 128KiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@220000 {\n",
+ "-\tpartition at 220000 {\n",
"-\t\tlabel = \"s_env\";\n",
"-\t\treg = <0x220000 0x40000>; /* 256KiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@7e0000 {\n",
+ "-\tpartition at 7e0000 {\n",
"-\t\tlabel = \"devinfo\";\n",
"-\t\treg = <0x7e0000 0x40000>; /* 256KiB */\n",
"-\t\tread-only;\n",
"-\t};\n",
"-\n",
- "-\tpartition\@820000 {\n",
+ "-\tpartition at 820000 {\n",
"-\t\tlabel = \"sysdiag\";\n",
"-\t\treg = <0x820000 0x1e0000>; /* 1920KiB */\n",
"-\t\tread-only;\n",
"-\t};\n",
"-\n",
"-\t/* kernel1 overlaps with rootfs1 by design */\n",
- "-\tpartition\@a00000 {\n",
+ "-\tpartition at a00000 {\n",
"-\t\tlabel = \"kernel1\";\n",
"-\t\treg = <0xa00000 0x5000000>; /* 80MiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@1000000 {\n",
+ "-\tpartition at 1000000 {\n",
"-\t\tlabel = \"rootfs1\";\n",
"-\t\treg = <0x1000000 0x4a00000>; /* 74MiB */\n",
"-\t};\n",
"-\n",
"-\t/* kernel2 overlaps with rootfs2 by design */\n",
- "-\tpartition\@5a00000 {\n",
+ "-\tpartition at 5a00000 {\n",
"-\t\tlabel = \"kernel2\";\n",
"-\t\treg = <0x5a00000 0x5000000>; /* 80MiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@6000000 {\n",
+ "-\tpartition at 6000000 {\n",
"-\t\tlabel = \"rootfs2\";\n",
"-\t\treg = <0x6000000 0x4a00000>; /* 74MiB */\n",
"-\t};\n",
@@ -512,7 +463,7 @@
"-\t/*\n",
"-\t * 86MiB, last MiB is for the BBT, not writable\n",
"-\t */\n",
- "-\tpartition\@aa00000 {\n",
+ "-\tpartition at aa00000 {\n",
"-\t\tlabel = \"syscfg\";\n",
"-\t\treg = <0xaa00000 0x5600000>;\n",
"-\t};\n",
@@ -523,7 +474,7 @@
"-\t * partitions would break the bootloader\n",
"-\t * supplied bootargs\n",
"-\t */\n",
- "-\tpartition\@180000 {\n",
+ "-\tpartition at 180000 {\n",
"-\t\tlabel = \"unused_area\";\n",
"-\t\treg = <0x260000 0x5c0000>; /* 5.75MiB */\n",
"+\tpartitions {\n",
@@ -531,52 +482,52 @@
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\tpartition\@0 {\n",
+ "+\t\tpartition at 0 {\n",
"+\t\t\tlabel = \"u-boot\";\n",
"+\t\t\treg = <0x0000000 0x200000>; /* 2MiB */\n",
"+\t\t\tread-only;\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@200000 {\n",
+ "+\t\tpartition at 200000 {\n",
"+\t\t\tlabel = \"u_env\";\n",
"+\t\t\treg = <0x200000 0x20000>; /* 128KiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@220000 {\n",
+ "+\t\tpartition at 220000 {\n",
"+\t\t\tlabel = \"s_env\";\n",
"+\t\t\treg = <0x220000 0x40000>; /* 256KiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@7e0000 {\n",
+ "+\t\tpartition at 7e0000 {\n",
"+\t\t\tlabel = \"devinfo\";\n",
"+\t\t\treg = <0x7e0000 0x40000>; /* 256KiB */\n",
"+\t\t\tread-only;\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@820000 {\n",
+ "+\t\tpartition at 820000 {\n",
"+\t\t\tlabel = \"sysdiag\";\n",
"+\t\t\treg = <0x820000 0x1e0000>; /* 1920KiB */\n",
"+\t\t\tread-only;\n",
"+\t\t};\n",
"+\n",
"+\t\t/* kernel1 overlaps with rootfs1 by design */\n",
- "+\t\tpartition\@a00000 {\n",
+ "+\t\tpartition at a00000 {\n",
"+\t\t\tlabel = \"kernel1\";\n",
"+\t\t\treg = <0xa00000 0x5000000>; /* 80MiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@1000000 {\n",
+ "+\t\tpartition at 1000000 {\n",
"+\t\t\tlabel = \"rootfs1\";\n",
"+\t\t\treg = <0x1000000 0x4a00000>; /* 74MiB */\n",
"+\t\t};\n",
"+\n",
"+\t\t/* kernel2 overlaps with rootfs2 by design */\n",
- "+\t\tpartition\@5a00000 {\n",
+ "+\t\tpartition at 5a00000 {\n",
"+\t\t\tlabel = \"kernel2\";\n",
"+\t\t\treg = <0x5a00000 0x5000000>; /* 80MiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@6000000 {\n",
+ "+\t\tpartition at 6000000 {\n",
"+\t\t\tlabel = \"rootfs2\";\n",
"+\t\t\treg = <0x6000000 0x4a00000>; /* 74MiB */\n",
"+\t\t};\n",
@@ -584,7 +535,7 @@
"+\t\t/*\n",
"+\t\t * 86MiB, last MiB is for the BBT, not writable\n",
"+\t\t */\n",
- "+\t\tpartition\@aa00000 {\n",
+ "+\t\tpartition at aa00000 {\n",
"+\t\t\tlabel = \"syscfg\";\n",
"+\t\t\treg = <0xaa00000 0x5600000>;\n",
"+\t\t};\n",
@@ -595,7 +546,7 @@
"+\t\t * partitions would break the bootloader\n",
"+\t\t * supplied bootargs\n",
"+\t\t */\n",
- "+\t\tpartition\@180000 {\n",
+ "+\t\tpartition at 180000 {\n",
"+\t\t\tlabel = \"unused_area\";\n",
"+\t\t\treg = <0x260000 0x5c0000>; /* 5.75MiB */\n",
"+\t\t};\n",
@@ -611,46 +562,46 @@
" &nand {\n",
" \t/* 128MiB */\n",
"-\n",
- "-\tpartition\@0 {\n",
+ "-\tpartition at 0 {\n",
"-\t\tlabel = \"u-boot\";\n",
"-\t\treg = <0x0000000 0x200000>; /* 2MiB */\n",
"-\t\tread-only;\n",
"-\t};\n",
"-\n",
- "-\tpartition\@100000 {\n",
+ "-\tpartition at 100000 {\n",
"-\t\tlabel = \"u_env\";\n",
"-\t\treg = <0x200000 0x40000>; /* 256KiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@140000 {\n",
+ "-\tpartition at 140000 {\n",
"-\t\tlabel = \"s_env\";\n",
"-\t\treg = <0x240000 0x40000>; /* 256KiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@900000 {\n",
+ "-\tpartition at 900000 {\n",
"-\t\tlabel = \"devinfo\";\n",
"-\t\treg = <0x900000 0x100000>; /* 1MiB */\n",
"-\t\tread-only;\n",
"-\t};\n",
"-\n",
"-\t/* kernel1 overlaps with rootfs1 by design */\n",
- "-\tpartition\@a00000 {\n",
+ "-\tpartition at a00000 {\n",
"-\t\tlabel = \"kernel1\";\n",
"-\t\treg = <0xa00000 0x2800000>; /* 40MiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@1000000 {\n",
+ "-\tpartition at 1000000 {\n",
"-\t\tlabel = \"rootfs1\";\n",
"-\t\treg = <0x1000000 0x2200000>; /* 34MiB */\n",
"-\t};\n",
"-\n",
"-\t/* kernel2 overlaps with rootfs2 by design */\n",
- "-\tpartition\@3200000 {\n",
+ "-\tpartition at 3200000 {\n",
"-\t\tlabel = \"kernel2\";\n",
"-\t\treg = <0x3200000 0x2800000>; /* 40MiB */\n",
"-\t};\n",
"-\n",
- "-\tpartition\@3800000 {\n",
+ "-\tpartition at 3800000 {\n",
"-\t\tlabel = \"rootfs2\";\n",
"-\t\treg = <0x3800000 0x2200000>; /* 34MiB */\n",
"-\t};\n",
@@ -658,7 +609,7 @@
"-\t/*\n",
"-\t * 38MiB, last MiB is for the BBT, not writable\n",
"-\t */\n",
- "-\tpartition\@5a00000 {\n",
+ "-\tpartition at 5a00000 {\n",
"-\t\tlabel = \"syscfg\";\n",
"-\t\treg = <0x5a00000 0x2600000>;\n",
"-\t};\n",
@@ -669,7 +620,7 @@
"-\t * partitions would break the bootloader\n",
"-\t * supplied bootargs\n",
"-\t */\n",
- "-\tpartition\@180000 {\n",
+ "-\tpartition at 180000 {\n",
"-\t\tlabel = \"unused_area\";\n",
"-\t\treg = <0x280000 0x680000>; /* 6.5MiB */\n",
"+\tpartitions {\n",
@@ -677,46 +628,46 @@
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\tpartition\@0 {\n",
+ "+\t\tpartition at 0 {\n",
"+\t\t\tlabel = \"u-boot\";\n",
"+\t\t\treg = <0x0000000 0x200000>; /* 2MiB */\n",
"+\t\t\tread-only;\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@100000 {\n",
+ "+\t\tpartition at 100000 {\n",
"+\t\t\tlabel = \"u_env\";\n",
"+\t\t\treg = <0x200000 0x40000>; /* 256KiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@140000 {\n",
+ "+\t\tpartition at 140000 {\n",
"+\t\t\tlabel = \"s_env\";\n",
"+\t\t\treg = <0x240000 0x40000>; /* 256KiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@900000 {\n",
+ "+\t\tpartition at 900000 {\n",
"+\t\t\tlabel = \"devinfo\";\n",
"+\t\t\treg = <0x900000 0x100000>; /* 1MiB */\n",
"+\t\t\tread-only;\n",
"+\t\t};\n",
"+\n",
"+\t\t/* kernel1 overlaps with rootfs1 by design */\n",
- "+\t\tpartition\@a00000 {\n",
+ "+\t\tpartition at a00000 {\n",
"+\t\t\tlabel = \"kernel1\";\n",
"+\t\t\treg = <0xa00000 0x2800000>; /* 40MiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@1000000 {\n",
+ "+\t\tpartition at 1000000 {\n",
"+\t\t\tlabel = \"rootfs1\";\n",
"+\t\t\treg = <0x1000000 0x2200000>; /* 34MiB */\n",
"+\t\t};\n",
"+\n",
"+\t\t/* kernel2 overlaps with rootfs2 by design */\n",
- "+\t\tpartition\@3200000 {\n",
+ "+\t\tpartition at 3200000 {\n",
"+\t\t\tlabel = \"kernel2\";\n",
"+\t\t\treg = <0x3200000 0x2800000>; /* 40MiB */\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@3800000 {\n",
+ "+\t\tpartition at 3800000 {\n",
"+\t\t\tlabel = \"rootfs2\";\n",
"+\t\t\treg = <0x3800000 0x2200000>; /* 34MiB */\n",
"+\t\t};\n",
@@ -724,7 +675,7 @@
"+\t\t/*\n",
"+\t\t * 38MiB, last MiB is for the BBT, not writable\n",
"+\t\t */\n",
- "+\t\tpartition\@5a00000 {\n",
+ "+\t\tpartition at 5a00000 {\n",
"+\t\t\tlabel = \"syscfg\";\n",
"+\t\t\treg = <0x5a00000 0x2600000>;\n",
"+\t\t};\n",
@@ -735,7 +686,7 @@
"+\t\t * partitions would break the bootloader\n",
"+\t\t * supplied bootargs\n",
"+\t\t */\n",
- "+\t\tpartition\@180000 {\n",
+ "+\t\tpartition at 180000 {\n",
"+\t\t\tlabel = \"unused_area\";\n",
"+\t\t\treg = <0x280000 0x680000>; /* 6.5MiB */\n",
"+\t\t};\n",
@@ -760,7 +711,7 @@
"+\t#address-cells = <1>;\n",
"+\t#size-cells = <0>;\n",
"+\n",
- "+\tnand: nand\@0 {\n",
+ "+\tnand: nand at 0 {\n",
"+\t\treg = <0>;\n",
"+\t\tmarvell,rb = <0>;\n",
"+\t\tmarvell,nand-keep-config;\n",
@@ -777,7 +728,7 @@
" \t\t\t\tstatus = \"okay\";\n",
" \t\t\t};\n",
" \n",
- "-\t\t\tflash\@d0000 {\n",
+ "-\t\t\tflash at d0000 {\n",
"-\t\t\t\tstatus = \"okay\";\n",
"-\t\t\t\tnum-cs = <1>;\n",
"-\t\t\t\tmarvell,nand-keep-config;\n",
@@ -786,21 +737,21 @@
"-\t\t\t\tnand-ecc-strength = <4>;\n",
"-\t\t\t\tnand-ecc-step-size = <512>;\n",
"-\n",
- "-\t\t\t\tpartition\@0 {\n",
+ "-\t\t\t\tpartition at 0 {\n",
"-\t\t\t\t\tlabel = \"U-Boot\";\n",
"-\t\t\t\t\treg = <0 0x800000>;\n",
"-\t\t\t\t};\n",
- "-\t\t\t\tpartition\@800000 {\n",
+ "-\t\t\t\tpartition at 800000 {\n",
"-\t\t\t\t\tlabel = \"Linux\";\n",
"-\t\t\t\t\treg = <0x800000 0x800000>;\n",
"-\t\t\t\t};\n",
- "-\t\t\t\tpartition\@1000000 {\n",
+ "-\t\t\t\tpartition at 1000000 {\n",
"-\t\t\t\t\tlabel = \"Filesystem\";\n",
"-\t\t\t\t\treg = <0x1000000 0x3f000000>;\n",
"-\t\t\t\t};\n",
"-\t\t\t};\n",
"-\n",
- " \t\t\tsdhci\@d8000 {\n",
+ " \t\t\tsdhci at d8000 {\n",
" \t\t\t\tbroken-cd;\n",
" \t\t\t\twp-inverted;\n",
"\@\@ -202,3 +179,34 \@\@\n",
@@ -810,7 +761,7 @@
"+&nand_controller {\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\tnand\@0 {\n",
+ "+\tnand at 0 {\n",
"+\t\treg = <0>;\n",
"+\t\tmarvell,rb = <0>;\n",
"+\t\tmarvell,nand-keep-config;\n",
@@ -823,15 +774,15 @@
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\t\tpartition\@0 {\n",
+ "+\t\t\tpartition at 0 {\n",
"+\t\t\t\tlabel = \"U-Boot\";\n",
"+\t\t\t\treg = <0 0x800000>;\n",
"+\t\t\t};\n",
- "+\t\t\tpartition\@800000 {\n",
+ "+\t\t\tpartition at 800000 {\n",
"+\t\t\t\tlabel = \"Linux\";\n",
"+\t\t\t\treg = <0x800000 0x800000>;\n",
"+\t\t\t};\n",
- "+\t\t\tpartition\@1000000 {\n",
+ "+\t\t\tpartition at 1000000 {\n",
"+\t\t\t\tlabel = \"Filesystem\";\n",
"+\t\t\t\treg = <0x1000000 0x3f000000>;\n",
"+\t\t\t};\n",
@@ -846,9 +797,9 @@
" \t\t\t\tstatus = \"okay\";\n",
" \t\t\t};\n",
" \n",
- "-\t\t\tnand: flash\@d0000 {\n",
+ "-\t\t\tnand: flash at d0000 {\n",
"-\t\t\t\tcompatible = \"marvell,armada370-nand\";\n",
- "+\t\t\tnand_controller: nand-controller\@d0000 {\n",
+ "+\t\t\tnand_controller: nand-controller at d0000 {\n",
"+\t\t\t\tcompatible = \"marvell,armada370-nand-controller\";\n",
" \t\t\t\treg = <0xd0000 0x54>;\n",
" \t\t\t\t#address-cells = <1>;\n",
@@ -861,4 +812,4 @@
"2.11.0"
]
-3363614304c8d075292a04da71075e5b3ec3af82d8c8eae3d0b7f26b2d697b5b
+f2ef449b3148ae8b9cf946290b0960bdc5bf3c9140fac0daa6a875d46d0e3c5c
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.