summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-08 09:36:57 -0800
committerOlof Johansson <olof@lixom.net>2012-03-08 09:36:57 -0800
commit2c76744b1b7850770712788a874f479d8033dc72 (patch)
treee86b20141a28e20534c37d757ff9f7663609794c /drivers/rtc
parent990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d (diff)
parent8bec2e9e2efa8660c88077b2f1524b7a36eda714 (diff)
Merge branch 'rtc' of git://github.com/hzhuang1/linux into next/drivers
* 'rtc' of git://github.com/hzhuang1/linux: rtc: sa1100: add OF support
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-sa1100.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 962510cf726..e443b7850ed 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -30,6 +30,7 @@
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/string.h>
+#include <linux/of.h>
#include <linux/pm.h>
#include <linux/bitops.h>
@@ -349,6 +350,13 @@ static const struct dev_pm_ops sa1100_rtc_pm_ops = {
};
#endif
+static struct of_device_id sa1100_rtc_dt_ids[] = {
+ { .compatible = "mrvl,sa1100-rtc", },
+ { .compatible = "mrvl,mmp-rtc", },
+ {}
+};
+MODULE_DEVICE_TABLE(of, sa1100_rtc_dt_ids);
+
static struct platform_driver sa1100_rtc_driver = {
.probe = sa1100_rtc_probe,
.remove = sa1100_rtc_remove,
@@ -357,6 +365,7 @@ static struct platform_driver sa1100_rtc_driver = {
#ifdef CONFIG_PM
.pm = &sa1100_rtc_pm_ops,
#endif
+ .of_match_table = sa1100_rtc_dt_ids,
},
};