kernel-5.4: bump to 5.4.102 and refresh patches

[openwrt/staging/mkresin.git] / target / linux / ipq806x / patches-5.4 / 088-v5.8-watchdog-qcom-wdt-disable-pretimeout-on-timer-platfo.patch

diff --git a/target/linux/ipq806x/patches-5.4/088-v5.8-watchdog-qcom-wdt-disable-pretimeout-on-timer-platfo.patch b/target/linux/ipq806x/patches-5.4/088-v5.8-watchdog-qcom-wdt-disable-pretimeout-on-timer-platfo.patch
index 605eb7d07b947b7acd938bd869658fc8d3527f70..1bd44fd5a0b2517c380eb7d4871fcb4a78808114 100644 (file)
--- a/target/linux/ipq806x/patches-5.4/088-v5.8-watchdog-qcom-wdt-disable-pretimeout-on-timer-platfo.patch
+++ b/target/linux/ipq806x/patches-5.4/088-v5.8-watchdog-qcom-wdt-disable-pretimeout-on-timer-platfo.patch
@@ -20,7 +20,7 @@ Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
 
 --- a/drivers/watchdog/qcom-wdt.c
 +++ b/drivers/watchdog/qcom-wdt.c
-@@ -40,6 +40,11 @@ static const u32 reg_offset_data_kpss[]
+@@ -39,6 +39,11 @@ static const u32 reg_offset_data_kpss[]
        [WDT_BITE_TIME] = 0x14,
  };
  
@@ -32,7 +32,7 @@ Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
  struct qcom_wdt {
        struct watchdog_device  wdd;
        unsigned long           rate;
-@@ -179,19 +184,29 @@ static void qcom_clk_disable_unprepare(v
+@@ -168,19 +173,29 @@ static void qcom_clk_disable_unprepare(v
        clk_disable_unprepare(data);
  }
  
@@ -65,7 +65,7 @@ Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
                dev_err(dev, "Unsupported QCOM WDT module\n");
                return -ENODEV;
        }
-@@ -247,7 +262,7 @@ static int qcom_wdt_probe(struct platfor
+@@ -236,7 +251,7 @@ static int qcom_wdt_probe(struct platfor
  
        /* check if there is pretimeout support */
        irq = platform_get_irq_optional(pdev, 0);
@@ -74,7 +74,7 @@ Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
                ret = devm_request_irq(dev, irq, qcom_wdt_isr,
                                       IRQF_TRIGGER_RISING,
                                       "wdt_bark", &wdt->wdd);
-@@ -267,7 +282,7 @@ static int qcom_wdt_probe(struct platfor
+@@ -256,7 +271,7 @@ static int qcom_wdt_probe(struct platfor
        wdt->wdd.min_timeout = 1;
        wdt->wdd.max_timeout = 0x10000000U / wdt->rate;
        wdt->wdd.parent = dev;
@@ -83,7 +83,7 @@ Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
  
        if (readl(wdt_addr(wdt, WDT_STS)) & 1)
                wdt->wdd.bootstatus = WDIOF_CARDRESET;
-@@ -311,9 +326,9 @@ static int __maybe_unused qcom_wdt_resum
+@@ -300,9 +315,9 @@ static int __maybe_unused qcom_wdt_resum
  static SIMPLE_DEV_PM_OPS(qcom_wdt_pm_ops, qcom_wdt_suspend, qcom_wdt_resume);
  
  static const struct of_device_id qcom_wdt_of_table[] = {