rtc: jz4740: Add support for devicetree
authorPaul Cercueil <paul@crapouillou.net>
Mon, 31 Oct 2016 20:39:47 +0000 (21:39 +0100)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Fri, 4 Nov 2016 22:52:02 +0000 (23:52 +0100)
See
Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt
for a description of the bindings.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Acked-by: Maarten ter Huurne <maarten@treewalker.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
drivers/rtc/rtc-jz4740.c

index 7ad2d7965b4e185e2703fc22b8c4b0f8252fc2f8..c2895cec56b46586de6a30f5929381283a780631 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
 #include <linux/slab.h>
@@ -245,6 +246,13 @@ void jz4740_rtc_poweroff(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(jz4740_rtc_poweroff);
 
+static const struct of_device_id jz4740_rtc_of_match[] = {
+       { .compatible = "ingenic,jz4740-rtc", .data = (void *)ID_JZ4740 },
+       { .compatible = "ingenic,jz4780-rtc", .data = (void *)ID_JZ4780 },
+       {},
+};
+MODULE_DEVICE_TABLE(of, jz4740_rtc_of_match);
+
 static int jz4740_rtc_probe(struct platform_device *pdev)
 {
        int ret;
@@ -252,12 +260,17 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
        uint32_t scratchpad;
        struct resource *mem;
        const struct platform_device_id *id = platform_get_device_id(pdev);
+       const struct of_device_id *of_id = of_match_device(
+                       jz4740_rtc_of_match, &pdev->dev);
 
        rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
        if (!rtc)
                return -ENOMEM;
 
-       rtc->type = id->driver_data;
+       if (of_id)
+               rtc->type = (enum jz4740_rtc_type)of_id->data;
+       else
+               rtc->type = id->driver_data;
 
        rtc->irq = platform_get_irq(pdev, 0);
        if (rtc->irq < 0) {
@@ -345,6 +358,7 @@ static struct platform_driver jz4740_rtc_driver = {
        .driver  = {
                .name  = "jz4740-rtc",
                .pm    = JZ4740_RTC_PM_OPS,
+               .of_match_table = of_match_ptr(jz4740_rtc_of_match),
        },
        .id_table = jz4740_rtc_ids,
 };