Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753740Ab3JBPv2 (ORCPT ); Wed, 2 Oct 2013 11:51:28 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:37933 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753050Ab3JBPvZ (ORCPT ); Wed, 2 Oct 2013 11:51:25 -0400 Date: Wed, 2 Oct 2013 08:51:18 -0700 From: Guenter Roeck To: Boris BREZILLON Cc: Wim Van Sebroeck , Nicolas Ferre , Jean-Christophe PLAGNIOL-VILLARD , Ludovic Desroches , Yang Wenyou , Grant Likely , Rob Herring , Rob Landley , Fabio Porcedda , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org Subject: Re: [v2,2/4] watchdog: at91sam9_wdt: update device tree doc Message-ID: <20131002155118.GA16703@roeck-us.net> References: <1371799414-3654-1-git-send-email-b.brezillon@overkiz.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1371799414-3654-1-git-send-email-b.brezillon@overkiz.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2923 Lines: 68 On Fri, Jun 21, 2013 at 03:23:34PM -0000, Boris BREZILLON wrote: > Add new at91sam9 watchdog properties to the documentation. > > Signed-off-by: Boris BREZILLON > Acked-by: Grant Likely > > --- > .../devicetree/bindings/watchdog/atmel-wdt.txt | 30 ++++++++++++++++++-- > 1 file changed, 28 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt > index fcdd48f..e043106 100644 > --- a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt > +++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt > @@ -9,11 +9,37 @@ Required properties: > > Optional properties: > - timeout-sec: contains the watchdog timeout in seconds. > +- interrupts : Should contain WDT interrupt. > +- atmel,max-heartbeat-sec : Should contain the maximum heartbeat value in > + seconds. This value should be less than 16. It is used to compute the > + WDV field. > +- atmel,min-heartbeat-sec : Should contain the minimum heartbeat value in > + seconds. This value should be less than 4 times the max-heartbeat-sec > + value. It is used to compute the WDD field. I am a bit at loss about "less than 4 times the max-heartbeat-sec value". Why would a min-timeout larger than the max-timeout make sense under any condition ? Do you mean to say that max-heartbeat should be at least four times the value of min-heartbeat (or that min-heartbeat should be less or equal to one-forth of max-heartbeat) ? Guenter > +- atmel,watchdog-type : Should be "hardware" or "software". Hardware watchdog > + use the at91 watchdog reset. Software watchdog use the watchdog > + interrupt to trigger a software reset. > +- atmel,reset-type : Should be "proc" or "all". > + "all" : assert peripherals and processor reset signals > + "proc" : assert the processor reset signal > + This is valid only when using "hardware" watchdog. > +- atmel,disable : Should be present if you want to disable the watchdog. > +- atmel,idle-halt : Should be present if you want to stop the watchdog when > + entering idle state. > +- atmel,dbg-halt : Should be present if you want to stop the watchdog when > + entering debug state. > > Example: > - > watchdog@fffffd40 { > compatible = "atmel,at91sam9260-wdt"; > reg = <0xfffffd40 0x10>; > - timeout-sec = <10>; > + interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; > + timeout-sec = <15>; > + atmel,watchdog-type = "hardware"; > + atmel,reset-type = "all"; > + atmel,dbg-halt; > + atmel,idle-halt; > + atmel,max-heartbeat-sec = <16>; > + atmel,min-heartbeat-sec = <0>; > + status = "okay"; > }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/