From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: Re: [PATCH 3/6] watchdog: s3c2410: Add support for device tree based probe Date: Mon, 20 Jun 2011 10:50:42 -0600 Message-ID: References: <1308567752-13451-1-git-send-email-thomas.abraham@linaro.org> <1308567752-13451-4-git-send-email-thomas.abraham@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1308567752-13451-4-git-send-email-thomas.abraham@linaro.org> Sender: linux-samsung-soc-owner@vger.kernel.org To: Thomas Abraham Cc: devicetree-discuss@lists.ozlabs.org, kgene.kim@samsung.com, linaro-dev@lists.linaro.org, patches@linaro.org, linux-samsung-soc@vger.kernel.org, ben-linux@fluff.org, linux-arm-kernel@lists.infradead.org, Wim Van Sebroeck , linux-watchdog@vger.kernel.org List-Id: devicetree@vger.kernel.org On Mon, Jun 20, 2011 at 5:02 AM, Thomas Abraham wrote: > This patch adds the of_match_table to enable s3c2410-wdt driver > to be probed when watchdog device node is found in the device tree. > > Signed-off-by: Thomas Abraham Acked-by: Grant Likely You need to send this to Wim and the linux-watchdog mailing lists. As far as I'm concerned, it can be merged immediately. g. > --- > =A0.../devicetree/bindings/watchdog/samsung-wdt.txt =A0 | =A0 12 ++++= ++++++++ > =A0drivers/watchdog/s3c2410_wdt.c =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 | =A0 10 ++++++++++ > =A02 files changed, 22 insertions(+), 0 deletions(-) > =A0create mode 100644 Documentation/devicetree/bindings/watchdog/sams= ung-wdt.txt > > diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.t= xt b/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt > new file mode 100644 > index 0000000..f2617e8 > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt > @@ -0,0 +1,12 @@ > +* Samsung's Watchdog Timer Controller > + > +The Samsung's Watchdog controller is used for resuming system operat= ion > +after a preset amount of time during which the WDT reset event has n= ot > +occured. > + > +Required properties: > +- compatible : should be "samsung,s3c2410-wdt" > +- reg : base physical address of the controller and length of memory= mapped > + =A0 =A0 =A0 region. > +- interrupts : interrupt number to the cpu. > + > diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c241= 0_wdt.c > index f7f5aa0..30da88f 100644 > --- a/drivers/watchdog/s3c2410_wdt.c > +++ b/drivers/watchdog/s3c2410_wdt.c > @@ -589,6 +589,15 @@ static int s3c2410wdt_resume(struct platform_dev= ice *dev) > =A0#define s3c2410wdt_resume =A0NULL > =A0#endif /* CONFIG_PM */ > > +#ifdef CONFIG_OF > +static const struct of_device_id s3c2410_wdt_match[] =3D { > + =A0 =A0 =A0 { .compatible =3D "samsung,s3c2410-wdt" }, > + =A0 =A0 =A0 {}, > +}; > +MODULE_DEVICE_TABLE(of, s3c2410_wdt_match); > +#else > +#define s3c2410_wdt_match NULL > +#endif > > =A0static struct platform_driver s3c2410wdt_driver =3D { > =A0 =A0 =A0 =A0.probe =A0 =A0 =A0 =A0 =A0=3D s3c2410wdt_probe, > @@ -599,6 +608,7 @@ static struct platform_driver s3c2410wdt_driver =3D= { > =A0 =A0 =A0 =A0.driver =A0 =A0 =A0 =A0 =3D { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0.owner =A0=3D THIS_MODULE, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0.name =A0 =3D "s3c2410-wdt", > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 .of_match_table =3D s3c2410_wdt_match, > =A0 =A0 =A0 =A0}, > =A0}; > > -- > 1.6.6.rc2 > > > _______________________________________________ > linaro-dev mailing list > linaro-dev@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/linaro-dev > --=20 Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.