On Mon, Nov 19, 2012 at 5:06 PM, Jason Cooper <[email protected]> wrote:
> On Mon, Nov 19, 2012 at 03:10:38PM +0100, Fabio Porcedda wrote: > > Only compile tested. > > > > Signed-off-by: Fabio Porcedda <[email protected]> > > Cc: Jason Cooper <[email protected]> > > Cc: Andrew Lunn <[email protected]> > > --- > > Documentation/devicetree/bindings/watchdog/marvel.txt | 5 +++++ > > drivers/watchdog/orion_wdt.c | 8 +++----- > > 2 files changed, 8 insertions(+), 5 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/watchdog/marvel.txt > b/Documentation/devicetree/bindings/watchdog/marvel.txt > > index 0b2503a..5dc8d30 100644 > > --- a/Documentation/devicetree/bindings/watchdog/marvel.txt > > +++ b/Documentation/devicetree/bindings/watchdog/marvel.txt > > @@ -5,10 +5,15 @@ Required Properties: > > - Compatibility : "marvell,orion-wdt" > > - reg : Address of the timer registers > > > > +Optional properties: > > + > > +- timeout-sec : Contains the watchdog timeout in seconds > > + > > Example: > > > > wdt@20300 { > > compatible = "marvell,orion-wdt"; > > reg = <0x20300 0x28>; > > + timeout-sec = <10>; > > status = "okay"; > > }; > > diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c > > index c20f96b..446a3e9 100644 > > --- a/drivers/watchdog/orion_wdt.c > > +++ b/drivers/watchdog/orion_wdt.c > > @@ -162,12 +162,10 @@ static int __devinit orion_wdt_probe(struct > platform_device *pdev) > > > > wdt_max_duration = WDT_MAX_CYCLE_COUNT / wdt_tclk; > > > > - if ((heartbeat < 1) || (heartbeat > wdt_max_duration)) > > - heartbeat = wdt_max_duration; > > - > > - orion_wdt.timeout = heartbeat; > > orion_wdt.min_timeout = 1; > > + orion_wdt.timeout = wdt_max_duration; > > orion_wdt.max_timeout = wdt_max_duration; > > + watchdog_init_timeout(&orion_wdt, heartbeat, pdev->dev.of_node); > > Hi Fabio, > > There are many boards using pdata, !CONFIG_OF. Have you compile-tested > this without CONFIG_OF? > Hi Jason, > thx, > > Jason. > > > > > watchdog_set_nowayout(&orion_wdt, nowayout); > > ret = watchdog_register_device(&orion_wdt); > > @@ -177,7 +175,7 @@ static int __devinit orion_wdt_probe(struct > platform_device *pdev) > > } > > > > pr_info("Initial timeout %d sec%s\n", > > - heartbeat, nowayout ? ", nowayout" : ""); > > + orion_wdt.timeout, nowayout ? ", nowayout" : ""); > > return 0; > > } > > > > -- > > 1.8.0 > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > [email protected] > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > I've tested with and without the CONFIG_OF define. The first time I’ve used the kirkwood_defconfig without modifications, the second time I’ve enabled only the CONFIG_MACH_SHEEVAPLUG and disabled USE_OF. In both cases the orion_wdt driver compile without any warning. Thanks for the review. Best regards -- Fabio Porcedda
_______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
