From b66726ca9bd55f92f314af28ce7086d7c2b42b7a 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 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 --- arch/arm/boot/dts/amlogic/mesong12a.dtsi | 8 +++++++- arch/arm/boot/dts/amlogic/mesong12b.dtsi | 8 +++++++- arch/arm/boot/dts/amlogic/mesongxl.dtsi | 3 ++- arch/arm/boot/dts/amlogic/mesontl1.dtsi | 8 +++++++- arch/arm/boot/dts/amlogic/mesontxl.dtsi | 8 +++++++- arch/arm64/boot/dts/amlogic/mesong12a.dtsi | 8 +++++++- arch/arm64/boot/dts/amlogic/mesong12b.dtsi | 8 +++++++- arch/arm64/boot/dts/amlogic/mesontxl.dtsi | 8 +++++++- 8 files changed, 51 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/mesong12a.dtsi b/arch/arm/boot/dts/amlogic/mesong12a.dtsi index b81b0ab..baa4187 100644 --- a/arch/arm/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm/boot/dts/amlogic/mesong12a.dtsi @@ -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>; diff --git a/arch/arm/boot/dts/amlogic/mesong12b.dtsi b/arch/arm/boot/dts/amlogic/mesong12b.dtsi index 09fceff..e783309 100644 --- a/arch/arm/boot/dts/amlogic/mesong12b.dtsi +++ b/arch/arm/boot/dts/amlogic/mesong12b.dtsi @@ -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>; diff --git a/arch/arm/boot/dts/amlogic/mesongxl.dtsi b/arch/arm/boot/dts/amlogic/mesongxl.dtsi index f887655..e31fa43 100644 --- a/arch/arm/boot/dts/amlogic/mesongxl.dtsi +++ b/arch/arm/boot/dts/amlogic/mesongxl.dtsi @@ -232,7 +232,8 @@ status = "okay"; }; - watchdog { + + wdt: watchdog@0xffd0f0d0 { compatible = "amlogic, meson-wdt"; status = "okay"; default_timeout=<10>; diff --git a/arch/arm/boot/dts/amlogic/mesontl1.dtsi b/arch/arm/boot/dts/amlogic/mesontl1.dtsi index 7f35d8a..4cb1327 100644 --- a/arch/arm/boot/dts/amlogic/mesontl1.dtsi +++ b/arch/arm/boot/dts/amlogic/mesontl1.dtsi @@ -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>; diff --git a/arch/arm/boot/dts/amlogic/mesontxl.dtsi b/arch/arm/boot/dts/amlogic/mesontxl.dtsi index 12accae..9cb47c6 100644 --- a/arch/arm/boot/dts/amlogic/mesontxl.dtsi +++ b/arch/arm/boot/dts/amlogic/mesontxl.dtsi @@ -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>; diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi index 0d0a4bd..d55ca6c 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi @@ -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>; diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi index 4d3d3f7..c9f4af1 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi @@ -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>; diff --git a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi index ffc50a27..10332df 100644 --- a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi @@ -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>; -- 2.7.4