[PATCH v2] Revert "arm64: dts: rockchip: remove redundant cd-gpios from rk3588 sdmmc nodes"

[FUKAUMI Naoki]

hi

On 9/12/24 19:26, Kever Yang wrote:
> Hi Naoki, Heiko,
> 
> On 2024/6/13 08:17, FUKAUMI Naoki wrote:
>> This reverts commit d859ad305ed19d9a77d8c8ecd22459b73da36ba6.
>>
>> Inserting and removing microSD card is not detected since above commit.
>> Reverting it fixes this problem.
>>
>> This is probably the same thing as 5 years ago on rk3399
>> https://lore.kernel.org/all/0608599d485117a9d99f5fb274fbb1b55f6ba9f7.1547466003.git.robin.murphy@arm.com/
> 
> Sorry for didn't notice this patch.

thank you for your information!

> The SD card hotplug can not work because the controller is getting into 
> runtime low power mode,
> 
> so we need the fix in mmc driver to make the CD function work as below:
> 
> https://lkml.org/lkml/2024/9/12/323

Heiko,

just FYI, this doesn't fix a problem below

https://lore.kernel.org/linux-rockchip/20240903085551.568-1-naoki@radxa.com/t/#u

Best regards,

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

> Thanks,
> - Kever
>>
>> So we'll go back to cd-gpios for now.
>>
>> this patch is tested on Radxa ROCK 5A and 5B.
>>
>> Fixes: d859ad305ed1 ("arm64: dts: rockchip: remove redundant cd-gpios 
>> from rk3588 sdmmc nodes")
>> Signed-off-by: FUKAUMI Naoki <naoki at radxa.com>
>>
>> Changes in v2:
>> - reword commit message
>> - remove empty line
>> ---
>>   arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 1 +
>>   arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts     | 1 +
>>   arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts         | 1 +
>>   arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts        | 1 +
>>   4 files changed, 4 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts 
>> b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
>> index 1a604429fb26..e74871491ef5 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
>> @@ -444,6 +444,7 @@ &sdhci {
>>   &sdmmc {
>>       bus-width = <4>;
>>       cap-sd-highspeed;
>> +    cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
>>       disable-wp;
>>       max-frequency = <150000000>;
>>       no-sdio;
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts 
>> b/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
>> index b4f22d95ac0e..e80caa36f8e4 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
>> @@ -435,6 +435,7 @@ &sdhci {
>>   &sdmmc {
>>       bus-width = <4>;
>>       cap-sd-highspeed;
>> +    cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
>>       disable-wp;
>>       max-frequency = <150000000>;
>>       no-sdio;
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts 
>> b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
>> index 4e2bf4eaef2b..df845929b084 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
>> @@ -390,6 +390,7 @@ &sdmmc {
>>       bus-width = <4>;
>>       cap-mmc-highspeed;
>>       cap-sd-highspeed;
>> +    cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
>>       disable-wp;
>>       sd-uhs-sdr104;
>>       vmmc-supply = <&vcc_3v3_s3>;
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts 
>> b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
>> index 8e2a07612d17..b070955627be 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
>> @@ -366,6 +366,7 @@ &sdmmc {
>>       bus-width = <4>;
>>       cap-mmc-highspeed;
>>       cap-sd-highspeed;
>> +    cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
>>       disable-wp;
>>       max-frequency = <150000000>;
>>       no-sdio;
>