[PATCH 1/2] ARM: dts: imx6qdl: pfla02: Use upstream som_flash node

[PATCH 1/2] ARM: dts: imx6qdl: pfla02: Use upstream som_flash node

[Alexander Shiyan]

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/dts/imx6qdl-phytec-pfla02.dtsi | 52 ++++++++++++-------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
index d0b056b2f..3eb510d43 100644
--- a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
@@ -21,7 +21,7 @@
 
 		environment-spinor {
 			compatible = "barebox,environment";
-			device-path = &flash, "partname:barebox-environment";
+			device-path = &som_flash, "partname:barebox-environment";
 			status = "disabled";
 		};
 
@@ -53,32 +53,30 @@
 
 /delete-node/ &{/memory@10000000};
 
-&ecspi3 {
-	flash: flash@0 {
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "barebox";
-				reg = <0x0 0x100000>;
-			};
-
-			partition@100000 {
-				label = "barebox-environment";
-				reg = <0x100000 0x20000>;
-			};
-
-			partition@120000 {
-				label = "oftree";
-				reg = <0x120000 0x20000>;
-			};
-
-			partition@140000 {
-				label = "kernel";
-				reg = <0x140000 0x0>;
-			};
+&som_flash {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partition@0 {
+			label = "barebox";
+			reg = <0x0 0x100000>;
+		};
+
+		partition@100000 {
+			label = "barebox-environment";
+			reg = <0x100000 0x20000>;
+		};
+
+		partition@120000 {
+			label = "oftree";
+			reg = <0x120000 0x20000>;
+		};
+
+		partition@140000 {
+			label = "kernel";
+			reg = <0x140000 0x0>;
 		};
 	};
 };
-- 
2.26.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] ARM: dts: imx6qdl: pfla02: Fix NAND offsets for partitions

[Alexander Shiyan]

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/dts/imx6qdl-phytec-pfla02.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
index 3eb510d43..2e4d4ed34 100644
--- a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
@@ -96,12 +96,12 @@
 			reg = <0x0 0x1000000>;
 		};
 
-		partition@400000 {
+		partition@1000000 {
 			label = "barebox-environment";
 			reg = <0x1000000 0x100000>;
 		};
 
-		partition@500000 {
+		partition@1100000 {
 			label = "root";
 			reg = <0x1100000 0x0>;
 		};
-- 
2.26.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] ARM: dts: imx6qdl: pfla02: Use upstream som_flash node

[Sascha Hauer]

On Thu, Nov 12, 2020 at 01:22:30PM +0300, Alexander Shiyan wrote:
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  arch/arm/dts/imx6qdl-phytec-pfla02.dtsi | 52 ++++++++++++-------------
>  1 file changed, 25 insertions(+), 27 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
> index d0b056b2f..3eb510d43 100644
> --- a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
> +++ b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi
> @@ -21,7 +21,7 @@
>  
>  		environment-spinor {
>  			compatible = "barebox,environment";
> -			device-path = &flash, "partname:barebox-environment";
> +			device-path = &som_flash, "partname:barebox-environment";
>  			status = "disabled";
>  		};
>  
> @@ -53,32 +53,30 @@
>  
>  /delete-node/ &{/memory@10000000};
>  
> -&ecspi3 {
> -	flash: flash@0 {
> -		partitions {
> -			compatible = "fixed-partitions";
> -			#address-cells = <1>;
> -			#size-cells = <1>;
> -
> -			partition@0 {
> -				label = "barebox";
> -				reg = <0x0 0x100000>;
> -			};
> -
> -			partition@100000 {
> -				label = "barebox-environment";
> -				reg = <0x100000 0x20000>;
> -			};
> -
> -			partition@120000 {
> -				label = "oftree";
> -				reg = <0x120000 0x20000>;
> -			};
> -
> -			partition@140000 {
> -				label = "kernel";
> -				reg = <0x140000 0x0>;
> -			};
> +&som_flash {
> +	partitions {
> +		compatible = "fixed-partitions";
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +
> +		partition@0 {
> +			label = "barebox";
> +			reg = <0x0 0x100000>;
> +		};
> +
> +		partition@100000 {
> +			label = "barebox-environment";
> +			reg = <0x100000 0x20000>;
> +		};
> +
> +		partition@120000 {
> +			label = "oftree";
> +			reg = <0x120000 0x20000>;
> +		};
> +
> +		partition@140000 {
> +			label = "kernel";
> +			reg = <0x140000 0x0>;
>  		};
>  	};
>  };
> -- 
> 2.26.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox