From: Wenyou Yang <wenyou.yang@atmel.com>
To: linux-arm-kernel@lists.infradead.org
Cc: nicolas.ferre@atmel.com, plagnioj@jcrosoft.com,
fabio.porcedda@gmail.com, JM.Lin@atmel.com,
wenyou.yang@atmel.com, wim@iguana.be,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4 4/8] watchdog/at91sam9_wdt: Adjust the options of watchdog_info
Date: Fri, 1 Feb 2013 15:06:22 +0800 [thread overview]
Message-ID: <1359702386-21284-5-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1359702386-21284-1-git-send-email-wenyou.yang@atmel.com>
Since the Watchdog Timer Mode Register can be only written only once,
so the watchdog_info shall not support WDIOF_SETTIMEOUT
and WDIOF_MAGICCLOSE options, remove them.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Cc: wim@iguana.be
Cc: linux-watchdog@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
drivers/watchdog/at91sam9_wdt.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index ce7930b..c6d9f1f 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -152,8 +152,7 @@ static int at91wdt_enable(struct watchdog_device *wddev, unsigned int timeout)
static const struct watchdog_info at91_wdt_info = {
.identity = DRV_NAME,
- .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
- WDIOF_MAGICCLOSE,
+ .options = WDIOF_KEEPALIVEPING,
};
static int at91wdt_start(struct watchdog_device *wddev)
--
1.7.9.5
next prev parent reply other threads:[~2013-02-01 7:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1359702386-21284-1-git-send-email-wenyou.yang@atmel.com>
2013-02-01 7:06 ` [PATCH v4 1/8] watchdog: add the function watchdog_is_open Wenyou Yang
2013-02-13 22:46 ` Wim Van Sebroeck
2013-02-01 7:06 ` [PATCH v4 2/8] watchdog/at91sam9_wdt: Remove at91wdt_private and add at91wdt_drvdata struct Wenyou Yang
2013-02-13 22:48 ` Wim Van Sebroeck
2013-02-18 5:33 ` Yang, Wenyou
2013-02-01 7:06 ` [PATCH v4 3/8] watchdog/at91sam9_wdt: Convert to use the watchdog framework Wenyou Yang
2013-02-13 23:10 ` Wim Van Sebroeck
2013-02-18 5:27 ` Yang, Wenyou
2013-02-01 7:06 ` Wenyou Yang [this message]
2013-02-13 23:15 ` [PATCH v4 4/8] watchdog/at91sam9_wdt: Adjust the options of watchdog_info Wim Van Sebroeck
2013-02-14 8:12 ` Alexander Stein
2013-02-01 7:06 ` [PATCH v4 5/8] watchdog/at91sam9_wdt: Add nowayout helpers to Watchdog Timer Driver Kernel API Wenyou Yang
2013-02-13 23:11 ` Wim Van Sebroeck
2013-02-01 7:06 ` [PATCH v4 6/8] watchdog/at91sam9_wdt: Remove the __initdata of at91wdt_wdd Wenyou Yang
2013-02-13 23:13 ` Wim Van Sebroeck
2013-02-01 7:06 ` [PATCH v4 7/8] ARM: dts: add the watchdog nodes for at91sam9x5 and at91sam9n12 SoC Wenyou Yang
2013-02-01 7:06 ` [PATCH v4 8/8] ARM: dts: add the watchdog nodes for at91sam9g25ek and at91sam9m10g45ek boards Wenyou Yang
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=1359702386-21284-5-git-send-email-wenyou.yang@atmel.com \
--to=wenyou.yang@atmel.com \
--cc=JM.Lin@atmel.com \
--cc=fabio.porcedda@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
--cc=wim@iguana.be \
/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).