diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2-power.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2-power.dtsi index 29842f55074d..2d1fc755cd83 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2-power.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2-power.dtsi @@ -481,6 +481,7 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; regulator-name = "vccio_sd_s0"; + regulator-ramp-delay = <800>; regulator-state-mem { regulator-off-in-suspend; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dtsi index 784a7b4271b5..d889e834477a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dtsi @@ -618,8 +618,6 @@ cap-sd-highspeed; disable-wp; sd-uhs-sdr104; - cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; - card-detect-delay = <800>; vmmc-supply = <&vcc_3v3_sd_s0>; vqmmc-supply = <&vccio_sd_s0>; status = "okay"; @@ -651,6 +649,42 @@ }; &pinctrl { + sdmmc { + /omit-if-no-ref/ + sdmmc_bus4: sdmmc-bus4 { + rockchip,pins = + /* sdmmc_d0 */ + <4 RK_PD0 1 &pcfg_pull_up_drv_level_3>, + /* sdmmc_d1 */ + <4 RK_PD1 1 &pcfg_pull_up_drv_level_3>, + /* sdmmc_d2 */ + <4 RK_PD2 1 &pcfg_pull_up_drv_level_3>, + /* sdmmc_d3 */ + <4 RK_PD3 1 &pcfg_pull_up_drv_level_3>; + }; + + /omit-if-no-ref/ + sdmmc_clk: sdmmc-clk { + rockchip,pins = + /* sdmmc_clk */ + <4 RK_PD5 1 &pcfg_pull_up_drv_level_3>; + }; + + /omit-if-no-ref/ + sdmmc_cmd: sdmmc-cmd { + rockchip,pins = + /* sdmmc_cmd */ + <4 RK_PD4 1 &pcfg_pull_up_drv_level_3>; + }; + + /omit-if-no-ref/ + sdmmc_det: sdmmc-det { + rockchip,pins = + /* sdmmc_det */ + <0 RK_PA4 1 &pcfg_pull_up_drv_level_3>; + }; + }; + headphone { hp_det: hp-det { rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;