kernel: bump 4.14 to 4.14.93

[openwrt/openwrt.git] / target / linux / cns3xxx / patches-4.14 / 020-watchdog_support.patch

diff --git a/target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch b/target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch
index 4f9f3e64652235d859b9e2a688ce99d2cfa9a094..df413c90409d098e96db922f7f484257528bb301 100644 (file)
--- a/target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch
+++ b/target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch
@@ -1,10 +1,9 @@
 Add a watchdog driver for ARM MPcore processors.
 
 Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -324,6 +324,13 @@ config KS8695_WATCHDOG
+@@ -355,6 +355,13 @@ config KS8695_WATCHDOG
          Watchdog timer embedded into KS8695 processor. This will reboot your
          system when the timeout is reached.
  
@@ -20,8 +19,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        help
 --- a/drivers/watchdog/Makefile
 +++ b/drivers/watchdog/Makefile
-@@ -47,6 +47,7 @@ obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
- obj-$(CONFIG_977_WATCHDOG) += wdt977.o
+@@ -49,6 +49,7 @@ obj-$(CONFIG_977_WATCHDOG) += wdt977.o
+ obj-$(CONFIG_GEMINI_WATCHDOG) += gemini_wdt.o
  obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
  obj-$(CONFIG_KS8695_WATCHDOG) += ks8695_wdt.o
 +obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
@@ -118,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +      struct resource *res;
 +      unsigned long rate = twd_timer_get_rate();
 +
-+      pr_info("MPCore WD init. clockrate: %u prescaler: %u countrate: %u timeout: %us\n", rate, 256, rate / 256, wdt_timeout);
++      pr_info("MPCore WD init. clockrate: %lu prescaler: %u countrate: %lu timeout: %us\n", rate, 256, rate / 256, wdt_timeout);
 +
 +      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 +      if (!res)
@@ -151,7 +150,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +MODULE_LICENSE("GPL");
 --- a/arch/arm/include/asm/smp_twd.h
 +++ b/arch/arm/include/asm/smp_twd.h
-@@ -33,5 +33,6 @@ struct twd_local_timer name __initdata =
+@@ -34,5 +34,6 @@ struct twd_local_timer name __initdata =
  };
  
  int twd_local_timer_register(struct twd_local_timer *);