From patchwork Tue Oct 27 16:06:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fu Wei Fu X-Patchwork-Id: 55636 Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1884309lbq; Tue, 27 Oct 2015 09:07:34 -0700 (PDT) X-Received: by 10.107.162.197 with SMTP id l188mr23377801ioe.57.1445962054216; Tue, 27 Oct 2015 09:07:34 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m17si11276139igt.76.2015.10.27.09.07.33; Tue, 27 Oct 2015 09:07:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965011AbbJ0QHb (ORCPT + 28 others); Tue, 27 Oct 2015 12:07:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35045 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964831AbbJ0QHZ (ORCPT ); Tue, 27 Oct 2015 12:07:25 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 55DE896D7; Tue, 27 Oct 2015 16:07:24 +0000 (UTC) Received: from magi-f22.redhat.com (vpn1-5-135.pek2.redhat.com [10.72.5.135]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9RG6vOF013412; Tue, 27 Oct 2015 12:07:13 -0400 From: fu.wei@linaro.org To: linaro-acpi@lists.linaro.org, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Cc: tekkamanninja@gmail.com, arnd@arndb.de, linux@roeck-us.net, vgandhi@codeaurora.org, wim@iguana.be, jcm@redhat.com, leo.duran@amd.com, corbet@lwn.net, mark.rutland@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, rjw@rjwysocki.net, dyoung@redhat.com, panand@redhat.com, Suravee.Suthikulpanit@amd.com, robherring2@gmail.com, Fu Wei Subject: [PATCH v8 1/5] Documentation: add sbsa-gwdt driver documentation Date: Wed, 28 Oct 2015 00:06:35 +0800 Message-Id: <1445961999-9506-2-git-send-email-fu.wei@linaro.org> In-Reply-To: <1445961999-9506-1-git-send-email-fu.wei@linaro.org> References: <1445961999-9506-1-git-send-email-fu.wei@linaro.org> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Fu Wei The sbsa-gwdt.txt documentation in devicetree/bindings/watchdog is for introducing SBSA(Server Base System Architecture) Generic Watchdog device node info into FDT. Also add sbsa-gwdt introduction in watchdog-parameters.txt Acked-by: Arnd Bergmann Signed-off-by: Fu Wei --- .../devicetree/bindings/watchdog/sbsa-gwdt.txt | 46 ++++++++++++++++++++++ Documentation/watchdog/watchdog-parameters.txt | 6 +++ 2 files changed, 52 insertions(+) -- 2.4.3 -- 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/ diff --git a/Documentation/devicetree/bindings/watchdog/sbsa-gwdt.txt b/Documentation/devicetree/bindings/watchdog/sbsa-gwdt.txt new file mode 100644 index 0000000..ad8e99a --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/sbsa-gwdt.txt @@ -0,0 +1,46 @@ +* SBSA (Server Base System Architecture) Generic Watchdog + +The SBSA Generic Watchdog Timer is used to force a reset of the system +after two stages of timeout have elapsed. A detailed definition of the +watchdog timer can be found in the ARM document: ARM-DEN-0029 - Server +Base System Architecture (SBSA) + +Required properties: +- compatible: Should at least contain "arm,sbsa-gwdt". + +- reg: Each entry specifies the base physical 64-bit address of a register + frame and the 64-bit length of that frame; currently, two frames must be + defined, in this order: + 1: Watchdog control frame + 2: Refresh frame. + +- interrupts: At least one interrupt must be defined that will be used as + the WS0 interrupt. A WS1 interrupt definition can be provided, but is + optional. The interrupts must be defined in this order: + 1: WS0 interrupt + 2: WS1 interrupt + +Optional properties +- timeout-sec: To use a timeout value that is different from the driver + default values, use this property. If used, at least one timeout value + (in seconds) must be provided. A second optional timeout value (in + seconds) may also be provided and will be used as the pre-timeout value, + if it is given. + + There are two possible sources for driver default timeout values: + (1) the driver contains hard-coded default values, or + (2) module parameters can be given when the module is loaded + + If timeout/pretimeout values are provided when the module loads, they + will take priority. Second priority will be the timeout-sec from DTB, + and third the hard-coded driver values. + +Example for FVP Foundation Model v8: + +watchdog@2a440000 { + compatible = "arm,sbsa-gwdt"; + reg = <0x0 0x2a440000 0 0x1000>, + <0x0 0x2a450000 0 0x1000>; + interrupts = <0 27 4>; + timeout-sec = <60 30>; +}; diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt index 9f9ec9f..e62c8c4 100644 --- a/Documentation/watchdog/watchdog-parameters.txt +++ b/Documentation/watchdog/watchdog-parameters.txt @@ -284,6 +284,12 @@ sbc_fitpc2_wdt: margin: Watchdog margin in seconds (default 60s) nowayout: Watchdog cannot be stopped once started ------------------------------------------------- +sbsa_gwdt: +timeout: Watchdog timeout in seconds. (default 60s) +pretimeout: Watchdog pretimeout in seconds. (default 30s) +nowayout: Watchdog cannot be stopped once started + (default=kernel config parameter) +------------------------------------------------- sc1200wdt: isapnp: When set to 0 driver ISA PnP support will be disabled (default=1) io: io port