[PATCH 1/2] arm64: dts: fsl-ls1028a-kontron-sl28: move MTD partitions

[PATCH 1/2] arm64: dts: fsl-ls1028a-kontron-sl28: move MTD partitions

[Michael Walle]

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>
---
 .../freescale/fsl-ls1028a-kontron-sl28.dts    | 94 ++++++++++---------
 1 file changed, 49 insertions(+), 45 deletions(-)

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 0516076087ae..7e3a33eb2045 100644
--- 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";
+			};
 		};
 	};
 };
-- 
2.20.1

[PATCH 2/2] arm64: dts: fsl-ls1028a-kontron-sl28: combine unused partitions

[Michael Walle]

The failsafe partitions for the DP firmware and for AT-F are unused. If
AT-F will ever be supported in the failsafe mode, then it will be a FIT
image. Thus fold the unused partitions into the failsafe bootloader one
to have enough storage if the bootloader image will grow.

While at it, remove the reserved partition. It served no purpose other
than having no hole in the map.

Signed-off-by: Michael Walle <michael@walle.cc>
---
 .../freescale/fsl-ls1028a-kontron-sl28.dts    | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

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 7e3a33eb2045..311e3aae0a3c 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
@@ -135,29 +135,11 @@
 			};
 
 			partition@10000 {
-				reg = <0x010000 0x0f0000>;
+				reg = <0x010000 0x1d0000>;
 				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";
-- 
2.20.1

Re: [PATCH 1/2] arm64: dts: fsl-ls1028a-kontron-sl28: move MTD partitions

[Shawn Guo]

On Thu, Mar 18, 2021 at 06:18:55PM +0100, Michael Walle wrote:
> 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>

Applied, thanks.