[PATCH v2 1/4] watchdog: meson: Enable meson SoC specific data

Guenter Roeck linux at roeck-us.net
Sat Nov 7 07:29:52 PST 2015


On 11/07/2015 03:02 AM, Carlo Caione wrote:
> From: Carlo Caione <carlo at endlessm.com>
>
> 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 at endlessm.com>
> ---
>   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.
Sorry if I overlooked it in v1.

Guenter




More information about the linux-arm-kernel mailing list