| Message ID | 1296998250-21856-5-git-send-email-thomas.abraham@linaro.org |
|---|---|
| State | New |
| Headers | show |
Thomas, On 02/06/2011 07:17 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<thomas.abraham@linaro.org> > --- > drivers/watchdog/s3c2410_wdt.c | 10 ++++++++++ > 1 files changed, 10 insertions(+), 0 deletions(-) > > diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c > index ae53662..a9edd50 100644 > --- a/drivers/watchdog/s3c2410_wdt.c > +++ b/drivers/watchdog/s3c2410_wdt.c > @@ -592,6 +592,13 @@ static int s3c2410wdt_resume(struct platform_device *dev) > #define s3c2410wdt_resume NULL > #endif /* CONFIG_PM */ > > +#ifdef CONFIG_OF > +static const struct of_device_id s3c2410_wdt_match[] = { > + { .compatible = "samsung,s3c2410-wdt" }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, s3c2410_wdt_match); > +#endif > > static struct platform_driver s3c2410wdt_driver = { > .probe = s3c2410wdt_probe, > @@ -602,6 +609,9 @@ static struct platform_driver s3c2410wdt_driver = { > .driver = { > .owner = THIS_MODULE, > .name = "s3c2410-wdt", > +#ifdef CONFIG_OF > + .of_match_table = s3c2410_wdt_match, > +#endif The ifdefs aren't necessary if you pick-up Grant's patch in devicetree/next branch. Rob
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index ae53662..a9edd50 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -592,6 +592,13 @@ static int s3c2410wdt_resume(struct platform_device *dev) #define s3c2410wdt_resume NULL #endif /* CONFIG_PM */ +#ifdef CONFIG_OF +static const struct of_device_id s3c2410_wdt_match[] = { + { .compatible = "samsung,s3c2410-wdt" }, + {}, +}; +MODULE_DEVICE_TABLE(of, s3c2410_wdt_match); +#endif static struct platform_driver s3c2410wdt_driver = { .probe = s3c2410wdt_probe, @@ -602,6 +609,9 @@ static struct platform_driver s3c2410wdt_driver = { .driver = { .owner = THIS_MODULE, .name = "s3c2410-wdt", +#ifdef CONFIG_OF + .of_match_table = s3c2410_wdt_match, +#endif }, };
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 <thomas.abraham@linaro.org> --- drivers/watchdog/s3c2410_wdt.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)