Skip to contentSkip to conversation

arm64: dts: rockchip: rock-5a, rock-5b: fix/update sdmmc properties

PATCH Superseded FUKAUMI Naoki 3 participants 4 messages Jul 22, 2023 – Jul 24, 2023

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

PATCH 1/1 arm64: dts: rockchip: rock-5a, rock-5b: fix/update sdmmc properties

add alias for sdmmc as mmc1.
make card detect work.
define pinctrl.

Fixes ea3e66e7ad0d ("arm64: dts: rockchip: add SD card support to rock-5a")
Fixes 2a6d4af5f157 ("arm64: dts: rockchip: Add SD card support to rock-5b")
---
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts  | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 4 ++++
 2 files changed, 8 insertions(+)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +4 -0
index fae91522c6fc..da8f43c9b255 100644
@@ -11,6 +11,7 @@ / {
 
 	aliases {
 		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 		serial2 = &uart2;
 	};
 
@@ -229,7 +230,10 @@ &sdmmc {
 	bus-width = <4>;
 	cap-mmc-highspeed;
 	cap-sd-highspeed;
+	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
 	disable-wp;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_det>;
 	sd-uhs-sdr104;
 	vmmc-supply = <&vcc_3v3_s3>;
 	vqmmc-supply = <&vccio_sd_s0>;
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +4 -0
index a6dff117b459..05628299e331 100644
@@ -13,6 +13,7 @@ / {
 
 	aliases {
 		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 		serial2 = &uart2;
 	};
 
@@ -319,10 +320,13 @@ &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;
 	no-mmc;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_det>;
 	sd-uhs-sdr104;
 	vmmc-supply = <&vcc_3v3_s0>;
 	vqmmc-supply = <&vccio_sd_s0>;
Signature · 7 lines
2.39.2


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

Hi,

Quoted 25 lines · FUKAUMI Naoki

add alias for sdmmc as mmc1.
make card detect work.
define pinctrl.

Fixes ea3e66e7ad0d ("arm64: dts: rockchip: add SD card support to rock-5a")
Fixes 2a6d4af5f157 ("arm64: dts: rockchip: Add SD card support to rock-5b")
---
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts  | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 4 ++++
 2 files changed, 8 insertions(+)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +1 -0
index fae91522c6fc..da8f43c9b255 100644
@@ -11,6 +11,7 @@ / {
 
 	aliases {
 		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 		serial2 = &uart2;
 	};
 

arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts &sdmmc { · line 236

Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +3 -0
@@ -229,7 +230,10 @@ &sdmmc {
 	bus-width = <4>;
 	cap-mmc-highspeed;
 	cap-sd-highspeed;
+	cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
 	disable-wp;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_det>;

pinctrl is identical to the one defined in rk3588s.dtsi and can be dropped.

Quoted 16 lines
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +0 -0
 	sd-uhs-sdr104;
 	vmmc-supply = <&vcc_3v3_s3>;
 	vqmmc-supply = <&vccio_sd_s0>;
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +1 -0
index a6dff117b459..05628299e331 100644
@@ -13,6 +13,7 @@ / {
 
 	aliases {
 		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 		serial2 = &uart2;
 	};
 

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

Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +3 -0
@@ -319,10 +320,13 @@ &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;
 	no-mmc;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_det>;

same here.

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

Quoted 3 lines
arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +0 -0
 	sd-uhs-sdr104;
 	vmmc-supply = <&vcc_3v3_s0>;
 	vqmmc-supply = <&vccio_sd_s0>;

-- Sebastian

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

#2 lore raw

PATCH v2 1/1 arm64: dts: rockchip: rock-5a, rock-5b: fix/update sdmmc properties

add alias for sdmmc as mmc1.
make card detect work.

Fixes ea3e66e7ad0d ("arm64: dts: rockchip: add SD card support to rock-5a")
Fixes 2a6d4af5f157 ("arm64: dts: rockchip: Add SD card support to rock-5b")

---
Changes in v2:
* drop pinctrl lines (Sebastian Reichel)

 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts  | 2 ++
 arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 2 ++
 2 files changed, 4 insertions(+)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +2 -0
index d029a77c9a1e..6b15a650490d 100644
@@ -12,6 +12,7 @@ / {
 
 	aliases {
 		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 		serial2 = &uart2;
 	};
 
@@ -349,6 +350,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 +2 -0
index c1b42e1f4477..8e1162aadc87 100644
@@ -13,6 +13,7 @@ / {
 
 	aliases {
 		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 		serial2 = &uart2;
 	};
 
@@ -359,6 +360,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.39.2


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

add alias for sdmmc as mmc1.
make card detect work.

Applied, thanks!

[1/1] arm64: dts: rockchip: rock-5a, rock-5b: fix/update sdmmc properties

      commit: c75b725ea6dd518beeebd693e4bfc02eb15e3b75

Best regards,

Signature · 6 lines
Heiko Stuebner <[email protected]>

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