Skip to content

Commit b16d9f4

Browse files
eichenbergersre
authored andcommitted
power: reset: gpio-poweroff: use sys-off handler API
Use the new sys-off handler API for gpio-poweroff. This allows us to have more than one poweroff handler and prioritise them. Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> Link: https://lore.kernel.org/r/20231006130428.11259-3-francesco@dolcini.it Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 13b4c69 commit b16d9f4

1 file changed

Lines changed: 12 additions & 25 deletions

File tree

drivers/power/reset/gpio-poweroff.c

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/gpio/consumer.h>
1616
#include <linux/mod_devicetable.h>
1717
#include <linux/module.h>
18+
#include <linux/reboot.h>
1819

1920
#define DEFAULT_TIMEOUT_MS 3000
2021

@@ -25,15 +26,9 @@ struct gpio_poweroff {
2526
u32 inactive_delay_ms;
2627
};
2728

28-
/*
29-
* Hold configuration here, cannot be more than one instance of the driver
30-
* since pm_power_off itself is global.
31-
*/
32-
static struct gpio_poweroff *gpio_poweroff;
33-
34-
static void gpio_poweroff_do_poweroff(void)
29+
static int gpio_poweroff_do_poweroff(struct sys_off_data *data)
3530
{
36-
BUG_ON(!gpio_poweroff);
31+
struct gpio_poweroff *gpio_poweroff = data->cb_data;
3732

3833
/* drive it active, also inactive->active edge */
3934
gpiod_direction_output(gpio_poweroff->reset_gpio, 1);
@@ -50,20 +45,16 @@ static void gpio_poweroff_do_poweroff(void)
5045
mdelay(gpio_poweroff->timeout_ms);
5146

5247
WARN_ON(1);
48+
49+
return NOTIFY_DONE;
5350
}
5451

5552
static int gpio_poweroff_probe(struct platform_device *pdev)
5653
{
54+
struct gpio_poweroff *gpio_poweroff;
5755
bool input = false;
5856
enum gpiod_flags flags;
59-
60-
/* If a pm_power_off function has already been added, leave it alone */
61-
if (pm_power_off != NULL) {
62-
dev_err(&pdev->dev,
63-
"%s: pm_power_off function already registered\n",
64-
__func__);
65-
return -EBUSY;
66-
}
57+
int ret;
6758

6859
gpio_poweroff = devm_kzalloc(&pdev->dev, sizeof(*gpio_poweroff), GFP_KERNEL);
6960
if (!gpio_poweroff)
@@ -89,14 +80,11 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
8980
if (IS_ERR(gpio_poweroff->reset_gpio))
9081
return PTR_ERR(gpio_poweroff->reset_gpio);
9182

92-
pm_power_off = &gpio_poweroff_do_poweroff;
93-
return 0;
94-
}
95-
96-
static int gpio_poweroff_remove(struct platform_device *pdev)
97-
{
98-
if (pm_power_off == &gpio_poweroff_do_poweroff)
99-
pm_power_off = NULL;
83+
ret = devm_register_sys_off_handler(&pdev->dev, SYS_OFF_MODE_POWER_OFF,
84+
SYS_OFF_PRIO_DEFAULT, gpio_poweroff_do_poweroff,
85+
gpio_poweroff);
86+
if (ret)
87+
return dev_err_probe(&pdev->dev, ret, "Cannot register poweroff handler\n");
10088

10189
return 0;
10290
}
@@ -109,7 +97,6 @@ MODULE_DEVICE_TABLE(of, of_gpio_poweroff_match);
10997

11098
static struct platform_driver gpio_poweroff_driver = {
11199
.probe = gpio_poweroff_probe,
112-
.remove = gpio_poweroff_remove,
113100
.driver = {
114101
.name = "poweroff-gpio",
115102
.of_match_table = of_gpio_poweroff_match,

0 commit comments

Comments
 (0)