linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] arm64: dts: rockchip: Fix SD card init on rk3399-nanopi4
@ 2022-07-13 22:22 Christian Kohlschütter
  2022-07-13 23:41 ` Heiko Stübner
  0 siblings, 1 reply; 29+ messages in thread
From: Christian Kohlschütter @ 2022-07-13 22:22 UTC (permalink / raw)
  To: Heiko Stuebner, linux-arm-kernel, linux-rockchip, linux-kernel

mmc/SD-card initialization may sometimes fail on NanoPi r4s with
"mmc1: problem reading SD Status register" /
"mmc1: error -110 whilst initialising SD card"

Moreover, rebooting would also sometimes hang.

Signed-off-by: Christian Kohlschütter <christian@kohlschutter.com>
---
 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
index 8c0ff6c96e03..91789801ab03 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
@@ -67,10 +67,10 @@ vcc1v8_s3: vcc1v8-s3 {
 	vcc3v0_sd: vcc3v0-sd {
 		compatible = "regulator-fixed";
 		enable-active-high;
-		gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
+		gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&sdmmc0_pwr_h>;
-		regulator-always-on;
+		regulator-boot-on;
 		regulator-min-microvolt = <3000000>;
 		regulator-max-microvolt = <3000000>;
 		regulator-name = "vcc3v0_sd";
@@ -580,7 +580,7 @@ wifi_reg_on_h: wifi-reg_on-h {
 
 	sdmmc {
 		sdmmc0_det_l: sdmmc0-det-l {
-			rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 
 		sdmmc0_pwr_h: sdmmc0-pwr-h {
-- 
2.36.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 29+ messages in thread

end of thread, other threads:[~2022-07-18 21:05 UTC | newest]

Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-13 22:22 [PATCH] arm64: dts: rockchip: Fix SD card init on rk3399-nanopi4 Christian Kohlschütter
2022-07-13 23:41 ` Heiko Stübner
2022-07-14 11:41   ` Robin Murphy
2022-07-14 12:14     ` Christian Kohlschütter
2022-07-14 13:14       ` Markus Reichl
2022-07-14 13:50       ` Robin Murphy
2022-07-14 16:24         ` Christian Kohlschütter
2022-07-14 16:26           ` [PATCH v2] " Christian Kohlschütter
2022-07-14 16:44             ` Christian Loehle
2022-07-14 17:20               ` Christian Kohlschütter
2022-07-15 17:02                 ` Christian Loehle
2022-07-14 17:02             ` Chen-Yu Tsai
2022-07-14 17:35               ` Robin Murphy
2022-07-14 17:57                 ` Christian Kohlschütter
2022-07-14 23:44                 ` Robin Murphy
2022-07-15 17:01                   ` [PATCH v3] " Christian Kohlschütter
2022-07-15 17:12                     ` [PATCH v4] " Christian Kohlschütter
2022-07-15 17:16                       ` Christian Kohlschütter
2022-07-15 18:11                         ` Robin Murphy
2022-07-15 18:57                           ` Christian Kohlschütter
2022-07-15 18:57                           ` Robin Murphy
2022-07-15 19:04                             ` Christian Kohlschütter
2022-07-15 19:38                               ` Robin Murphy
2022-07-15 22:33                                 ` Christian Kohlschütter
2022-07-16  0:24                                   ` Christian Kohlschütter
2022-07-16 19:43                                     ` [PATCH v5] " Christian Kohlschütter
2022-07-18 12:04                                       ` [PATCH v6] " Christian Kohlschütter
2022-07-18 12:05                                         ` Christian Kohlschütter
2022-07-18 21:04                                           ` Christian Kohlschütter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).