mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-22 04:37:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

watchdog: bcm2835_wdt: Switch to new sys-off handler API

Browse Source 
Kernel now supports chained power-off handlers. Use
devm_register_sys_off_handler() that registers a power-off handler. Legacy
pm_power_off() will be removed once all drivers and archs are converted to
the new sys-off API.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20260302180853.224112-1-afd@ti.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Andrew Davis
2026-03-02 12:08:53 -06:00
committed by Guenter Roeck
parent 587d5a3778
commit bdd918c4e4
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/watchdog/bcm2835_wdt.c
View File

@@ -19,6 +19,7 @@
#include <linux/platform_device.h>
#include <linux/of_address.h>
#include <linux/of_platform.h>
#include <linux/reboot.h>
#define PM_RSTC 0x1c
#define PM_RSTS 0x20
@@ -49,8 +50,6 @@ struct bcm2835_wdt {
spinlock_t lock;
};
static struct bcm2835_wdt *bcm2835_power_off_wdt;
static unsigned int heartbeat;
static bool nowayout = WATCHDOG_NOWAYOUT;
@@ -150,9 +149,9 @@ static struct watchdog_device bcm2835_wdt_wdd = {
* indicate to bootcode.bin not to reboot, then most of the chip will be
* powered off.
*/
static void bcm2835_power_off(void)
static int bcm2835_power_off(struct sys_off_data *data)
{
struct bcm2835_wdt *wdt = bcm2835_power_off_wdt;
struct bcm2835_wdt *wdt = data->cb_data;
u32 val;
/*
@@ -166,6 +165,8 @@ static void bcm2835_power_off(void)
/* Continue with normal reset mechanism */
__bcm2835_restart(wdt);
return NOTIFY_DONE;
}
static int bcm2835_wdt_probe(struct platform_device *pdev)
@@ -206,28 +207,17 @@ static int bcm2835_wdt_probe(struct platform_device *pdev)
if (err)
return err;
if (of_device_is_system_power_controller(pdev->dev.parent->of_node)) {
if (!pm_power_off) {
pm_power_off = bcm2835_power_off;
bcm2835_power_off_wdt = wdt;
} else {
dev_info(dev, "Poweroff handler already present!\n");
}
}
if (of_device_is_system_power_controller(pdev->dev.parent->of_node))
devm_register_sys_off_handler(dev, SYS_OFF_MODE_POWER_OFF,
SYS_OFF_PRIO_DEFAULT,
bcm2835_power_off, wdt);
dev_info(dev, "Broadcom BCM2835 watchdog timer");
return 0;
}
static void bcm2835_wdt_remove(struct platform_device *pdev)
{
if (pm_power_off == bcm2835_power_off)
pm_power_off = NULL;
}
static struct platform_driver bcm2835_wdt_driver = {
.probe = bcm2835_wdt_probe,
.remove = bcm2835_wdt_remove,
.driver = {
.name = "bcm2835-wdt",
},