diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-17 20:15:38 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-17 20:15:38 (GMT) |
commit | 6606b342febfd470b4a33acb73e360eeaca1d9bb (patch) | |
tree | 2414cc2ca582aa34be6e6ed5c830658fbf21db41 /drivers/watchdog/cadence_wdt.c | |
parent | a016af2e70bfca23f2f5de7d8708157b86ea374d (diff) | |
parent | ac36856fe4321454b6789c019c96c3ec854094ed (diff) | |
download | linux-6606b342febfd470b4a33acb73e360eeaca1d9bb.tar.xz |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck:
"This adds following items:
- watchdog restart handler support
- watchdog reboot notifier support
- watchdog sysfs attributes
- support for the following new devices: AMD Mullins platform, AMD
Carrizo platform, meson8b SoC, CSRatlas7, TS-4800, Alphascale
asm9260-wdt, Zodiac, Sigma Designs SMP86xx/SMP87xx
- Changes in refcounting for the watchdog core
- watchdog core improvements
- and small fixes"
* git://www.linux-watchdog.org/linux-watchdog: (60 commits)
watchdog: asm9260: remove __init and __exit annotations
watchdog: Drop pointer to watchdog device from struct watchdog_device
watchdog: ziirave: Use watchdog infrastructure to create sysfs attributes
watchdog: Add support for creating driver specific sysfs attributes
watchdog: kill unref/ref ops
watchdog: stmp3xxx: Remove unused variables
watchdog: add MT7621 watchdog support
hwmon: (sch56xx) Drop watchdog driver data reference count callbacks
watchdog: da9055_wdt: Drop reference counting
watchdog: da9052_wdt: Drop reference counting
watchdog: Separate and maintain variables based on variable lifetime
watchdog: diag288: Stop re-using watchdog core internal flags
watchdog: Create watchdog device in watchdog_dev.c
watchdog: qcom-wdt: Do not set 'dev' in struct watchdog_device
watchdog: mena21: Do not use device pointer from struct watchdog_device
watchdog: gpio: Do not use device pointer from struct watchdog_device
watchdog: tangox: Print info message using pointer to platform device
watchdog: bcm2835_wdt: Drop log message if watchdog is stopped
devicetree: watchdog: add binding for Sigma Designs SMP8642 watchdog
watchdog: add support for Sigma Designs SMP86xx/SMP87xx
...
Diffstat (limited to 'drivers/watchdog/cadence_wdt.c')
-rw-r--r-- | drivers/watchdog/cadence_wdt.c | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c index bcfd2a2..4dda902 100644 --- a/drivers/watchdog/cadence_wdt.c +++ b/drivers/watchdog/cadence_wdt.c @@ -18,7 +18,6 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> -#include <linux/reboot.h> #include <linux/watchdog.h> #define CDNS_WDT_DEFAULT_TIMEOUT 10 @@ -72,7 +71,6 @@ MODULE_PARM_DESC(nowayout, * @ctrl_clksel: counter clock prescaler selection * @io_lock: spinlock for IO register access * @cdns_wdt_device: watchdog device structure - * @cdns_wdt_notifier: notifier structure * * Structure containing parameters specific to cadence watchdog. */ @@ -84,7 +82,6 @@ struct cdns_wdt { u32 ctrl_clksel; spinlock_t io_lock; struct watchdog_device cdns_wdt_device; - struct notifier_block cdns_wdt_notifier; }; /* Write access to Registers */ @@ -280,29 +277,6 @@ static struct watchdog_ops cdns_wdt_ops = { .set_timeout = cdns_wdt_settimeout, }; -/** - * cdns_wdt_notify_sys - Notifier for reboot or shutdown. - * - * @this: handle to notifier block - * @code: turn off indicator - * @unused: unused - * Return: NOTIFY_DONE - * - * This notifier is invoked whenever the system reboot or shutdown occur - * because we need to disable the WDT before system goes down as WDT might - * reset on the next boot. - */ -static int cdns_wdt_notify_sys(struct notifier_block *this, unsigned long code, - void *unused) -{ - struct cdns_wdt *wdt = container_of(this, struct cdns_wdt, - cdns_wdt_notifier); - if (code == SYS_DOWN || code == SYS_HALT) - cdns_wdt_stop(&wdt->cdns_wdt_device); - - return NOTIFY_DONE; -} - /************************Platform Operations*****************************/ /** * cdns_wdt_probe - Probe call for the device. @@ -360,6 +334,7 @@ static int cdns_wdt_probe(struct platform_device *pdev) } watchdog_set_nowayout(cdns_wdt_device, nowayout); + watchdog_stop_on_reboot(cdns_wdt_device); watchdog_set_drvdata(cdns_wdt_device, wdt); wdt->clk = devm_clk_get(&pdev->dev, NULL); @@ -386,14 +361,6 @@ static int cdns_wdt_probe(struct platform_device *pdev) spin_lock_init(&wdt->io_lock); - wdt->cdns_wdt_notifier.notifier_call = &cdns_wdt_notify_sys; - ret = register_reboot_notifier(&wdt->cdns_wdt_notifier); - if (ret != 0) { - dev_err(&pdev->dev, "cannot register reboot notifier err=%d)\n", - ret); - goto err_clk_disable; - } - ret = watchdog_register_device(cdns_wdt_device); if (ret) { dev_err(&pdev->dev, "Failed to register wdt device\n"); @@ -427,7 +394,6 @@ static int cdns_wdt_remove(struct platform_device *pdev) cdns_wdt_stop(&wdt->cdns_wdt_device); watchdog_unregister_device(&wdt->cdns_wdt_device); - unregister_reboot_notifier(&wdt->cdns_wdt_notifier); clk_disable_unprepare(wdt->clk); return 0; @@ -455,8 +421,7 @@ static void cdns_wdt_shutdown(struct platform_device *pdev) */ static int __maybe_unused cdns_wdt_suspend(struct device *dev) { - struct platform_device *pdev = container_of(dev, - struct platform_device, dev); + struct platform_device *pdev = to_platform_device(dev); struct cdns_wdt *wdt = platform_get_drvdata(pdev); cdns_wdt_stop(&wdt->cdns_wdt_device); @@ -474,8 +439,7 @@ static int __maybe_unused cdns_wdt_suspend(struct device *dev) static int __maybe_unused cdns_wdt_resume(struct device *dev) { int ret; - struct platform_device *pdev = container_of(dev, - struct platform_device, dev); + struct platform_device *pdev = to_platform_device(dev); struct cdns_wdt *wdt = platform_get_drvdata(pdev); ret = clk_prepare_enable(wdt->clk); |