From: Lee Jones <lee.jones@linaro.org>
To: stable@vger.kernel.org
Subject: [PATCH 4.19 03/15] watchdog: sama5d4: fix WDD value to be always set to max
Date: Mon, 2 Dec 2019 10:30:38 +0000 [thread overview]
Message-ID: <20191202103050.2668-3-lee.jones@linaro.org> (raw)
In-Reply-To: <20191202103050.2668-1-lee.jones@linaro.org>
From: Eugen Hristev <eugen.hristev@microchip.com>
[ Upstream commit 8632944841d41a36d77dd1fa88d4201b5291100f ]
WDD value must be always set to max (0xFFF) otherwise the hardware
block will reset the board on the first ping of the watchdog.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/watchdog/sama5d4_wdt.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
index 1e93c1b0e3cf..d4953365dd9a 100644
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
@@ -111,9 +111,7 @@ static int sama5d4_wdt_set_timeout(struct watchdog_device *wdd,
u32 value = WDT_SEC2TICKS(timeout);
wdt->mr &= ~AT91_WDT_WDV;
- wdt->mr &= ~AT91_WDT_WDD;
wdt->mr |= AT91_WDT_SET_WDV(value);
- wdt->mr |= AT91_WDT_SET_WDD(value);
/*
* WDDIS has to be 0 when updating WDD/WDV. The datasheet states: When
@@ -251,7 +249,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
timeout = WDT_SEC2TICKS(wdd->timeout);
- wdt->mr |= AT91_WDT_SET_WDD(timeout);
+ wdt->mr |= AT91_WDT_SET_WDD(WDT_SEC2TICKS(MAX_WDT_TIMEOUT));
wdt->mr |= AT91_WDT_SET_WDV(timeout);
ret = sama5d4_wdt_init(wdt);
--
2.24.0
next prev parent reply other threads:[~2019-12-02 10:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-02 10:30 [PATCH 4.19 01/15] clk: at91: fix update bit maps on CFG_MOR write Lee Jones
2019-12-02 10:30 ` [PATCH 4.19 02/15] arm: add missing include platform-data/atmel.h Lee Jones
2019-12-02 10:30 ` Lee Jones [this message]
2019-12-02 10:30 ` [PATCH 4.19 04/15] drm/atmel-hlcdc: revert shift by 8 Lee Jones
2019-12-02 10:30 ` [PATCH 4.19 05/15] net: macb: Fix SUBNS increment and increase resolution Lee Jones
2019-12-02 10:30 ` [PATCH 4.19 06/15] media: v4l2-ctrl: fix flags for DO_WHITE_BALANCE Lee Jones
2019-12-02 10:30 ` [PATCH 4.19 07/15] net: macb: fix error format in dev_err() Lee Jones
2019-12-02 10:30 ` [PATCH 4.19 08/15] media: atmel: atmel-isc: fix asd memory allocation Lee Jones
2019-12-02 10:30 ` [PATCH 4.19 09/15] media: atmel: atmel-isc: fix INIT_WORK misplacement Lee Jones
2019-12-02 10:30 ` [PATCH 4.19 10/15] mtd: rawnand: atmel: Fix spelling mistake in error message Lee Jones
2019-12-02 10:30 ` [PATCH 4.19 11/15] pwm: Clear chip_data in pwm_put() Lee Jones
2019-12-02 10:30 ` [PATCH 4.19 12/15] net: macb driver, check for SKBTX_HW_TSTAMP Lee Jones
2019-12-02 10:30 ` [PATCH 4.19 13/15] mtd: rawnand: atmel: fix possible object reference leak Lee Jones
2019-12-02 10:30 ` [PATCH 4.19 14/15] mtd: spi-nor: cast to u64 to avoid uint overflows Lee Jones
2019-12-02 10:30 ` [PATCH 4.19 15/15] clk: at91: generated: set audio_pll_allowed in at91_clk_register_generated() Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191202103050.2668-3-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).