arm64: dts: rockchip: rk3399: rock960: Rename vcc_sys into vcc5v0_sys
Subsystems (2)
PATCH 1/3 arm64: dts: rockchip: rk3399: rock960: Rename vcc_sys into vcc5v0_sys
It is always better practice to follow regulator naming conventions as per the schematics for future references.
So, rename vcc_sys into vcc5v0_sys as per rk3399 power diagram of rock960 schematics.
--- .../boot/dts/rockchip/rk3399-rock960.dtsi | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +15 -15
@@ -26,9 +26,9 @@ regulator-always-on; }; - vcc_sys: vcc-sys { + vcc5v0_sys: vcc5v0-sys { compatible = "regulator-fixed"; - regulator-name = "vcc_sys"; + regulator-name = "vcc5v0_sys"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on;
@@ -40,7 +40,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; - vin-supply = <&vcc_sys>; + vin-supply = <&vcc5v0_sys>; }; vcc3v3_pcie: vcc3v3-pcie-regulator {
@@ -64,7 +64,7 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; - vin-supply = <&vcc_sys>; + vin-supply = <&vcc5v0_sys>; }; };
@@ -123,7 +123,7 @@ regulator-ramp-delay = <1000>; regulator-always-on; regulator-boot-on; - vin-supply = <&vcc_sys>; + vin-supply = <&vcc5v0_sys>; status = "okay"; regulator-state-mem {
@@ -141,7 +141,7 @@ regulator-ramp-delay = <1000>; regulator-always-on; regulator-boot-on; - vin-supply = <&vcc_sys>; + vin-supply = <&vcc5v0_sys>; regulator-state-mem { regulator-off-in-suspend; };
@@ -159,16 +159,16 @@ #clock-cells = <1>; clock-output-names = "xin32k", "rk808-clkout2"; - vcc1-supply = <&vcc_sys>; - vcc2-supply = <&vcc_sys>; - vcc3-supply = <&vcc_sys>; - vcc4-supply = <&vcc_sys>; - vcc6-supply = <&vcc_sys>; - vcc7-supply = <&vcc_sys>; + vcc1-supply = <&vcc5v0_sys>; + vcc2-supply = <&vcc5v0_sys>; + vcc3-supply = <&vcc5v0_sys>; + vcc4-supply = <&vcc5v0_sys>; + vcc6-supply = <&vcc5v0_sys>; + vcc7-supply = <&vcc5v0_sys>; vcc8-supply = <&vcc3v3_sys>; - vcc9-supply = <&vcc_sys>; - vcc10-supply = <&vcc_sys>; - vcc11-supply = <&vcc_sys>; + vcc9-supply = <&vcc5v0_sys>; + vcc10-supply = <&vcc5v0_sys>; + vcc11-supply = <&vcc5v0_sys>; vcc12-supply = <&vcc3v3_sys>; vddio-supply = <&vcc_1v8>;
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 2/3 arm64: dts: rockchip: rk3399: rock960: Add 12V DCIN regulator
12V DCIN regulator is root source supply for the rest of regulators in Rock960 power diagram.
Add support for it and attach same to supply vcc5v0_sys.
--- arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +10 -0
@@ -18,6 +18,15 @@ reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; }; + vcc12v_dcin: vcc12v-dcin { + compatible = "regulator-fixed"; + regulator-name = "vcc12v_dcin"; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + regulator-always-on; + regulator-boot-on; + }; + vcc1v8_s0: vcc1v8-s0 { compatible = "regulator-fixed"; regulator-name = "vcc1v8_s0";
@@ -32,6 +41,7 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; + vin-supply = <&vcc12v_dcin>; }; vcc3v3_sys: vcc3v3-sys {
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH 3/3 arm64: dts: rockchip: rk3399: rock960: Add missing GPIO for vcc5v0_host
In reply to Jagan Tekivcc5v0_host on rock960 is bound to have GPIO4_PD1.
Add support for it.
--- arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +1 -0
@@ -68,6 +68,7 @@ vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; enable-active-high; + gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&host_vbus_drv>; regulator-name = "vcc5v0_host";
Signature · 1 line
2.18.0.321.gffc6fa0e3
Re: [PATCH 3/3] arm64: dts: rockchip: rk3399: rock960: Add missing GPIO for vcc5v0_host
Quoted 16 lines · Jagan Teki
vcc5v0_hoston rock960 is bound to haveGPIO4_PD1.Add support for it.
Signed-off-by Jagan Teki <[email protected]>Signed-off-by Akash Gajjar <[email protected]>--- arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 1 + 1 file changed, 1 insertion(+)arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +0
-0
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi line 71
Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +1
-0@@ -68,6 +68,7 @@ vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; enable-active-high; + gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
This is already present in dts file, sorry for the noise. please ignore.
Heiko Stuebner
maintainerAm Montag, 11. März 2019, 16:03:30 CET schrieb Jagan Teki:
Quoted 8 lines
It is always better practice to follow regulator naming conventions as per the schematics for future references.
So, rename
vcc_sysintovcc5v0_sysas per rk3399 power diagram of rock960 schematics.Signed-off-by Jagan Teki <[email protected]>Signed-off-by Akash Gajjar <[email protected]>
I've double-checked both rock960 and ficus schematics to verify and applied both patch 1+2 for 5.2
Thanks
Heiko