[PATCH] ARM: dts: helios4: fix spi1 location

[Gregory CLEMENT]

Rosen Penev <rosenp at gmail.com> writes:

> This spi node is specified in armada-38x.dtsi with proper compatible
> strings whereas they are not present here. Instead of copy and pasting
> various lines, just reference the node in the dtsi.
>
> This dts seems to predate the move of spi from internal-regs to the soc
> node so this moves it in line there.
>
> Allows proper probing of SPI at runtime.
>
> Remove the microsom_spi1_cs_pins pinctrl group and its reference in
> &spi1. The group only muxed mpp59 to the "spi1" function, but that
> pin (SPI1 cs0) is already covered by spi1_pins, which selects the
> same function for mpp56-59 in armada-38x.dtsi.
>
> Fixes: ced8025b569e ("ARM: dts: armada388-helios4")
> Signed-off-by: Rosen Penev <rosenp at gmail.com>

Applied on mvebu/dt

Thanks,

Gregory
> ---
>  .../arm/boot/dts/marvell/armada-388-helios4.dts | 17 ++++++-----------
>  1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/boot/dts/marvell/armada-388-helios4.dts b/arch/arm/boot/dts/marvell/armada-388-helios4.dts
> index 9de9a8a4267c..ae03d42f92a0 100644
> --- a/arch/arm/boot/dts/marvell/armada-388-helios4.dts
> +++ b/arch/arm/boot/dts/marvell/armada-388-helios4.dts
> @@ -254,13 +254,6 @@ sata3: sata-port at 1 {
>  				};
>  			};
>  
> -			spi at 10680 {
> -				pinctrl-0 = <&spi1_pins
> -					     &microsom_spi1_cs_pins>;
> -				pinctrl-names = "default";
> -				status = "okay";
> -			};
> -
>  			sdhci at d8000 {
>  				bus-width = <4>;
>  				cd-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
> @@ -327,11 +320,13 @@ helios_fan2_pins: helios_fan2_pins {
>  					marvell,pins = "mpp48", "mpp55";
>  					marvell,function = "gpio";
>  				};
> -				microsom_spi1_cs_pins: spi1-cs-pins {
> -					marvell,pins = "mpp59";
> -					marvell,function = "spi1";
> -				};
>  			};
>  		};
>  	};
>  };
> +
> +&spi1 {
> +	pinctrl-0 = <&spi1_pins>;
> +	pinctrl-names = "default";
> +	status = "okay";
> +};
> -- 
> 2.55.0
>

-- 
Grégory CLEMENT, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com