From: Francesco Dolcini <[email protected]>
Use the new sys-off handler API for gpio-poweroff. This allows us to have more
than one power-off handler and to have a priority for the handler. Also, add a
priority property so we can use gpio-poweroff even when registering another
poweroff handler or using the legacy pm_power_off method.
v1->v2:
- Add $ref to restart-handler.yaml in gpio-poweroff.yaml
Stefan Eichenberger (4):
power: reset: gpio-poweroff: use a struct to store the module
variables
power: reset: gpio-poweroff: use sys-off handler API
dt-bindings: power: reset: gpio-poweroff: Add priority property
power: reset: gpio-poweroff: make sys handler priority configurable
.../bindings/power/reset/gpio-poweroff.yaml | 6 ++
drivers/power/reset/gpio-poweroff.c | 82 ++++++++++---------
2 files changed, 50 insertions(+), 38 deletions(-)
--
2.25.1
From: Stefan Eichenberger <[email protected]>
Use a struct to store the module variables. This is required to later
move to notifier_blocks where we can have several instances.
Signed-off-by: Stefan Eichenberger <[email protected]>
Signed-off-by: Francesco Dolcini <[email protected]>
---
drivers/power/reset/gpio-poweroff.c | 48 +++++++++++++++++++----------
1 file changed, 31 insertions(+), 17 deletions(-)
diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
index b28f24da1b3c..dea550e422f3 100644
--- a/drivers/power/reset/gpio-poweroff.c
+++ b/drivers/power/reset/gpio-poweroff.c
@@ -17,32 +17,37 @@
#include <linux/module.h>
#define DEFAULT_TIMEOUT_MS 3000
+
+struct gpio_poweroff {
+ struct gpio_desc *reset_gpio;
+ u32 timeout_ms;
+ u32 active_delay_ms;
+ u32 inactive_delay_ms;
+};
+
/*
* Hold configuration here, cannot be more than one instance of the driver
* since pm_power_off itself is global.
*/
-static struct gpio_desc *reset_gpio;
-static u32 timeout = DEFAULT_TIMEOUT_MS;
-static u32 active_delay = 100;
-static u32 inactive_delay = 100;
+static struct gpio_poweroff *gpio_poweroff;
static void gpio_poweroff_do_poweroff(void)
{
- BUG_ON(!reset_gpio);
+ BUG_ON(!gpio_poweroff);
/* drive it active, also inactive->active edge */
- gpiod_direction_output(reset_gpio, 1);
- mdelay(active_delay);
+ gpiod_direction_output(gpio_poweroff->reset_gpio, 1);
+ mdelay(gpio_poweroff->active_delay_ms);
/* drive inactive, also active->inactive edge */
- gpiod_set_value_cansleep(reset_gpio, 0);
- mdelay(inactive_delay);
+ gpiod_set_value_cansleep(gpio_poweroff->reset_gpio, 0);
+ mdelay(gpio_poweroff->inactive_delay_ms);
/* drive it active, also inactive->active edge */
- gpiod_set_value_cansleep(reset_gpio, 1);
+ gpiod_set_value_cansleep(gpio_poweroff->reset_gpio, 1);
/* give it some time */
- mdelay(timeout);
+ mdelay(gpio_poweroff->timeout_ms);
WARN_ON(1);
}
@@ -60,20 +65,29 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
return -EBUSY;
}
+ gpio_poweroff = devm_kzalloc(&pdev->dev, sizeof(*gpio_poweroff), GFP_KERNEL);
+ if (!gpio_poweroff)
+ return -ENOMEM;
+
input = device_property_read_bool(&pdev->dev, "input");
if (input)
flags = GPIOD_IN;
else
flags = GPIOD_OUT_LOW;
- device_property_read_u32(&pdev->dev, "active-delay-ms", &active_delay);
+
+ gpio_poweroff->active_delay_ms = 100;
+ gpio_poweroff->inactive_delay_ms = 100;
+ gpio_poweroff->timeout_ms = DEFAULT_TIMEOUT_MS;
+
+ device_property_read_u32(&pdev->dev, "active-delay-ms", &gpio_poweroff->active_delay_ms);
device_property_read_u32(&pdev->dev, "inactive-delay-ms",
- &inactive_delay);
- device_property_read_u32(&pdev->dev, "timeout-ms", &timeout);
+ &gpio_poweroff->inactive_delay_ms);
+ device_property_read_u32(&pdev->dev, "timeout-ms", &gpio_poweroff->timeout_ms);
- reset_gpio = devm_gpiod_get(&pdev->dev, NULL, flags);
- if (IS_ERR(reset_gpio))
- return PTR_ERR(reset_gpio);
+ gpio_poweroff->reset_gpio = devm_gpiod_get(&pdev->dev, NULL, flags);
+ if (IS_ERR(gpio_poweroff->reset_gpio))
+ return PTR_ERR(gpio_poweroff->reset_gpio);
pm_power_off = &gpio_poweroff_do_poweroff;
return 0;
--
2.25.1
From: Stefan Eichenberger <[email protected]>
Add a priority property equal to gpio-restart to allow increasing the
priority of the gpio-poweroff handler.
Signed-off-by: Stefan Eichenberger <[email protected]>
Signed-off-by: Francesco Dolcini <[email protected]>
---
drivers/power/reset/gpio-poweroff.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
index 0deb293eb2d6..52cfeee2cb28 100644
--- a/drivers/power/reset/gpio-poweroff.c
+++ b/drivers/power/reset/gpio-poweroff.c
@@ -54,6 +54,7 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
struct gpio_poweroff *gpio_poweroff;
bool input = false;
enum gpiod_flags flags;
+ int priority = SYS_OFF_PRIO_DEFAULT;
int ret;
gpio_poweroff = devm_kzalloc(&pdev->dev, sizeof(*gpio_poweroff), GFP_KERNEL);
@@ -75,14 +76,18 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
device_property_read_u32(&pdev->dev, "inactive-delay-ms",
&gpio_poweroff->inactive_delay_ms);
device_property_read_u32(&pdev->dev, "timeout-ms", &gpio_poweroff->timeout_ms);
+ device_property_read_u32(&pdev->dev, "priority", &priority);
+ if (priority > 255) {
+ dev_err(&pdev->dev, "Invalid priority property: %u\n", priority);
+ return -EINVAL;
+ }
gpio_poweroff->reset_gpio = devm_gpiod_get(&pdev->dev, NULL, flags);
if (IS_ERR(gpio_poweroff->reset_gpio))
return PTR_ERR(gpio_poweroff->reset_gpio);
ret = devm_register_sys_off_handler(&pdev->dev, SYS_OFF_MODE_POWER_OFF,
- SYS_OFF_PRIO_DEFAULT, gpio_poweroff_do_poweroff,
- gpio_poweroff);
+ priority, gpio_poweroff_do_poweroff, gpio_poweroff);
if (ret)
return dev_err_probe(&pdev->dev, ret, "Cannot register poweroff handler\n");
--
2.25.1
On Fri, 06 Oct 2023 10:04:24 -0300, Francesco Dolcini wrote:
> Use the new sys-off handler API for gpio-poweroff. This allows us to have more
> than one power-off handler and to have a priority for the handler. Also, add a
> priority property so we can use gpio-poweroff even when registering another
> poweroff handler or using the legacy pm_power_off method.
>
> v1->v2:
> - Add $ref to restart-handler.yaml in gpio-poweroff.yaml
>
> [...]
Applied, thanks!
[1/4] power: reset: gpio-poweroff: use a struct to store the module variables
commit: 13b4c6964665cadb9b06c085029710c43a0c662e
[2/4] power: reset: gpio-poweroff: use sys-off handler API
commit: b16d9f49735f3d26e23f0ba4a2cf21668fc6b66b
[3/4] dt-bindings: power: reset: gpio-poweroff: Add priority property
commit: 4ee17bd30788496a279ceaabc7ecaaf39f61cfc4
[4/4] power: reset: gpio-poweroff: make sys handler priority configurable
commit: d03d2a8cdefe86f04cfb53934a708620e7dfbfcb
Best regards,
--
Sebastian Reichel <[email protected]>