arm64: dts: rockchip: change pinctrl-0 name in pcie3x1 for Radxa E25
Subsystems (2)
PATCH v2 1/2 arm64: dts: rockchip: change pinctrl-0 name in pcie3x1 for Radxa E25
to avoid conflict with sdmmc_det, change pci3x1 pinctrl-0 name.
---
Changes in v2:
- new
--- arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +5 -1
@@ -123,7 +123,7 @@ &pcie30phy { &pcie3x1 { num-lanes = <1>; pinctrl-names = "default"; - pinctrl-0 = <&pcie30x1m0_pins>; + pinctrl-0 = <&pcie30x1_reset_h>; reset-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_minipcie>; status = "okay";
@@ -148,6 +148,10 @@ pcie30x1_enable_h: pcie30x1-enable-h { rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; }; + pcie30x1_reset_h: pcie30x1-reset-h { + rockchip,pins = <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + pcie30x2_reset_h: pcie30x2-reset-h { rockchip,pins = <2 RK_PD6 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
PATCH v2 2/2 arm64: dts: rockchip: remove cd-gpios property in sdmmc0 for Radxa E25
adding &sdmmc0_det to pinctrl-0 makes micro SD card detection work without cd-gpios property. remove it.
---
Changes in v2:
- drop Fixes tag
--- arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +1 -3
@@ -197,11 +197,9 @@ &sata1 { &sdmmc0 { bus-width = <4>; cap-sd-highspeed; - cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; - /* Also used in pcie30x1_clkreqnm0 */ disable-wp; pinctrl-names = "default"; - pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd>; + pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>; sd-uhs-sdr104; vmmc-supply = <&vcc3v3_sd>; vqmmc-supply = <&vccio_sd>;
Signature · 7 lines
2.43.0 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Hi,
can anyone review this series?
Best regards,
--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.
Quoted 24 lines · FUKAUMI Naoki
to avoid conflict with
sdmmc_det, change pci3x1 pinctrl-0 name.Signed-off-by FUKAUMI Naoki <[email protected]>---
Changes in v2:
- new--- arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +1
-1@@ -123,7 +123,7 @@ &pcie30phy { &pcie3x1 { num-lanes = <1>; pinctrl-names = "default"; - pinctrl-0 = <&pcie30x1m0_pins>; + pinctrl-0 = <&pcie30x1_reset_h>; reset-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_minipcie>; status = "okay";
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts pcie30x1_enable_h: pcie30x1-enable-h { · line 157
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +4
-0@@ -148,6 +148,10 @@ pcie30x1_enable_h: pcie30x1-enable-h { rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; }; + pcie30x1_reset_h: pcie30x1-reset-h { + rockchip,pins = <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + pcie30x2_reset_h: pcie30x2-reset-h { rockchip,pins = <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>; };
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: (subset) [PATCH v2 1/2] arm64: dts: rockchip: change pinctrl-0 name in pcie3x1 for Radxa E25
In reply to FUKAUMI NaokiQuoted 3 lines · FUKAUMI Naoki
to avoid conflict with
sdmmc_det, change pci3x1 pinctrl-0 name.
Applied, thanks!
[1/2] arm64: dts: rockchip: change pinctrl-0 name in pcie3x1 for Radxa E25
commit: be41da78a9738514d3b6c1acfaf156bbf380ce57
Didn't take patch2. As you know from the sdmmc runtime-pm thread you were in too, that whole thing is still in flux, so using cd-gpios does provide us with the safest and power efficient way for card-detect.
Best regards,
Signature · 6 lines
Heiko Stuebner <[email protected]> _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: (subset) [PATCH v2 1/2] arm64: dts: rockchip: change pinctrl-0 name in pcie3x1 for Radxa E25
Hi,
Quoted 5 lines · Heiko Stuebner
Quoted 3 lines · FUKAUMI Naoki
to avoid conflict with
sdmmc_det, change pci3x1 pinctrl-0 name.
Quoted 8 lines
Applied, thanks!
[1/2] arm64: dts: rockchip: change pinctrl-0 name in pcie3x1 for Radxa E25
commit: be41da78a9738514d3b6c1acfaf156bbf380ce57Didn't take patch2. As you know from the sdmmc runtime-pm thread you were in too, that whole thing is still in flux, so using cd-gpios does provide us with the safest and power efficient way for card-detect.
I think that was only for RK3588 series.
on RK356x boards, CD is working without cd-gpios, but it may have power efficient issue as like as RK3588, right?
Best Regards,
--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.
Quoted 3 lines
Best regards,
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip