[U-Boot] [PATCH] ARM: mvebu: sync Armada-38x dts with Linux 4.20

Baruch Siach baruch at tkos.co.il
Sun Dec 9 07:44:20 UTC 2018


Hi Chris,

On Fri, Dec 07, 2018 at 04:21:47PM +1300, Chris Packham wrote:
> Sync the Armada-38x device tree files with Linux 4.20-rc5. The changes
> not taken are new compatible strings for the uart and nand flash
> controller. The nand binding is best updated if/when the mtd/nand
> infrastructure is updated.
> 
> Signed-off-by: Chris Packham <judge.packham at gmail.com>
> ---
> I've updated the clearfog and controlcenterdc boards enough for them to
> compile. In the case of clearfog there are a lot of changes in Linux so
> it's probably best if the board maintainer looks at what is needed.
> controlcenterdc isn't in linux so again I've just done enough for
> compilation.

[...]

> diff --git a/arch/arm/dts/armada-388-clearfog.dts b/arch/arm/dts/armada-388-clearfog.dts
> index 16a47d59e667..a70ce0391221 100644
> --- a/arch/arm/dts/armada-388-clearfog.dts
> +++ b/arch/arm/dts/armada-388-clearfog.dts
> @@ -118,18 +118,7 @@
>  				status = "okay";
>  			};
>  
> -			spi1: spi at 10680 {
> -				/*
> -				 * CS0: W25Q32
> -				 * CS1:
> -				 * CS2: mikrobus
> -				 */
> -				pinctrl-0 = <&spi1_pins &clearfog_spi1_cs_pins &mikro_spi_pins>;
> -				pinctrl-names = "default";
> -				status = "okay";
> -			};
> -
> -			usb0: usb3 at f8000 {
> +			usb3 at f8000 {
>  				/* CON7, USB-A port on back of device */
>  				status = "okay";
>  			};
> @@ -322,6 +311,18 @@
>  	};
>  };
>  
> +&spi1 {
> +	/*
> +	 * Add SPI CS pins for clearfog:
> +	 * CS0: W25Q32
> +	 * CS1: PIC microcontroller (Pro models)
> +	 * CS2: mikrobus
> +	 */
> +	pinctrl-0 = <&spi1_pins &mikro_spi_pins>;
> +	pinctrl-names = "default";
> +	status = "okay";

You took this from the kernel armada-388-clearfog.dtsi but ignored 
armada-388-clearfog.dts. This is a mess, actually. Both are wrong in different 
ways.

In this patch, the removal of &clearfog_spi1_cs_pins is right. The addition of 
the "CS1: PIC microcontroller" comment is wrong. In production Clearfog Pro 
model the PIC controller is not assembled. Even the PIC assembly option does 
not included SPI signals. See page 10 of the schematics:

  https://wiki.solid-run.com/lib/exe/fetch.php?media=a38x:carrierboard:docs:clearfog-schematics-2.1.pdf

baruch

> +};
> +

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -


More information about the U-Boot mailing list