From b643c5476ff1231cf8a266d7482d58885476657e Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 19 Sep 2012 12:13:16 -0600
Subject: [PATCH] --- yaml --- r: 342395 b: refs/heads/master c:
 380e04ac2cd96a4c36ad164fce556427dcd2ea0f h: refs/heads/master i:   342393:
 6da5a00e2241b948917e0e2e47e52f16a6184b62   342391:
 e5deb3887f0b44a0f34fa2242bfd2d104c38c913 v: v3

---
 [refs]                                        |  2 +-
 .../bindings/rtc/nvidia,tegra20-rtc.txt       | 19 +++++++++++++++++++
 trunk/arch/arm/boot/dts/tegra20.dtsi          |  6 ++++++
 trunk/arch/arm/boot/dts/tegra30.dtsi          |  6 ++++++
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt

diff --git a/[refs] b/[refs]
index 022e176c453b..54050abe1f8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f2b7fb202a2fa93702a79d36033e5c8bee0120d
+refs/heads/master: 380e04ac2cd96a4c36ad164fce556427dcd2ea0f
diff --git a/trunk/Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt b/trunk/Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt
new file mode 100644
index 000000000000..93f45e9dce7c
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt
@@ -0,0 +1,19 @@
+NVIDIA Tegra20 real-time clock
+
+The Tegra RTC maintains seconds and milliseconds counters, and five alarm
+registers. The alarms and other interrupts may wake the system from low-power
+state.
+
+Required properties:
+
+- compatible : should be "nvidia,tegra20-rtc".
+- reg : Specifies base physical address and size of the registers.
+- interrupts : A single interrupt specifier.
+
+Example:
+
+timer {
+	compatible = "nvidia,tegra20-rtc";
+	reg = <0x7000e000 0x100>;
+	interrupts = <0 2 0x04>;
+};
diff --git a/trunk/arch/arm/boot/dts/tegra20.dtsi b/trunk/arch/arm/boot/dts/tegra20.dtsi
index 96c922d8bb39..63c25cefaad7 100644
--- a/trunk/arch/arm/boot/dts/tegra20.dtsi
+++ b/trunk/arch/arm/boot/dts/tegra20.dtsi
@@ -234,6 +234,12 @@
 		#pwm-cells = <2>;
 	};
 
+	rtc {
+		compatible = "nvidia,tegra20-rtc";
+		reg = <0x7000e000 0x100>;
+		interrupts = <0 2 0x04>;
+	};
+
 	i2c@7000c000 {
 		compatible = "nvidia,tegra20-i2c";
 		reg = <0x7000c000 0x100>;
diff --git a/trunk/arch/arm/boot/dts/tegra30.dtsi b/trunk/arch/arm/boot/dts/tegra30.dtsi
index 48a8320ebf03..f7af06621cc8 100644
--- a/trunk/arch/arm/boot/dts/tegra30.dtsi
+++ b/trunk/arch/arm/boot/dts/tegra30.dtsi
@@ -230,6 +230,12 @@
 		#pwm-cells = <2>;
 	};
 
+	rtc {
+		compatible = "nvidia,tegra30-rtc", "nvidia,tegra20-rtc";
+		reg = <0x7000e000 0x100>;
+		interrupts = <0 2 0x04>;
+	};
+
 	i2c@7000c000 {
 		compatible =  "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
 		reg = <0x7000c000 0x100>;