[openwrt/openwrt] bcm4908: use upstream-accepted watchdog patches

[LEDE Commits]

rmilecki pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/864fdf2bf3f4b5c71e57a27c514672b966580148

commit 864fdf2bf3f4b5c71e57a27c514672b966580148
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Mon Jul 18 15:44:32 2022 +0200

    bcm4908: use upstream-accepted watchdog patches
    
    Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
 ...5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch} |  8 ++++++--
 ...watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch} | 10 ++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/target/linux/bcm4908/patches-5.10/181-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch b/target/linux/bcm4908/patches-5.10/089-v5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch
similarity index 75%
rename from target/linux/bcm4908/patches-5.10/181-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch
rename to target/linux/bcm4908/patches-5.10/089-v5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch
index ed38c301db..a03d538db9 100644
--- a/target/linux/bcm4908/patches-5.10/181-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch
+++ b/target/linux/bcm4908/patches-5.10/089-v5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch
@@ -1,3 +1,4 @@
+From cd91fb2776967b2b2dea27307a3f23ba3d9bbb32 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
 Date: Wed, 9 Feb 2022 21:32:02 +0100
 Subject: [PATCH] watchdog: allow building BCM7038_WDT for BCM4908
@@ -11,14 +12,17 @@ including the watchdog block. Allow building this driver for it.
 Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
 Acked-by: Florian Fainelli <f.fainelli at gmail.com>
 Reviewed-by: Guenter Roeck <linux at roeck-us.net>
+Link: https://lore.kernel.org/r/20220209203202.26395-1-zajec5@gmail.com
+Signed-off-by: Guenter Roeck <linux at roeck-us.net>
+Signed-off-by: Wim Van Sebroeck <wim at linux-watchdog.org>
 ---
  drivers/watchdog/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -1800,7 +1800,7 @@ config BCM7038_WDT
- 	tristate "BCM7038 Watchdog"
+@@ -1779,7 +1779,7 @@ config BCM7038_WDT
+ 	tristate "BCM63xx/BCM7038 Watchdog"
  	select WATCHDOG_CORE
  	depends on HAS_IOMEM
 -	depends on ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST
diff --git a/target/linux/bcm4908/patches-5.10/182-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch b/target/linux/bcm4908/patches-5.10/090-v5.20-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch
similarity index 65%
rename from target/linux/bcm4908/patches-5.10/182-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch
rename to target/linux/bcm4908/patches-5.10/090-v5.20-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch
index 6a6f7e4299..9d11a55ffa 100644
--- a/target/linux/bcm4908/patches-5.10/182-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch
+++ b/target/linux/bcm4908/patches-5.10/090-v5.20-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch
@@ -1,5 +1,6 @@
+From 2dd441f16d6ad6104d85c4e5dfeb6dde4df26869 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at 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,13 +13,18 @@ programmed just like the 7038 one.
 
 Cc: Florian Fainelli <f.fainelli at gmail.com>
 Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+Acked-by: Florian Fainelli <f.fainelli at gmail.com>
+Reviewed-by: Guenter Roeck <linux at roeck-us.net>
+Link: https://lore.kernel.org/r/20220216063408.23168-1-zajec5@gmail.com
+Signed-off-by: Guenter Roeck <linux at roeck-us.net>
+Signed-off-by: Wim Van Sebroeck <wim at linux-watchdog.org>
 ---
  drivers/watchdog/bcm7038_wdt.c | 1 +
  1 file changed, 1 insertion(+)
 
 --- a/drivers/watchdog/bcm7038_wdt.c
 +++ b/drivers/watchdog/bcm7038_wdt.c
-@@ -193,6 +193,7 @@ static SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_
+@@ -218,6 +218,7 @@ static SIMPLE_DEV_PM_OPS(bcm7038_wdt_pm_ops, bcm7038_wdt_suspend,
  			 bcm7038_wdt_resume);
  
  static const struct of_device_id bcm7038_wdt_match[] = {