diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0591-gpio-poweroff-Remember-the-old-poweroff-handler.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0591-gpio-poweroff-Remember-the-old-poweroff-handler.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0591-gpio-poweroff-Remember-the-old-poweroff-handler.patch b/target/linux/bcm27xx/patches-5.10/950-0591-gpio-poweroff-Remember-the-old-poweroff-handler.patch new file mode 100644 index 0000000000..f154b3373a --- /dev/null +++ b/target/linux/bcm27xx/patches-5.10/950-0591-gpio-poweroff-Remember-the-old-poweroff-handler.patch @@ -0,0 +1,53 @@ +From 6fe800dee9b24ef1d75a0acd5b067a1e84f2a5da Mon Sep 17 00:00:00 2001 +From: Phil Elwell <phil@raspberrypi.com> +Date: Tue, 27 Apr 2021 08:59:01 +0100 +Subject: [PATCH] gpio-poweroff: Remember the old poweroff handler + +Keeping a copy of the old poweroff handler allows it to be restored +should this module be unloaded, but also provides a fallback if the +power hasn't been removed when the timeout elapses. + +See: https://github.com/raspberrypi/rpi-eeprom/issues/330 + +Signed-off-by: Phil Elwell <phil@raspberrypi.com> +--- + drivers/power/reset/gpio-poweroff.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- 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 (*old_power_off)(void); + + static void gpio_poweroff_do_poweroff(void) + { +@@ -43,6 +44,9 @@ static void gpio_poweroff_do_poweroff(vo + /* give it some time */ + mdelay(timeout); + ++ if (old_power_off) ++ old_power_off(); ++ + WARN_ON(1); + } + +@@ -83,6 +87,7 @@ static int gpio_poweroff_probe(struct pl + gpiod_export_link(&pdev->dev, "poweroff-gpio", reset_gpio); + } + ++ old_power_off = pm_power_off; + pm_power_off = &gpio_poweroff_do_poweroff; + return 0; + } +@@ -90,7 +95,7 @@ static int gpio_poweroff_probe(struct pl + static int gpio_poweroff_remove(struct platform_device *pdev) + { + if (pm_power_off == &gpio_poweroff_do_poweroff) +- pm_power_off = NULL; ++ pm_power_off = old_power_off; + + gpiod_unexport(reset_gpio); + |