* [PATCH 1/2] ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name
@ 2022-03-31 14:13 Claudiu Beznea
2022-03-31 14:13 ` [PATCH 2/2] ARM: dts: at91: fix pinctrl phandles Claudiu Beznea
0 siblings, 1 reply; 3+ messages in thread
From: Claudiu Beznea @ 2022-03-31 14:13 UTC (permalink / raw)
To: nicolas.ferre, alexandre.belloni, robh+dt
Cc: devicetree, linux-arm-kernel, linux-kernel, Claudiu Beznea
Pinctrl phandle is for spi1 so rename it to reflect this.
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
arch/arm/boot/dts/at91-sama5d4_xplained.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
index d241c24f0d83..accb92cfac44 100644
--- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
@@ -82,7 +82,7 @@ usart4: serial@fc010000 {
spi1: spi@fc018000 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_spi0_cs>;
+ pinctrl-0 = <&pinctrl_spi1_cs>;
cs-gpios = <&pioB 21 0>;
status = "okay";
};
@@ -140,7 +140,7 @@ pinctrl_macb0_phy_irq: macb0_phy_irq_0 {
atmel,pins =
<AT91_PIOE 1 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
};
- pinctrl_spi0_cs: spi0_cs_default {
+ pinctrl_spi1_cs: spi1_cs_default {
atmel,pins =
<AT91_PIOB 21 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
--
2.32.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: dts: at91: fix pinctrl phandles
2022-03-31 14:13 [PATCH 1/2] ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name Claudiu Beznea
@ 2022-03-31 14:13 ` Claudiu Beznea
2022-04-13 17:02 ` Nicolas Ferre
0 siblings, 1 reply; 3+ messages in thread
From: Claudiu Beznea @ 2022-03-31 14:13 UTC (permalink / raw)
To: nicolas.ferre, alexandre.belloni, robh+dt
Cc: devicetree, linux-arm-kernel, linux-kernel, Claudiu Beznea,
Ajay Kathat
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@microchip.com>
Co-developed-by: Ajay Kathat <ajay.kathat@microchip.com>
Signed-off-by: Ajay Kathat <ajay.kathat@microchip.com>
Tested-by: Ajay Kathat <ajay.kathat@microchip.com>
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
Hi, Nicolas,
If all good with this patches please update the SHA1 on "Depends-on"
tag.
Thank you,
Claudiu Beznea
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@0 {
};
spi0: spi@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@0 {
};
spi1: spi@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@fc010000 {
};
spi1: spi@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";
};
--
2.32.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] ARM: dts: at91: fix pinctrl phandles
2022-03-31 14:13 ` [PATCH 2/2] ARM: dts: at91: fix pinctrl phandles Claudiu Beznea
@ 2022-04-13 17:02 ` Nicolas Ferre
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Ferre @ 2022-04-13 17:02 UTC (permalink / raw)
To: Claudiu Beznea, alexandre.belloni, robh+dt
Cc: devicetree, linux-arm-kernel, linux-kernel, Ajay Kathat
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@microchip.com>
> Co-developed-by: Ajay Kathat <ajay.kathat@microchip.com>
> Signed-off-by: Ajay Kathat <ajay.kathat@microchip.com>
> Tested-by: Ajay Kathat <ajay.kathat@microchip.com>
> Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
For the 2 patches:
Acked-by: Nicolas Ferre <nicolas.ferre@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@0 {
> };
>
> spi0: spi@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@0 {
> };
>
> spi1: spi@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@fc010000 {
> };
>
> spi1: spi@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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-13 17:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-31 14:13 [PATCH 1/2] ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name Claudiu Beznea
2022-03-31 14:13 ` [PATCH 2/2] ARM: dts: at91: fix pinctrl phandles Claudiu Beznea
2022-04-13 17:02 ` Nicolas Ferre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).