On Wed, Oct 02, 2013 at 01:44:32PM -0500, dinguyen@xxxxxxxxxx wrote:
> From: Dinh Nguyen <dinguyen@xxxxxxxxxx>
>
> Add device tree support to the DW watchdog timer.
>
> Signed-off-by: Dinh Nguyen <dinguyen@xxxxxxxxxx>
> Acked-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
> Reviewed-by: Pavel Machek <pavel@xxxxxxx>
> Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
> Cc: Jamie Iles <jamie@xxxxxxxxxxxxx>
> Cc: Viresh Kumar <viresh.linux@xxxxxxxxx>
> Cc: Wim Van Sebroeck <wim@xxxxxxxxx>
> Cc: Pavel Machek <pavel@xxxxxxx>
> Cc: Rob Herring <rob.herring@xxxxxxxxxxx>
> Cc: Pawel Moll <pawel.moll@xxxxxxx>
> Cc: Mark Rutland <mark.rutland@xxxxxxx>
> Cc: Stephen Warren <swarren@xxxxxxxxxxxxx>
> Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Cc: devicetree@xxxxxxxxxxxxxxx
> Cc: linux-watchdog@xxxxxxxxxxxxxxx
> ---
> v2:
> - Use of_match_ptr() for of_match_table
> ---
> .../devicetree/bindings/watchdog/dw_wdt.txt | 16 ++++++++++++++++
> drivers/watchdog/dw_wdt.c | 8 ++++++++
> 2 files changed, 24 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/watchdog/dw_wdt.txt
>
> diff --git a/Documentation/devicetree/bindings/watchdog/dw_wdt.txt b/Documentation/devicetree/bindings/watchdog/dw_wdt.txt
> new file mode 100644
> index 0000000..29e150b
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/dw_wdt.txt
> @@ -0,0 +1,16 @@
> +Synopsys Designware Watchdog Timer
> +
> +Required Properties:
> +
> +- Compatiblity : "snps,dw-wdt"
> +- reg : Base address of the watchdog timer register.
> +
> +Example:
> +
> + watchdog0: wd@ffd02000 {
> + compatible = "snps,dw-wdt";
> + reg = <0xffd02000 0x1000>;
> + interrupts = <0 171 4>;
> + clocks = <&per_base_clk>;
> + status = "okay";
> + };
> diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
> index 2037669..a720f9b 100644
> --- a/drivers/watchdog/dw_wdt.c
> +++ b/drivers/watchdog/dw_wdt.c
> @@ -29,6 +29,7 @@
> #include <linux/miscdevice.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> +#include <linux/of.h>
> #include <linux/pm.h>
> #include <linux/platform_device.h>
> #include <linux/spinlock.h>
> @@ -343,12 +344,19 @@ static int dw_wdt_drv_remove(struct platform_device *pdev)
> return 0;
> }
>
> +static const struct of_device_id dw_wdt_of_match[] = {
> + { .compatible = "snps,dw-wdt", },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, dw_wdt_of_match);
> +
> static struct platform_driver dw_wdt_driver = {
> .probe = dw_wdt_drv_probe,
> .remove = dw_wdt_drv_remove,
> .driver = {
> .name = "dw_wdt",
> .owner = THIS_MODULE,
> + .of_match_table = of_match_ptr(dw_wdt_of_match),
There is a separate set of patches from Sachin, removing unnecessary
uses of of_match_ptr() from various watchdog drivers. Sachin's argument
is that it does not make sense to use of_match_ptr if the function
it points to (dw_wdt_of_match in this case) is always compiled
unconditionally anyway.
Your comments suggest that you actually _added_ of_match_ptr() in v2 of this
patch, even though dw_wdt_of_match always exists and of_match_ptr is thus
technically unnecessary.
Not that I really care one way or another, but can we get an authoritative
answer what subsystem maintainers are supposed to accept ?
Thanks,
Guenter
> #ifdef CONFIG_PM
> .pm = &dw_wdt_pm_ops,
> #endif /* CONFIG_PM */
> --
> 1.7.9.5
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
