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

Commit 6924089c authored by Robert Jarzmik's avatar Robert Jarzmik
Browse files

watchdog: sa11x0/pxa: get rid of get_clock_tick_rate 



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: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Acked-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent f4e14edf

drivers/watchdog/sa1100_wdt.c

+23 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/clk.h>

#include <linux/types.h>

#include <linux/kernel.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 struct clk *clk;



static int __init sa1100dog_init(void)

{

	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
@@ -176,11 +192,17 @@ static int __init sa1100dog_init(void) 
		pr_info("SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n",

			margin);

	return ret;

err:

	clk_disable_unprepare(clk);

	clk_put(clk);

	return ret;

}



static void __exit sa1100dog_exit(void)

{

	misc_deregister(&sa1100dog_miscdev);

	clk_disable_unprepare(clk);

	clk_put(clk);

}



module_init(sa1100dog_init);