From 4d9d2075214673f100d8cdd70d51d6d4e3c2b81d Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Wed, 20 Oct 2021 22:41:43 +0200 Subject: [PATCH 449/478] arm64: dts: rk3399-pinephone-pro: Fix SD card power supply definition GPIO0_A1 is used for modem's RI. SD card power supply is not changeable. Signed-off-by: Ondrej Jirman --- .../dts/rockchip/rk3399-pinephone-pro.dts | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts index 3e9aa7bb7f4a..e6aac03e1ec9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts @@ -215,23 +215,6 @@ vcc1v8_codec: vcc1v8-codec-regulator { vin-supply = <&vcc3v3_sys>; }; - /* micro SD card power */ - vcc3v0_sd: vcc3v0-sd { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&sdmmc0_pwr_h>; - regulator-name = "vcc3v0_sd"; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - vin-supply = <&vcc3v3_sys>; - - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - /* MIPI DSI panel 1.8v supply */ vcc1v8_lcd: vcc1v8-lcd { compatible = "regulator-fixed"; @@ -474,8 +457,8 @@ regulator-state-mem { }; }; - vcc_sd: LDO_REG9 { - regulator-name = "vcc_sd"; + vccio_sd: LDO_REG9 { + regulator-name = "vccio_sd"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; regulator-state-mem { @@ -799,7 +782,7 @@ &io_domains { bt656-supply = <&vcc1v8_dvp>; audio-supply = <&vcca1v8_codec>; - sdmmc-supply = <&vcc_sd>; + sdmmc-supply = <&vccio_sd>; gpio1830-supply = <&vcc_3v0>; }; @@ -1034,8 +1017,8 @@ &sdmmc { max-frequency = <150000000>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; - vmmc-supply = <&vcc3v0_sd>; - vqmmc-supply = <&vcc_sd>; + vmmc-supply = <&vcc3v3_sys>; + vqmmc-supply = <&vccio_sd>; status = "okay"; }; -- 2.35.3