lkml.org 
[lkml]   [2012]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 4/8] wdt: Device tree support for pnx4008-wdt
    Date
    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),

    \
     
     \ /
      Last update: 2012-04-02 20:37    [W:0.020 / U:63.360 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site