arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A
Subsystems (2)
PATCH v3 1/1 arm64: dts: rockchip: change pinctrl for pcie2x1l2 for Radxa ROCK 5A
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.
---
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(-)
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +5 -5
@@ -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>; }; };
Signature · 7 lines
2.43.0 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Quoted 8 lines · FUKAUMI Naoki
for pcie2x1l2, only
pcie20x1_2_perstn_m0is 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,
Signature · 6 lines
Heiko Stuebner <[email protected]> _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Hi,
Quoted 6 lines · FUKAUMI Naoki
for pcie2x1l2, only
pcie20x1_2_perstn_m0is 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
Quoted 31 lines
Signed-off-by FUKAUMI Naoki <[email protected]>---
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(-)arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +2
-3@@ -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 {
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts io_led: io-led { · line 336
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +3
-2+ 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
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stübner
maintainerAm Mittwoch, 2. Oktober 2024, 12:50:29 CEST schrieb Jonas Karlman:
Quoted 7 lines
Hi,
Quoted 4 lines · FUKAUMI Naoki
for pcie2x1l2, only
pcie20x1_2_perstn_m0is required, and its function needs to be GPIO to avoid freeze at "pci enum" without PCIe device on u-boot.
Quoted 8 lines
Quoted 2 lines
change pinctrl definitions for pcie2x1l2. no functional change is intended on Linux kernel.
After the split and addition of
pcie2_resetI 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_resettopcie20x1_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.
Quoted 33 lines
Quoted 33 lines
Signed-off-by FUKAUMI Naoki <[email protected]>---
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(-)arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +3
-3@@ -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>; };
Quoted 9 lines
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts io_led: io-led { · line 336
Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +2
-2- 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
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
hi,
Quoted 15 lines · Heiko Stübner
Am Mittwoch, 2. Oktober 2024, 12:50:29 CEST schrieb Jonas Karlman:
Quoted 14 lines
Hi,
Quoted 6 lines · FUKAUMI Naoki
for pcie2x1l2, only
pcie20x1_2_perstn_m0is 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_resetI 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".
Quoted 8 lines
Quoted 1 line
Looks like this now just rename
pcie2_resettopcie20x1_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.
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
Signed-off-by FUKAUMI Naoki <[email protected]>---
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(-)arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +3
-3@@ -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>; };
Quoted 14 lines
Quoted 9 lines
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts io_led: io-led { · line 336
Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +2
-2- 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
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Quoted 11 lines · Heiko Stübner
Am Mittwoch, 2. Oktober 2024, 12:50:29 CEST schrieb Jonas Karlman:
Quoted 10 lines
Hi,
Quoted 6 lines · FUKAUMI Naoki
for pcie2x1l2, only
pcie20x1_2_perstn_m0is 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.
Quoted 7 lines
Quoted 5 lines
After the split and addition of
pcie2_resetI 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_resettopcie20x1_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.
Quoted 2 lines
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
Quoted 51 lines
But you're right, that renaming of the pinctrl reset entry should definitly not be in there.
Quoted 42 lines
Quoted 40 lines
Signed-off-by FUKAUMI Naoki <[email protected]>---
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(-)arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +5
-5@@ -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
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stübner
maintainerAm Mittwoch, 2. Oktober 2024, 13:42:05 CEST schrieb Jonas Karlman:
Quoted 31 lines · Heiko Stübner
Quoted 11 lines
Am Mittwoch, 2. Oktober 2024, 12:50:29 CEST schrieb Jonas Karlman:
Quoted 10 lines
Hi,
Quoted 6 lines · FUKAUMI Naoki
for pcie2x1l2, only
pcie20x1_2_perstn_m0is 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.
Quoted 7 lines
Quoted 5 lines
After the split and addition of
pcie2_resetI 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_resettopcie20x1_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.
Quoted 2 lines
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.
Quoted 7 lines
"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
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip