From d016e56778d12804badac8342c497a691ae646d6 Mon Sep 17 00:00:00 2001 From: Weixin Zhou Date: Tue, 18 Dec 2018 11:33:58 +0800 Subject: [PATCH] arm64: dts: rockchip: add 809 poweroff after the hw reset for rk3399pro v10/v11 Change-Id: Ib01bb214311d61ec1bd889545c182097e968da98 Signed-off-by: Weixin Zhou --- arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts | 8 ++------ arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts index 508b5df521ca..d21a0bf1b921 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts @@ -359,8 +359,9 @@ pinctrl-0 = <&pmic_int_l>; pinctrl-1 = <&soc_slppin_slp>, <&rk809_slppin_slp>; pinctrl-2 = <&soc_slppin_gpio>, <&rk809_slppin_pwrdn>; - pinctrl-3 = <&soc_slppin_rst>, <&rk809_slppin_rst>; + pinctrl-3 = <&soc_slppin_gpio>,<&rk809_slppin_rst>; rockchip,system-power-controller; + pmic-reset-func = <0>; wakeup-source; #clock-cells = <1>; clock-output-names = "rk808-clkout1", "rk808-clkout2"; @@ -1001,11 +1002,6 @@ rockchip,pins = <1 RK_PA5 1 &pcfg_pull_none>; }; - - soc_slppin_rst: soc-slppin-rst { - rockchip,pins = - <1 RK_PA5 2 &pcfg_pull_none>; - }; }; sdio-pwrseq { diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts index 66b366b96977..c3ad8f243c4d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts @@ -365,8 +365,9 @@ pinctrl-0 = <&pmic_int_l>; pinctrl-1 = <&soc_slppin_slp>, <&rk809_slppin_slp>; pinctrl-2 = <&soc_slppin_gpio>, <&rk809_slppin_pwrdn>; - pinctrl-3 = <&soc_slppin_rst>, <&rk809_slppin_rst>; + pinctrl-3 = <&soc_slppin_gpio>,<&rk809_slppin_rst>; rockchip,system-power-controller; + pmic-reset-func = <0>; wakeup-source; #clock-cells = <1>; clock-output-names = "rk808-clkout1", "rk808-clkout2"; @@ -1009,11 +1010,6 @@ rockchip,pins = <1 RK_PA5 1 &pcfg_pull_none>; }; - - soc_slppin_rst: soc-slppin-rst { - rockchip,pins = - <1 RK_PA5 2 &pcfg_pull_none>; - }; }; sdio-pwrseq {