projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
22e831d
)
Revert "arm: dts: gxl: replace watchdog with new version [1/1]"
author
Luan Yuan
<luan.yuan@amlogic.com>
Sat, 8 Dec 2018 04:30:03 +0000
(12:30 +0800)
committer
Luan Yuan
<luan.yuan@amlogic.com>
Sat, 8 Dec 2018 04:30:03 +0000
(12:30 +0800)
This reverts commit
d932cb0022d9daeede4eb78f19b2d36c2cb9fab6
.
arch/arm/boot/dts/amlogic/mesongxl.dtsi
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/amlogic/mesongxl.dtsi
b/arch/arm/boot/dts/amlogic/mesongxl.dtsi
index
0235105
..
f887655
100644
(file)
--- a/
arch/arm/boot/dts/amlogic/mesongxl.dtsi
+++ b/
arch/arm/boot/dts/amlogic/mesongxl.dtsi
@@
-232,10
+232,15
@@
status = "okay";
};
-
- wdt: watchdog@0xffd0f0d0 {
- compatible = "amlogic,meson-gxl-wdt";
+ watchdog {
+ compatible = "amlogic, meson-wdt";
status = "okay";
+ default_timeout=<10>;
+ reset_watchdog_method=<1>; /* 0:sysfs,1:kernel */
+ reset_watchdog_time=<2>;
+ shutdown_timeout=<10>;
+ firmware_timeout=<6>;
+ suspend_timeout=<6>;
reg = <0xc11098d0 0x10>;
clock-names = "xtal";
clocks = <&xtal>;