* [PATCH 1/3] arm64: dts: rockchip: rk3399: rock960: Rename vcc_sys into vcc5v0_sys
@ 2019-03-11 15:03 Jagan Teki
2019-03-11 15:03 ` [PATCH 2/3] arm64: dts: rockchip: rk3399: rock960: Add 12V DCIN regulator Jagan Teki
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Jagan Teki @ 2019-03-11 15:03 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Mark Rutland
Cc: devicetree, linux-arm-kernel, linux-rockchip, linux-kernel,
linux-amarula, Jagan Teki, Akash Gajjar
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.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Akash Gajjar <akash@openedev.com>
---
.../boot/dts/rockchip/rk3399-rock960.dtsi | 30 +++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index 2927db4dda9d..a268ec9f6b5e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -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>;
--
2.18.0.321.gffc6fa0e3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] arm64: dts: rockchip: rk3399: rock960: Add 12V DCIN regulator
2019-03-11 15:03 [PATCH 1/3] arm64: dts: rockchip: rk3399: rock960: Rename vcc_sys into vcc5v0_sys Jagan Teki
@ 2019-03-11 15:03 ` Jagan Teki
2019-03-11 15:03 ` [PATCH 3/3] arm64: dts: rockchip: rk3399: rock960: Add missing GPIO for vcc5v0_host Jagan Teki
2019-03-12 10:38 ` [PATCH 1/3] arm64: dts: rockchip: rk3399: rock960: Rename vcc_sys into vcc5v0_sys Heiko Stuebner
2 siblings, 0 replies; 5+ messages in thread
From: Jagan Teki @ 2019-03-11 15:03 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Mark Rutland
Cc: devicetree, linux-arm-kernel, linux-rockchip, linux-kernel,
linux-amarula, Jagan Teki, Akash Gajjar
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.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Akash Gajjar <akash@openedev.com>
---
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index a268ec9f6b5e..68ca3bf9ea2f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -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 {
--
2.18.0.321.gffc6fa0e3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] arm64: dts: rockchip: rk3399: rock960: Add missing GPIO for vcc5v0_host
2019-03-11 15:03 [PATCH 1/3] arm64: dts: rockchip: rk3399: rock960: Rename vcc_sys into vcc5v0_sys Jagan Teki
2019-03-11 15:03 ` [PATCH 2/3] arm64: dts: rockchip: rk3399: rock960: Add 12V DCIN regulator Jagan Teki
@ 2019-03-11 15:03 ` Jagan Teki
2019-03-11 18:10 ` Jagan Teki
2019-03-12 10:38 ` [PATCH 1/3] arm64: dts: rockchip: rk3399: rock960: Rename vcc_sys into vcc5v0_sys Heiko Stuebner
2 siblings, 1 reply; 5+ messages in thread
From: Jagan Teki @ 2019-03-11 15:03 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Mark Rutland
Cc: devicetree, linux-arm-kernel, linux-rockchip, linux-kernel,
linux-amarula, Jagan Teki, Akash Gajjar
vcc5v0_host on rock960 is bound to have GPIO4_PD1.
Add support for it.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Akash Gajjar <akash@openedev.com>
---
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index 68ca3bf9ea2f..c3d3343d6dde 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -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";
--
2.18.0.321.gffc6fa0e3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 3/3] arm64: dts: rockchip: rk3399: rock960: Add missing GPIO for vcc5v0_host
2019-03-11 15:03 ` [PATCH 3/3] arm64: dts: rockchip: rk3399: rock960: Add missing GPIO for vcc5v0_host Jagan Teki
@ 2019-03-11 18:10 ` Jagan Teki
0 siblings, 0 replies; 5+ messages in thread
From: Jagan Teki @ 2019-03-11 18:10 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Mark Rutland
Cc: devicetree, linux-arm-kernel, linux-rockchip, linux-kernel,
linux-amarula, Akash Gajjar
On Mon, Mar 11, 2019 at 8:33 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> vcc5v0_host on rock960 is bound to have GPIO4_PD1.
>
> Add support for it.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> Signed-off-by: Akash Gajjar <akash@openedev.com>
> ---
> arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
> index 68ca3bf9ea2f..c3d3343d6dde 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
> @@ -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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] arm64: dts: rockchip: rk3399: rock960: Rename vcc_sys into vcc5v0_sys
2019-03-11 15:03 [PATCH 1/3] arm64: dts: rockchip: rk3399: rock960: Rename vcc_sys into vcc5v0_sys Jagan Teki
2019-03-11 15:03 ` [PATCH 2/3] arm64: dts: rockchip: rk3399: rock960: Add 12V DCIN regulator Jagan Teki
2019-03-11 15:03 ` [PATCH 3/3] arm64: dts: rockchip: rk3399: rock960: Add missing GPIO for vcc5v0_host Jagan Teki
@ 2019-03-12 10:38 ` Heiko Stuebner
2 siblings, 0 replies; 5+ messages in thread
From: Heiko Stuebner @ 2019-03-12 10:38 UTC (permalink / raw)
To: Jagan Teki
Cc: Rob Herring, Mark Rutland, devicetree, linux-arm-kernel,
linux-rockchip, linux-kernel, linux-amarula, Akash Gajjar
Am Montag, 11. März 2019, 16:03:30 CET schrieb Jagan Teki:
> 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.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> Signed-off-by: Akash Gajjar <akash@openedev.com>
I've double-checked both rock960 and ficus schematics to verify
and applied both patch 1+2 for 5.2
Thanks
Heiko
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-03-12 10:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-11 15:03 [PATCH 1/3] arm64: dts: rockchip: rk3399: rock960: Rename vcc_sys into vcc5v0_sys Jagan Teki
2019-03-11 15:03 ` [PATCH 2/3] arm64: dts: rockchip: rk3399: rock960: Add 12V DCIN regulator Jagan Teki
2019-03-11 15:03 ` [PATCH 3/3] arm64: dts: rockchip: rk3399: rock960: Add missing GPIO for vcc5v0_host Jagan Teki
2019-03-11 18:10 ` Jagan Teki
2019-03-12 10:38 ` [PATCH 1/3] arm64: dts: rockchip: rk3399: rock960: Rename vcc_sys into vcc5v0_sys Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).