Skip to contentSkip to conversation

Revert "arm64: dts: rockchip: remove redundant cd-gpios from rk3588 sdmmc nodes"

PATCH Superseded FUKAUMI Naoki 3 participants 7 messages Jun 11, 2024 – Sep 12, 2024

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

PATCH 1/1 Revert "arm64: dts: rockchip: remove redundant cd-gpios from rk3588 sdmmc nodes"

This reverts commit d859ad305ed19d9a77d8c8ecd22459b73da36ba6.

inserting and removing microSD card is not detected since this commit. tested on rock-5a and rock-5b.

Fixes d859ad305ed1 ("arm64: dts: rockchip: remove redundant cd-gpios from rk3588 sdmmc nodes")
---
 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(+)
arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +1 -0
index 1a604429fb26..e74871491ef5 100644
@@ -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;
arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts +1 -0
index b4f22d95ac0e..e80caa36f8e4 100644
@@ -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;
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +1 -0
index 4e2bf4eaef2b..df845929b084 100644
@@ -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>;
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +1 -0
index 8e2a07612d17..b070955627be 100644
@@ -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;
Signature · 7 lines
2.43.0


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

Am Dienstag, 11. Juni 2024, 14:06:44 CEST schrieb FUKAUMI Naoki:

Quoted 8 lines

This reverts commit d859ad305ed19d9a77d8c8ecd22459b73da36ba6.

inserting and removing microSD card is not detected since this commit. tested on rock-5a and rock-5b.

Fixes d859ad305ed1 ("arm64: dts: rockchip: remove redundant cd-gpios from rk3588 sdmmc nodes")

This is probably the same thing as 5 years ago on rk3399
https://lore.kernel.org/all/0608599d485117a9d99f5fb274fbb1b55f6ba9f7.1547466003.git.robin.murphy@arm.com/

So we'll go back to cd-gpios for now.

#2 lore raw

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

In reply to FUKAUMI Naoki

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/

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")

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(+)
arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +1 -0
index 1a604429fb26..e74871491ef5 100644
@@ -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;
arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts +1 -0
index b4f22d95ac0e..e80caa36f8e4 100644
@@ -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;
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +1 -0
index 4e2bf4eaef2b..df845929b084 100644
@@ -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>;
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +1 -0
index 8e2a07612d17..b070955627be 100644
@@ -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;
Signature · 7 lines
2.43.0


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

Am Donnerstag, 13. Juni 2024, 02:17:57 CEST schrieb FUKAUMI Naoki:

Quoted 8 lines

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/

Quoted 6 lines

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")

applied as fix for 6.10

sidenote: please don't send v2 patches as replies to v1 but instead start a new mail thread. Tooling like b4 does not cope that well with multiple patch versions in the same thread.

Thanks
Heiko

#4 lore raw
In reply to FUKAUMI Naoki

Hi Naoki, Heiko,

Quoted 7 lines · FUKAUMI Naoki

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.

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

Thanks,
- Kever

Quoted 59 lines

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")

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(+)
arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +1 -0
index 1a604429fb26..e74871491ef5 100644
@@ -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;
arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts +1 -0
index b4f22d95ac0e..e80caa36f8e4 100644
@@ -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;
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +1 -0
index 4e2bf4eaef2b..df845929b084 100644
@@ -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>;
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +0 -0
index 8e2a07612d17..b070955627be 100644

arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts &sdmmc { · line 372

Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +1 -0
@@ -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;

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

#5 lore raw

hi

Quoted 5 lines · Kever Yang

Hi Naoki, Heiko,

Quoted 2 lines · FUKAUMI Naoki

This reverts commit d859ad305ed19d9a77d8c8ecd22459b73da36ba6.

Quoted 7 lines
Quoted 5 lines

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!

Quoted 5 lines

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/[email protected]/t/#u

Best regards,

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

Quoted 60 lines

Thanks,
- Kever

Quoted 58 lines

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")

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(+)
arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +1 -0
index 1a604429fb26..e74871491ef5 100644
@@ -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;
arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts +1 -0
index b4f22d95ac0e..e80caa36f8e4 100644
@@ -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;
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +1 -0
index 4e2bf4eaef2b..df845929b084 100644
@@ -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>;
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +0 -0
index 8e2a07612d17..b070955627be 100644
Quoted 9 lines

arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts &sdmmc { · line 372

Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +1 -0
@@ -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;

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

#6 lore raw
In reply to Kever Yang

hi

Quoted 11 lines · Kever Yang

Hi Naoki, Heiko,

Quoted 7 lines · FUKAUMI Naoki

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/

Quoted 7 lines

Sorry for didn't notice this patch.

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

I tested this patch on Radxa E54C and ROCK 5A/5B/5C. CD works fine without cd-gpios. revert patch can be reverted :)

thank you very much!

Best regards,

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

Quoted 60 lines

Thanks,
- Kever

Quoted 58 lines

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")

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(+)
arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +1 -0
index 1a604429fb26..e74871491ef5 100644
@@ -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;
arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts +1 -0
index b4f22d95ac0e..e80caa36f8e4 100644
@@ -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;
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +1 -0
index 4e2bf4eaef2b..df845929b084 100644
@@ -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>;
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +0 -0
index 8e2a07612d17..b070955627be 100644
Quoted 9 lines

arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts &sdmmc { · line 372

Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +1 -0
@@ -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;

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