aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.10/189-watchdog-sama5d4_wdt-add-support-for-sama7g5-wdt.patch
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-03-02 13:11:44 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2022-03-05 21:05:45 +0100
commit05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5 (patch)
tree68e66de94e62af2e06719bd8e6b56f88ce80993a /target/linux/at91/patches-5.10/189-watchdog-sama5d4_wdt-add-support-for-sama7g5-wdt.patch
parentef4bf8b403205062ddb38ebe7b8c4951be346368 (diff)
downloadupstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.gz
upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.bz2
upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.zip
kernel: bump 5.10 to 5.10.103
Patches automatically rebased. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/at91/patches-5.10/189-watchdog-sama5d4_wdt-add-support-for-sama7g5-wdt.patch')
-rw-r--r--target/linux/at91/patches-5.10/189-watchdog-sama5d4_wdt-add-support-for-sama7g5-wdt.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/at91/patches-5.10/189-watchdog-sama5d4_wdt-add-support-for-sama7g5-wdt.patch b/target/linux/at91/patches-5.10/189-watchdog-sama5d4_wdt-add-support-for-sama7g5-wdt.patch
index 55ce7c525b..b79ccadf92 100644
--- a/target/linux/at91/patches-5.10/189-watchdog-sama5d4_wdt-add-support-for-sama7g5-wdt.patch
+++ b/target/linux/at91/patches-5.10/189-watchdog-sama5d4_wdt-add-support-for-sama7g5-wdt.patch
@@ -18,11 +18,9 @@ Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/watchdog/sama5d4_wdt.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
-diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
-index e5d11d6a2600..ec20ad4e534f 100644
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
-@@ -268,8 +268,10 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
+@@ -268,8 +268,10 @@ static int sama5d4_wdt_probe(struct plat
wdd->min_timeout = MIN_WDT_TIMEOUT;
wdd->max_timeout = MAX_WDT_TIMEOUT;
wdt->last_ping = jiffies;
@@ -35,7 +33,7 @@ index e5d11d6a2600..ec20ad4e534f 100644
watchdog_set_drvdata(wdd, wdt);
-@@ -329,6 +331,10 @@ static const struct of_device_id sama5d4_wdt_of_match[] = {
+@@ -329,6 +331,10 @@ static const struct of_device_id sama5d4
{
.compatible = "microchip,sam9x60-wdt",
},
@@ -46,6 +44,3 @@ index e5d11d6a2600..ec20ad4e534f 100644
{ }
};
MODULE_DEVICE_TABLE(of, sama5d4_wdt_of_match);
---
-2.32.0
-