From 8299d1f057439f94c6a4412e2e5c5082b82a30c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Sat, 21 Aug 2021 10:54:34 +0200
Subject: bcm27xx: add kernel 5.10 support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted
patches, wireless patches and defconfig patches.
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 4B v1.1 4G
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
...oweroff-Remember-the-old-poweroff-handler.patch | 53 ++++++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100644 target/linux/bcm27xx/patches-5.10/950-0591-gpio-poweroff-Remember-the-old-poweroff-handler.patch
(limited to 'target/linux/bcm27xx/patches-5.10/950-0591-gpio-poweroff-Remember-the-old-poweroff-handler.patch')
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);
+
--
cgit v1.2.3