From patchwork Wed Jun 15 20:18:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Fordham X-Patchwork-Id: 883482 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5FKIubm030828 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 15 Jun 2011 20:19:17 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QWwXt-0001qq-Et; Wed, 15 Jun 2011 20:18:37 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QWwXt-0006Ix-1W; Wed, 15 Jun 2011 20:18:37 +0000 Received: from mail-bw0-f49.google.com ([209.85.214.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QWwXp-0006Ie-S9 for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2011 20:18:34 +0000 Received: by bwz1 with SMTP id 1so1018188bwz.36 for ; Wed, 15 Jun 2011 13:18:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to :content-type; bh=jGncEFgoy6IoNmA7G5ShTztV0rM9mnRYi0ABDp3rc68=; b=fpFgfJQgl5vV3PUc+i5MaIcyn56sx4liILDGIbCJ9ufAtJl5ijvoiQv7KRzbTCQeYo ME/VAHxeW8RIMd6yQFvqZLhcMK4d75lpqBFEnZbt00acGAqB8D9K/j9FlYFYX+/r6xtR u93WACoAgHD6KlzSX/ePAdkwFGCU2hnb/7k4U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=Stdm64gr6+uj8PmbyQFYWy2YKRuIOpt+u1n2AcLX0E+JGzkxtaXcHsSa0V+Lw35vN5 rpb5xnZJAEWX0iDjNQH9XDMQ809OUIrH/weI96Qa+O96o9weRnnpn9elQWy+ZhfpP8vj Ar6V5BvGdj22ePMD3p1jiUMRN7behMIl4kYW8= MIME-Version: 1.0 Received: by 10.204.128.85 with SMTP id j21mr33806bks.89.1308169112065; Wed, 15 Jun 2011 13:18:32 -0700 (PDT) Received: by 10.204.9.23 with HTTP; Wed, 15 Jun 2011 13:18:32 -0700 (PDT) Date: Wed, 15 Jun 2011 13:18:32 -0700 Message-ID: Subject: [MPCore Watchdog]: Add suspend/resume support. From: Peter Fordham To: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110615_161834_057315_FDF30393 X-CRM114-Status: GOOD ( 15.00 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is freemail (peter.fordham[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 RFC_ABUSE_POST Both abuse and postmaster missing on sender domain 0.0 T_TO_NO_BRKTS_FREEMAIL T_TO_NO_BRKTS_FREEMAIL X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 15 Jun 2011 20:19:17 +0000 (UTC) Add support for suspend and resume to the MPCore watchdog driver. --- drivers/watchdog/mpcore_wdt.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) .owner = THIS_MODULE, diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c index 2b4af22..5f63a74 100644 --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c @@ -407,12 +407,36 @@ static int __devexit mpcore_wdt_remove(struct platform_device *dev) return 0; } +#ifdef CONFIG_PM +static int mpcore_wdt_suspend(struct platform_device *dev, pm_message_t msg) +{ + struct mpcore_wdt *wdt = platform_get_drvdata(dev); + mpcore_wdt_stop(wdt); /* Turn the WDT off */ + return 0; +} + +static int mpcore_wdt_resume(struct platform_device *dev) +{ + struct mpcore_wdt *wdt = platform_get_drvdata(dev); + /* re-activate timer */ + if (test_bit(0, &wdt->timer_alive)) { + mpcore_wdt_start(wdt); + } + return 0; +} +#else +#define mpcore_wdt_suspend NULL +#define mpcore_wdt_resume NULL +#endif + /* work with hotplug and coldplug */ MODULE_ALIAS("platform:mpcore_wdt"); static struct platform_driver mpcore_wdt_driver = { .probe = mpcore_wdt_probe, .remove = __devexit_p(mpcore_wdt_remove), + .suspend = mpcore_wdt_suspend, + .resume = mpcore_wdt_resume, .shutdown = mpcore_wdt_shutdown, .driver = {