* [PATCH] arm64: dts: rockchip: rock-5a, rock-5b: fix/update sdmmc properties
@ 2023-07-22 6:51 FUKAUMI Naoki
2023-07-22 11:19 ` Sebastian Reichel
0 siblings, 1 reply; 4+ messages in thread
From: FUKAUMI Naoki @ 2023-07-22 6:51 UTC (permalink / raw)
To: heiko; +Cc: sebastian.reichel, lucas.tanure, linux-rockchip, 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")
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
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(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index fae91522c6fc..da8f43c9b255 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -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>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
index a6dff117b459..05628299e331 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -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>;
--
2.39.2
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] arm64: dts: rockchip: rock-5a, rock-5b: fix/update sdmmc properties
2023-07-22 6:51 [PATCH] arm64: dts: rockchip: rock-5a, rock-5b: fix/update sdmmc properties FUKAUMI Naoki
@ 2023-07-22 11:19 ` Sebastian Reichel
2023-07-22 12:11 ` [PATCH v2] " FUKAUMI Naoki
0 siblings, 1 reply; 4+ messages in thread
From: Sebastian Reichel @ 2023-07-22 11:19 UTC (permalink / raw)
To: FUKAUMI Naoki; +Cc: heiko, lucas.tanure, linux-rockchip
[-- Attachment #1.1: Type: text/plain, Size: 2214 bytes --]
Hi,
On Sat, Jul 22, 2023 at 03:51:29PM +0900, FUKAUMI Naoki wrote:
> 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")
> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
> ---
> 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(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> index fae91522c6fc..da8f43c9b255 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
> @@ -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>;
pinctrl is identical to the one defined in rk3588s.dtsi and can be
dropped.
> sd-uhs-sdr104;
> vmmc-supply = <&vcc_3v3_s3>;
> vqmmc-supply = <&vccio_sd_s0>;
> diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
> index a6dff117b459..05628299e331 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
> @@ -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>;
same here.
> sd-uhs-sdr104;
> vmmc-supply = <&vcc_3v3_s0>;
> vqmmc-supply = <&vccio_sd_s0>;
-- Sebastian
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 170 bytes --]
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] arm64: dts: rockchip: rock-5a, rock-5b: fix/update sdmmc properties
2023-07-22 11:19 ` Sebastian Reichel
@ 2023-07-22 12:11 ` FUKAUMI Naoki
2023-07-24 19:12 ` Heiko Stuebner
0 siblings, 1 reply; 4+ messages in thread
From: FUKAUMI Naoki @ 2023-07-22 12:11 UTC (permalink / raw)
To: sebastian.reichel, heiko; +Cc: linux-rockchip, lucas.tanure, naoki
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")
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
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(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index d029a77c9a1e..6b15a650490d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -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>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
index c1b42e1f4477..8e1162aadc87 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -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;
--
2.39.2
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] arm64: dts: rockchip: rock-5a, rock-5b: fix/update sdmmc properties
2023-07-22 12:11 ` [PATCH v2] " FUKAUMI Naoki
@ 2023-07-24 19:12 ` Heiko Stuebner
0 siblings, 0 replies; 4+ messages in thread
From: Heiko Stuebner @ 2023-07-24 19:12 UTC (permalink / raw)
To: sebastian.reichel, FUKAUMI Naoki
Cc: Heiko Stuebner, lucas.tanure, linux-rockchip
On Sat, 22 Jul 2023 21:11:50 +0900, FUKAUMI Naoki wrote:
> 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,
--
Heiko Stuebner <heiko@sntech.de>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-24 19:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-22 6:51 [PATCH] arm64: dts: rockchip: rock-5a, rock-5b: fix/update sdmmc properties FUKAUMI Naoki
2023-07-22 11:19 ` Sebastian Reichel
2023-07-22 12:11 ` [PATCH v2] " FUKAUMI Naoki
2023-07-24 19:12 ` Heiko Stuebner
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.