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

[Stefan Roese]

Hi Kosta,

On 04.12.2016 17:12, kostap at marvell.com wrote:
> From: Konstantin Porotchkin <kostap at marvell.com>
>
> Align the Armada-8040-db and Armada-7040-db SPI and I2C
> DTS settings with latest DB settings:
> - 8040-db: disable i2c0 and spi0 on AP (MPPs are reserved for SDIO)
> - 8040-db: disable cps_i2c0 on CP1
> - 8040-db: enable spi1 on CP1 (the new location of the boot flash)
>   The spi1 on CP1 is aliased as spi0 since this is the way
>   the driver enumerates it.
>
> Changes for v2:
> - 7040-db: remove i2c0 and spi0 entries from AP (MPPs are reserved for SDIO)
>
> Signed-off-by: Konstantin Porotchkin <kostap at marvell.com>
> Cc: Stefan Roese <sr at denx.de>
> Cc: Nadav Haklai <nadavh at marvell.com>
> Cc: Neta Zur Hershkovits <neta at marvell.com>
> Cc: Omri Itach <omrii at marvell.com>
> Cc: Igal Liberman <igall at marvell.com>
> Cc: Haim Boot <hayim at marvell.com>
> Cc: Hanna Hawa <hannah at marvell.com>
> ---

Please move the patch version history below this "---" line. By doing
this, the history will not be added to the git repository (where it
does not really belong). Please do this generally for all your patches
please.

Other than this:

Reviewed-by: Stefan Roese <sr at denx.de>

>  arch/arm/dts/armada-7040-db.dts | 32 ----------------------
>  arch/arm/dts/armada-8040-db.dts | 60 +++++++++++++++++------------------------
>  2 files changed, 25 insertions(+), 67 deletions(-)
>
> diff --git a/arch/arm/dts/armada-7040-db.dts b/arch/arm/dts/armada-7040-db.dts
> index b8fe5a9..1e4d676 100644
> --- a/arch/arm/dts/armada-7040-db.dts
> +++ b/arch/arm/dts/armada-7040-db.dts
> @@ -66,38 +66,6 @@
>  	};
>  };
>
> -&i2c0 {
> -	status = "okay";
> -	clock-frequency = <100000>;
> -};
> -
> -&spi0 {
> -	status = "okay";
> -
> -	spi-flash at 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 at 0 {
> -				label = "U-Boot";
> -				reg = <0 0x200000>;
> -			};
> -			partition at 400000 {
> -				label = "Filesystem";
> -				reg = <0x200000 0xce0000>;
> -			};
> -		};
> -	};
> -};
> -
>  &uart0 {
>  	status = "okay";
>  };
> 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 at 00000000 {
> @@ -66,38 +66,6 @@
>  	};
>  };
>
> -&i2c0 {
> -	status = "okay";
> -	clock-frequency = <100000>;
> -};
> -
> -&spi0 {
> -	status = "okay";
> -
> -	spi-flash at 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 at 0 {
> -				label = "U-Boot";
> -				reg = <0 0x200000>;
> -			};
> -			partition at 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 at 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 at 0 {
> +				label = "U-Boot";
> +				reg = <0 0x200000>;
> +			};
> +			partition at 400000 {
> +				label = "Filesystem";
> +				reg = <0x200000 0xce0000>;
> +			};
> +		};
> +	};
>  };
>
>  /* CON4 on CP1 expansion */
>

Thanks,
Stefan