Merge branch 'for-linus-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[linux-2.6-block.git] / drivers / rtc / rtc-sh.c

diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index c626e43a9cbb48f6c254517dc858dd1451c550d3..6c2d3989f967baff96625ab39d0d19336b002def 100644 (file)
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -27,7 +27,15 @@
 #include <linux/log2.h>
 #include <linux/clk.h>
 #include <linux/slab.h>
+#ifdef CONFIG_SUPERH
 #include <asm/rtc.h>
+#else
+/* Default values for RZ/A RTC */
+#define rtc_reg_size           sizeof(u16)
+#define RTC_BIT_INVERTED        0      /* no chip bugs */
+#define RTC_CAP_4_DIGIT_YEAR    (1 << 0)
+#define RTC_DEF_CAPABILITIES    RTC_CAP_4_DIGIT_YEAR
+#endif
 
 #define DRV_NAME       "sh-rtc"
 
@@ -570,6 +578,8 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
        rtc->alarm_irq = platform_get_irq(pdev, 2);
 
        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+       if (!res)
+               res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (unlikely(res == NULL)) {
                dev_err(&pdev->dev, "No IO resource\n");
                return -ENOENT;
@@ -587,12 +597,15 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
        if (unlikely(!rtc->regbase))
                return -EINVAL;
 
-       clk_id = pdev->id;
-       /* With a single device, the clock id is still "rtc0" */
-       if (clk_id < 0)
-               clk_id = 0;
+       if (!pdev->dev.of_node) {
+               clk_id = pdev->id;
+               /* With a single device, the clock id is still "rtc0" */
+               if (clk_id < 0)
+                       clk_id = 0;
 
-       snprintf(clk_name, sizeof(clk_name), "rtc%d", clk_id);
+               snprintf(clk_name, sizeof(clk_name), "rtc%d", clk_id);
+       } else
+               snprintf(clk_name, sizeof(clk_name), "fck");
 
        rtc->clk = devm_clk_get(&pdev->dev, clk_name);
        if (IS_ERR(rtc->clk)) {
@@ -608,6 +621,8 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
        clk_enable(rtc->clk);
 
        rtc->capabilities = RTC_DEF_CAPABILITIES;
+
+#ifdef CONFIG_SUPERH
        if (dev_get_platdata(&pdev->dev)) {
                struct sh_rtc_platform_info *pinfo =
                        dev_get_platdata(&pdev->dev);
@@ -618,6 +633,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
                 */
                rtc->capabilities |= pinfo->capabilities;
        }
+#endif
 
        if (rtc->carry_irq <= 0) {
                /* register shared periodic/carry/alarm irq */
@@ -718,8 +734,7 @@ static void sh_rtc_set_irq_wake(struct device *dev, int enabled)
        }
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int sh_rtc_suspend(struct device *dev)
+static int __maybe_unused sh_rtc_suspend(struct device *dev)
 {
        if (device_may_wakeup(dev))
                sh_rtc_set_irq_wake(dev, 1);
@@ -727,21 +742,27 @@ static int sh_rtc_suspend(struct device *dev)
        return 0;
 }
 
-static int sh_rtc_resume(struct device *dev)
+static int __maybe_unused sh_rtc_resume(struct device *dev)
 {
        if (device_may_wakeup(dev))
                sh_rtc_set_irq_wake(dev, 0);
 
        return 0;
 }
-#endif
 
 static SIMPLE_DEV_PM_OPS(sh_rtc_pm_ops, sh_rtc_suspend, sh_rtc_resume);
 
+static const struct of_device_id sh_rtc_of_match[] = {
+       { .compatible = "renesas,sh-rtc", },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, sh_rtc_of_match);
+
 static struct platform_driver sh_rtc_platform_driver = {
        .driver         = {
                .name   = DRV_NAME,
                .pm     = &sh_rtc_pm_ops,
+               .of_match_table = sh_rtc_of_match,
        },
        .remove         = __exit_p(sh_rtc_remove),
 };