linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mathieu@codeaurora.org (Mathieu Olivari)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] ARM: msm: add watchdog entries to DT timer binding doc
Date: Fri, 20 Feb 2015 18:19:36 -0800	[thread overview]
Message-ID: <1424485176-8348-4-git-send-email-mathieu@codeaurora.org> (raw)
In-Reply-To: <1424485176-8348-1-git-send-email-mathieu@codeaurora.org>

The watchdog has been reworked to use the same DT node as the timer.
This change is updating the device tree doc accordingly.

Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
---
 Documentation/devicetree/bindings/arm/msm/timer.txt | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/msm/timer.txt b/Documentation/devicetree/bindings/arm/msm/timer.txt
index 74607b6..5e10c34 100644
--- a/Documentation/devicetree/bindings/arm/msm/timer.txt
+++ b/Documentation/devicetree/bindings/arm/msm/timer.txt
@@ -9,11 +9,17 @@ Properties:
                "qcom,scss-timer" - scorpion subsystem
 
 - interrupts : Interrupts for the debug timer, the first general purpose
-               timer, and optionally a second general purpose timer in that
-               order.
+               timer, and optionally a second general purpose timer, and
+               optionally as well, 2 watchdog interrupts, in that order.
 
 - reg : Specifies the base address of the timer registers.
 
+- clocks: Reference to the parent clocks, one per output clock. The parents
+          must appear in the same order as the clock names.
+
+- clock-names: The name of the clocks as free-form strings. They should be in
+               the same order as the clocks.
+
 - clock-frequency : The frequency of the debug timer and the general purpose
                     timer(s) in Hz in that order.
 
@@ -29,9 +35,13 @@ Example:
                compatible = "qcom,scss-timer", "qcom,msm-timer";
                interrupts = <1 1 0x301>,
                             <1 2 0x301>,
-                            <1 3 0x301>;
+                            <1 3 0x301>,
+                            <1 4 0x301>,
+                            <1 5 0x301>;
                reg = <0x0200a000 0x100>;
                clock-frequency = <19200000>,
                                  <32768>;
+               clocks = <&sleep_clk>;
+               clock-names = "sleep";
                cpu-offset = <0x40000>;
        };
-- 
1.9.1

  parent reply	other threads:[~2015-02-21  2:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-21  2:19 [PATCH 0/3] arm: msm: Use timer DT node for qcom watchdog config Mathieu Olivari
2015-02-21  2:19 ` [PATCH 1/3] watchdog: qcom: use timer devicetree binding Mathieu Olivari
2015-02-23 19:04   ` Stephen Boyd
2015-02-23 19:31   ` Guenter Roeck
2015-02-21  2:19 ` [PATCH 2/3] ARM: qcom: add description of KPSS WDT for IPQ8064 Mathieu Olivari
2015-02-23 19:05   ` Stephen Boyd
2015-02-23 19:32   ` Guenter Roeck
2015-02-21  2:19 ` Mathieu Olivari [this message]
2015-02-23 19:33   ` [PATCH 3/3] ARM: msm: add watchdog entries to DT timer binding doc Guenter Roeck
2015-02-23 21:35 ` [PATCH 0/3] arm: msm: Use timer DT node for qcom watchdog config Arnd Bergmann
2015-02-23 22:07   ` Stephen Boyd
2015-03-27  5:55 ` Stephen Boyd

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=1424485176-8348-4-git-send-email-mathieu@codeaurora.org \
    --to=mathieu@codeaurora.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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).