netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Roland Stigge <stigge@antcom.de>
To: arm@kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
	w.sang@pengutronix.de, srinivas.bakki@nxp.com,
	kevin.wells@nxp.com, gregkh@linuxfoundation.org,
	netdev@vger.kernel.org, rtc-linux@googlegroups.com,
	a.zummo@towertech.it, linux-watchdog@vger.kernel.org,
	wim@iguana.be
Cc: Roland Stigge <stigge@antcom.de>
Subject: [PATCH 7/7] wdt: Device tree support for pnx4008-wdt
Date: Mon,  2 Apr 2012 14:56:04 +0200	[thread overview]
Message-ID: <1333371364-21347-8-git-send-email-stigge@antcom.de> (raw)
In-Reply-To: <1333371364-21347-1-git-send-email-stigge@antcom.de>

This patch adds watchdog support to pnx4008-wdt.c

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

---

 Applies to v3.4-rc1

 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),

  parent reply	other threads:[~2012-04-02 12:56 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-02 12:55 [PATCH 0/7]: arm: lpc32xx: Device tree support Roland Stigge
2012-04-02 12:55 ` [PATCH 1/7] iio: Add device tree support to LPC32xx ADC Roland Stigge
2012-04-02 12:55 ` [PATCH 2/7] rtc: Add device tree support for LPC32xx Roland Stigge
2012-04-02 12:56 ` [PATCH 3/7] net: Add device tree support to LPC32xx Roland Stigge
2012-04-02 12:56 ` [PATCH 4/7] arm: mach-pnx4008: Adjust i2c.c to updated i2c-pnx.c Roland Stigge
     [not found]   ` <1333371364-21347-5-git-send-email-stigge-uj/7R2tJ6VmzQB+pC5nmwQ@public.gmane.org>
2012-04-02 13:07     ` Arnd Bergmann
2012-04-02 12:56 ` [PATCH 5/7] i2c: Add device tree support to i2c-pnx.c Roland Stigge
     [not found]   ` <1333371364-21347-6-git-send-email-stigge-uj/7R2tJ6VmzQB+pC5nmwQ@public.gmane.org>
2012-04-02 13:17     ` Arnd Bergmann
2012-04-02 12:56 ` [PATCH 6/7] i2c-pnx.c: Fix suspend Roland Stigge
2012-04-02 12:56 ` Roland Stigge [this message]
     [not found] ` <1333371364-21347-1-git-send-email-stigge-uj/7R2tJ6VmzQB+pC5nmwQ@public.gmane.org>
2012-04-02 13:45   ` [PATCH 0/7]: arm: lpc32xx: Device tree support Arnd Bergmann
     [not found]     ` <201204021345.04512.arnd-r2nGTMty4D4@public.gmane.org>
2012-04-02 14:02       ` Roland Stigge

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1333371364-21347-8-git-send-email-stigge@antcom.de \
    --to=stigge@antcom.de \
    --cc=a.zummo@towertech.it \
    --cc=arm@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=kevin.wells@nxp.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rtc-linux@googlegroups.com \
    --cc=srinivas.bakki@nxp.com \
    --cc=w.sang@pengutronix.de \
    --cc=wim@iguana.be \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).