Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e862e7c4ee52c2d1a0af37a8c3a2bda079042b06

Authored by Roland Stigge
Committed by Linus Torvalds
1 parent bcffb10f28
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

drivers/rtc/rtc-lpc32xx.c: add device tree support 

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>

Showing 2 changed files with 26 additions and 1 deletions Side-by-side Diff

Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt
Diff comments   View file @ e862e7c
  1 +* NXP LPC32xx SoC Real Time Clock controller
  2 +
  3 +Required properties:
  4 +- compatible: must be "nxp,lpc3220-rtc"
  5 +- reg: physical base address of the controller and length of memory mapped
  6 + region.
  7 +- interrupts: The RTC interrupt
  8 +
  9 +Example:
  10 +
  11 + rtc@40024000 {
  12 + compatible = "nxp,lpc3220-rtc";
  13 + reg = <0x40024000 0x1000>;
  14 + interrupts = <52 0>;
  15 + };
drivers/rtc/rtc-lpc32xx.c
Diff comments   View file @ e862e7c
... ... @@ -19,6 +19,7 @@
19 19 #include <linux/rtc.h>
20 20 #include <linux/slab.h>
21 21 #include <linux/io.h>
  22 +#include <linux/of.h>
22 23  
23 24 /*
24 25 * Clock and Power control register offsets
25 26  
... ... @@ -386,13 +387,22 @@
386 387 #define LPC32XX_RTC_PM_OPS NULL
387 388 #endif
388 389  
  390 +#ifdef CONFIG_OF
  391 +static const struct of_device_id lpc32xx_rtc_match[] = {
  392 + { .compatible = "nxp,lpc3220-rtc" },
  393 + { }
  394 +};
  395 +MODULE_DEVICE_TABLE(of, lpc32xx_rtc_match);
  396 +#endif
  397 +
389 398 static struct platform_driver lpc32xx_rtc_driver = {
390 399 .probe = lpc32xx_rtc_probe,
391 400 .remove = __devexit_p(lpc32xx_rtc_remove),
392 401 .driver = {
393 402 .name = RTC_NAME,
394 403 .owner = THIS_MODULE,
395   - .pm = LPC32XX_RTC_PM_OPS
  404 + .pm = LPC32XX_RTC_PM_OPS,
  405 + .of_match_table = of_match_ptr(lpc32xx_rtc_match),
396 406 },
397 407 };
398 408