Skip to contentSkip to conversation

arm64: dts: rockchip: remove cd-gpios property in sdmmc0 for Radxa E25

PATCH In review FUKAUMI Naoki 2 participants 5 messages Sep 3, 2024 – Sep 18, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

Fixes 2bf2f4d9f673 ("arm64: dts: rockchip: Add Radxa CM3I E25")
---
 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
index 84a0789fad96..875484d11858 100644
@@ -193,11 +193,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
#1 lore raw

arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts &sata1 { · line 198

Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +1 -3
-	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>;

The sdmmc0_det pin conflicts with pcie30x1_clkreqnm0. The pcie30x1m0_pins contains pcie30x1_clkreqnm0. That's why I wrote it this way.

&pcie3x1 {
	num-lanes = <1>;
	pinctrl-names = "default";
	pinctrl-0 = <&pcie30x1m0_pins>;

Thanks,
Chukun

Signature · 7 lines
2.25.1


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#2 lore raw

hi

Quoted 10 lines · Chukun Pan

arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts &sata1 { · line 198

Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +1 -3
-	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>;

The sdmmc0_det pin conflicts with pcie30x1_clkreqnm0. The pcie30x1m0_pins contains pcie30x1_clkreqnm0. That's why I wrote it this way.

pcie30x1_clkreqnm0 is unused[1], so it can be used for sdmmc0.

[1] https://lore.kernel.org/linux-rockchip/[email protected]/

Best regards,

FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.

Quoted 8 lines
&pcie3x1 {
	num-lanes = <1>;
	pinctrl-names = "default";
	pinctrl-0 = <&pcie30x1m0_pins>;

Thanks,
Chukun

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

#3 lore raw
Quoted 1 line

pcie30x1_clkreqnm0 is unused[1], so it can be used for sdmmc0.

Please update the pinctrl of pcie3x1 node first to avoid conflicts. Btw I don't think this commit needs a fixes tag.

Thanks,
Chukun

Signature · 7 lines
2.25.1


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#4 lore raw

Hi,

Quoted 3 lines · Chukun Pan
Quoted 1 line

pcie30x1_clkreqnm0 is unused[1], so it can be used for sdmmc0.

Please update the pinctrl of pcie3x1 node first to avoid conflicts.

I see. I will add it as first patch of this series.

Quoted 1 line

Btw I don't think this commit needs a fixes tag.

sure.

Best regards,

--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.

Quoted 3 lines

Thanks,
Chukun

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip