shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

arm: dts: gxl: replace watchdog with new version [1/1]

Browse Source 
PD#SWPL-1600

Problem:
The current watchdog is not the upstream standard driver.

Solution:
Replace watchdog device tree to use the standard watchdog driver.

Verify:
S905X P215/P212 Android-32bit Kernel-32bit.

Change-Id: I972c8ebb0158caa2df393d9a2d687d9298181102
Signed-off-by: Bo Yang <bo.yang@amlogic.com>

watchdog: Change the feed watchdog mode [1/1]

PD#SWPL-2378

Problem:
Using Android to feed watchdog is not easy to debug the
crash problem, in addition, the Android does not open
the dog feeding service.

Solution:
Change the DTS configuration and change into driver feed watchdog.

Verify:
test pass on g12a-u200

Change-Id: Ie0a91fd8451fdccf3038ba6290a277c9048c52cd
Signed-off-by: Yingyuan Zhu <yingyuan.zhu@amlogic.com>
This commit is contained in:
Bo Yang
2018-11-03 10:22:02 +08:00
committed by Luan Yuan
parent 5326c14af0
commit b66726ca9b
8 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/amlogic/mesong12a.dtsi
View File

@@ -430,8 +430,14 @@
};
wdt: watchdog@0xffd0f0d0 {
compatible = "amlogic,meson-g12a-wdt";
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 = <0xffd0f0d0 0x10>;
clock-names = "xtal";
clocks = <&xtal>;

8
arch/arm/boot/dts/amlogic/mesong12b.dtsi
View File

@@ -471,8 +471,14 @@
};
wdt: watchdog@0xffd0f0d0 {
compatible = "amlogic,meson-g12a-wdt";
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 = <0xffd0f0d0 0x10>;
clock-names = "xtal";
clocks = <&xtal>;

3
arch/arm/boot/dts/amlogic/mesongxl.dtsi
View File

@@ -232,7 +232,8 @@
status = "okay";
};
watchdog {
wdt: watchdog@0xffd0f0d0 {
compatible = "amlogic, meson-wdt";
status = "okay";
default_timeout=<10>;

8
arch/arm/boot/dts/amlogic/mesontl1.dtsi
View File

@@ -307,8 +307,14 @@
};
wdt: watchdog@0xffd0f0d0 {
compatible = "amlogic,meson-tl1-wdt";
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 = <0xffd0f0d0 0x10>;
clock-names = "xtal";
clocks = <&xtal>;

8
arch/arm/boot/dts/amlogic/mesontxl.dtsi
View File

@@ -560,8 +560,14 @@
};
wdt_ee: watchdog@98d0 {
compatible = "amlogic,meson-txl-wdt";
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 = <0x98d0 0x10>;
clock-names = "xtal";
clocks = <&xtal>;

8
arch/arm64/boot/dts/amlogic/mesong12a.dtsi
View File

@@ -430,8 +430,14 @@
};
wdt: watchdog@0xffd0f0d0 {
compatible = "amlogic,meson-g12a-wdt";
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 = <0x0 0xffd0f0d0 0x0 0x10>;
clock-names = "xtal";
clocks = <&xtal>;

8
arch/arm64/boot/dts/amlogic/mesong12b.dtsi
View File

@@ -471,8 +471,14 @@
};
wdt: watchdog@0xffd0f0d0 {
compatible = "amlogic,meson-g12a-wdt";
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 = <0x0 0xffd0f0d0 0x0 0x10>;
clock-names = "xtal";
clocks = <&xtal>;

8
arch/arm64/boot/dts/amlogic/mesontxl.dtsi
View File

@@ -560,8 +560,14 @@
};
wdt_ee: watchdog@98d0 {
compatible = "amlogic,meson-txl-wdt";
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 = <0x0 0x98d0 0x0 0x10>;
clock-names = "xtal";
clocks = <&xtal>;