aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2012-03-05 06:26:42 -0500
committerHaojian Zhuang <haojian.zhuang@gmail.com>2012-03-06 02:03:31 -0500
commit8bec2e9e2efa8660c88077b2f1524b7a36eda714 (patch)
tree46dd1ded15c1aed3a8e61315c77f6fbf91973475 /drivers/rtc
parent4128e27584f58bce9f56a9a0346650c94a651332 (diff)
rtc: sa1100: add OF support
Add OF support on rtc-sa1100. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
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 962510cf726f..e443b7850ede 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -30,6 +30,7 @@
30#include <linux/interrupt.h> 30#include <linux/interrupt.h>
31#include <linux/slab.h> 31#include <linux/slab.h>
32#include <linux/string.h> 32#include <linux/string.h>
33#include <linux/of.h>
33#include <linux/pm.h> 34#include <linux/pm.h>
34#include <linux/bitops.h> 35#include <linux/bitops.h>
35 36
@@ -349,6 +350,13 @@ static const struct dev_pm_ops sa1100_rtc_pm_ops = {
349}; 350};
350#endif 351#endif
351 352
353static struct of_device_id sa1100_rtc_dt_ids[] = {
354 { .compatible = "mrvl,sa1100-rtc", },
355 { .compatible = "mrvl,mmp-rtc", },
356 {}
357};
358MODULE_DEVICE_TABLE(of, sa1100_rtc_dt_ids);
359
352static struct platform_driver sa1100_rtc_driver = { 360static struct platform_driver sa1100_rtc_driver = {
353 .probe = sa1100_rtc_probe, 361 .probe = sa1100_rtc_probe,
354 .remove = sa1100_rtc_remove, 362 .remove = sa1100_rtc_remove,
@@ -357,6 +365,7 @@ static struct platform_driver sa1100_rtc_driver = {
357#ifdef CONFIG_PM 365#ifdef CONFIG_PM
358 .pm = &sa1100_rtc_pm_ops, 366 .pm = &sa1100_rtc_pm_ops,
359#endif 367#endif
368 .of_match_table = sa1100_rtc_dt_ids,
360 }, 369 },
361}; 370};
362 371