diff options
| author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2014-03-15 15:17:59 -0300 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2014-06-10 21:44:24 +0200 |
| commit | ebf5cf7628f04b6988b9ad08d919728748ecbce0 (patch) | |
| tree | cf50ba2040edb332c4edfea48a3c6db688a28702 /drivers/watchdog | |
| parent | eba985e20c70d99a278c04ff5c492d90d53a20dd (diff) | |
| download | talos-op-linux-ebf5cf7628f04b6988b9ad08d919728748ecbce0.tar.gz talos-op-linux-ebf5cf7628f04b6988b9ad08d919728748ecbce0.zip | |
watchdog: orion: Introduce per-SoC stop() function
In order to support other SoCs, it's needed to have a different stop()
implementation for each SoC. This commit adds no functionality, and it
consists of preparation work.
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/orion_wdt.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index 365d6cc53074..be7c71c5d951 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -58,6 +58,7 @@ struct orion_watchdog_data { int (*clock_init)(struct platform_device *, struct orion_watchdog *); int (*start)(struct watchdog_device *); + int (*stop)(struct watchdog_device *); }; struct orion_watchdog { @@ -192,7 +193,7 @@ static int orion_wdt_start(struct watchdog_device *wdt_dev) return dev->data->start(wdt_dev); } -static int orion_wdt_stop(struct watchdog_device *wdt_dev) +static int orion_stop(struct watchdog_device *wdt_dev) { struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); @@ -205,6 +206,29 @@ static int orion_wdt_stop(struct watchdog_device *wdt_dev) return 0; } +static int armada370_stop(struct watchdog_device *wdt_dev) +{ + struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); + u32 reg; + + /* Disable reset on watchdog */ + reg = readl(dev->rstout); + reg &= ~dev->data->rstout_enable_bit; + writel(reg, dev->rstout); + + /* Disable watchdog timer */ + atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit, 0); + + return 0; +} + +static int orion_wdt_stop(struct watchdog_device *wdt_dev) +{ + struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev); + + return dev->data->stop(wdt_dev); +} + static int orion_wdt_enabled(struct orion_watchdog *dev) { bool enabled, running; @@ -277,6 +301,7 @@ static const struct orion_watchdog_data orion_data = { .wdt_counter_offset = 0x24, .clock_init = orion_wdt_clock_init, .start = orion_start, + .stop = orion_stop, }; static const struct orion_watchdog_data armada370_data = { @@ -285,6 +310,7 @@ static const struct orion_watchdog_data armada370_data = { .wdt_counter_offset = 0x34, .clock_init = armada370_wdt_clock_init, .start = armada370_start, + .stop = armada370_stop, }; static const struct orion_watchdog_data armadaxp_data = { @@ -293,6 +319,7 @@ static const struct orion_watchdog_data armadaxp_data = { .wdt_counter_offset = 0x34, .clock_init = armadaxp_wdt_clock_init, .start = armada370_start, + .stop = armada370_stop, }; static const struct of_device_id orion_wdt_of_match_table[] = { |
