From d932cb0022d9daeede4eb78f19b2d36c2cb9fab6 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Sat, 3 Nov 2018 10:22:02 +0800 Subject: [PATCH] arm: dts: gxl: replace watchdog with new version [1/1] 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 --- arch/arm/boot/dts/amlogic/mesongxl.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/mesongxl.dtsi b/arch/arm/boot/dts/amlogic/mesongxl.dtsi index 8c88bd2..df21827 100644 --- a/arch/arm/boot/dts/amlogic/mesongxl.dtsi +++ b/arch/arm/boot/dts/amlogic/mesongxl.dtsi @@ -232,15 +232,10 @@ status = "okay"; }; - watchdog { - compatible = "amlogic, meson-wdt"; + + wdt: watchdog@0xffd0f0d0 { + compatible = "amlogic,meson-gxl-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>; -- 2.7.4