* [PATCH RESEND v3] wdt: Device tree support for pnx4008-wdt
@ 2012-04-20 14:46 ` Roland Stigge
0 siblings, 0 replies; 4+ messages in thread
From: Roland Stigge @ 2012-04-20 14:46 UTC (permalink / raw)
To: wim, grant.likely, rob.herring, linux-watchdog, linux-kernel,
arm, linux-arm-kernel
Cc: Roland Stigge
This patch adds watchdog support to pnx4008-wdt.c
Signed-off-by: Roland Stigge <stigge@antcom.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
Applies to v3.4-rc3
NOTE: I separated out this patch from the first patch series of the LPC32xx
device tree conversion because most of those patches are already applied to
-next and are basically unrelated. The LPC32xx devicetree conversion builds
upon this patch.
Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt | 13 +++++++++++++
drivers/watchdog/pnx4008_wdt.c | 10 ++++++++++
2 files changed, 23 insertions(+)
--- /dev/null
+++ linux-2.6/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt
@@ -0,0 +1,13 @@
+* NXP PNX watchdog timer
+
+Required properties:
+- compatible: must be "nxp,pnx4008-wdt"
+- reg: physical base address of the controller and length of memory mapped
+ region.
+
+Example:
+
+ watchdog@4003C000 {
+ compatible = "nxp,pnx4008-wdt";
+ reg = <0x4003C000 0x1000>;
+ };
--- linux-2.6.orig/drivers/watchdog/pnx4008_wdt.c
+++ linux-2.6/drivers/watchdog/pnx4008_wdt.c
@@ -32,6 +32,7 @@
#include <linux/io.h>
#include <linux/slab.h>
#include <linux/err.h>
+#include <linux/of.h>
#include <mach/hardware.h>
/* WatchDog Timer - Chapter 23 Page 207 */
@@ -201,10 +202,19 @@ static int __devexit pnx4008_wdt_remove(
return 0;
}
+#ifdef CONFIG_OF
+static const struct of_device_id pnx4008_wdt_match[] = {
+ { .compatible = "nxp,pnx4008-wdt" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, pnx4008_wdt_match);
+#endif
+
static struct platform_driver platform_wdt_driver = {
.driver = {
.name = "pnx4008-watchdog",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(pnx4008_wdt_match),
},
.probe = pnx4008_wdt_probe,
.remove = __devexit_p(pnx4008_wdt_remove),
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH RESEND v3] wdt: Device tree support for pnx4008-wdt
@ 2012-04-20 14:46 ` Roland Stigge
0 siblings, 0 replies; 4+ messages in thread
From: Roland Stigge @ 2012-04-20 14:46 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds watchdog support to pnx4008-wdt.c
Signed-off-by: Roland Stigge <stigge@antcom.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
Applies to v3.4-rc3
NOTE: I separated out this patch from the first patch series of the LPC32xx
device tree conversion because most of those patches are already applied to
-next and are basically unrelated. The LPC32xx devicetree conversion builds
upon this patch.
Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt | 13 +++++++++++++
drivers/watchdog/pnx4008_wdt.c | 10 ++++++++++
2 files changed, 23 insertions(+)
--- /dev/null
+++ linux-2.6/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt
@@ -0,0 +1,13 @@
+* NXP PNX watchdog timer
+
+Required properties:
+- compatible: must be "nxp,pnx4008-wdt"
+- reg: physical base address of the controller and length of memory mapped
+ region.
+
+Example:
+
+ watchdog at 4003C000 {
+ compatible = "nxp,pnx4008-wdt";
+ reg = <0x4003C000 0x1000>;
+ };
--- linux-2.6.orig/drivers/watchdog/pnx4008_wdt.c
+++ linux-2.6/drivers/watchdog/pnx4008_wdt.c
@@ -32,6 +32,7 @@
#include <linux/io.h>
#include <linux/slab.h>
#include <linux/err.h>
+#include <linux/of.h>
#include <mach/hardware.h>
/* WatchDog Timer - Chapter 23 Page 207 */
@@ -201,10 +202,19 @@ static int __devexit pnx4008_wdt_remove(
return 0;
}
+#ifdef CONFIG_OF
+static const struct of_device_id pnx4008_wdt_match[] = {
+ { .compatible = "nxp,pnx4008-wdt" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, pnx4008_wdt_match);
+#endif
+
static struct platform_driver platform_wdt_driver = {
.driver = {
.name = "pnx4008-watchdog",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(pnx4008_wdt_match),
},
.probe = pnx4008_wdt_probe,
.remove = __devexit_p(pnx4008_wdt_remove),
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH RESEND v3] wdt: Device tree support for pnx4008-wdt
2012-04-20 14:46 ` Roland Stigge
@ 2012-04-20 18:22 ` Sergei Shtylyov
-1 siblings, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2012-04-20 18:22 UTC (permalink / raw)
To: Roland Stigge
Cc: wim, grant.likely, rob.herring, linux-watchdog, linux-kernel,
arm, linux-arm-kernel
Hello.
On 04/20/2012 06:46 PM, Roland Stigge wrote:
> This patch adds watchdog support to pnx4008-wdt.c
s/watchdog/device tree/
> Signed-off-by: Roland Stigge<stigge@antcom.de>
> Reviewed-by: Arnd Bergmann<arnd@arndb.de>
WBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH RESEND v3] wdt: Device tree support for pnx4008-wdt
@ 2012-04-20 18:22 ` Sergei Shtylyov
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2012-04-20 18:22 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 04/20/2012 06:46 PM, Roland Stigge wrote:
> This patch adds watchdog support to pnx4008-wdt.c
s/watchdog/device tree/
> Signed-off-by: Roland Stigge<stigge@antcom.de>
> Reviewed-by: Arnd Bergmann<arnd@arndb.de>
WBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-04-20 18:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-20 14:46 [PATCH RESEND v3] wdt: Device tree support for pnx4008-wdt Roland Stigge
2012-04-20 14:46 ` Roland Stigge
2012-04-20 18:22 ` Sergei Shtylyov
2012-04-20 18:22 ` Sergei Shtylyov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.