diff options
| author | Thomas Abraham <thomas.abraham@linaro.org> | 2011-10-24 08:49:04 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-12-22 20:07:10 -0500 |
| commit | 39ce4084a604a3ef0e2836e074c02bbbcc7c1509 (patch) | |
| tree | bb66668c9b87406fa248bf7ff26a08368634dad5 /drivers/rtc | |
| parent | b3d6ac3e5f937440a362c0fa187257fa1197f5b9 (diff) | |
rtc: rtc-s3c: Add device tree support
Add device tree based discovery support for Samsung's rtc controller.
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-s3c.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index 5b979d9cc332..175067a17c46 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
| 26 | #include <linux/log2.h> | 26 | #include <linux/log2.h> |
| 27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
| 28 | #include <linux/of.h> | ||
| 28 | 29 | ||
| 29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
| 30 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
| @@ -507,7 +508,13 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) | |||
| 507 | goto err_nortc; | 508 | goto err_nortc; |
| 508 | } | 509 | } |
| 509 | 510 | ||
| 510 | s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data; | 511 | #ifdef CONFIG_OF |
| 512 | if (pdev->dev.of_node) | ||
| 513 | s3c_rtc_cpu_type = of_device_is_compatible(pdev->dev.of_node, | ||
| 514 | "samsung,s3c6410-rtc") ? TYPE_S3C64XX : TYPE_S3C2410; | ||
| 515 | else | ||
| 516 | #endif | ||
| 517 | s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data; | ||
| 511 | 518 | ||
| 512 | /* Check RTC Time */ | 519 | /* Check RTC Time */ |
| 513 | 520 | ||
| @@ -629,6 +636,17 @@ static int s3c_rtc_resume(struct platform_device *pdev) | |||
| 629 | #define s3c_rtc_resume NULL | 636 | #define s3c_rtc_resume NULL |
| 630 | #endif | 637 | #endif |
| 631 | 638 | ||
| 639 | #ifdef CONFIG_OF | ||
| 640 | static const struct of_device_id s3c_rtc_dt_match[] = { | ||
| 641 | { .compatible = "samsung,s3c2410-rtc" }, | ||
| 642 | { .compatible = "samsung,s3c6410-rtc" }, | ||
| 643 | {}, | ||
| 644 | }; | ||
| 645 | MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match); | ||
| 646 | #else | ||
| 647 | #define s3c_rtc_dt_match NULL | ||
| 648 | #endif | ||
| 649 | |||
| 632 | static struct platform_device_id s3c_rtc_driver_ids[] = { | 650 | static struct platform_device_id s3c_rtc_driver_ids[] = { |
| 633 | { | 651 | { |
| 634 | .name = "s3c2410-rtc", | 652 | .name = "s3c2410-rtc", |
| @@ -651,6 +669,7 @@ static struct platform_driver s3c_rtc_driver = { | |||
| 651 | .driver = { | 669 | .driver = { |
| 652 | .name = "s3c-rtc", | 670 | .name = "s3c-rtc", |
| 653 | .owner = THIS_MODULE, | 671 | .owner = THIS_MODULE, |
| 672 | .of_match_table = s3c_rtc_dt_match, | ||
| 654 | }, | 673 | }, |
| 655 | }; | 674 | }; |
| 656 | 675 | ||
