diff mbox

[U-Boot,1/6] arm64: mvebu: Modify the A8K SPI and I2C config in DTS

Message ID 1479656309-21772-2-git-send-email-kostap@marvell.com
State Superseded
Delegated to: Stefan Roese
Headers show

Commit Message

Kostya Porotchkin Nov. 20, 2016, 3:38 p.m. UTC
From: Konstantin Porotchkin <kostap@marvell.com>

Align the Armada-8040-db SPI and I2C DTS settings with latest
A8040 DB settings:
- disable i2c0 and spi0 on AP (pins are reserved for eMMC)
- disable cps_i2c0 on CP1
- enable spi1 on CP1 (the new location of the boot flash)

Change-Id: I54698ce4dc8dbe6a2af14099f5bcc3ca3b21d7e1
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Neta Zur Hershkovits <neta@marvell.com>
Cc: Omri Itach <omrii@marvell.com>
Cc: Igal Liberman <igall@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>
---
 arch/arm/dts/armada-8040-db.dts | 60 +++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 35 deletions(-)

Comments

Stefan Roese Nov. 24, 2016, 9:02 a.m. UTC | #1
Hi Kosta,

On 20.11.2016 16:38, kostap@marvell.com wrote:
> From: Konstantin Porotchkin <kostap@marvell.com>
>
> Align the Armada-8040-db SPI and I2C DTS settings with latest
> A8040 DB settings:
> - disable i2c0 and spi0 on AP (pins are reserved for eMMC)
> - disable cps_i2c0 on CP1
> - enable spi1 on CP1 (the new location of the boot flash)

Thanks. I understand that the current SPI / I2C settings are
still valid for boards with earlier SoC revisions. Is this
correct? Would it make sense to move the old version into
a new file then, perhaps:

arch/arm/dts/armada-8040-db-revA.dts

?

This would be handy for users of this version at least for a
short period of time. This new file can be removed once its
not needed any more in a few months.

If you think this is a good idea, could you please add this
new file in a new patch to this patchset in v2?

> Change-Id: I54698ce4dc8dbe6a2af14099f5bcc3ca3b21d7e1
> Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
> Cc: Stefan Roese <sr@denx.de>
> Cc: Nadav Haklai <nadavh@marvell.com>
> Cc: Neta Zur Hershkovits <neta@marvell.com>
> Cc: Omri Itach <omrii@marvell.com>
> Cc: Igal Liberman <igall@marvell.com>
> Cc: Haim Boot <hayim@marvell.com>
> Cc: Hanna Hawa <hannah@marvell.com>
> ---
>  arch/arm/dts/armada-8040-db.dts | 60 +++++++++++++++++------------------------
>  1 file changed, 25 insertions(+), 35 deletions(-)
>
> diff --git a/arch/arm/dts/armada-8040-db.dts b/arch/arm/dts/armada-8040-db.dts
> index 7fb674b..86666a1 100644
> --- a/arch/arm/dts/armada-8040-db.dts
> +++ b/arch/arm/dts/armada-8040-db.dts
> @@ -57,7 +57,7 @@
>
>  	aliases {
>  		i2c0 = &cpm_i2c0;
> -		spi0 = &spi0;
> +		spi0 = &cps_spi1;
>  	};
>
>  	memory@00000000 {
> @@ -66,38 +66,6 @@
>  	};
>  };
>
> -&i2c0 {
> -	status = "okay";
> -	clock-frequency = <100000>;
> -};
> -
> -&spi0 {
> -	status = "okay";
> -
> -	spi-flash@0 {
> -		#address-cells = <1>;
> -		#size-cells = <1>;
> -		compatible = "jedec,spi-nor";
> -		reg = <0>;
> -		spi-max-frequency = <10000000>;
> -
> -		partitions {
> -			compatible = "fixed-partitions";
> -			#address-cells = <1>;
> -			#size-cells = <1>;
> -
> -			partition@0 {
> -				label = "U-Boot";
> -				reg = <0 0x200000>;
> -			};
> -			partition@400000 {
> -				label = "Filesystem";
> -				reg = <0x200000 0xce0000>;
> -			};
> -		};
> -	};
> -};
> -
>  /* Accessible over the mini-USB CON9 connector on the main board */
>  &uart0 {
>  	status = "okay";
> @@ -134,9 +102,31 @@
>  	status = "okay";
>  };
>
> -&cps_i2c0 {
> +&cps_spi1 {
>  	status = "okay";
> -	clock-frequency = <100000>;
> +
> +	spi-flash@0 {
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +		compatible = "jedec,spi-nor";
> +		reg = <0>;
> +		spi-max-frequency = <10000000>;
> +
> +		partitions {
> +			compatible = "fixed-partitions";
> +			#address-cells = <1>;
> +			#size-cells = <1>;
> +
> +			partition@0 {
> +				label = "U-Boot";
> +				reg = <0 0x200000>;
> +			};
> +			partition@400000 {
> +				label = "Filesystem";
> +				reg = <0x200000 0xce0000>;
> +			};
> +		};
> +	};
>  };
>
>  /* CON4 on CP1 expansion */
>

Thanks,
Stefan
Stefan Roese Nov. 24, 2016, 12:05 p.m. UTC | #2
Hi Kosta,

On 24.11.2016 10:22, Kostya Porotchkin wrote:
> The A0 SoC is not for production, it is engineering samples
> only.
> Marvell has no plans for supporting this SoC in the future.

Of course.

> I believe that once you get a replacement for your board
> there will be no other customers using A0 SoC.

Okay. Then I will keep a copy of this file locally for testing
in the next weeks.

Thanks,
Stefan
diff mbox

Patch

diff --git a/arch/arm/dts/armada-8040-db.dts b/arch/arm/dts/armada-8040-db.dts
index 7fb674b..86666a1 100644
--- a/arch/arm/dts/armada-8040-db.dts
+++ b/arch/arm/dts/armada-8040-db.dts
@@ -57,7 +57,7 @@ 
 
 	aliases {
 		i2c0 = &cpm_i2c0;
-		spi0 = &spi0;
+		spi0 = &cps_spi1;
 	};
 
 	memory@00000000 {
@@ -66,38 +66,6 @@ 
 	};
 };
 
-&i2c0 {
-	status = "okay";
-	clock-frequency = <100000>;
-};
-
-&spi0 {
-	status = "okay";
-
-	spi-flash@0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <10000000>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "U-Boot";
-				reg = <0 0x200000>;
-			};
-			partition@400000 {
-				label = "Filesystem";
-				reg = <0x200000 0xce0000>;
-			};
-		};
-	};
-};
-
 /* Accessible over the mini-USB CON9 connector on the main board */
 &uart0 {
 	status = "okay";
@@ -134,9 +102,31 @@ 
 	status = "okay";
 };
 
-&cps_i2c0 {
+&cps_spi1 {
 	status = "okay";
-	clock-frequency = <100000>;
+
+	spi-flash@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "U-Boot";
+				reg = <0 0x200000>;
+			};
+			partition@400000 {
+				label = "Filesystem";
+				reg = <0x200000 0xce0000>;
+			};
+		};
+	};
 };
 
 /* CON4 on CP1 expansion */