]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drivers/rtc/rtc-lpc32xx.c: add device tree support
authorRoland Stigge <stigge@antcom.de>
Tue, 29 May 2012 22:07:39 +0000 (15:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 May 2012 23:22:34 +0000 (16:22 -0700)
Adds device tree support for rtc-lpc32xx.c

Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt [new file with mode: 0644]
drivers/rtc/rtc-lpc32xx.c

diff --git a/Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt b/Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt
new file mode 100644 (file)
index 0000000..a87a1e9
--- /dev/null
@@ -0,0 +1,15 @@
+* NXP LPC32xx SoC Real Time Clock controller
+
+Required properties:
+- compatible: must be "nxp,lpc3220-rtc"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: The RTC interrupt
+
+Example:
+
+       rtc@40024000 {
+               compatible = "nxp,lpc3220-rtc";
+               reg = <0x40024000 0x1000>;
+               interrupts = <52 0>;
+       };
index 63c72189c64b38d76d7d1e31721f359f724d983d..d5218553741ff54f871799f51b5969d74eabe85c 100644 (file)
@@ -19,6 +19,7 @@
 #include <linux/rtc.h>
 #include <linux/slab.h>
 #include <linux/io.h>
+#include <linux/of.h>
 
 /*
  * Clock and Power control register offsets
@@ -386,13 +387,22 @@ static const struct dev_pm_ops lpc32xx_rtc_pm_ops = {
 #define LPC32XX_RTC_PM_OPS NULL
 #endif
 
+#ifdef CONFIG_OF
+static const struct of_device_id lpc32xx_rtc_match[] = {
+       { .compatible = "nxp,lpc3220-rtc" },
+       { }
+};
+MODULE_DEVICE_TABLE(of, lpc32xx_rtc_match);
+#endif
+
 static struct platform_driver lpc32xx_rtc_driver = {
        .probe          = lpc32xx_rtc_probe,
        .remove         = __devexit_p(lpc32xx_rtc_remove),
        .driver = {
                .name   = RTC_NAME,
                .owner  = THIS_MODULE,
-               .pm     = LPC32XX_RTC_PM_OPS
+               .pm     = LPC32XX_RTC_PM_OPS,
+               .of_match_table = of_match_ptr(lpc32xx_rtc_match),
        },
 };