From 516e6f7a0e95a62f41f65eb3414bc708ff1cbc7c Mon Sep 17 00:00:00 2001 From: shengfei Xu Date: Fri, 10 Dec 2021 12:15:09 +0000 Subject: [PATCH] arm64: dts: rockchip: adjust the power supply based on the hardware for rk3588 boards Signed-off-by: shengfei Xu Change-Id: I2f0bd82ac41313ba2a09fb91ce595824a47d0957 --- arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi | 1 - .../boot/dts/rockchip/rk3588-evb2-lp4.dtsi | 1 + .../boot/dts/rockchip/rk3588-evb3-lp5.dtsi | 1 + .../boot/dts/rockchip/rk3588-evb4-lp4.dtsi | 10 ++++ .../boot/dts/rockchip/rk3588-nvr-demo.dtsi | 10 ++++ arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi | 2 +- .../dts/rockchip/rk3588-rk806-single.dtsi | 55 ------------------- .../boot/dts/rockchip/rk3588s-evb2-lp5.dtsi | 1 + .../boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi | 1 + .../boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi | 53 ++++++++++++++++++ 10 files changed, 78 insertions(+), 57 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi index ed49b541fd1e..c86c97d58a3e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi @@ -968,7 +968,6 @@ cap-sd-highspeed; disable-wp; sd-uhs-sdr104; - vmmc-supply = <&vcc_3v3_sd_s0>; vqmmc-supply = <&vccio_sd_s0>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi index 67ad68926fe6..e4f32851bbe4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi @@ -456,6 +456,7 @@ &sdmmc { status = "okay"; + vmmc-supply = <&vcc_3v3_sd_s0>; }; &u2phy0_otg { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi index 6caeb2fb5c59..f827cab16657 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi @@ -1119,6 +1119,7 @@ &sdmmc { status = "okay"; + vmmc-supply = <&vcc_3v3_sd_s0>; }; &u2phy1_otg { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi index 842be98e21fa..5223a1e2ee4c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi @@ -55,6 +55,16 @@ pinctrl-0 = <&typec5v_pwren>; }; + vcc_1v1_nldo_s3: vcc-1v1-nldo-s3 { + compatible = "regulator-fixed"; + regulator-name = "vcc_1v1_nldo_s3"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1100000>; + vin-supply = <&vcc5v0_sys>; + }; + vcc3v3_au5426: vcc3v3-au5426 { compatible = "regulator-fixed"; regulator-name = "vcc3v3_au5426"; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi index 1522c122035b..1c94a5f15a8a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi @@ -115,6 +115,16 @@ pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_otg_en>; }; + + vcc_1v1_nldo_s3: vcc-1v1-nldo-s3 { + compatible = "regulator-fixed"; + regulator-name = "vcc_1v1_nldo_s3"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1100000>; + vin-supply = <&vcc5v0_sys>; + }; }; &combphy0_ps { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi index a8df08c4e58f..8885b8be80fc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi @@ -189,7 +189,7 @@ &saradc { status = "okay"; - vref-supply = <&vcc_1v8_cam_s0>; + vref-supply = <&avcc_1v8_s0>; }; &tsadc { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi index 3a9b57f9c40f..25ff1f4a57e3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi @@ -7,61 +7,6 @@ #include #include -/ { - vcc_1v1_nldo_s3: vcc-1v1-nldo-s3 { - compatible = "regulator-fixed"; - regulator-name = "vcc_1v1_nldo_s3"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; - vin-supply = <&vcc5v0_sys>; - }; - - vcc_3v3_sd_s0: vcc-3v3-sd-s0 { - compatible = "regulator-fixed"; - regulator-name = "vcc_3v3_sd_s0"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_LOW>; - enable-active-low; - vin-supply = <&vcc_3v3_s3>; - regulator-state-mem { - regulator-off-in-suspend; - }; - }; - - vcc_1v2_cam_s0: vcc-1v2-cam-s0 { - compatible = "regulator-fixed"; - regulator-name = "vcc_1v2_cam_s0"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - gpios = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>; - enable-active-high; - vin-supply = <&vcc_3v3_s3>; - regulator-state-mem { - regulator-off-in-suspend; - }; - - }; - - vcc_1v8_cam_s0: vcc-1v2-cam-s0 { - compatible = "regulator-fixed"; - regulator-name = "vcc_1v8_cam_s0"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - vin-supply = <&vcc_3v3_s3>; - }; - - vcc_2v8_cam_s0: vcc-1v2-cam-s0 { - compatible = "regulator-fixed"; - regulator-name = "vcc_2v8_cam_s0"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - vin-supply = <&vcc_3v3_s3>; - }; -}; - &i2c0 { status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi index d3dd9e8b3978..10942853da00 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi @@ -844,6 +844,7 @@ &sdmmc { status = "okay"; + vmmc-supply = <&vcc_3v3_sd_s0>; }; &pdm0 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi index b19c9906c93f..407c05cdb2ea 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi @@ -261,6 +261,7 @@ &sdmmc { status = "okay"; + vmmc-supply = <&vcc_3v3_sd_s0>; }; &sata2 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi index 34bc0ba9d26b..a00bb89bc012 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi @@ -123,6 +123,58 @@ pinctrl-0 = <&vcc5v0_host_en>; }; + vcc_1v1_nldo_s3: vcc-1v1-nldo-s3 { + compatible = "regulator-fixed"; + regulator-name = "vcc_1v1_nldo_s3"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1100000>; + vin-supply = <&vcc5v0_sys>; + }; + + vcc_1v2_cam_s0: vcc-1v2-cam-s0 { + compatible = "regulator-fixed"; + regulator-name = "vcc_1v2_cam_s0"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + gpios = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>; + enable-active-high; + vin-supply = <&vcc_3v3_s3>; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vcc_1v8_cam_s0: vcc-1v8-cam-s0 { + compatible = "regulator-fixed"; + regulator-name = "vcc_1v8_cam_s0"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc_3v3_s3>; + }; + + vcc_2v8_cam_s0: vcc-2v8-cam-s0 { + compatible = "regulator-fixed"; + regulator-name = "vcc_2v8_cam_s0"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + vin-supply = <&vcc_3v3_s3>; + }; + + vcc_3v3_sd_s0: vcc-3v3-sd-s0 { + compatible = "regulator-fixed"; + regulator-name = "vcc_3v3_sd_s0"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_LOW>; + enable-active-low; + vin-supply = <&vcc_3v3_s3>; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; clocks = <&hym8563>; @@ -717,6 +769,7 @@ &sdmmc { status = "okay"; + vmmc-supply = <&vcc_3v3_sd_s0>; }; &spdif_tx1 {