diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-08-21 10:54:34 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-08-21 19:07:07 +0200 |
commit | 8299d1f057439f94c6a4412e2e5c5082b82a30c9 (patch) | |
tree | 1bf678d61f11f7394493be464c7876e496f7faed /target/linux/bcm27xx/patches-5.10/950-0369-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch | |
parent | 33b6885975ce376ff075362b7f0890326043111b (diff) | |
download | upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.tar.gz upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.tar.bz2 upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.zip |
bcm27xx: add kernel 5.10 support
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>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0369-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0369-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0369-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch b/target/linux/bcm27xx/patches-5.10/950-0369-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch new file mode 100644 index 0000000000..dba18c6fc6 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.10/950-0369-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch @@ -0,0 +1,29 @@ +From c518032ec09c3e21872a5b2f9114655d55d9ade1 Mon Sep 17 00:00:00 2001 +From: Tim Gover <tim.gover@raspberrypi.org> +Date: Thu, 22 Oct 2020 15:30:55 +0100 +Subject: [PATCH] watchdog: bcm2835: Ignore params after the partition + number + +Use sscanf to extract the partition number and ignore extra parameters +which are only relevant to other reboot notifiers. +--- + drivers/watchdog/bcm2835_wdt.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/watchdog/bcm2835_wdt.c ++++ b/drivers/watchdog/bcm2835_wdt.c +@@ -126,10 +126,12 @@ static int bcm2835_restart(struct watchd + { + struct bcm2835_wdt *wdt = watchdog_get_drvdata(wdog); + +- unsigned long long val; ++ unsigned long val; + u8 partition = 0; + +- if (data && !kstrtoull(data, 0, &val) && val <= 63) ++ // Allow extra arguments separated by spaces after ++ // the partition number. ++ if (data && sscanf(data, "%lu", &val) && val < 63) + partition = val; + + __bcm2835_restart(wdt, partition); |