On 11/07/2015 07:45 AM, Carlo Caione wrote:
On Sat, Nov 7, 2015 at 4:29 PM, Guenter Roeck <linux@xxxxxxxxxxxx> wrote:
On 11/07/2015 03:02 AM, Carlo Caione wrote:
From: Carlo Caione <carlo@xxxxxxxxxxxx>
With this patch we refactor the driver code to enable watchdog support
for all platforms based on Amlogic meson SoCs.
Signed-off-by: Carlo Caione <carlo@xxxxxxxxxxxx>
---
drivers/watchdog/meson_wdt.c | 56
++++++++++++++++++++++++++++++--------------
1 file changed, 39 insertions(+), 17 deletions(-)
diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
index 1f4155e..446af94 100644
--- a/drivers/watchdog/meson_wdt.c
+++ b/drivers/watchdog/meson_wdt.c
@@ -19,6 +19,7 @@
#include <linux/moduleparam.h>
#include <linux/notifier.h>
#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/reboot.h>
#include <linux/types.h>
@@ -27,35 +28,47 @@
#define DRV_NAME "meson_wdt"
#define MESON_WDT_TC 0x00
-#define MESON_WDT_TC_EN BIT(22)
-#define MESON_WDT_TC_TM_MASK 0x3fffff
#define MESON_WDT_DC_RESET (3 << 24)
#define MESON_WDT_RESET 0x04
-#define MESON_WDT_TIMEOUT 30
+#define MESON_WDT_TIMEOUT 5
This is not a reasonable default, the change is not mentioned
in the description, and it is unrelated to the change at hand.
The problem is that the default is too small or simply that the change
is not mentioned?
Both.
For the meson8b the maximum timeout is ~8 sec whereas for meson6 is
~40 sec that's why I lowered the default from 30 to 5 sec.
I can set a different default for each SoC but at least for meson8b
the value will be always < 8 sec.
Ok, but your change impacts both architectures. There is no reason
to hold meson6 hostage for the meson8b limitations.
An easy fix would be to set the actual timeout to min(default, max).
Thanks,
Guenter
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
