From f6f9c2eecbc23eb74bd1fa8093f69abff3b71a06 Mon Sep 17 00:00:00 2001 From: Shengfei Xu Date: Fri, 15 Dec 2023 16:33:09 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3399-sapphire: Adjust the sequence of vcc3v3_sys and vcc_sys Change-Id: Iee8374a1262bb84b338333950f53185406fe63c4 Signed-off-by: Shengfei Xu --- .../boot/dts/rockchip/rk3399-sapphire.dtsi | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi index 98cefb366932..b6eedc4ac494 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -81,6 +81,26 @@ regulator-max-microvolt = <12000000>; }; + vcc_sys: vcc-sys { + compatible = "regulator-fixed"; + regulator-name = "vcc_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&dc_12v>; + }; + + vcc3v3_sys: vcc3v3-sys { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_sys>; + }; + /* * The fan power supply comes from the baseboard. * For the standalone Sapphire one option is to connect a wire @@ -134,16 +154,6 @@ vin-supply = <&vcc3v3_sys>; }; - vcc3v3_sys: vcc3v3-sys { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_sys"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_sys>; - }; - vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; enable-active-high; @@ -165,16 +175,6 @@ vin-supply = <&vcc_sys>; }; - vcc_sys: vcc-sys { - compatible = "regulator-fixed"; - regulator-name = "vcc_sys"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&dc_12v>; - }; - vdd_log: vdd-log { compatible = "pwm-regulator"; pwms = <&pwm2 0 25000 1>; @@ -799,4 +799,4 @@ &vopl_mmu { status = "okay"; -}; \ No newline at end of file +};