diff options
| author | Caesar Wang <wxt@rock-chips.com> | 2016-01-23 17:32:35 +0800 |
|---|---|---|
| committer | Caesar Wang <wxt@rock-chips.com> | 2016-01-23 17:43:04 +0800 |
| commit | 2de00cd979a36beee7103e408c1a43b837296cc8 (patch) | |
| tree | 562718d43542c9ba440450fc817eb1bd23d79fb4 | |
| parent | 8a897d8a6a3c6bb96c89e593bc1df85e8784f124 (diff) | |
| download | v4.1-2de00cd979a36beee7103e408c1a43b837296cc8.tar.gz | |
Revert "FROMLIST: ARM: dts: rockchip: add reboot-mode node for rk3036 SoCs"
This reverts commit 4c9ec9da205964399b36845e701c1370e73d31f2.
That should be the "reboot bootloader" instead of "reboot fastboot"
if you are using the standard interface.
Change-Id: I7b119b9d81a694716efdfe2181ea6e2e19d0c817
| -rw-r--r-- | arch/arm/boot/dts/rk3036.dtsi | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index edaee54da61..bcd9f650f94 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -43,7 +43,6 @@ #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" / { @@ -362,33 +361,8 @@ }; grf: syscon@20008000 { - compatible = "rockchip,rk3036-grf", "syscon", "simple-mfd"; + compatible = "rockchip,rk3036-grf", "syscon"; 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>; - }; - - recovery { - linux,mode = "recovery"; - loader,magic = <BOOT_RECOVERY>; - }; - - fastboot { - linux,mode = "fastboot"; - loader,magic = <BOOT_FASTBOOT>; - }; - }; }; acodec: acodec-ana@20030000 { |