diff options
| author | Caesar Wang <wxt@rock-chips.com> | 2016-01-13 10:08:50 +0800 |
|---|---|---|
| committer | Leo Wang <leozwang@google.com> | 2016-01-27 06:12:51 +0000 |
| commit | 235516e12eba89d98ebf7e49a28a0116de9ae6d5 (patch) | |
| tree | 3b96a4887de8a769c77c2dc996c70a95749b56c9 | |
| parent | 960ac4e363d9e31b1bcc8bae0711d107de0c486c (diff) | |
| download | v4.1-235516e12eba89d98ebf7e49a28a0116de9ae6d5.tar.gz | |
FROMLIST: ARM: dts: rockchip: add reboot-mode node for rk3036 SoCs
Add reboot mode driver DT node for rk3036 platform.
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Bug: 25923642
Patchset: reboot bootloader can enter fastboot mode.
(fixes the bootloader instead of the fastboot)
(am from https://patchwork.kernel.org/patch/8021581/)
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I986a393e67536b841fd7db0118a7bf8fbcda868e
| -rw-r--r-- | arch/arm/boot/dts/rk3036.dtsi | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index 7081d8728fe..7618c6b7787 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -43,6 +43,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/clock/rk3036-cru.h> +#include <dt-bindings/soc/rockchip_boot-mode.h> #include "skeleton.dtsi" / { @@ -368,8 +369,38 @@ }; grf: syscon@20008000 { - compatible = "rockchip,rk3036-grf", "syscon"; + compatible = "rockchip,rk3036-grf", "syscon", "simple-mfd"; reg = <0x20008000 0x1000>; + + reboot-mode { + compatible = "syscon-reboot-mode"; + offset = <0x1d8>; + + normal { + linux,mode = "normal"; + loader,magic = <BOOT_NORMAL>; + }; + + loader { + linux,mode = "loader"; + loader,magic = <BOOT_LOADER>; + }; + + maskrom { + linux,mode = "maskrom"; + loader,magic = <BOOT_MASKROM>; + }; + + recovery { + linux,mode = "recovery"; + loader,magic = <BOOT_RECOVERY>; + }; + + bootloader { + linux,mode = "bootloader"; + loader,magic = <BOOT_FASTBOOT>; + }; + }; }; acodec: acodec-ana@20030000 { |