Commit a97a09bd authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Wim Van Sebroeck

watchdog: at91sam9: get and use slow clock

Commit dca1a4b5 ("clk: at91: keep slow clk enabled to prevent system
hang") added a workaround for the slow clock as it is not properly handled
by its users.

Get and use the slow clock as it is necessary for the at91sam9 watchdog.
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent f4fff94e
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/clk.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
...@@ -90,6 +91,7 @@ struct at91wdt { ...@@ -90,6 +91,7 @@ struct at91wdt {
unsigned long heartbeat; /* WDT heartbeat in jiffies */ unsigned long heartbeat; /* WDT heartbeat in jiffies */
bool nowayout; bool nowayout;
unsigned int irq; unsigned int irq;
struct clk *sclk;
}; };
/* ......................................................................... */ /* ......................................................................... */
...@@ -352,15 +354,25 @@ static int __init at91wdt_probe(struct platform_device *pdev) ...@@ -352,15 +354,25 @@ static int __init at91wdt_probe(struct platform_device *pdev)
if (IS_ERR(wdt->base)) if (IS_ERR(wdt->base))
return PTR_ERR(wdt->base); return PTR_ERR(wdt->base);
wdt->sclk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(wdt->sclk))
return PTR_ERR(wdt->sclk);
err = clk_prepare_enable(wdt->sclk);
if (err) {
dev_err(&pdev->dev, "Could not enable slow clock\n");
return err;
}
if (pdev->dev.of_node) { if (pdev->dev.of_node) {
err = of_at91wdt_init(pdev->dev.of_node, wdt); err = of_at91wdt_init(pdev->dev.of_node, wdt);
if (err) if (err)
return err; goto err_clk;
} }
err = at91_wdt_init(pdev, wdt); err = at91_wdt_init(pdev, wdt);
if (err) if (err)
return err; goto err_clk;
platform_set_drvdata(pdev, wdt); platform_set_drvdata(pdev, wdt);
...@@ -368,6 +380,11 @@ static int __init at91wdt_probe(struct platform_device *pdev) ...@@ -368,6 +380,11 @@ static int __init at91wdt_probe(struct platform_device *pdev)
wdt->wdd.timeout, wdt->nowayout); wdt->wdd.timeout, wdt->nowayout);
return 0; return 0;
err_clk:
clk_disable_unprepare(wdt->sclk);
return err;
} }
static int __exit at91wdt_remove(struct platform_device *pdev) static int __exit at91wdt_remove(struct platform_device *pdev)
...@@ -377,6 +394,7 @@ static int __exit at91wdt_remove(struct platform_device *pdev) ...@@ -377,6 +394,7 @@ static int __exit at91wdt_remove(struct platform_device *pdev)
pr_warn("I quit now, hardware will probably reboot!\n"); pr_warn("I quit now, hardware will probably reboot!\n");
del_timer(&wdt->timer); del_timer(&wdt->timer);
clk_disable_unprepare(wdt->sclk);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment