| Message ID | 20231225222859.17153-1-inindev@gmail.com |
|---|---|
| State | Accepted |
| Commit | 7738f551173540b3daa63a91b384b167eacd24fd |
| Headers | show |
| Series | [v2,1/2] arm64: dts: rockchip: support poweroff on the rock-5b | expand |
Hi, On Mon, Dec 25, 2023 at 10:28:19PM +0000, John Clark wrote: > Allow the rock-5b to poweroff its pmic. When issuing a "shutdown -h now" > on the rock-5b it reboots instead. Defining 'system-power-controller' > allows the rk806 to power down. > > Commit c699fbfdfd54 ("arm64: dts: rockchip: Support poweroff on > NanoPC-T6") similarly resolves this issue for the nanopc-t6. > > Signed-off-by: John Clark <inindev@gmail.com> > --- Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> -- Sebastian > Changes since v1: > - added commit message with additional patch detail > - expressed the related commit using checkpatch > > --- > arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts > index 74719aaf697c..dc7b88f29172 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts > @@ -426,6 +426,8 @@ pmic@0 { > pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, > <&rk806_dvs2_null>, <&rk806_dvs3_null>; > > + system-power-controller; > + > vcc1-supply = <&vcc5v0_sys>; > vcc2-supply = <&vcc5v0_sys>; > vcc3-supply = <&vcc5v0_sys>; > -- > 2.43.0 > >
Hi, On Mon, Dec 25, 2023 at 10:28:20PM +0000, John Clark wrote: > Both rk806_dvs1_null and rk806_dvs2_null duplicate gpio_pwrctrl2 and > gpio_pwrctrl1 is not set. This patch sets gpio_pwrctrl1. > > Signed-off-by: John Clark <inindev@gmail.com> > --- > Changes since v1: > - added commit message with additional patch detail > > --- Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> -- Sebastian > arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts > index dc7b88f29172..a0e303c3a1dc 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts > @@ -448,7 +448,7 @@ pmic@0 { > #gpio-cells = <2>; > > rk806_dvs1_null: dvs1-null-pins { > - pins = "gpio_pwrctrl2"; > + pins = "gpio_pwrctrl1"; > function = "pin_fun0"; > }; > > -- > 2.43.0 > >
On Mon, 25 Dec 2023 22:28:19 +0000, John Clark wrote: > Allow the rock-5b to poweroff its pmic. When issuing a "shutdown -h now" > on the rock-5b it reboots instead. Defining 'system-power-controller' > allows the rk806 to power down. > > Commit c699fbfdfd54 ("arm64: dts: rockchip: Support poweroff on > NanoPC-T6") similarly resolves this issue for the nanopc-t6. > > [...] Applied, thanks! [1/2] arm64: dts: rockchip: support poweroff on the rock-5b commit: 7738f551173540b3daa63a91b384b167eacd24fd [2/2] arm64: dts: rockchip: correct gpio_pwrctrl1 typo commit: aed6514c4e3aee843385ded4c5ee0921b51c30fa Best regards,
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 74719aaf697c..dc7b88f29172 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -426,6 +426,8 @@ pmic@0 { pinctrl-0 = <&pmic_pins>, <&rk806_dvs1_null>, <&rk806_dvs2_null>, <&rk806_dvs3_null>; + system-power-controller; + vcc1-supply = <&vcc5v0_sys>; vcc2-supply = <&vcc5v0_sys>; vcc3-supply = <&vcc5v0_sys>;
Allow the rock-5b to poweroff its pmic. When issuing a "shutdown -h now" on the rock-5b it reboots instead. Defining 'system-power-controller' allows the rk806 to power down. Commit c699fbfdfd54 ("arm64: dts: rockchip: Support poweroff on NanoPC-T6") similarly resolves this issue for the nanopc-t6. Signed-off-by: John Clark <inindev@gmail.com> --- Changes since v1: - added commit message with additional patch detail - expressed the related commit using checkpatch --- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 ++ 1 file changed, 2 insertions(+)