diff mbox series

[v2,6/6] arm64: zynqmp: Used fixed-partitions for QSPI in k26

Message ID 7368dc772d8dc29477a880ac2065e2ecb98cf3f5.1684767562.git.michal.simek@amd.com (mailing list archive)
State New, archived
Headers show
Series arm64: zynqmp: Misc zynqmp changes | expand

Commit Message

Michal Simek May 22, 2023, 2:59 p.m. UTC 
Using fixed partitions is recommended way how to describe QSPI. Also add
label for qspi flash memory to be able to reference it in future.

Signed-off-by: Michal Simek <michal.simek@amd.com>
---

(no changes since v1)

---
 .../boot/dts/xilinx/zynqmp-sm-k26-revA.dts    | 169 +++++++++---------
 1 file changed, 88 insertions(+), 81 deletions(-)

Comments

Michal Simek June 5, 2023, 11:16 a.m. UTC | #1 
On 5/22/23 16:59, Michal Simek wrote:
> Using fixed partitions is recommended way how to describe QSPI. Also add
> label for qspi flash memory to be able to reference it in future.
> 
> Signed-off-by: Michal Simek <michal.simek@amd.com>
> ---
> 
> (no changes since v1)
> 
> ---
>   .../boot/dts/xilinx/zynqmp-sm-k26-revA.dts    | 169 +++++++++---------
>   1 file changed, 88 insertions(+), 81 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts
> index 84e18fdce775..dfd1a18f5a10 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts
> @@ -127,87 +127,94 @@ spi_flash: flash@0 { /* MT25QU512A */
>   		spi-tx-bus-width = <4>;
>   		spi-rx-bus-width = <4>;
>   		spi-max-frequency = <40000000>; /* 40MHz */
> -		partition@0 {
> -			label = "Image Selector";
> -			reg = <0x0 0x80000>; /* 512KB */
> -			read-only;
> -			lock;
> -		};
> -		partition@80000 {
> -			label = "Image Selector Golden";
> -			reg = <0x80000 0x80000>; /* 512KB */
> -			read-only;
> -			lock;
> -		};
> -		partition@100000 {
> -			label = "Persistent Register";
> -			reg = <0x100000 0x20000>; /* 128KB */
> -		};
> -		partition@120000 {
> -			label = "Persistent Register Backup";
> -			reg = <0x120000 0x20000>; /* 128KB */
> -		};
> -		partition@140000 {
> -			label = "Open_1";
> -			reg = <0x140000 0xC0000>; /* 768KB */
> -		};
> -		partition@200000 {
> -			label = "Image A (FSBL, PMU, ATF, U-Boot)";
> -			reg = <0x200000 0xD00000>; /* 13MB */
> -		};
> -		partition@f00000 {
> -			label = "ImgSel Image A Catch";
> -			reg = <0xF00000 0x80000>; /* 512KB */
> -			read-only;
> -			lock;
> -		};
> -		partition@f80000 {
> -			label = "Image B (FSBL, PMU, ATF, U-Boot)";
> -			reg = <0xF80000 0xD00000>; /* 13MB */
> -		};
> -		partition@1c80000 {
> -			label = "ImgSel Image B Catch";
> -			reg = <0x1C80000 0x80000>; /* 512KB */
> -			read-only;
> -			lock;
> -		};
> -		partition@1d00000 {
> -			label = "Open_2";
> -			reg = <0x1D00000 0x100000>; /* 1MB */
> -		};
> -		partition@1e00000 {
> -			label = "Recovery Image";
> -			reg = <0x1E00000 0x200000>; /* 2MB */
> -			read-only;
> -			lock;
> -		};
> -		partition@2000000 {
> -			label = "Recovery Image Backup";
> -			reg = <0x2000000 0x200000>; /* 2MB */
> -			read-only;
> -			lock;
> -		};
> -		partition@2200000 {
> -			label = "U-Boot storage variables";
> -			reg = <0x2200000 0x20000>; /* 128KB */
> -		};
> -		partition@2220000 {
> -			label = "U-Boot storage variables backup";
> -			reg = <0x2220000 0x20000>; /* 128KB */
> -		};
> -		partition@2240000 {
> -			label = "SHA256";
> -			reg = <0x2240000 0x40000>; /* 256B but 256KB sector */
> -			read-only;
> -			lock;
> -		};
> -		partition@2280000 {
> -			label = "Secure OS Storage";
> -			reg = <0x2280000 0x20000>; /* 128KB */
> -		};
> -		partition@22A0000 {
> -			label = "User";
> -			reg = <0x22A0000 0x1d60000>; /* 29.375 MB */
> +
> +		partitions {
> +			compatible = "fixed-partitions";
> +			#address-cells = <1>;
> +			#size-cells = <1>;
> +
> +			partition@0 {
> +				label = "Image Selector";
> +				reg = <0x0 0x80000>; /* 512KB */
> +				read-only;
> +				lock;
> +			};
> +			partition@80000 {
> +				label = "Image Selector Golden";
> +				reg = <0x80000 0x80000>; /* 512KB */
> +				read-only;
> +				lock;
> +			};
> +			partition@100000 {
> +				label = "Persistent Register";
> +				reg = <0x100000 0x20000>; /* 128KB */
> +			};
> +			partition@120000 {
> +				label = "Persistent Register Backup";
> +				reg = <0x120000 0x20000>; /* 128KB */
> +			};
> +			partition@140000 {
> +				label = "Open_1";
> +				reg = <0x140000 0xC0000>; /* 768KB */
> +			};
> +			partition@200000 {
> +				label = "Image A (FSBL, PMU, ATF, U-Boot)";
> +				reg = <0x200000 0xD00000>; /* 13MB */
> +			};
> +			partition@f00000 {
> +				label = "ImgSel Image A Catch";
> +				reg = <0xF00000 0x80000>; /* 512KB */
> +				read-only;
> +				lock;
> +			};
> +			partition@f80000 {
> +				label = "Image B (FSBL, PMU, ATF, U-Boot)";
> +				reg = <0xF80000 0xD00000>; /* 13MB */
> +			};
> +			partition@1c80000 {
> +				label = "ImgSel Image B Catch";
> +				reg = <0x1C80000 0x80000>; /* 512KB */
> +				read-only;
> +				lock;
> +			};
> +			partition@1d00000 {
> +				label = "Open_2";
> +				reg = <0x1D00000 0x100000>; /* 1MB */
> +			};
> +			partition@1e00000 {
> +				label = "Recovery Image";
> +				reg = <0x1E00000 0x200000>; /* 2MB */
> +				read-only;
> +				lock;
> +			};
> +			partition@2000000 {
> +				label = "Recovery Image Backup";
> +				reg = <0x2000000 0x200000>; /* 2MB */
> +				read-only;
> +				lock;
> +			};
> +			partition@2200000 {
> +				label = "U-Boot storage variables";
> +				reg = <0x2200000 0x20000>; /* 128KB */
> +			};
> +			partition@2220000 {
> +				label = "U-Boot storage variables backup";
> +				reg = <0x2220000 0x20000>; /* 128KB */
> +			};
> +			partition@2240000 {
> +				label = "SHA256";
> +				reg = <0x2240000 0x40000>; /* 256B but 256KB sector */
> +				read-only;
> +				lock;
> +			};
> +			partition@2280000 {
> +				label = "Secure OS Storage";
> +				reg = <0x2280000 0x20000>; /* 128KB */
> +			};
> +			partition@22A0000 {
> +				label = "User";
> +				reg = <0x22A0000 0x1d60000>; /* 29.375 MB */
> +			};
>   		};
>   	};
>   };

Applied.
M
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts
index 84e18fdce775..dfd1a18f5a10 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts
@@ -127,87 +127,94 @@  spi_flash: flash@0 { /* MT25QU512A */
 		spi-tx-bus-width = <4>;
 		spi-rx-bus-width = <4>;
 		spi-max-frequency = <40000000>; /* 40MHz */
-		partition@0 {
-			label = "Image Selector";
-			reg = <0x0 0x80000>; /* 512KB */
-			read-only;
-			lock;
-		};
-		partition@80000 {
-			label = "Image Selector Golden";
-			reg = <0x80000 0x80000>; /* 512KB */
-			read-only;
-			lock;
-		};
-		partition@100000 {
-			label = "Persistent Register";
-			reg = <0x100000 0x20000>; /* 128KB */
-		};
-		partition@120000 {
-			label = "Persistent Register Backup";
-			reg = <0x120000 0x20000>; /* 128KB */
-		};
-		partition@140000 {
-			label = "Open_1";
-			reg = <0x140000 0xC0000>; /* 768KB */
-		};
-		partition@200000 {
-			label = "Image A (FSBL, PMU, ATF, U-Boot)";
-			reg = <0x200000 0xD00000>; /* 13MB */
-		};
-		partition@f00000 {
-			label = "ImgSel Image A Catch";
-			reg = <0xF00000 0x80000>; /* 512KB */
-			read-only;
-			lock;
-		};
-		partition@f80000 {
-			label = "Image B (FSBL, PMU, ATF, U-Boot)";
-			reg = <0xF80000 0xD00000>; /* 13MB */
-		};
-		partition@1c80000 {
-			label = "ImgSel Image B Catch";
-			reg = <0x1C80000 0x80000>; /* 512KB */
-			read-only;
-			lock;
-		};
-		partition@1d00000 {
-			label = "Open_2";
-			reg = <0x1D00000 0x100000>; /* 1MB */
-		};
-		partition@1e00000 {
-			label = "Recovery Image";
-			reg = <0x1E00000 0x200000>; /* 2MB */
-			read-only;
-			lock;
-		};
-		partition@2000000 {
-			label = "Recovery Image Backup";
-			reg = <0x2000000 0x200000>; /* 2MB */
-			read-only;
-			lock;
-		};
-		partition@2200000 {
-			label = "U-Boot storage variables";
-			reg = <0x2200000 0x20000>; /* 128KB */
-		};
-		partition@2220000 {
-			label = "U-Boot storage variables backup";
-			reg = <0x2220000 0x20000>; /* 128KB */
-		};
-		partition@2240000 {
-			label = "SHA256";
-			reg = <0x2240000 0x40000>; /* 256B but 256KB sector */
-			read-only;
-			lock;
-		};
-		partition@2280000 {
-			label = "Secure OS Storage";
-			reg = <0x2280000 0x20000>; /* 128KB */
-		};
-		partition@22A0000 {
-			label = "User";
-			reg = <0x22A0000 0x1d60000>; /* 29.375 MB */
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "Image Selector";
+				reg = <0x0 0x80000>; /* 512KB */
+				read-only;
+				lock;
+			};
+			partition@80000 {
+				label = "Image Selector Golden";
+				reg = <0x80000 0x80000>; /* 512KB */
+				read-only;
+				lock;
+			};
+			partition@100000 {
+				label = "Persistent Register";
+				reg = <0x100000 0x20000>; /* 128KB */
+			};
+			partition@120000 {
+				label = "Persistent Register Backup";
+				reg = <0x120000 0x20000>; /* 128KB */
+			};
+			partition@140000 {
+				label = "Open_1";
+				reg = <0x140000 0xC0000>; /* 768KB */
+			};
+			partition@200000 {
+				label = "Image A (FSBL, PMU, ATF, U-Boot)";
+				reg = <0x200000 0xD00000>; /* 13MB */
+			};
+			partition@f00000 {
+				label = "ImgSel Image A Catch";
+				reg = <0xF00000 0x80000>; /* 512KB */
+				read-only;
+				lock;
+			};
+			partition@f80000 {
+				label = "Image B (FSBL, PMU, ATF, U-Boot)";
+				reg = <0xF80000 0xD00000>; /* 13MB */
+			};
+			partition@1c80000 {
+				label = "ImgSel Image B Catch";
+				reg = <0x1C80000 0x80000>; /* 512KB */
+				read-only;
+				lock;
+			};
+			partition@1d00000 {
+				label = "Open_2";
+				reg = <0x1D00000 0x100000>; /* 1MB */
+			};
+			partition@1e00000 {
+				label = "Recovery Image";
+				reg = <0x1E00000 0x200000>; /* 2MB */
+				read-only;
+				lock;
+			};
+			partition@2000000 {
+				label = "Recovery Image Backup";
+				reg = <0x2000000 0x200000>; /* 2MB */
+				read-only;
+				lock;
+			};
+			partition@2200000 {
+				label = "U-Boot storage variables";
+				reg = <0x2200000 0x20000>; /* 128KB */
+			};
+			partition@2220000 {
+				label = "U-Boot storage variables backup";
+				reg = <0x2220000 0x20000>; /* 128KB */
+			};
+			partition@2240000 {
+				label = "SHA256";
+				reg = <0x2240000 0x40000>; /* 256B but 256KB sector */
+				read-only;
+				lock;
+			};
+			partition@2280000 {
+				label = "Secure OS Storage";
+				reg = <0x2280000 0x20000>; /* 128KB */
+			};
+			partition@22A0000 {
+				label = "User";
+				reg = <0x22A0000 0x1d60000>; /* 29.375 MB */
+			};
 		};
 	};
 };