[PATCH 2/2] ARM: dts: at91: fix pinctrl phandles

[Nicolas Ferre]

On 31/03/2022 at 16:13, Claudiu Beznea wrote:
> Commit bf781869e5cf ("ARM: dts: at91: add pinctrl-{names, 0} for all
> gpios") introduces pinctrl phandles for pins used by individual
> controllers to avoid failures due to commit 2ab73c6d8323 ("gpio:
> Support GPIO controllers without pin-ranges"). For SPI controllers
> available on SAMA5D4 and SAMA5D3 some of the pins are defined in
> SoC specific dtsi on behalf of pinctrl-0. Adding extra pinctrl phandles
> on board specific dts also on behalf of pinctrl-0 overwrite the pinctrl-0
> phandle specified in SoC specific dtsi. Thus add the board specific
> pinctrl to pinctrl-1.
> 
> Fixes: bf781869e5cf ("ARM: dts: at91: add pinctrl-{names, 0} for all gpios")
> Depends-on: e8042102d11e ("ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name")
> Reported-by: Ajay Kathat <ajay.kathat at microchip.com>
> Co-developed-by: Ajay Kathat <ajay.kathat at microchip.com>
> Signed-off-by: Ajay Kathat <ajay.kathat at microchip.com>
> Tested-by: Ajay Kathat <ajay.kathat at microchip.com>
> Signed-off-by: Claudiu Beznea <claudiu.beznea at microchip.com>

For the 2 patches:
Acked-by: Nicolas Ferre <nicolas.ferre at microchip.com>


> ---
> 
> Hi, Nicolas,
> 
> If all good with this patches please update the SHA1 on "Depends-on"
> tag.

Yes, sure. I did it on the "fixes" branch queued for 5.18.

Thanks, best regards,
   Nicolas

>   arch/arm/boot/dts/at91-sama5d3_xplained.dts | 8 ++++----
>   arch/arm/boot/dts/at91-sama5d4_xplained.dts | 4 ++--
>   2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
> index d72c042f2850..a49c2966b41e 100644
> --- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
> +++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
> @@ -57,8 +57,8 @@ slot at 0 {
>   			};
>   
>   			spi0: spi at f0004000 {
> -				pinctrl-names = "default";
> -				pinctrl-0 = <&pinctrl_spi0_cs>;
> +				pinctrl-names = "default", "cs";
> +				pinctrl-1 = <&pinctrl_spi0_cs>;
>   				cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;
>   				status = "okay";
>   			};
> @@ -171,8 +171,8 @@ slot at 0 {
>   			};
>   
>   			spi1: spi at f8008000 {
> -				pinctrl-names = "default";
> -				pinctrl-0 = <&pinctrl_spi1_cs>;
> +				pinctrl-names = "default", "cs";
> +				pinctrl-1 = <&pinctrl_spi1_cs>;
>   				cs-gpios = <&pioC 25 0>;
>   				status = "okay";
>   			};
> diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
> index accb92cfac44..e519d2747936 100644
> --- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts
> +++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
> @@ -81,8 +81,8 @@ usart4: serial at fc010000 {
>   			};
>   
>   			spi1: spi at fc018000 {
> -				pinctrl-names = "default";
> -				pinctrl-0 = <&pinctrl_spi1_cs>;
> +				pinctrl-names = "default", "cs";
> +				pinctrl-1 = <&pinctrl_spi1_cs>;
>   				cs-gpios = <&pioB 21 0>;
>   				status = "okay";
>   			};


-- 
Nicolas Ferre