UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'rtc' of git://github.com/hzhuang1/linux into next/drivers 

* 'rtc' of git://github.com/hzhuang1/linux:
  rtc: sa1100: add OF support
This commit is contained in:
Olof Johansson 2012-03-08 09:36:57 -08:00
parent 990b07d952 8bec2e9e2e
commit 2c76744b1b
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/rtc/rtc-sa1100.c
View File

@ -30,6 +30,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/of.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/bitops.h> #include <linux/bitops.h>
@ -349,6 +350,13 @@ static const struct dev_pm_ops sa1100_rtc_pm_ops = {
}; };
#endif #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 = { static struct platform_driver sa1100_rtc_driver = {
.probe = sa1100_rtc_probe, .probe = sa1100_rtc_probe,
.remove = sa1100_rtc_remove, .remove = sa1100_rtc_remove,
@ -357,6 +365,7 @@ static struct platform_driver sa1100_rtc_driver = {
#ifdef CONFIG_PM #ifdef CONFIG_PM
.pm = &sa1100_rtc_pm_ops, .pm = &sa1100_rtc_pm_ops,
#endif #endif
.of_match_table = sa1100_rtc_dt_ids,
}, },
}; };