Patchwork [RESEND,v5] rtc: Add device tree support for LPC32xx

login
register
mail settings
Submitter stigge@antcom.de
Date May 3, 2012, 7:33 p.m.
Message ID <1336073581-25667-1-git-send-email-stigge@antcom.de>
Download mbox | patch
Permalink /patch/156766/
State New
Headers show

Comments

stigge@antcom.de - May 3, 2012, 7:33 p.m.
This patch adds device tree support for rtc-lpc32xx.c

Signed-off-by: Roland Stigge <stigge@antcom.de>

---

Applies to v3.4-rc5

Changes since v4:
* Reduced "compatible" strings to just the first one

 Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt |   15 +++++++++++++++
 drivers/rtc/rtc-lpc32xx.c                             |   12 +++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
Rob Herring - May 3, 2012, 7:36 p.m.
On 05/03/2012 02:33 PM, Roland Stigge wrote:
> This patch adds device tree support for rtc-lpc32xx.c
> 
> Signed-off-by: Roland Stigge <stigge@antcom.de>
> 

Acked-by: Rob Herring <rob.herring@calxeda.com>

> ---
> 
> Applies to v3.4-rc5
> 
> Changes since v4:
> * Reduced "compatible" strings to just the first one
> 
>  Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt |   15 +++++++++++++++
>  drivers/rtc/rtc-lpc32xx.c                             |   12 +++++++++++-
>  2 files changed, 26 insertions(+), 1 deletion(-)
> 
> --- /dev/null
> +++ linux-2.6/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>;
> +	};
> --- linux-2.6.orig/drivers/rtc/rtc-lpc32xx.c
> +++ linux-2.6/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),
>  	},
>  };
>  
> _______________________________________________
> devicetree-discuss mailing list
> devicetree-discuss@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/devicetree-discuss
Arnd Bergmann - May 4, 2012, 12:58 p.m.
On Thursday 03 May 2012, Roland Stigge wrote:
> This patch adds device tree support for rtc-lpc32xx.c
> 
> Signed-off-by: Roland Stigge <stigge@antcom.de>
> 

Acked-by: Arnd Bergmann <arnd@arndb.de>

Patch

--- /dev/null
+++ linux-2.6/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>;
+	};
--- linux-2.6.orig/drivers/rtc/rtc-lpc32xx.c
+++ linux-2.6/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),
 	},
 };