arm64: dts: fsl-ls1028a-kontron-sl28: move MTD partitions

Move the MTD partitions to the partitions subnode. This is the new way
to specify the partitions, see
  Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml

Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
index 0516076..7e3a33e 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
@@ -115,8 +115,6 @@
        status = "okay";
 
        flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                m25p,fast-read;
                spi-max-frequency = <133000000>;
@@ -125,49 +123,55 @@
                spi-rx-bus-width = <2>; /* 2 SPI Rx lines */
                spi-tx-bus-width = <1>; /* 1 SPI Tx line */
 
-               partition@0 {
-                       reg = <0x000000 0x010000>;
-                       label = "rcw";
-                       read-only;
-               };
-
-               partition@10000 {
-                       reg = <0x010000 0x0f0000>;
-                       label = "failsafe bootloader";
-                       read-only;
-               };
-
-               partition@100000 {
-                       reg = <0x100000 0x040000>;
-                       label = "failsafe DP firmware";
-                       read-only;
-               };
-
-               partition@140000 {
-                       reg = <0x140000 0x0a0000>;
-                       label = "failsafe trusted firmware";
-                       read-only;
-               };
-
-               partition@1e0000 {
-                       reg = <0x1e0000 0x020000>;
-                       label = "reserved";
-                       read-only;
-               };
-
-               partition@200000 {
-                       reg = <0x200000 0x010000>;
-                       label = "configuration store";
-               };
-
-               partition@210000 {
-                       reg = <0x210000 0x1d0000>;
-                       label = "bootloader";
-               };
-
-               partition@3e0000 {
-                       reg = <0x3e0000 0x020000>;
-                       label = "bootloader environment";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               reg = <0x000000 0x010000>;
+                               label = "rcw";
+                               read-only;
+                       };
+
+                       partition@10000 {
+                               reg = <0x010000 0x0f0000>;
+                               label = "failsafe bootloader";
+                               read-only;
+                       };
+
+                       partition@100000 {
+                               reg = <0x100000 0x040000>;
+                               label = "failsafe DP firmware";
+                               read-only;
+                       };
+
+                       partition@140000 {
+                               reg = <0x140000 0x0a0000>;
+                               label = "failsafe trusted firmware";
+                               read-only;
+                       };
+
+                       partition@1e0000 {
+                               reg = <0x1e0000 0x020000>;
+                               label = "reserved";
+                               read-only;
+                       };
+
+                       partition@200000 {
+                               reg = <0x200000 0x010000>;
+                               label = "configuration store";
+                       };
+
+                       partition@210000 {
+                               reg = <0x210000 0x1d0000>;
+                               label = "bootloader";
+                       };
+
+                       partition@3e0000 {
+                               reg = <0x3e0000 0x020000>;
+                               label = "bootloader environment";
+                       };
                };
        };
 };