diff options
author | Andy Yan <andy.yan@rock-chips.com> | 2016-07-06 09:28:34 -0400 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2016-08-11 14:07:30 -0400 |
commit | b60ab70bbeced9a780ba297ffc555bc3a8ae6045 (patch) | |
tree | bc9af0cc503abc160df8dc608175673f45e2f8ab /arch/arm/boot | |
parent | a148a05512b62b1d4beb35a76733017f018ba20a (diff) |
ARM: dts: rockchip: add syscon-reboot-mode DT node
Rockchip platform use a SYSCON mapped register store
the reboot mode magic value for bootloader to use when
system reboot. So add syscon-reboot-mode driver DT node
for rk3xxx/rk3036/rk3288 based platform
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/rk3036.dtsi | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/rk3288.dtsi | 10 | ||||
-rw-r--r-- | arch/arm/boot/dts/rk3xxx.dtsi | 12 |
3 files changed, 32 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index 843d2be2e4e9..a935523a1eb8 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <dt-bindings/interrupt-controller/arm-gic.h> | 43 | #include <dt-bindings/interrupt-controller/arm-gic.h> |
44 | #include <dt-bindings/pinctrl/rockchip.h> | 44 | #include <dt-bindings/pinctrl/rockchip.h> |
45 | #include <dt-bindings/clock/rk3036-cru.h> | 45 | #include <dt-bindings/clock/rk3036-cru.h> |
46 | #include <dt-bindings/soc/rockchip,boot-mode.h> | ||
46 | #include "skeleton.dtsi" | 47 | #include "skeleton.dtsi" |
47 | 48 | ||
48 | / { | 49 | / { |
@@ -313,8 +314,17 @@ | |||
313 | }; | 314 | }; |
314 | 315 | ||
315 | grf: syscon@20008000 { | 316 | grf: syscon@20008000 { |
316 | compatible = "rockchip,rk3036-grf", "syscon"; | 317 | compatible = "rockchip,rk3036-grf", "syscon", "simple-mfd"; |
317 | reg = <0x20008000 0x1000>; | 318 | reg = <0x20008000 0x1000>; |
319 | |||
320 | reboot-mode { | ||
321 | compatible = "syscon-reboot-mode"; | ||
322 | offset = <0x1d8>; | ||
323 | mode-normal = <BOOT_NORMAL>; | ||
324 | mode-recovery = <BOOT_RECOVERY>; | ||
325 | mode-bootloader = <BOOT_FASTBOOT>; | ||
326 | mode-loader = <BOOT_BL_DOWNLOAD>; | ||
327 | }; | ||
318 | }; | 328 | }; |
319 | 329 | ||
320 | acodec: acodec-ana@20030000 { | 330 | acodec: acodec-ana@20030000 { |
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index e5c4a11f6bc6..48ca4e452564 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <dt-bindings/clock/rk3288-cru.h> | 45 | #include <dt-bindings/clock/rk3288-cru.h> |
46 | #include <dt-bindings/thermal/thermal.h> | 46 | #include <dt-bindings/thermal/thermal.h> |
47 | #include <dt-bindings/power/rk3288-power.h> | 47 | #include <dt-bindings/power/rk3288-power.h> |
48 | #include <dt-bindings/soc/rockchip,boot-mode.h> | ||
48 | #include "skeleton.dtsi" | 49 | #include "skeleton.dtsi" |
49 | 50 | ||
50 | / { | 51 | / { |
@@ -791,6 +792,15 @@ | |||
791 | clocks = <&cru ACLK_GPU>; | 792 | clocks = <&cru ACLK_GPU>; |
792 | }; | 793 | }; |
793 | }; | 794 | }; |
795 | |||
796 | reboot-mode { | ||
797 | compatible = "syscon-reboot-mode"; | ||
798 | offset = <0x94>; | ||
799 | mode-normal = <BOOT_NORMAL>; | ||
800 | mode-recovery = <BOOT_RECOVERY>; | ||
801 | mode-bootloader = <BOOT_FASTBOOT>; | ||
802 | mode-loader = <BOOT_BL_DOWNLOAD>; | ||
803 | }; | ||
794 | }; | 804 | }; |
795 | 805 | ||
796 | sgrf: syscon@ff740000 { | 806 | sgrf: syscon@ff740000 { |
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index 99bbcc2c9b89..405d61258f10 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi | |||
@@ -43,6 +43,7 @@ | |||
43 | 43 | ||
44 | #include <dt-bindings/interrupt-controller/irq.h> | 44 | #include <dt-bindings/interrupt-controller/irq.h> |
45 | #include <dt-bindings/interrupt-controller/arm-gic.h> | 45 | #include <dt-bindings/interrupt-controller/arm-gic.h> |
46 | #include <dt-bindings/soc/rockchip,boot-mode.h> | ||
46 | #include "skeleton.dtsi" | 47 | #include "skeleton.dtsi" |
47 | 48 | ||
48 | / { | 49 | / { |
@@ -246,8 +247,17 @@ | |||
246 | }; | 247 | }; |
247 | 248 | ||
248 | pmu: pmu@20004000 { | 249 | pmu: pmu@20004000 { |
249 | compatible = "rockchip,rk3066-pmu", "syscon"; | 250 | compatible = "rockchip,rk3066-pmu", "syscon", "simple-mfd"; |
250 | reg = <0x20004000 0x100>; | 251 | reg = <0x20004000 0x100>; |
252 | |||
253 | reboot-mode { | ||
254 | compatible = "syscon-reboot-mode"; | ||
255 | offset = <0x40>; | ||
256 | mode-normal = <BOOT_NORMAL>; | ||
257 | mode-recovery = <BOOT_RECOVERY>; | ||
258 | mode-bootloader = <BOOT_FASTBOOT>; | ||
259 | mode-loader = <BOOT_BL_DOWNLOAD>; | ||
260 | }; | ||
251 | }; | 261 | }; |
252 | 262 | ||
253 | grf: grf@20008000 { | 263 | grf: grf@20008000 { |