]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
bcm4908: use upstream-accepted watchdog patches
authorRafał Miłecki <rafal@milecki.pl>
Mon, 18 Jul 2022 13:44:32 +0000 (15:44 +0200)
committerRafał Miłecki <rafal@milecki.pl>
Mon, 18 Jul 2022 17:45:37 +0000 (19:45 +0200)
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 864fdf2bf3f4b5c71e57a27c514672b966580148)

target/linux/bcm4908/patches-5.4/089-v5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch [moved from target/linux/bcm4908/patches-5.4/181-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch with 81% similarity]
target/linux/bcm4908/patches-5.4/090-v5.20-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch [moved from target/linux/bcm4908/patches-5.4/182-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch with 71% similarity]

similarity index 81%
rename from target/linux/bcm4908/patches-5.4/181-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch
rename to target/linux/bcm4908/patches-5.4/089-v5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch
index a42fb7d611babb17cff71aeae73dd0fbd27724b1..23671c8d3d6a813442ebe09366da0d40d352c7ac 100644 (file)
@@ -1,3 +1,4 @@
+From cd91fb2776967b2b2dea27307a3f23ba3d9bbb32 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
 Date: Wed, 9 Feb 2022 21:32:02 +0100
 Subject: [PATCH] watchdog: allow building BCM7038_WDT for BCM4908
@@ -11,6 +12,9 @@ including the watchdog block. Allow building this driver for it.
 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 Acked-by: Florian Fainelli <f.fainelli@gmail.com>
 Reviewed-by: Guenter Roeck <linux@roeck-us.net>
+Link: https://lore.kernel.org/r/20220209203202.26395-1-zajec5@gmail.com
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
 ---
  drivers/watchdog/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
similarity index 71%
rename from target/linux/bcm4908/patches-5.4/182-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch
rename to target/linux/bcm4908/patches-5.4/090-v5.20-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch
index 6a6f7e42994678717666a5e941bc924a11c729b7..d6d2fd9ab6125e06a67e641da8b571c1d2fd206d 100644 (file)
@@ -1,5 +1,6 @@
+From 2dd441f16d6ad6104d85c4e5dfeb6dde4df26869 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 16 Feb 2022 07:28:34 +0100
+Date: Wed, 16 Feb 2022 07:34:08 +0100
 Subject: [PATCH] watchdog: bcm7038_wdt: Support BCM6345 compatible string
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -12,6 +13,11 @@ programmed just like the 7038 one.
 
 Cc: Florian Fainelli <f.fainelli@gmail.com>
 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Acked-by: Florian Fainelli <f.fainelli@gmail.com>
+Reviewed-by: Guenter Roeck <linux@roeck-us.net>
+Link: https://lore.kernel.org/r/20220216063408.23168-1-zajec5@gmail.com
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
 ---
  drivers/watchdog/bcm7038_wdt.c | 1 +
  1 file changed, 1 insertion(+)