From: linux@roeck-us•net (Guenter Roeck)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v5 3/6] watchdog: pnx4008: add support for soft reset
Date: Mon, 29 Feb 2016 20:03:30 -0800 [thread overview]
Message-ID: <56D51492.4000405@roeck-us.net> (raw)
In-Reply-To: <1456767068-14449-4-git-send-email-slemieux.tyco@gmail.com>
On 02/29/2016 09:31 AM, Sylvain Lemieux wrote:
> From: Sylvain Lemieux <slemieux@tycoint•com>
>
> Add support for explicit soft reset using the reboot mode.
>
> The default reboot mode behavior is unchanged;
> you can overwrite the default reboot type in the board specific file
> "DT_MACHINE_START" definition using the "reboot_mode" parameter.
>
> Signed-off-by: Sylvain Lemieux <slemieux@tycoint•com>
> ---
> Changes from v4 to v5:
> - no logical change; updated to work with new revision of patch #2.
>
> Changes from v3 to v4:
> - none.
>
> Changes from v2 to v3:
> - no logical change; updated to work with new revision of patch #2.
>
> Changes from v1 to v2:
> - Rename patch title;
> was "arm: lpc32xx: restart: add support for soft reset"
> - Add change to "pnx-4008" driver instead of "mach-lpc32xx".
> - Use define available in "pnx-4008" when writting to watchdog register.
>
> drivers/watchdog/pnx4008_wdt.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
> index f3be522..e05bfecf 100644
> --- a/drivers/watchdog/pnx4008_wdt.c
> +++ b/drivers/watchdog/pnx4008_wdt.c
> @@ -129,9 +129,16 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd,
> static int pnx4008_restart_handler(struct watchdog_device *wdd,
> unsigned long mode, void *cmd)
> {
> - /* Instant assert of RESETOUT_N with pulse length 1mS */
> - writel(13000, WDTIM_PULSE(wdt_base));
> - writel(M_RES2 | RESFRC1 | RESFRC2, WDTIM_MCTRL(wdt_base));
> + if (mode == (unsigned long)REBOOT_SOFT) {
Are those typecasts really necessary ?
Guenter
> + /* Force match output active */
> + writel(EXT_MATCH0, WDTIM_EMR(wdt_base));
> + /* Internal reset on match output (RESOUT_N not asserted) */
> + writel(M_RES1, WDTIM_MCTRL(wdt_base));
> + } else {
> + /* Instant assert of RESETOUT_N with pulse length 1mS */
> + writel(13000, WDTIM_PULSE(wdt_base));
> + writel(M_RES2 | RESFRC1 | RESFRC2, WDTIM_MCTRL(wdt_base));
> + }
>
> /* Wait for watchdog to reset system */
> mdelay(1000);
>
next prev parent reply other threads:[~2016-03-01 4:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 17:31 [PATCH v5 0/6] watchdog: pnx4008: add restart handler Sylvain Lemieux
2016-02-29 17:31 ` [PATCH v5 1/6] watchdog: pnx4008: update logging during power-on Sylvain Lemieux
2016-02-29 17:31 ` [PATCH v5 2/6] watchdog: pnx4008: add restart handler Sylvain Lemieux
2016-02-29 17:31 ` [PATCH v5 3/6] watchdog: pnx4008: add support for soft reset Sylvain Lemieux
2016-03-01 4:03 ` Guenter Roeck [this message]
2016-03-01 16:04 ` Sylvain Lemieux
2016-03-03 4:52 ` Guenter Roeck
2016-02-29 17:31 ` [PATCH v5 4/6] watchdog: pnx4008: restart: support "cmd" from userspace Sylvain Lemieux
2016-02-29 17:31 ` [PATCH v5 5/6] arm: lpc32xx: phy3250 remove restart hook Sylvain Lemieux
2016-02-29 17:31 ` [PATCH v5 6/6] arm: lpc32xx: remove restart handler Sylvain Lemieux
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=56D51492.4000405@roeck-us.net \
--to=linux@roeck-us$(echo .)net \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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