diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 19:15:55 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 19:16:04 (GMT) |
| commit | 7d1206bc2859c6e9f46e35ae697c138e7d7858a7 (patch) | |
| tree | 14af84e9a635e59293edf81aa562b6740c57d310 /drivers/rtc/rtc-mv.c | |
| parent | f4eb28340771c12cdbf8b5ec149dbd3b0eef1687 (diff) | |
| parent | c899445f9783309ac73073282d4c0ae27f51fa9a (diff) | |
| download | linux-7d1206bc2859c6e9f46e35ae697c138e7d7858a7.tar.xz | |
Merge branch 'kirkwood/dt' into next/dt2
This was part of the for-next branch earlier but for some reasons
a rebuild of the tree missed it, so I'm putting it back in now.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/rtc/rtc-mv.c')
| -rw-r--r-- | drivers/rtc/rtc-mv.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c index 768e2ed..0dd8421 100644 --- a/drivers/rtc/rtc-mv.c +++ b/drivers/rtc/rtc-mv.c @@ -12,6 +12,7 @@ #include <linux/bcd.h> #include <linux/io.h> #include <linux/platform_device.h> +#include <linux/of.h> #include <linux/delay.h> #include <linux/gfp.h> #include <linux/module.h> @@ -294,11 +295,19 @@ static int __exit mv_rtc_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static struct of_device_id rtc_mv_of_match_table[] = { + { .compatible = "mrvl,orion-rtc", }, + {} +}; +#endif + static struct platform_driver mv_rtc_driver = { .remove = __exit_p(mv_rtc_remove), .driver = { .name = "rtc-mv", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(rtc_mv_of_match_table), }, }; |