diff mbox series

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

Message ID 20240903080938.913-1-naoki@radxa.com (mailing list archive)
State New
Headers show
Series arm64: dts: rockchip: remove cd-gpios property in sdmmc0 for Radxa E25 | expand

Commit Message

FUKAUMI Naoki Sept. 3, 2024, 8:09 a.m. UTC
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")
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Chukun Pan Sept. 13, 2024, 7:20 a.m. UTC | #1
> -	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
FUKAUMI Naoki Sept. 15, 2024, 11:57 p.m. UTC | #2
hi

On 9/13/24 16:20, Chukun Pan wrote:
>> -	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/4985f0c5-3772-4e8e-82e9-35c8ac8ae20c@rock-chips.com/

Best regards,

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

> &pcie3x1 {
> 	num-lanes = <1>;
> 	pinctrl-names = "default";
> 	pinctrl-0 = <&pcie30x1m0_pins>;
> 
> Thanks,
> Chukun
>
Chukun Pan Sept. 18, 2024, 2 a.m. UTC | #3
> 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
FUKAUMI Naoki Sept. 18, 2024, 5:42 a.m. UTC | #4
Hi,

On 9/18/24 11:00, Chukun Pan wrote:
>> 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.

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

sure.

Best regards,

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

> Thanks,
> Chukun
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
index 84a0789fad96..875484d11858 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
@@ -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>;