From 6f18427f993d00f94be3c802cb77f012d3f57c55 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marex@denx.de>
Date: Tue, 26 Jun 2012 16:29:27 +0800
Subject: [PATCH] --- yaml --- r: 313231 b: refs/heads/master c:
 dd8d20a3f32a7ba37526f5b4dfd4d35a93e5342f h: refs/heads/master i:   313229:
 4674365eddb01e21e0a88918b5f5f515821c3167   313227:
 ff8bb946408a289b2c2dbeee7410922b9e35d61d   313223:
 9fb79214404a0cc12d6913ec60b6bdc1ce505e03   313215:
 a012f3e0069b36a96cd7d8d21311052a5f3ce9bd v: v3

---
 [refs]                                           |  2 +-
 .../devicetree/bindings/rtc/stmp3xxx-rtc.txt     | 16 ++++++++++++++++
 trunk/drivers/rtc/rtc-stmp3xxx.c                 |  8 ++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt

diff --git a/[refs] b/[refs]
index d8df47f03b5b..45dd9e874ecc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1d4f23ec0688f58b7d60265f38e1cbe8c3a4432
+refs/heads/master: dd8d20a3f32a7ba37526f5b4dfd4d35a93e5342f
diff --git a/trunk/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt b/trunk/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
new file mode 100644
index 000000000000..b800070fe6e9
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
@@ -0,0 +1,16 @@
+* STMP3xxx/i.MX28 Time Clock controller
+
+Required properties:
+- compatible: should be one of the following.
+    * "fsl,stmp3xxx-rtc"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: rtc alarm interrupt
+
+Example:
+
+rtc@80056000 {
+	compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc";
+	reg = <0x80056000 2000>;
+	interrupts = <29>;
+};
diff --git a/trunk/drivers/rtc/rtc-stmp3xxx.c b/trunk/drivers/rtc/rtc-stmp3xxx.c
index 10287865e330..739ef55694f4 100644
--- a/trunk/drivers/rtc/rtc-stmp3xxx.c
+++ b/trunk/drivers/rtc/rtc-stmp3xxx.c
@@ -25,6 +25,7 @@
 #include <linux/interrupt.h>
 #include <linux/rtc.h>
 #include <linux/slab.h>
+#include <linux/of_device.h>
 
 #include <mach/common.h>
 
@@ -265,6 +266,12 @@ static int stmp3xxx_rtc_resume(struct platform_device *dev)
 #define stmp3xxx_rtc_resume	NULL
 #endif
 
+static const struct of_device_id rtc_dt_ids[] = {
+	{ .compatible = "fsl,stmp3xxx-rtc", },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, rtc_dt_ids);
+
 static struct platform_driver stmp3xxx_rtcdrv = {
 	.probe		= stmp3xxx_rtc_probe,
 	.remove		= stmp3xxx_rtc_remove,
@@ -273,6 +280,7 @@ static struct platform_driver stmp3xxx_rtcdrv = {
 	.driver		= {
 		.name	= "stmp3xxx-rtc",
 		.owner	= THIS_MODULE,
+		.of_match_table = rtc_dt_ids,
 	},
 };