diff options
| author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2019-09-18 15:32:45 +0300 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-01-27 20:36:26 +0200 |
| commit | 4309fde637b7218b0d60a9966c9738583e97a96f (patch) | |
| tree | fb330c334d67189aba98abd9a3f7e21bf4d016a1 | |
| parent | d2fa055fecec8efb9ece9a133c693ab9a0133a25 (diff) | |
power: reset: gpio-poweroff: add force-mode
Property "force-mode" tells the driver to replace previously
initialized power-off kernel hook and allows gpio-poweroff to
probe and operate successfully in any case.
Related-to: #42589
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
(cherry picked from commit 371447a8663984d8ff090288247805cea3dc4282)
Conflicts:
Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt
drivers/power/reset/gpio-poweroff.c
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt | 3 | ||||
| -rw-r--r-- | drivers/power/reset/gpio-poweroff.c | 27 |
2 files changed, 24 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt index 3e56c1b34a4c..2056e299a472 100644 --- a/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt +++ b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt @@ -31,6 +31,9 @@ Optional properties: - inactive-delay-ms: Delay (default 100) to wait after driving gpio inactive - timeout-ms: Time to wait before asserting a WARN_ON(1). If nothing is specified, 3000 ms is used. +- force-mode: Force replacing pm_power_off kernel hook. + If this optional property is not specified, the driver will fail to + load if someone has registered the pm_power_off hook earlier. Examples: diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c index 6a4bbb506551..2725d30aa9c7 100644 --- a/drivers/power/reset/gpio-poweroff.c +++ b/drivers/power/reset/gpio-poweroff.c @@ -24,6 +24,7 @@ static struct gpio_desc *reset_gpio; static u32 timeout = DEFAULT_TIMEOUT_MS; static u32 active_delay = 100; static u32 inactive_delay = 100; +static void *prev_pm_power_off = NULL; static void gpio_poweroff_do_poweroff(void) { @@ -49,14 +50,28 @@ static void gpio_poweroff_do_poweroff(void) static int gpio_poweroff_probe(struct platform_device *pdev) { bool input = false; + bool force = false; enum gpiod_flags flags; - /* If a pm_power_off function has already been added, leave it alone */ + + force = of_property_read_bool(pdev->dev.of_node, "force-mode"); + + /* + * If a pm_power_off function has already been added, leave it alone, + * if force-mode is not enabled. + */ if (pm_power_off != NULL) { - dev_err(&pdev->dev, - "%s: pm_power_off function already registered", - __func__); - return -EBUSY; + if (force) { + dev_warn(&pdev->dev, + "%s: pm_power_off function replaced", + __func__); + prev_pm_power_off = pm_power_off; + } else { + dev_err(&pdev->dev, + "%s: pm_power_off function already registered", + __func__); + return -EBUSY; + } } input = device_property_read_bool(&pdev->dev, "input"); @@ -81,7 +96,7 @@ static int gpio_poweroff_probe(struct platform_device *pdev) static int gpio_poweroff_remove(struct platform_device *pdev) { if (pm_power_off == &gpio_poweroff_do_poweroff) - pm_power_off = NULL; + pm_power_off = prev_pm_power_off; return 0; } |