From 366dfa4c5b89cd2efe091c5d06a21bd5ad17d585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 18 Jul 2022 15:44:32 +0200 Subject: [PATCH] bcm4908: use upstream-accepted watchdog patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki (cherry picked from commit 864fdf2bf3f4b5c71e57a27c514672b966580148) --- ...watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch} | 4 ++++ ...dog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch} | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) rename target/linux/bcm4908/patches-5.4/{181-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch => 089-v5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch} (81%) rename target/linux/bcm4908/patches-5.4/{182-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch => 090-v5.20-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch} (71%) diff --git a/target/linux/bcm4908/patches-5.4/181-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch b/target/linux/bcm4908/patches-5.4/089-v5.18-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch 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 a42fb7d611b..23671c8d3d6 100644 --- a/target/linux/bcm4908/patches-5.4/181-watchdog-allow-building-BCM7038_WDT-for-BCM4908.patch +++ b/target/linux/bcm4908/patches-5.4/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?= 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 Acked-by: Florian Fainelli Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20220209203202.26395-1-zajec5@gmail.com +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck --- drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/bcm4908/patches-5.4/182-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch b/target/linux/bcm4908/patches-5.4/090-v5.20-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch 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 6a6f7e42994..d6d2fd9ab61 100644 --- a/target/linux/bcm4908/patches-5.4/182-watchdog-bcm7038_wdt-Support-BCM6345-compatible-stri.patch +++ b/target/linux/bcm4908/patches-5.4/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?= -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 Signed-off-by: Rafał Miłecki +Acked-by: Florian Fainelli +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20220216063408.23168-1-zajec5@gmail.com +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck --- drivers/watchdog/bcm7038_wdt.c | 1 + 1 file changed, 1 insertion(+)