iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

watchdog: sa11x0/pxa: get rid of get_clock_tick_rate

Browse Source 
The OS timer rate used for the watchdog can now be fetched from the
standard clock API. This will remove the last user of
get_clock_tick_rate() in both pxa and sa11x0 architectures.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Robert Jarzmik 2016-09-19 21:12:14 +02:00
parent f4e14edf25
commit 6924089c48
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/watchdog/sa1100_wdt.c
View File

@ -22,6 +22,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/clk.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/fs.h> #include <linux/fs.h>
@ -155,12 +156,27 @@ static struct miscdevice sa1100dog_miscdev = {
}; };
static int margin __initdata = 60; /* (secs) Default is 1 minute */ static int margin __initdata = 60; /* (secs) Default is 1 minute */
static struct clk *clk;
static int __init sa1100dog_init(void) static int __init sa1100dog_init(void)
{ {
int ret; int ret;
oscr_freq = get_clock_tick_rate(); clk = clk_get(NULL, "OSTIMER0");
if (IS_ERR(clk)) {
pr_err("SA1100/PXA2xx Watchdog Timer: clock not found: %d\n",
(int) PTR_ERR(clk));
return PTR_ERR(clk);
}
ret = clk_prepare_enable(clk);
if (ret) {
pr_err("SA1100/PXA2xx Watchdog Timer: clock failed to prepare+enable: %d\n",
ret);
goto err;
}
oscr_freq = clk_get_rate(clk);
/* /*
* Read the reset status, and save it for later. If * Read the reset status, and save it for later. If
@ -176,11 +192,17 @@ static int __init sa1100dog_init(void)
pr_info("SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n", pr_info("SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n",
margin); margin);
return ret; return ret;
err:
clk_disable_unprepare(clk);
clk_put(clk);
return ret;
} }
static void __exit sa1100dog_exit(void) static void __exit sa1100dog_exit(void)
{ {
misc_deregister(&sa1100dog_miscdev); misc_deregister(&sa1100dog_miscdev);
clk_disable_unprepare(clk);
clk_put(clk);
} }
module_init(sa1100dog_init); module_init(sa1100dog_init);