Subject: [merged] drivers-rtc-rtc-ds1742c-add-devicetree-support.patch removed from -mm tree To: shc_work@xxxxxxx,mark.rutland@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 24 Jan 2014 11:02:34 -0800 The patch titled Subject: drivers/rtc/rtc-ds1742.c: add devicetree support has been removed from the -mm tree. Its filename was drivers-rtc-rtc-ds1742c-add-devicetree-support.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Alexander Shiyan <shc_work@xxxxxxx> Subject: drivers/rtc/rtc-ds1742.c: add devicetree support This patch allows the driver to be enabled with devicetree. Signed-off-by: Alexander Shiyan <shc_work@xxxxxxx> Acked-by: Mark Rutland <mark.rutland@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/devicetree/bindings/rtc/maxim,ds1742.txt | 12 ++++++++++ drivers/rtc/rtc-ds1742.c | 10 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff -puN /dev/null Documentation/devicetree/bindings/rtc/maxim,ds1742.txt --- /dev/null +++ a/Documentation/devicetree/bindings/rtc/maxim,ds1742.txt @@ -0,0 +1,12 @@ +* Maxim (Dallas) DS1742/DS1743 Real Time Clock + +Required properties: +- compatible: Should contain "maxim,ds1742". +- reg: Physical base address of the RTC and length of memory + mapped region. + +Example: + rtc: rtc@10000000 { + compatible = "maxim,ds1742"; + reg = <0x10000000 0x800>; + }; diff -puN drivers/rtc/rtc-ds1742.c~drivers-rtc-rtc-ds1742c-add-devicetree-support drivers/rtc/rtc-ds1742.c --- a/drivers/rtc/rtc-ds1742.c~drivers-rtc-rtc-ds1742c-add-devicetree-support +++ a/drivers/rtc/rtc-ds1742.c @@ -13,12 +13,13 @@ */ #include <linux/bcd.h> -#include <linux/init.h> #include <linux/kernel.h> #include <linux/gfp.h> #include <linux/delay.h> #include <linux/jiffies.h> #include <linux/rtc.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/io.h> #include <linux/module.h> @@ -215,12 +216,19 @@ static int ds1742_rtc_remove(struct plat return 0; } +static struct of_device_id __maybe_unused ds1742_rtc_of_match[] = { + { .compatible = "maxim,ds1742", }, + { } +}; +MODULE_DEVICE_TABLE(of, ds1742_rtc_of_match); + static struct platform_driver ds1742_rtc_driver = { .probe = ds1742_rtc_probe, .remove = ds1742_rtc_remove, .driver = { .name = "rtc-ds1742", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(ds1742_rtc_of_match), }, }; _ Patches currently in -mm which might be from shc_work@xxxxxxx 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