From 050bcecb6b113586f9fb92e3b4fa8fd06b20fb24 Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@linaro.org>
Date: Wed, 13 Mar 2013 13:05:34 +0800
Subject: [PATCH] --- yaml --- r: 374199 b: refs/heads/master c:
 69a517b2471bcd1c5a175aad82647c1e2c24f08b h: refs/heads/master i:   374197:
 e4c8cb59fd93712be362765225595dc95beeec7f   374195:
 6cc02cfd2dd1ebb93e8734b2a89abf66b6fd5309   374191:
 fcce5befc29dbdde3cf7b760f78b4b9bd8a3f29f v: v3

---
 [refs]                                        |  2 +-
 .../devicetree/bindings/timer/arm,sp804.txt   | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/timer/arm,sp804.txt

diff --git a/[refs] b/[refs]
index 8a1458592586..61dc3acfbe7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 870e2928cf3368ca9b06bc925d0027b0a56bcd8e
+refs/heads/master: 69a517b2471bcd1c5a175aad82647c1e2c24f08b
diff --git a/trunk/Documentation/devicetree/bindings/timer/arm,sp804.txt b/trunk/Documentation/devicetree/bindings/timer/arm,sp804.txt
new file mode 100644
index 000000000000..5cd8eee74af1
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/timer/arm,sp804.txt
@@ -0,0 +1,29 @@
+ARM sp804 Dual Timers
+---------------------------------------
+
+Required properties:
+- compatible: Should be "arm,sp804" & "arm,primecell"
+- interrupts: Should contain the list of Dual Timer interrupts. This is the
+	interrupt for timer 1 and timer 2. In the case of a single entry, it is
+	the combined interrupt or if "arm,sp804-has-irq" is present that
+	specifies which timer interrupt is connected.
+- reg: Should contain location and length for dual timer register.
+- clocks: clocks driving the dual timer hardware. This list should be 1 or 3
+	clocks.	With 3 clocks, the order is timer0 clock, timer1 clock,
+	apb_pclk. A single clock can also be specified if the same clock is
+	used for all clock inputs.
+
+Optional properties:
+- arm,sp804-has-irq = <#>: In the case of only 1 timer irq line connected, this
+	specifies if the irq connection is for timer 1 or timer 2. A value of 1
+	or 2 should be used.
+
+Example:
+
+	timer0: timer@fc800000 {
+		compatible = "arm,sp804", "arm,primecell";
+		reg = <0xfc800000 0x1000>;
+		interrupts = <0 0 4>, <0 1 4>;
+		clocks = <&timclk1 &timclk2 &pclk>;
+		clock-names = "timer1", "timer2", "apb_pclk";
+	};