From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751641AbdBDX5Y (ORCPT ); Sat, 4 Feb 2017 18:57:24 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:49010 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751033AbdBDX5W (ORCPT ); Sat, 4 Feb 2017 18:57:22 -0500 Subject: Re: [PATCH 2/2] watchdog: sama5d4: Implement resume hook To: Alexandre Belloni References: <20170130171848.31598-1-alexandre.belloni@free-electrons.com> <20170130171848.31598-2-alexandre.belloni@free-electrons.com> Cc: Wim Van Sebroeck , Nicolas Ferre , linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org From: Guenter Roeck Message-ID: <179ad9de-b2de-947f-e990-92de1a2ce374@roeck-us.net> Date: Sat, 4 Feb 2017 15:57:17 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20170130171848.31598-2-alexandre.belloni@free-electrons.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/30/2017 09:18 AM, Alexandre Belloni wrote: > When resuming for the deepest state on sama5d2, it is necessary to restore > MR as the registers are lost. > > Signed-off-by: Alexandre Belloni > --- > drivers/watchdog/sama5d4_wdt.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c > index 6dd07bef515a..de8ff10a032e 100644 > --- a/drivers/watchdog/sama5d4_wdt.c > +++ b/drivers/watchdog/sama5d4_wdt.c > @@ -258,11 +258,28 @@ static const struct of_device_id sama5d4_wdt_of_match[] = { > }; > MODULE_DEVICE_TABLE(of, sama5d4_wdt_of_match); > > +#ifdef CONFIG_PM_SLEEP > +static int sama5d4_wdt_resume(struct device *dev) > +{ > + struct sama5d4_wdt *wdt = dev_get_drvdata(dev); > + > + wdt_write(wdt, AT91_WDT_MR, wdt->mr & ~AT91_WDT_WDDIS); > + if (wdt->mr & AT91_WDT_WDDIS) > + wdt_write(wdt, AT91_WDT_MR, wdt->mr); > + > + return 0; > +} > +#endif > + First time I ever see a system which doesn't need a matching suspend function. I assume that isn't needed. With that, Reviewed-by: Guenter Roeck Thanks, Guenter > +static SIMPLE_DEV_PM_OPS(sama5d4_wdt_pm_ops, NULL, > + sama5d4_wdt_resume); > + > static struct platform_driver sama5d4_wdt_driver = { > .probe = sama5d4_wdt_probe, > .remove = sama5d4_wdt_remove, > .driver = { > .name = "sama5d4_wdt", > + .pm = &sama5d4_wdt_pm_ops, > .of_match_table = sama5d4_wdt_of_match, > } > }; >