diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2011-07-18 11:15:21 +0800 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2011-07-26 21:19:16 +0000 |
| commit | f5a427eedeead2be82561497a12788bd1f0c07d3 (patch) | |
| tree | c983a6b9a761dbb4a635b24766a8c39d9a894731 | |
| parent | 9487a9cc7140ef88d532c989570ee77436ede1e0 (diff) | |
| download | kernel_samsung_smdk4412-f5a427eedeead2be82561497a12788bd1f0c07d3.zip kernel_samsung_smdk4412-f5a427eedeead2be82561497a12788bd1f0c07d3.tar.gz kernel_samsung_smdk4412-f5a427eedeead2be82561497a12788bd1f0c07d3.tar.bz2 | |
watchdog: imx2_wdt: add device tree probe support
Adds device tree probe support for imx2_wdt driver.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -rw-r--r-- | Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt | 14 | ||||
| -rw-r--r-- | drivers/watchdog/imx2_wdt.c | 6 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt new file mode 100644 index 0000000..2144af1 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt @@ -0,0 +1,14 @@ +* Freescale i.MX Watchdog Timer (WDT) Controller + +Required properties: +- compatible : Should be "fsl,<soc>-wdt" +- reg : Should contain WDT registers location and length +- interrupts : Should contain WDT interrupt + +Examples: + +wdt@73f98000 { + compatible = "fsl,imx51-wdt", "fsl,imx21-wdt"; + reg = <0x73f98000 0x4000>; + interrupts = <58>; +}; diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 86f7cac..b8ef2c6 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -329,12 +329,18 @@ static void imx2_wdt_shutdown(struct platform_device *pdev) } } +static const struct of_device_id imx2_wdt_dt_ids[] = { + { .compatible = "fsl,imx21-wdt", }, + { /* sentinel */ } +}; + static struct platform_driver imx2_wdt_driver = { .remove = __exit_p(imx2_wdt_remove), .shutdown = imx2_wdt_shutdown, .driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, + .of_match_table = imx2_wdt_dt_ids, }, }; |