Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 789cd470 authored by Ulrik Bech Hald's avatar Ulrik Bech Hald Committed by Wim Van Sebroeck
Browse files

[WATCHDOG] OMAP fixes: enable clock in probe, trigger timer reload 



This patch contains two fixes:

1)In omap_wdt_probe() the watchdog is reset and disabled. This
requires register access and the clks needs to be enabled temporarily

2)In omap_wdt_open() the timer register needs to be reloaded
to trigger a new timer value (the default of 60s)

Tested on OMAP34xx platform (Zoom1)

Reviewed-by: default avatarKevin Hilman <khilman@ti.deeprootsystems.com>
Signed-off-by: default avatarUlrik Bech Hald <ubh@ti.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 90074dce

drivers/watchdog/omap_wdt.c

+7 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ static int omap_wdt_open(struct inode *inode, struct file *file) 
	file->private_data = (void *) wdev;



	omap_wdt_set_timeout(wdev);

	omap_wdt_ping(wdev); /* trigger loading of new timeout value */

	omap_wdt_enable(wdev);



	return nonseekable_open(inode, file);
@@ -313,6 +314,9 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, wdev);



	clk_enable(wdev->ick);

	clk_enable(wdev->fck);



	omap_wdt_disable(wdev);

	omap_wdt_adjust_timeout(timer_margin);
@@ -332,6 +336,9 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev) 
	/* autogate OCP interface clock */

	__raw_writel(0x01, wdev->base + OMAP_WATCHDOG_SYS_CONFIG);



	clk_disable(wdev->ick);

	clk_disable(wdev->fck);



	omap_wdt_dev = pdev;



	return 0;