All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ross Parker <rossjparker@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] imx_watchdog: Do not assert WDOG_B on watchdog init
Date: Tue, 02 Aug 2016 08:08:07 +0000	[thread overview]
Message-ID: <CALPuKC8uZAWF3o2o3ZYEk18cWKfWc6_Tn6KwyE7mvGmvebRHwQ@mail.gmail.com> (raw)

Currently the driver asserts WDOG_B by clearing WCR_WDA bit when
enabling the watchdog. Do not clear WCR_WDA.

Signed-off-by: Ross Parker <rossjparker@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>

---
 drivers/watchdog/imx_watchdog.c | 2 +-
 include/fsl_wdog.h              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/watchdog/imx_watchdog.c
b/drivers/watchdog/imx_watchdog.c
index 2938d9f..3f826d1 100644
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -34,7 +34,7 @@ void hw_watchdog_init(void)
 #endif
  timeout = (CONFIG_WATCHDOG_TIMEOUT_MSECS / 500) - 1;
  writew(WCR_WDZST | WCR_WDBG | WCR_WDE | WCR_WDT | WCR_SRS |
- SET_WCR_WT(timeout), &wdog->wcr);
+ WCR_WDA | SET_WCR_WT(timeout), &wdog->wcr);
  hw_watchdog_reset();
 }
 #endif
diff --git a/include/fsl_wdog.h b/include/fsl_wdog.h
index f698d4d..7818f78 100644
--- a/include/fsl_wdog.h
+++ b/include/fsl_wdog.h
@@ -15,5 +15,6 @@ struct watchdog_regs {
 #define WCR_WDE 0x04
 #define WCR_WDT 0x08
 #define WCR_SRS 0x10
+#define WCR_WDA 0x20
 #define SET_WCR_WT(x) (x << 8)
 #define WCR_WT_MSK SET_WCR_WT(0xFF)
-- 
1.9.1

             reply	other threads:[~2016-08-02  8:08 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-02  8:08 Ross Parker [this message]
2016-10-04  9:01 ` [U-Boot] [PATCH] imx_watchdog: Do not assert WDOG_B on watchdog init Stefano Babic

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=CALPuKC8uZAWF3o2o3ZYEk18cWKfWc6_Tn6KwyE7mvGmvebRHwQ@mail.gmail.com \
    --to=rossjparker@gmail.com \
    --cc=u-boot@lists.denx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.