| Message ID | 20230924203740.65744-1-tszucs@protonmail.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: rockchip: Add sdio node to rock-5b | expand |
Hi, On Sun, Sep 24, 2023 at 08:37:45PM +0000, Tamás Szűcs wrote: > Enable SDIO on Radxa ROCK 5 Model B M.2 Key E. Add sdio node and alias as mmc2. > Add regulator for the 3.3 V rail bringing it up during boot. Make sure EKEY_EN > is muxed as GPIO. > > Signed-off-by: Tamás Szűcs <tszucs@protonmail.ch> > --- Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> -- Sebastian > .../boot/dts/rockchip/rk3588-rock-5b.dts | 43 +++++++++++++++++++ > 1 file changed, 43 insertions(+) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts > index 8ab60968f275..d1c3f9e10b3d 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; > + mmc2 = &sdio; > serial2 = &uart2; > }; > > @@ -76,6 +77,21 @@ vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { > regulator-max-microvolt = <1100000>; > vin-supply = <&vcc5v0_sys>; > }; > + > + vcc3v3_wf: vcc3v3-wf-regulator { > + compatible = "regulator-fixed"; > + regulator-name = "vcc3v3_wf"; > + regulator-always-on; > + regulator-boot-on; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + enable-active-high; > + gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&vcc3v3_wf_en>; > + startup-delay-us = <50000>; > + vin-supply = <&vcc5v0_sys>; > + }; > }; > > &cpu_b0 { > @@ -222,6 +238,12 @@ vcc5v0_host_en: vcc5v0-host-en { > rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; > }; > }; > + > + m2e { > + vcc3v3_wf_en: vcc3v3-wf-en { > + rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > }; > > &pwm1 { > @@ -258,6 +280,27 @@ &sdmmc { > status = "okay"; > }; > > +&sdio { > + max-frequency = <200000000>; > + no-sd; > + no-mmc; > + non-removable; > + bus-width = <4>; > + cap-sdio-irq; > + disable-wp; > + keep-power-in-suspend; > + wakeup-source; > + sd-uhs-sdr12; > + sd-uhs-sdr25; > + sd-uhs-sdr50; > + sd-uhs-sdr104; > + vmmc-supply = <&vcc3v3_wf>; > + vqmmc-supply = <&vcc_1v8_s3>; > + pinctrl-names = "default"; > + pinctrl-0 = <&sdiom0_pins>; > + status = "okay"; > +}; > + > &spi2 { > status = "okay"; > assigned-clocks = <&cru CLK_SPI2>; > -- > 2.40.1 > >
On Sun, 24 Sep 2023 20:37:45 +0000, Tamás Szűcs wrote: > Enable SDIO on Radxa ROCK 5 Model B M.2 Key E. Add sdio node and alias as mmc2. > Add regulator for the 3.3 V rail bringing it up during boot. Make sure EKEY_EN > is muxed as GPIO. > > Applied, thanks! [1/1] arm64: dts: rockchip: Add sdio node to rock-5b commit: 1c9a53ff7ece056eb995332f0d9523ca43fdcb5a Best regards,
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 8ab60968f275..d1c3f9e10b3d 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; + mmc2 = &sdio; serial2 = &uart2; }; @@ -76,6 +77,21 @@ vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { regulator-max-microvolt = <1100000>; vin-supply = <&vcc5v0_sys>; }; + + vcc3v3_wf: vcc3v3-wf-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_wf"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc3v3_wf_en>; + startup-delay-us = <50000>; + vin-supply = <&vcc5v0_sys>; + }; }; &cpu_b0 { @@ -222,6 +238,12 @@ vcc5v0_host_en: vcc5v0-host-en { rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; + + m2e { + vcc3v3_wf_en: vcc3v3-wf-en { + rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; &pwm1 { @@ -258,6 +280,27 @@ &sdmmc { status = "okay"; }; +&sdio { + max-frequency = <200000000>; + no-sd; + no-mmc; + non-removable; + bus-width = <4>; + cap-sdio-irq; + disable-wp; + keep-power-in-suspend; + wakeup-source; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + vmmc-supply = <&vcc3v3_wf>; + vqmmc-supply = <&vcc_1v8_s3>; + pinctrl-names = "default"; + pinctrl-0 = <&sdiom0_pins>; + status = "okay"; +}; + &spi2 { status = "okay"; assigned-clocks = <&cru CLK_SPI2>;
Enable SDIO on Radxa ROCK 5 Model B M.2 Key E. Add sdio node and alias as mmc2. Add regulator for the 3.3 V rail bringing it up during boot. Make sure EKEY_EN is muxed as GPIO. Signed-off-by: Tamás Szűcs <tszucs@protonmail.ch> --- .../boot/dts/rockchip/rk3588-rock-5b.dts | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+)