Skip to contentSkip to conversation

arm64: dts: rockchip: use correct pinctrl for syr82x on rk3399 firefly

PATCH New Heiko Stuebner 1 participant 2 messages Dec 4, 2018

Subsystems (2)
Device tree bindings Arm Rockchip
lore
Share & tools
lore

Heiko Stuebner

author maintainer
#0 lore raw

PATCH 1/2 arm64: dts: rockchip: use correct pinctrl for syr82x on rk3399 firefly

On the firefly the vsel pins of the syr82x regulators are connected to soc gpios, making them software controllable.
Right now the pins do not get configured at all, so cpu_b_sleep_h is configured as input with a pull up while the gpu_sleep_h has a pull-down.

In contrast the pin names indicate both should be high in their sleep state and low in normal operation and the fcs,suspend-voltage-selector does mirror this setting, so enable the already existing pinctrl entries for them and also fix their naming to match the schematics.

Signed-off-by Heiko Stuebner <[email protected]>
---
 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +6 -2
index aaa485dbe081..ea63477ca9fe 100644
@@ -456,6 +456,8 @@
 		compatible = "silergy,syr827";
 		reg = <0x40>;
 		fcs,suspend-voltage-selector = <1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&cpu_b_sleep_h>;
 		regulator-name = "vdd_cpu_b";
 		regulator-min-microvolt = <712500>;
 		regulator-max-microvolt = <1500000>;

@@ -473,6 +475,8 @@
 		compatible = "silergy,syr828";
 		reg = <0x41>;
 		fcs,suspend-voltage-selector = <1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&gpu_sleep_h>;
 		regulator-name = "vdd_gpu";
 		regulator-min-microvolt = <712500>;
 		regulator-max-microvolt = <1500000>;

@@ -589,11 +593,11 @@
 	};
 
 	pmic {
-		vsel1_gpio: vsel1-gpio {
+		cpu_b_sleep_h: cpu-b-sleep-h {
 			rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 
-		vsel2_gpio: vsel2-gpio {
+		gpu_sleep_h: gpu-sleep-h {
 			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
 		};
 	};
Signature · 1 line
2.18.0
author maintainer
#1 lore raw

PATCH 2/2 arm64: dts: rockchip: add enable-ramp-delay for syr82x on rk3399-firefly

The syr82x regulators have a hardware enable ramp delay of 300us as indicated by the datasheet and also the rk3288-firefly use of them. Therefore add the necessary properties for the two regulators on rk3399-firefly as well.

Signed-off-by Heiko Stuebner <[email protected]>
---
 arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +2 -0
index ea63477ca9fe..4b4c15ff3242 100644
@@ -461,6 +461,7 @@
 		regulator-name = "vdd_cpu_b";
 		regulator-min-microvolt = <712500>;
 		regulator-max-microvolt = <1500000>;
+		regulator-enable-ramp-delay = <300>;
 		regulator-ramp-delay = <1000>;
 		regulator-always-on;
 		regulator-boot-on;

@@ -480,6 +481,7 @@
 		regulator-name = "vdd_gpu";
 		regulator-min-microvolt = <712500>;
 		regulator-max-microvolt = <1500000>;
+		regulator-enable-ramp-delay = <300>;
 		regulator-ramp-delay = <1000>;
 		regulator-always-on;
 		regulator-boot-on;
Signature · 1 line
2.18.0