The patch titled Subject: drivers/rtc/rtc-lpc32xx.c: add device tree support has been removed from the -mm tree. Its filename was drivers-rtc-rtc-lpc32xxc-add-device-tree-support.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Roland Stigge <stigge@xxxxxxxxx> Subject: drivers/rtc/rtc-lpc32xx.c: add device tree support Adds device tree support for rtc-lpc32xx.c Signed-off-by: Roland Stigge <stigge@xxxxxxxxx> Acked-by: Rob Herring <rob.herring@xxxxxxxxxxx> Acked-by: Arnd Bergmann <arnd@xxxxxxxx> Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt | 15 ++++++++++ drivers/rtc/rtc-lpc32xx.c | 12 +++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff -puN /dev/null Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt --- /dev/null +++ a/Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt @@ -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>; + }; diff -puN drivers/rtc/rtc-lpc32xx.c~drivers-rtc-rtc-lpc32xxc-add-device-tree-support drivers/rtc/rtc-lpc32xx.c --- a/drivers/rtc/rtc-lpc32xx.c~drivers-rtc-rtc-lpc32xxc-add-device-tree-support +++ a/drivers/rtc/rtc-lpc32xx.c @@ -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_r #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), }, }; _ Patches currently in -mm which might be from stigge@xxxxxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html