From 5d8b8680f599600fc64842f842bb40b26b6b618e Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Wed, 19 Jan 2022 09:25:09 +0000 Subject: [PATCH] arm64: dts: rockchip: rk3588: use pmu0_grf for reboot mode If use pmu1_grf register, BL31 can't assert NPOR when reboot. Signed-off-by: Joseph Chen Change-Id: I14c78f83aa600d8964eccb2eb7df2c7f6fc0b530 --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 44fc77dafd62..7fb6490a3023 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -1412,13 +1412,13 @@ usbhost_dwc3_0: usb@fcd00000 { }; }; - pmu1_grf: syscon@fd58a000 { - compatible = "rockchip,rk3588-pmu1-grf", "syscon", "simple-mfd"; - reg = <0x0 0xfd58a000 0x0 0x2000>; + pmu0_grf: syscon@fd588000 { + compatible = "rockchip,rk3588-pmu0-grf", "syscon", "simple-mfd"; + reg = <0x0 0xfd588000 0x0 0x2000>; reboot_mode: reboot-mode { compatible = "syscon-reboot-mode"; - offset = <0x200>; + offset = <0x80>; mode-bootloader = ; mode-charge = ; mode-fastboot = ; @@ -1431,6 +1431,11 @@ reboot_mode: reboot-mode { }; }; + pmu1_grf: syscon@fd58a000 { + compatible = "rockchip,rk3588-pmu1-grf", "syscon"; + reg = <0x0 0xfd58a000 0x0 0x2000>; + }; + sys_grf: syscon@fd58c000 { compatible = "rockchip,rk3588-sys-grf", "syscon", "simple-mfd"; reg = <0x0 0xfd58c000 0x0 0x1000>;