| Message ID | 20230722065129.3039-1-naoki@radxa.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: rockchip: rock-5a, rock-5b: fix/update sdmmc properties | expand |
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
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>;
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(+)