* [PATCH v3] arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A
@ 2024-10-01 23:50 FUKAUMI Naoki
2024-10-02 10:30 ` Heiko Stuebner
2024-10-02 10:50 ` Jonas Karlman
0 siblings, 2 replies; 7+ messages in thread
From: FUKAUMI Naoki @ 2024-10-01 23:50 UTC (permalink / raw)
To: heiko; +Cc: linux-rockchip, jonas, FUKAUMI Naoki
for pcie2x1l2, only pcie20x1_2_perstn_m0 is required, and its function
needs to be GPIO to avoid freeze at "pci enum" without PCIe device on
u-boot.
change pinctrl definitions for pcie2x1l2. no functional change is
intended on Linux kernel.
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
Changed in v3:
- rebase on next/master
Changed in v2:
- reword commit message
---
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
index 87fce8d9a964..841ac9a30628 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -310,7 +310,7 @@ rgmii_phy1: ethernet-phy@1 {
};
&pcie2x1l2 {
- pinctrl-0 = <&pcie2_reset>, <&pcie20x1m0_clkreqn>, <&pcie20x1m0_waken>;
+ pinctrl-0 = <&pcie20x1_2_perstn_m0>;
pinctrl-names = "default";
reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc3v3_wf>;
@@ -325,12 +325,12 @@ io_led: io-led {
};
pcie {
- pow_en: pow-en {
- rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
+ pcie20x1_2_perstn_m0: pcie20x1-2-perstn-m0 {
+ rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
};
- pcie2_reset: pcie2-reset {
- rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
+ pow_en: pow-en {
+ rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
--
2.43.0
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v3] arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A
2024-10-01 23:50 [PATCH v3] arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A FUKAUMI Naoki
@ 2024-10-02 10:30 ` Heiko Stuebner
2024-10-02 10:50 ` Jonas Karlman
1 sibling, 0 replies; 7+ messages in thread
From: Heiko Stuebner @ 2024-10-02 10:30 UTC (permalink / raw)
To: FUKAUMI Naoki; +Cc: Heiko Stuebner, linux-rockchip, jonas
On Tue, 1 Oct 2024 23:50:46 +0000, FUKAUMI Naoki wrote:
> for pcie2x1l2, only pcie20x1_2_perstn_m0 is required, and its function
> needs to be GPIO to avoid freeze at "pci enum" without PCIe device on
> u-boot.
>
> change pinctrl definitions for pcie2x1l2. no functional change is
> intended on Linux kernel.
>
> [...]
Applied, thanks!
[1/1] arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A
commit: a86fca38c8129aac1cc7cec886e1eb306816b7d5
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v3] arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A
2024-10-01 23:50 [PATCH v3] arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A FUKAUMI Naoki
2024-10-02 10:30 ` Heiko Stuebner
@ 2024-10-02 10:50 ` Jonas Karlman
2024-10-02 11:21 ` Heiko Stübner
1 sibling, 1 reply; 7+ messages in thread
From: Jonas Karlman @ 2024-10-02 10:50 UTC (permalink / raw)
To: FUKAUMI Naoki, heiko; +Cc: linux-rockchip
Hi,
On 2024-10-02 01:50, FUKAUMI Naoki wrote:
> for pcie2x1l2, only pcie20x1_2_perstn_m0 is required, and its function
> needs to be GPIO to avoid freeze at "pci enum" without PCIe device on
> u-boot.
>
> change pinctrl definitions for pcie2x1l2. no functional change is
> intended on Linux kernel.
After the split and addition of pcie2_reset I think this patch is no
longer needed? The issue this patch tried to fix was already
fixed/changed in "arm64: dts: rockchip: Split up RK3588's PCIe pinctrls".
Looks like this now just rename pcie2_reset to pcie20x1_2_perstn_m0?
Regards,
Jonas
>
> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
> ---
> Changed in v3:
> - rebase on next/master
> Changed in v2:
> - reword commit message
> ---
> arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
> index 87fce8d9a964..841ac9a30628 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
> @@ -310,7 +310,7 @@ rgmii_phy1: ethernet-phy@1 {
> };
>
> &pcie2x1l2 {
> - pinctrl-0 = <&pcie2_reset>, <&pcie20x1m0_clkreqn>, <&pcie20x1m0_waken>;
> + pinctrl-0 = <&pcie20x1_2_perstn_m0>;
> pinctrl-names = "default";
> reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
> vpcie3v3-supply = <&vcc3v3_wf>;
> @@ -325,12 +325,12 @@ io_led: io-led {
> };
>
> pcie {
> - pow_en: pow-en {
> - rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
> + pcie20x1_2_perstn_m0: pcie20x1-2-perstn-m0 {
> + rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
> };
>
> - pcie2_reset: pcie2-reset {
> - rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
> + pow_en: pow-en {
> + rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
> };
> };
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v3] arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A
2024-10-02 10:50 ` Jonas Karlman
@ 2024-10-02 11:21 ` Heiko Stübner
2024-10-02 11:41 ` FUKAUMI Naoki
2024-10-02 11:42 ` Jonas Karlman
0 siblings, 2 replies; 7+ messages in thread
From: Heiko Stübner @ 2024-10-02 11:21 UTC (permalink / raw)
To: FUKAUMI Naoki, Jonas Karlman; +Cc: linux-rockchip
Am Mittwoch, 2. Oktober 2024, 12:50:29 CEST schrieb Jonas Karlman:
> Hi,
>
> On 2024-10-02 01:50, FUKAUMI Naoki wrote:
> > for pcie2x1l2, only pcie20x1_2_perstn_m0 is required, and its function
> > needs to be GPIO to avoid freeze at "pci enum" without PCIe device on
> > u-boot.
> >
> > change pinctrl definitions for pcie2x1l2. no functional change is
> > intended on Linux kernel.
>
> After the split and addition of pcie2_reset I think this patch is no
> longer needed? The issue this patch tried to fix was already
> fixed/changed in "arm64: dts: rockchip: Split up RK3588's PCIe pinctrls".
>
> Looks like this now just rename pcie2_reset to pcie20x1_2_perstn_m0?
and removes the other pinctrl states clkreqn and waken .
In a previous version they mentioned that this somehow affects u-boot.
But you're right, that renaming of the pinctrl reset entry should
definitly not be in there.
> > Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
> > ---
> > Changed in v3:
> > - rebase on next/master
> > Changed in v2:
> > - reword commit message
> > ---
> > arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
> > index 87fce8d9a964..841ac9a30628 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
> > +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
> > @@ -310,7 +310,7 @@ rgmii_phy1: ethernet-phy@1 {
> > };
> >
> > &pcie2x1l2 {
> > - pinctrl-0 = <&pcie2_reset>, <&pcie20x1m0_clkreqn>, <&pcie20x1m0_waken>;
> > + pinctrl-0 = <&pcie20x1_2_perstn_m0>;
> > pinctrl-names = "default";
> > reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
> > vpcie3v3-supply = <&vcc3v3_wf>;
> > @@ -325,12 +325,12 @@ io_led: io-led {
> > };
> >
> > pcie {
> > - pow_en: pow-en {
> > - rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
> > + pcie20x1_2_perstn_m0: pcie20x1-2-perstn-m0 {
> > + rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
> > };
> >
> > - pcie2_reset: pcie2-reset {
> > - rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
> > + pow_en: pow-en {
> > + rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
> > };
> > };
> >
>
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v3] arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A
2024-10-02 11:21 ` Heiko Stübner
@ 2024-10-02 11:41 ` FUKAUMI Naoki
2024-10-02 11:42 ` Jonas Karlman
1 sibling, 0 replies; 7+ messages in thread
From: FUKAUMI Naoki @ 2024-10-02 11:41 UTC (permalink / raw)
To: Heiko Stübner, Jonas Karlman; +Cc: linux-rockchip
hi,
On 10/2/24 20:21, Heiko Stübner wrote:
> Am Mittwoch, 2. Oktober 2024, 12:50:29 CEST schrieb Jonas Karlman:
>> Hi,
>>
>> On 2024-10-02 01:50, FUKAUMI Naoki wrote:
>>> for pcie2x1l2, only pcie20x1_2_perstn_m0 is required, and its function
>>> needs to be GPIO to avoid freeze at "pci enum" without PCIe device on
>>> u-boot.
>>>
>>> change pinctrl definitions for pcie2x1l2. no functional change is
>>> intended on Linux kernel.
>>
>> After the split and addition of pcie2_reset I think this patch is no
>> longer needed? The issue this patch tried to fix was already
>> fixed/changed in "arm64: dts: rockchip: Split up RK3588's PCIe pinctrls".
>>
>> Looks like this now just rename pcie2_reset to pcie20x1_2_perstn_m0?
>
> and removes the other pinctrl states clkreqn and waken .
>
> In a previous version they mentioned that this somehow affects u-boot.
>
> But you're right, that renaming of the pinctrl reset entry should
> definitly not be in there.
I wonder where "pcie2_reset" comes from.
in schematic, only "pcie20x1_2_perstn_m0" is used.
Best regards,
--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.
>>> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
>>> ---
>>> Changed in v3:
>>> - rebase on next/master
>>> Changed in v2:
>>> - reword commit message
>>> ---
>>> arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 10 +++++-----
>>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
>>> index 87fce8d9a964..841ac9a30628 100644
>>> --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
>>> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
>>> @@ -310,7 +310,7 @@ rgmii_phy1: ethernet-phy@1 {
>>> };
>>>
>>> &pcie2x1l2 {
>>> - pinctrl-0 = <&pcie2_reset>, <&pcie20x1m0_clkreqn>, <&pcie20x1m0_waken>;
>>> + pinctrl-0 = <&pcie20x1_2_perstn_m0>;
>>> pinctrl-names = "default";
>>> reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
>>> vpcie3v3-supply = <&vcc3v3_wf>;
>>> @@ -325,12 +325,12 @@ io_led: io-led {
>>> };
>>>
>>> pcie {
>>> - pow_en: pow-en {
>>> - rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
>>> + pcie20x1_2_perstn_m0: pcie20x1-2-perstn-m0 {
>>> + rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
>>> };
>>>
>>> - pcie2_reset: pcie2-reset {
>>> - rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
>>> + pow_en: pow-en {
>>> + rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
>>> };
>>> };
>>>
>>
>>
>
>
>
>
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v3] arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A
2024-10-02 11:21 ` Heiko Stübner
2024-10-02 11:41 ` FUKAUMI Naoki
@ 2024-10-02 11:42 ` Jonas Karlman
2024-10-02 13:25 ` Heiko Stübner
1 sibling, 1 reply; 7+ messages in thread
From: Jonas Karlman @ 2024-10-02 11:42 UTC (permalink / raw)
To: Heiko Stübner, FUKAUMI Naoki; +Cc: linux-rockchip
On 2024-10-02 13:21, Heiko Stübner wrote:
> Am Mittwoch, 2. Oktober 2024, 12:50:29 CEST schrieb Jonas Karlman:
>> Hi,
>>
>> On 2024-10-02 01:50, FUKAUMI Naoki wrote:
>>> for pcie2x1l2, only pcie20x1_2_perstn_m0 is required, and its function
>>> needs to be GPIO to avoid freeze at "pci enum" without PCIe device on
>>> u-boot.
>>>
>>> change pinctrl definitions for pcie2x1l2. no functional change is
>>> intended on Linux kernel.
>>
>> After the split and addition of pcie2_reset I think this patch is no
>> longer needed? The issue this patch tried to fix was already
>> fixed/changed in "arm64: dts: rockchip: Split up RK3588's PCIe pinctrls".
>>
>> Looks like this now just rename pcie2_reset to pcie20x1_2_perstn_m0?
>
> and removes the other pinctrl states clkreqn and waken .
This is not something that I think should have been done in the first
place, the pins/signals exists in hw and schematics, however software
is not using these signals.
>
> In a previous version they mentioned that this somehow affects u-boot.
The issue with U-Boot is that for pcie the pin used for reset-gpios must
use gpio func pinconf, or pci enumerating in U-Boot will freeze the
board.
"arm64: dts: rockchip: Split up RK3588's PCIe pinctrls" already changed
to use the gpio func for the perstn pin, so the U-Boot issue should
already have been resolved with that patch.
For Linux the pins gpio func is implicitly configured when the pcie
driver request the reset-gpios pin. In U-Boot there exists some pinctrl
overrides to solve freeze issues, those should also be sent upstream ;-)
Regards,
Jonas
>
> But you're right, that renaming of the pinctrl reset entry should
> definitly not be in there.
>
>
>>> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
>>> ---
>>> Changed in v3:
>>> - rebase on next/master
>>> Changed in v2:
>>> - reword commit message
>>> ---
>>> arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 10 +++++-----
>>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
>>> index 87fce8d9a964..841ac9a30628 100644
>>> --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
>>> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
>>> @@ -310,7 +310,7 @@ rgmii_phy1: ethernet-phy@1 {
>>> };
>>>
>>> &pcie2x1l2 {
>>> - pinctrl-0 = <&pcie2_reset>, <&pcie20x1m0_clkreqn>, <&pcie20x1m0_waken>;
>>> + pinctrl-0 = <&pcie20x1_2_perstn_m0>;
>>> pinctrl-names = "default";
>>> reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
>>> vpcie3v3-supply = <&vcc3v3_wf>;
>>> @@ -325,12 +325,12 @@ io_led: io-led {
>>> };
>>>
>>> pcie {
>>> - pow_en: pow-en {
>>> - rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
>>> + pcie20x1_2_perstn_m0: pcie20x1-2-perstn-m0 {
>>> + rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
>>> };
>>>
>>> - pcie2_reset: pcie2-reset {
>>> - rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
>>> + pow_en: pow-en {
>>> + rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
>>> };
>>> };
>>>
>>
>>
>
>
>
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v3] arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A
2024-10-02 11:42 ` Jonas Karlman
@ 2024-10-02 13:25 ` Heiko Stübner
0 siblings, 0 replies; 7+ messages in thread
From: Heiko Stübner @ 2024-10-02 13:25 UTC (permalink / raw)
To: FUKAUMI Naoki, Jonas Karlman; +Cc: linux-rockchip
Am Mittwoch, 2. Oktober 2024, 13:42:05 CEST schrieb Jonas Karlman:
> On 2024-10-02 13:21, Heiko Stübner wrote:
> > Am Mittwoch, 2. Oktober 2024, 12:50:29 CEST schrieb Jonas Karlman:
> >> Hi,
> >>
> >> On 2024-10-02 01:50, FUKAUMI Naoki wrote:
> >>> for pcie2x1l2, only pcie20x1_2_perstn_m0 is required, and its function
> >>> needs to be GPIO to avoid freeze at "pci enum" without PCIe device on
> >>> u-boot.
> >>>
> >>> change pinctrl definitions for pcie2x1l2. no functional change is
> >>> intended on Linux kernel.
> >>
> >> After the split and addition of pcie2_reset I think this patch is no
> >> longer needed? The issue this patch tried to fix was already
> >> fixed/changed in "arm64: dts: rockchip: Split up RK3588's PCIe pinctrls".
> >>
> >> Looks like this now just rename pcie2_reset to pcie20x1_2_perstn_m0?
> >
> > and removes the other pinctrl states clkreqn and waken .
>
> This is not something that I think should have been done in the first
> place, the pins/signals exists in hw and schematics, however software
> is not using these signals.
>
> >
> > In a previous version they mentioned that this somehow affects u-boot.
>
> The issue with U-Boot is that for pcie the pin used for reset-gpios must
> use gpio func pinconf, or pci enumerating in U-Boot will freeze the
> board.
>
> "arm64: dts: rockchip: Split up RK3588's PCIe pinctrls" already changed
> to use the gpio func for the perstn pin, so the U-Boot issue should
> already have been resolved with that patch.
>
> For Linux the pins gpio func is implicitly configured when the pcie
> driver request the reset-gpios pin. In U-Boot there exists some pinctrl
> overrides to solve freeze issues, those should also be sent upstream ;-)
ok, so I'll just drop this patch for now.
If some other use comes up, please resubmit.
Thanks
Heiko
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-10-02 13:27 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-01 23:50 [PATCH v3] arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A FUKAUMI Naoki
2024-10-02 10:30 ` Heiko Stuebner
2024-10-02 10:50 ` Jonas Karlman
2024-10-02 11:21 ` Heiko Stübner
2024-10-02 11:41 ` FUKAUMI Naoki
2024-10-02 11:42 ` Jonas Karlman
2024-10-02 13:25 ` Heiko Stübner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox